@@ -78,14 +78,14 @@ export default class PermissionsCollaboratorDialog extends React.Component {
78
78
super ( ) ;
79
79
80
80
const isDefault = lodash . isEqual ( customPermissions , defaultPermissions )
81
- this . isDefault = isDefault
82
81
83
82
this . state = {
84
83
transitioning : false ,
85
84
showLevels : false ,
86
85
level : 'Simple' , // 'Simple' | 'Advanced'
87
86
customPermissions,
88
87
features,
88
+ isDefault,
89
89
selectedTab : ( isDefault ? 'Default' : 'Custom' )
90
90
} ;
91
91
}
@@ -146,7 +146,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
146
146
</ SliderWrap >
147
147
< div className = { styles . tableWrap } >
148
148
< div className = { styles . table } >
149
- < Tabs >
149
+ < Tabs defaultIndex = { ( this . state . isDefault ? 0 : 1 ) } >
150
150
< div className = { styles . subHeader } >
151
151
< div className = { [ styles . public , styles . row ] . join ( ' ' ) } >
152
152
< div className = { styles . label } >
@@ -160,7 +160,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
160
160
id = 'tab1'
161
161
name = 'Tab'
162
162
className = { styles . radiobutton }
163
- defaultChecked = { this . isDefault }
163
+ defaultChecked = { this . state . isDefault }
164
164
disabled = { false }
165
165
onClick = { ( ) => this . setState ( { selectedTab : 'Default' } ) }
166
166
/>
@@ -172,7 +172,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
172
172
< RadioButton
173
173
id = 'tab2'
174
174
name = 'Tab'
175
- defaultChecked = { ! this . isDefault }
175
+ defaultChecked = { ! this . state . isDefault }
176
176
disabled = { false }
177
177
onClick = { ( ) => this . setState ( { selectedTab : 'Custom' } ) }
178
178
/>
@@ -199,12 +199,16 @@ export default class PermissionsCollaboratorDialog extends React.Component {
199
199
primary = { true }
200
200
value = { this . props . confirmText }
201
201
onClick = { ( ) => {
202
- this . props . onConfirm (
203
- ( this . state . selectedTab === 'Default' ?
204
- this . props . defaultPermissions :
205
- this . state . customPermissions
206
- )
207
- )
202
+ let permissions = { }
203
+ if ( this . state . selectedTab === 'Default' ) {
204
+ permissions = this . props . defaultPermissions
205
+ this . setState ( { isDefault : true } )
206
+ } else {
207
+ permissions = this . state . customPermissions
208
+ this . setState ( { isDefault : false } )
209
+ }
210
+ console . log ( 'permissions' , permissions )
211
+ this . props . onConfirm ( permissions )
208
212
} }
209
213
/>
210
214
</ div >
0 commit comments