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
fix(core): prevent floating sidebar from disappearing unexpectedly (#8477)
JimmFly675a010dfca8
diff --git a/packages/frontend/component/src/components/rename-modal/index.tsx b/packages/frontend/component/src/components/rename-modal/index.tsxindex acf06429a3..e1c668b18a 100644--- a/packages/frontend/component/src/components/rename-modal/index.tsx+++ b/packages/frontend/component/src/components/rename-modal/index.tsx@@ -51,6 +51,7 @@ export const RenameModal = ({sideOffset: -12,onClick: e => e.stopPropagation(),style: { borderRadius: 10, padding: 8 },+ role: 'rename-modal',}}items={<Inputdiff --git a/packages/frontend/core/src/modules/app-sidebar/views/index.tsx b/packages/frontend/core/src/modules/app-sidebar/views/index.tsxindex 4bdf913429..b807811205 100644--- a/packages/frontend/core/src/modules/app-sidebar/views/index.tsx+++ b/packages/frontend/core/src/modules/app-sidebar/views/index.tsx@@ -124,13 +124,28 @@ export function AppSidebar({ children }: PropsWithChildren) {appSidebarService.setOpen(false);}, [appSidebarService]);- const onMouseEnter = useCallback(() => {- appSidebarService.setHovering(true);- }, [appSidebarService]);-- const onMouseLeave = useCallback(() => {- appSidebarService.setHovering(false);- }, [appSidebarService]);+ useEffect(() => {+ if (sidebarState !== 'floating' || resizing) {+ return;+ }+ const onMouseMove = (e: MouseEvent) => {+ const menuElement = document.querySelector(+ 'body > [data-radix-popper-content-wrapper] > [data-radix-menu-content]'+ );++ if (menuElement) {+ return;+ }++ if (e.clientX > width + 20) {+ appSidebarService.setHovering(false);+ }+ };+ document.addEventListener('mousemove', onMouseMove);+ return () => {+ document.removeEventListener('mousemove', onMouseMove);+ };+ }, [appSidebarService, resizing, sidebarState, width]);return (<>@@ -152,8 +167,6 @@ export function AppSidebar({ children }: PropsWithChildren) {})}resizeHandleOffset={0}resizeHandleVerticalPadding={clientBorder ? 16 : 0}- onMouseEnter={onMouseEnter}- onMouseLeave={onMouseLeave}data-transparentdata-open={sidebarState !== 'close'}data-has-border={hasRightBorder}diff --git a/packages/frontend/core/src/modules/app-sidebar/views/sidebar-header/sidebar-switch.tsx b/packages/frontend/core/src/modules/app-sidebar/views/sidebar-header/sidebar-switch.tsxindex 8a99dcd522..685a257c1d 100644--- a/packages/frontend/core/src/modules/app-sidebar/views/sidebar-header/sidebar-switch.tsx+++ b/packages/frontend/core/src/modules/app-sidebar/views/sidebar-header/sidebar-switch.tsx@@ -26,10 +26,6 @@ export const SidebarSwitch = ({appSidebarService.toggleSidebar();}, [appSidebarService]);- const handleMouseLeave = useCallback(() => {- appSidebarService.setHovering(false);- }, [appSidebarService]);-const t = useI18n();const tooltipContent = open? t['com.affine.sidebarSwitch.collapse']()@@ -42,7 +38,6 @@ export const SidebarSwitch = ({className={styles.sidebarSwitchClip}data-testid={`app-sidebar-arrow-button-${open ? 'collapse' : 'expand'}`}onMouseEnter={handleMouseEnter}- onMouseLeave={handleMouseLeave}><IconButtontooltip={tooltipContent}diff --git a/tests/affine-desktop/e2e/tabs.spec.ts b/tests/affine-desktop/e2e/tabs.spec.tsindex cbc08949e2..510262ab45 100644--- a/tests/affine-desktop/e2e/tabs.spec.ts+++ b/tests/affine-desktop/e2e/tabs.spec.ts@@ -92,8 +92,10 @@ test('Collapse Sidebar', async ({ page }) => {await page.locator('[data-testid=app-sidebar-arrow-button-collapse][data-show=true]').click();- await page.mouse.move(500, 500);const sliderBarArea = page.getByTestId('app-sidebar');+ await sliderBarArea.hover();+ await page.mouse.move(600, 500);+ await page.waitForTimeout(5000);await expect(sliderBarArea).not.toBeInViewport();});@@ -101,8 +103,10 @@ test('Expand Sidebar', async ({ page }) => {await page.locator('[data-testid=app-sidebar-arrow-button-collapse][data-show=true]').click();- await page.mouse.move(500, 500);- const sliderBarArea = page.getByTestId('sliderBar-inner');+ const sliderBarArea = page.getByTestId('app-sidebar');+ await sliderBarArea.hover();+ await page.mouse.move(600, 500);+ await page.waitForTimeout(5000);await expect(sliderBarArea).not.toBeInViewport();await page