File tree Expand file tree Collapse file tree 3 files changed +9
-7
lines changed Expand file tree Collapse file tree 3 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -58,7 +58,6 @@ module.exports = React.createClass( {
58
58
} ,
59
59
60
60
componentDidMount ( ) {
61
- Modal . setAppElement ( SLDSSettings . getAppElement ( ) ) ;
62
61
//console.log('!!! window.activeElement !!! ',document.activeElement);
63
62
this . setState ( { returnFocusTo :document . activeElement } )
64
63
if ( ! this . state . revealed ) {
Original file line number Diff line number Diff line change @@ -10,6 +10,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
10
10
*/
11
11
12
12
'use strict' ;
13
+ import Modal from 'react-modal' ;
14
+
13
15
14
16
let assetsPath = 'assets/' ;
15
17
let appRoot ;
@@ -25,9 +27,10 @@ module.exports = {
25
27
setAppElement : ( el ) => {
26
28
if ( el ) {
27
29
appRoot = el ;
30
+ Modal . setAppElement ( el ) ;
28
31
}
29
32
} ,
30
33
getAppElement : ( ) => {
31
34
return appRoot ;
32
35
}
33
- } ;
36
+ } ;
Original file line number Diff line number Diff line change @@ -12,13 +12,13 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
12
12
import SLDSPicklistBase from './SLDSPicklistBase' ;
13
13
import SLDSSettings from './SLDSSettings' ;
14
14
import SLDSButton from './SLDSButton' ;
15
- // import SLDSModal from './SLDSModal';
16
- // import SLDSModalTrigger from './SLDSModal/trigger';
15
+ import SLDSModal from './SLDSModal' ;
16
+ import SLDSModalTrigger from './SLDSModal/trigger' ;
17
17
18
18
module . exports = {
19
19
SLDSPicklistBase : SLDSPicklistBase ,
20
20
SLDSSettings : SLDSSettings ,
21
21
SLDSButton : SLDSButton ,
22
- // SLDSModal: SLDSModal,
23
- // SLDSModalTrigger: SLDSModalTrigger
24
- } ;
22
+ SLDSModal : SLDSModal ,
23
+ SLDSModalTrigger : SLDSModalTrigger
24
+ } ;
You can’t perform that action at this time.
0 commit comments