Skip to content

Commit cbdd593

Browse files
committed
clean
1 parent 9321bb8 commit cbdd593

4 files changed

Lines changed: 45 additions & 33 deletions

File tree

lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,8 +1183,8 @@ - (void)setOpenSide:(MMDrawerSide)openSide {
11831183
_openSide = openSide;
11841184
[self.centerContainerView setOpenSide:openSide];
11851185
if (openSide == MMDrawerSideNone) {
1186-
// [self.leftDrawerViewController.view setHidden:YES];
1187-
// [self.rightDrawerViewController.view setHidden:YES];
1186+
[self.leftDrawerViewController.view setHidden:YES];
1187+
[self.rightDrawerViewController.view setHidden:YES];
11881188
}
11891189
[self setNeedsStatusBarAppearanceUpdateIfSupported];
11901190
}

playground/src/screens/LayoutsScreen.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export default class LayoutsScreen extends NavigationComponent<NavigationProps,
125125
};
126126

127127
sideMenu = () =>
128-
Navigation.push(this.props.componentId, {
128+
Navigation.showModal({
129129
sideMenu: {
130130
left: {
131131
component: {
@@ -145,12 +145,12 @@ export default class LayoutsScreen extends NavigationComponent<NavigationProps,
145145
name: Screens.SideMenuRight,
146146
},
147147
},
148-
// options: {
149-
// layout: {
150-
// orientation: ['portrait', 'landscape'],
151-
// },
152-
// // modalPresentationStyle: OptionsModalPresentationStyle.pageSheet,
153-
// },
148+
options: {
149+
layout: {
150+
orientation: ['portrait', 'landscape'],
151+
},
152+
modalPresentationStyle: OptionsModalPresentationStyle.pageSheet,
153+
},
154154
},
155155
});
156156

playground/src/screens/SetRootScreen.tsx

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,22 @@ export default class SetRootScreen extends React.Component<NavigationProps> {
336336
},
337337
},
338338
center: {
339-
component: {
340-
name: Screens.SideMenuCenter,
341-
options: {
342-
animations: {
343-
setRoot: {
344-
waitForRender: true,
339+
stack: {
340+
children: [
341+
{
342+
component: {
343+
name: Screens.SideMenuCenter,
344+
id: 'SideMenuCenter',
345+
options: {
346+
animations: {
347+
setRoot: {
348+
waitForRender: true,
349+
},
350+
},
351+
},
345352
},
346353
},
347-
},
354+
],
348355
},
349356
},
350357
options: {
@@ -369,15 +376,22 @@ export default class SetRootScreen extends React.Component<NavigationProps> {
369376
},
370377
},
371378
center: {
372-
component: {
373-
name: Screens.SideMenuCenter,
374-
options: {
375-
animations: {
376-
setRoot: {
377-
waitForRender: true,
379+
stack: {
380+
children: [
381+
{
382+
component: {
383+
name: Screens.SideMenuCenter,
384+
id: 'SideMenuCenter',
385+
options: {
386+
animations: {
387+
setRoot: {
388+
waitForRender: true,
389+
},
390+
},
391+
},
378392
},
379393
},
380-
},
394+
],
381395
},
382396
},
383397
options: {

playground/src/screens/SideMenuLeftScreen.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,19 @@ const SideMenuLeftScreen: NavigationFunctionComponent<Props> = ({ componentId, m
3939

4040
const push = () => Navigation.push('SideMenuCenter', Screens.Pushed);
4141

42-
const pushAndClose = () => {
43-
close();
42+
const pushAndClose = () =>
4443
Navigation.push('SideMenuCenter', {
4544
component: {
4645
name: Screens.Pushed,
47-
// options: {
48-
// sideMenu: {
49-
// left: {
50-
// visible: false,
51-
// },
52-
// },
53-
// },
46+
options: {
47+
sideMenu: {
48+
left: {
49+
visible: false,
50+
},
51+
},
52+
},
5453
},
5554
});
56-
};
5755

5856
const close = () =>
5957
Navigation.mergeOptions(componentId, {

0 commit comments

Comments
 (0)