Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

chore: scroll down to new page

ascarbek67e396aadf65
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/constants.ts b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/constants.ts
index 24909b26e1..48e51e7f9a 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/constants.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/constants.ts
@@ -1,4 +1,5 @@
export const INITIAL_FOLDER_HEIGHT = 40;
+export const FOLDER_MARGIN = 16;
export const PAGE_ITEM_HEIGHT = 40;
export const ANIMATION_DURATION = 300;
export const NAV_PANEL_MINIMUM_WIDTH = 200;
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts
index 642e75f4e4..cf96e2a085 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/FolderItem.hooks.ts
@@ -65,7 +65,6 @@ export const useFolderEvents = (folder: IFolder, pages: IPage[]) => {
}, [pages]);
const onFolderNameClick = () => {
- appDispatch(foldersActions.toggleShowPages({ id: folder.id }));
if (showPages) {
setFolderHeight(`${INITIAL_FOLDER_HEIGHT}px`);
} else {
@@ -144,6 +143,8 @@ export const useFolderEvents = (folder: IFolder, pages: IPage[]) => {
})
);
+ setShowPages(true);
+
appDispatch(activePageIdActions.setActivePageId(newView.id));
navigate(`/page/document/${newView.id}`);
@@ -160,6 +161,8 @@ export const useFolderEvents = (folder: IFolder, pages: IPage[]) => {
layoutType: ViewLayoutTypePB.Board,
});
+ setShowPages(true);
+
appDispatch(
pagesActions.addPage({
folderId: folder.id,
@@ -185,6 +188,8 @@ export const useFolderEvents = (folder: IFolder, pages: IPage[]) => {
layoutType: ViewLayoutTypePB.Grid,
});
+ setShowPages(true);
+
appDispatch(
pagesActions.addPage({
folderId: folder.id,
@@ -202,6 +207,10 @@ export const useFolderEvents = (folder: IFolder, pages: IPage[]) => {
}
};
+ useEffect(() => {
+ appDispatch(foldersActions.setShowPages({ id: folder.id, showPages: showPages }));
+ }, [showPages]);
+
return {
showPages,
onFolderNameClick,
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx
index 683724ea5b..5a35137e9b 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/layout/NavigationPanel/NavigationPanel.tsx
@@ -7,10 +7,16 @@ import { NavigationResizer } from './NavigationResizer';
import { IFolder } from '../../../stores/reducers/folders/slice';
import { IPage } from '../../../stores/reducers/pages/slice';
import { useNavigate } from 'react-router-dom';
-import React, { useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
import { useDispatch } from 'react-redux';
import { useAppSelector } from '../../../stores/store';
-import { ANIMATION_DURATION, NAV_PANEL_MINIMUM_WIDTH } from '../../_shared/constants';
+import {
+ ANIMATION_DURATION,
+ FOLDER_MARGIN,
+ INITIAL_FOLDER_HEIGHT,
+ NAV_PANEL_MINIMUM_WIDTH,
+ PAGE_ITEM_HEIGHT,
+} from '../../_shared/constants';
export const NavigationPanel = ({
onHideMenuClick,
@@ -33,6 +39,44 @@ export const NavigationPanel = ({
const pagesStore = useAppSelector((state) => state.pages);
const activePageId = useAppSelector((state) => state.activePageId);
+ useEffect(() => {
+ setTimeout(() => {
+ if (!el.current) return;
+ if (!activePageId?.length) return;
+ const activePage = pagesStore.find((page) => page.id === activePageId);
+ if (!activePage) return;
+
+ const folderIndex = foldersStore.findIndex((folder) => folder.id === activePage.folderId);
+ if (folderIndex === -1) return;
+
+ let height = 0;
+ for (let i = 0; i < folderIndex; i++) {
+ height += INITIAL_FOLDER_HEIGHT + FOLDER_MARGIN;
+ if (foldersStore[i].showPages === true) {
+ height += pagesStore.filter((p) => p.folderId === foldersStore[i].id).length * PAGE_ITEM_HEIGHT;
+ }
+ }
+
+ height += INITIAL_FOLDER_HEIGHT + FOLDER_MARGIN / 2;
+
+ const pageIndex = pagesStore
+ .filter((p) => p.folderId === foldersStore[folderIndex].id)
+ .findIndex((p) => p.id === activePageId);
+ for (let i = 0; i <= pageIndex; i++) {
+ height += PAGE_ITEM_HEIGHT;
+ }
+
+ const elHeight = el.current.getBoundingClientRect().height;
+ const scrollTop = el.current.scrollTop;
+
+ console.log(`scrollTop: ${scrollTop}, elHeight: ${elHeight.toFixed(0)}, height: ${height}`);
+
+ if (scrollTop + elHeight < height) {
+ el.current.scrollTo(0, height - elHeight);
+ }
+ }, ANIMATION_DURATION);
+ }, [activePageId]);
+
return (
<>
<div
@@ -46,8 +90,8 @@ export const NavigationPanel = ({
<div className={'flex flex-col'}>
<AppLogo iconToShow={'hide'} onHideMenuClick={onHideMenuClick}></AppLogo>
<WorkspaceUser></WorkspaceUser>
- <div className={'relative flex flex-col'} style={{ height: 'calc(100vh - 300px)' }} ref={el}>
- <div className={'flex flex-col overflow-auto px-2'}>
+ <div className={'relative flex flex-col'} style={{ height: 'calc(100vh - 300px)' }}>
+ <div className={'flex flex-col overflow-auto px-2'} ref={el}>
<WorkspaceApps folders={folders} pages={pages} onPageClick={onPageClick} />
</div>
</div>
diff --git a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/slice.ts b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/slice.ts
index 31cc72b05a..80d93d596f 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/slice.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/stores/reducers/folders/slice.ts
@@ -24,8 +24,8 @@ export const foldersSlice = createSlice({
clearFolders() {
return [];
},
- toggleShowPages(state, action: PayloadAction<{ id: string }>) {
- return state.map((f) => (f.id === action.payload.id ? { ...f, showPages: !f.showPages } : f));
+ setShowPages(state, action: PayloadAction<{ id: string; showPages: boolean }>) {
+ return state.map((f) => (f.id === action.payload.id ? { ...f, showPages: action.payload.showPages } : f));
},
},
});