@@ -5,7 +5,7 @@ export default class ToggleAndDisplayPattern extends React.Component {
5
5
constructor ( ...args ) {
6
6
super ( ...args ) ;
7
7
this . wrapper = null ;
8
- this . _activeChidlren = [ ] ;
8
+ this . _activeChildren = [ ] ;
9
9
this . _hiddenChildren = [ ] ;
10
10
}
11
11
@@ -36,7 +36,7 @@ export default class ToggleAndDisplayPattern extends React.Component {
36
36
child . ref ( c ) ;
37
37
}
38
38
if ( c ) {
39
- this . _activeChidlren . push ( c ) ;
39
+ this . _activeChildren . push ( c ) ;
40
40
}
41
41
} ;
42
42
return React . cloneElement ( child , newProps ) ;
@@ -58,7 +58,7 @@ export default class ToggleAndDisplayPattern extends React.Component {
58
58
}
59
59
60
60
componentWillUpdate ( ) {
61
- this . _activeChidlren = [ ] ;
61
+ this . _activeChildren = [ ] ;
62
62
this . _hiddenChildren = [ ] ;
63
63
}
64
64
@@ -67,7 +67,7 @@ export default class ToggleAndDisplayPattern extends React.Component {
67
67
}
68
68
69
69
componentDidUpdate ( ) {
70
- this . _updatePattens ( )
70
+ this . _updatePattens ( ) ;
71
71
}
72
72
73
73
render ( ) {
@@ -90,7 +90,7 @@ export default class ToggleAndDisplayPattern extends React.Component {
90
90
const activeElement = document . activeElement ;
91
91
isActiveWrapper = wrapper . contains ( activeElement ) ;
92
92
}
93
- this . _activeChidlren . forEach ( child => {
93
+ this . _activeChildren . forEach ( child => {
94
94
const childDOM = findDOMNode ( child ) ;
95
95
if ( childDOM ) {
96
96
childDOM . hidden = false ;
@@ -103,11 +103,12 @@ export default class ToggleAndDisplayPattern extends React.Component {
103
103
}
104
104
} ) ;
105
105
// move to focus
106
- if ( isActiveWrapper && this . _activeChidlren . length === 1 ) {
107
- const activeDOM = findDOMNode ( this . _activeChidlren [ 0 ] ) ;
108
- if ( activeDOM ) {
106
+ if ( isActiveWrapper && this . _activeChildren . length === 1 ) {
107
+ const activeDOM = findDOMNode ( this . _activeChildren [ 0 ] ) ;
108
+ if ( activeDOM && ! activeDOM . contains ( document . activeElement ) ) {
109
109
activeDOM . focus ( ) ;
110
110
}
111
111
}
112
112
}
113
- }
113
+ }
114
+
0 commit comments