self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

Mobile: Add additional checks when updating sidebar state (#12428)

Browse Source
This commit is contained in:
Henry Heino
2025-06-10 01:03:32 -07:00
committed by GitHub
parent 8134390bf4
commit f16b6e8887
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/app-mobile/components/SideMenu.tsx
View File

@@ -326,7 +326,6 @@ const SideMenuComponent: React.FC<Props> = props => {
const SideMenu = connect((state: State) => { const SideMenu = connect((state: State) => {
return { return {
themeId: state.settings.theme, themeId: state.settings.theme,
isOpen: state.showSideMenu,
}; };
})(SideMenuComponent); })(SideMenuComponent);

8
packages/app-mobile/components/buttons/FloatingActionButton.tsx
View File

@@ -45,10 +45,12 @@ const useIcon = (iconName: string) => {
const FloatingActionButton = (props: ActionButtonProps) => { const FloatingActionButton = (props: ActionButtonProps) => {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const onMenuToggled = useCallback(() => { const onMenuToggled = useCallback(() => {
props.dispatch({
type: 'SIDE_MENU_CLOSE',
});
const newOpen = !open; const newOpen = !open;
if (newOpen) {
props.dispatch({
type: 'SIDE_MENU_CLOSE',
});
}
setOpen(newOpen); setOpen(newOpen);
}, [setOpen, open, props.dispatch]); }, [setOpen, open, props.dispatch]);

16
packages/app-mobile/root.tsx
View File

@@ -1243,13 +1243,16 @@ class AppComponent extends React.Component<AppComponentProps, AppComponentState>
} }
} }
private sideMenu_change(isOpen: boolean) { private sideMenu_change = (isOpen: boolean) => {
// Make sure showSideMenu property of state is updated // Make sure showSideMenu property of state is updated
// when the menu is open/closed. // when the menu is open/closed.
this.props.dispatch({ // Avoid dispatching unnecessarily. See https://github.com/laurent22/joplin/issues/12427
type: isOpen ? 'SIDE_MENU_OPEN' : 'SIDE_MENU_CLOSE', if (isOpen !== this.props.showSideMenu) {
}); this.props.dispatch({
} type: isOpen ? 'SIDE_MENU_OPEN' : 'SIDE_MENU_CLOSE',
});
}
};
private getSideMenuWidth = () => { private getSideMenuWidth = () => {
const sideMenuWidth = getResponsiveValue({ const sideMenuWidth = getResponsiveValue({
@@ -1339,7 +1342,8 @@ class AppComponent extends React.Component<AppComponentProps, AppComponentState>
toleranceY={20} toleranceY={20}
openMenuOffset={this.state.sideMenuWidth} openMenuOffset={this.state.sideMenuWidth}
menuPosition={menuPosition} menuPosition={menuPosition}
onChange={(isOpen: boolean) => this.sideMenu_change(isOpen)} onChange={this.sideMenu_change}
isOpen={this.props.showSideMenu}
disableGestures={disableSideMenuGestures} disableGestures={disableSideMenuGestures}
> >
<StatusBar barStyle={statusBarStyle} /> <StatusBar barStyle={statusBarStyle} />