There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(core): disable the back gesture when the menu is open (#9263)
zzj372045acdbda04ee
diff --git a/packages/frontend/apps/ios/src/app.tsx b/packages/frontend/apps/ios/src/app.tsxindex abb3dd8f95..ea170ea9cd 100644--- a/packages/frontend/apps/ios/src/app.tsx+++ b/packages/frontend/apps/ios/src/app.tsx@@ -44,6 +44,7 @@ import { useTheme } from 'next-themes';import { Suspense, useEffect } from 'react';import { RouterProvider } from 'react-router-dom';+import { BlocksuiteMenuConfigProvider } from './bs-menu-config';import { configureFetchProvider } from './fetch';import { ModalConfigProvider } from './modal-config';import { Cookie } from './plugins/cookie';@@ -259,11 +260,13 @@ export function App() {<AffineContext store={getCurrentStore()}><KeyboardThemeProvider /><ModalConfigProvider>- <RouterProvider- fallbackElement={<AppFallback />}- router={router}- future={future}- />+ <BlocksuiteMenuConfigProvider>+ <RouterProvider+ fallbackElement={<AppFallback />}+ router={router}+ future={future}+ />+ </BlocksuiteMenuConfigProvider></ModalConfigProvider></AffineContext></I18nProvider>diff --git a/packages/frontend/apps/ios/src/bs-menu-config.tsx b/packages/frontend/apps/ios/src/bs-menu-config.tsxnew file mode 100644index 0000000000..fa8967cf10--- /dev/null+++ b/packages/frontend/apps/ios/src/bs-menu-config.tsx@@ -0,0 +1,41 @@+import { NavigationGestureService } from '@affine/core/mobile/modules/navigation-gesture';+import { onMenuOpen } from '@blocksuite/affine-components/context-menu';+import { useService } from '@toeverything/infra';+import { type PropsWithChildren, useCallback, useEffect, useRef } from 'react';++export const BlocksuiteMenuConfigProvider = ({+ children,+}: PropsWithChildren) => {+ const navigationGesture = useService(NavigationGestureService);+ const menuCountRef = useRef(0);+ const prevEnabledRef = useRef(false);++ const handleMenuState = useCallback(() => {+ const currentCount = menuCountRef.current + 1;+ menuCountRef.current = currentCount;++ if (currentCount === 1) {+ prevEnabledRef.current = navigationGesture.enabled$.value;+ if (prevEnabledRef.current) {+ navigationGesture.setEnabled(false);+ }+ }++ return () => {+ const currentCount = menuCountRef.current - 1;+ menuCountRef.current = currentCount;++ if (currentCount === 0 && prevEnabledRef.current) {+ navigationGesture.setEnabled(true);+ }+ };+ }, [navigationGesture]);++ useEffect(() => {+ return onMenuOpen(() => {+ return handleMenuState();+ });+ }, [handleMenuState]);++ return children;+};