Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
76e470d
initial commit
markdevocht Nov 20, 2025
f2d3c0c
AppDelegate updates
markdevocht Nov 20, 2025
b04308c
RNNAppDelegate update
markdevocht Nov 20, 2025
5d3298e
RNNAppDelegate update
markdevocht Nov 20, 2025
a5d9b05
update scripts
markdevocht Nov 23, 2025
ccbf5d1
sim updates
markdevocht Nov 23, 2025
c4ce866
podspec update
markdevocht Nov 23, 2025
d4d5c25
Upgraded to latest version React Native
gosha212 Nov 23, 2025
e243239
Added new pipelines
gosha212 Nov 23, 2025
8fe69af
Added new pipelines
gosha212 Nov 23, 2025
63b3d98
Merge branch 'feat/iOS-RN79' into feat/rn-79
gosha212 Nov 23, 2025
9e4ddcb
Disable autolink test
gosha212 Nov 23, 2025
f7aa449
device downgrade
markdevocht Nov 23, 2025
7237a29
Disabled tests
gosha212 Nov 23, 2025
50c2ce9
script update
markdevocht Nov 23, 2025
9b9d60a
Rename .java to .kt
gosha212 Nov 23, 2025
f1088c8
Fixed roboletric tests
gosha212 Nov 23, 2025
1d16653
update scripts
markdevocht Nov 23, 2025
0525eb5
Reenable tests
gosha212 Nov 23, 2025
3b74e9a
update scripts
markdevocht Nov 23, 2025
a666c06
update podspec
markdevocht Nov 23, 2025
892ae02
and again
markdevocht Nov 23, 2025
6341d19
Merge remote-tracking branch 'origin/feat/rn-79' into feat/iOS-RN79
markdevocht Nov 23, 2025
a9dbce5
cleanup
markdevocht Nov 23, 2025
4942b3c
headers for tests to run in xcode
markdevocht Nov 24, 2025
ca55c86
test updates to aline with iOS 18
markdevocht Nov 24, 2025
6164975
podspec update
markdevocht Nov 24, 2025
33c789f
reanimated update for RN0.79
markdevocht Nov 24, 2025
0445588
link test update for iOS
markdevocht Nov 24, 2025
2570749
android linker test templates added
markdevocht Nov 24, 2025
4ab878c
snapshot update for linker test
markdevocht Nov 25, 2025
fbc20d8
update for linnker test and podspec
markdevocht Nov 26, 2025
4c75f81
remove old snap test
markdevocht Nov 26, 2025
0756e54
Documentation update
markdevocht Nov 26, 2025
ff05133
update in docs
markdevocht Nov 26, 2025
2f745b7
Better documentation
markdevocht Nov 26, 2025
e7724e2
cleanup
markdevocht Dec 1, 2025
07c767a
sidemenu fix for when sending width #8068
markdevocht Dec 4, 2025
5b434b9
cleanup
markdevocht Dec 4, 2025
ad1b5cb
Merge remote-tracking branch 'origin/master' into feat/_from_iOS-RN79…
markdevocht Dec 7, 2025
38e47d3
Merge branch 'master' into feat/_from_iOS-RN79_sidemenu_visible_#8068
markdevocht Dec 8, 2025
55266e6
Added test
markdevocht Dec 9, 2025
e14e0c4
Merge branch 'master' into feat/_from_iOS-RN79_sidemenu_visible_#8068
gosha212 Dec 10, 2025
da0c901
Merge branch 'master' into feat/_from_iOS-RN79_sidemenu_visible_#8068
gosha212 Dec 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ios/RNNSideMenu/MMDrawerController/MMDrawerController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,12 @@ - (void)closeDrawerInOverlayMode:(UIViewController *)sideDrawerViewController
[self.centerContainerView bringSubviewToFront:self.centerContentOverlay];
self.centerContentOverlay.alpha = 0.5;
}


//Reset the centerContainerView frame if it deviated
if (self.centerContainerView.frame.origin.x == visibleSide == MMDrawerSideLeft ? _maximumLeftDrawerWidth : _maximumRightDrawerWidth) {
[self.centerContainerView setFrame:self.childControllerContainerView.bounds];
}

CGFloat distance = ABS(currentFrame.origin.x - finalFrame.origin.x);
NSTimeInterval duration = [self animationDurationForDistance:distance velocity:velocity];

Expand Down
12 changes: 12 additions & 0 deletions playground/e2e/SideMenu.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Utils from './Utils';
import TestIDs from '../src/testIDs';
import jestExpect from 'expect';

const {elementByLabel, elementById, expectImagesToBeEqual} = Utils;

Expand Down Expand Up @@ -90,6 +91,17 @@ describe('SideMenu', () => {
await elementById('SideMenuContainer').takeScreenshot(`side_menu_${openMode}`);
expectImagesToBeEqual(actual, snapshottedImagePath);
});

it.e2e(':ios: center container should reset to full width after push and close', async () => {
await elementById(TestIDs.OPEN_LEFT_SIDE_MENU_BTN).tap();
await elementById(TestIDs.LEFT_SIDE_MENU_PUSH_AND_CLOSE_BTN).tap();
await elementById(TestIDs.POP_BTN).tap();
const containerAttrs = await elementById('SideMenuContainer').getAttributes();
const containerWidth = containerAttrs.frame.width;
const centerAttrs = await elementById(TestIDs.SIDE_MENU_CENTER_SCREEN_CONTAINER).getAttributes();
const centerWidth = centerAttrs.frame.width;
jestExpect(centerWidth).toBe(containerWidth);
});
});

it.e2e(':ios: should open above-content by default', async () => {
Expand Down