Make above-content mode the new default

Author: d4vidi

e2e/SideMenu.test.js

@@ -3,17 +3,19 @@ import TestIDs from '../playground/src/testIDs';
 
 const {elementByLabel, elementById, expectImagesToBeEqual} = Utils;
 
-describe.each([ 'aboveContent', 'pushContent' ])('SideMenu', (openMode) => {
+describe('SideMenu', () => {
     beforeEach(async () => {
         await device.launchApp({newInstance : true});
         await elementById(TestIDs.SIDE_MENU_BTN).tap();
-
-        if (openMode === 'aboveContent') {
-            await elementById(TestIDs.TOGGLE_SIDE_MENU_OPEN_MODE_BTN).tap();
-        }
     });
 
-    describe(`Open mode '${openMode}'`, () => {
+    describe.each(['aboveContent', 'pushContent'])('Open mode %s', (openMode) => {
+        beforeEach(async () => {
+            if (openMode === 'pushContent') {
+                await elementById(TestIDs.TOGGLE_SIDE_MENU_OPEN_MODE_BTN).tap();
+            }
+        });
+
         it('close SideMenu and push to stack with static id', async () => {
             await elementById(TestIDs.OPEN_LEFT_SIDE_MENU_BTN).tap();
             await elementById(TestIDs.LEFT_SIDE_MENU_PUSH_BTN).tap();
@@ -89,4 +91,17 @@ describe.each([ 'aboveContent', 'pushContent' ])('SideMenu', (openMode) => {
             expectImagesToBeEqual(actual, snapshottedImagePath);
         });
     });
+
+    it.e2e(':ios: should open above-content by default', async () => {
+        await elementById(TestIDs.TOGGLE_SIDE_MENU_OPEN_MODE_BTN).tap(); // aboveContent --> pushContent
+        await elementById(TestIDs.TOGGLE_SIDE_MENU_OPEN_MODE_BTN).tap(); // pushContent --> undefined
+        await expect(elementByLabel('Open mode: undefined')).toBeVisible();
+
+        await elementById(TestIDs.OPEN_LEFT_SIDE_MENU_BTN).tap();
+
+        const snapshottedImagePath = `./e2e/assets/side_menu.undefined.png`;
+        const actual =
+          await elementById('SideMenuContainer').takeScreenshot(`side_menu_undefined`);
+        expectImagesToBeEqual(actual, snapshottedImagePath);
+    });
 });

e2e/assets/side_menu.aboveContent.png

@@ -54,14 +54,14 @@ - (void)applyOptions:(RNNNavigationOptions *)options {
     [self.sideMenuController.view
         setBackgroundColor:[withDefault.layout.backgroundColor withDefault:nil]];
 
-    MMDrawerOpenMode openModeLeft = MMDrawerOpenModePushContent; // Default value
+    MMDrawerOpenMode openModeLeft = MMDrawerOpenModeAboveContent; // Default value
     if (withDefault.sideMenu.left.openMode.hasValue) {
         NSString *openModeString = withDefault.sideMenu.left.openMode.get;
         openModeLeft = MMDrawerOpenModeFromString(openModeString);
     }
     [self.sideMenuController side:MMDrawerSideLeft openMode:openModeLeft];
 
-    MMDrawerOpenMode openModeRight = MMDrawerOpenModePushContent; // Default value
+    MMDrawerOpenMode openModeRight = MMDrawerOpenModeAboveContent; // Default value
     if (withDefault.sideMenu.right.openMode.hasValue) {
         NSString *openModeString = withDefault.sideMenu.right.openMode.get;
         openModeRight = MMDrawerOpenModeFromString(openModeString);

e2e/assets/side_menu.pushContent.png

@@ -29,9 +29,6 @@ - (void)mergeOptions:(RNNSideMenuSideOptions *)options {
         self.openMode = options.openMode;
 }
 
-/**
- Converts a string open mode to the equivalent MMDrawerOpenMode enum value
- */
 MMDrawerOpenMode MMDrawerOpenModeFromString(NSString *openModeString) {
     if ([openModeString isEqualToString:@"aboveContent"]) {
         return MMDrawerOpenModeAboveContent;