From 6e6ae2df163c31779f89dde2d2ded3c657f344aa Mon Sep 17 00:00:00 2001 From: alt0 Date: Thu, 22 Dec 2022 15:29:48 +0800 Subject: [PATCH 1/4] fix: render key issue --- packages/app/src/components/header/header.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app/src/components/header/header.tsx b/packages/app/src/components/header/header.tsx index 82f0558ae9..1287ff72d6 100644 --- a/packages/app/src/components/header/header.tsx +++ b/packages/app/src/components/header/header.tsx @@ -37,10 +37,10 @@ type HeaderRightItemNames = | 'syncUser'; const HeaderRightItems: Record = { - editorOptionMenu: , - trashButtonGroup: , - themeModeSwitch: , - syncUser: , + editorOptionMenu: , + trashButtonGroup: , + themeModeSwitch: , + syncUser: , }; export const Header = ({ From fa532d6447a0fd4bfd488b1c7afca46dd32768b7 Mon Sep 17 00:00:00 2001 From: alt0 Date: Thu, 22 Dec 2022 15:30:05 +0800 Subject: [PATCH 2/4] fix: default workspace page --- packages/app/src/pages/workspace/index.tsx | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/app/src/pages/workspace/index.tsx diff --git a/packages/app/src/pages/workspace/index.tsx b/packages/app/src/pages/workspace/index.tsx new file mode 100644 index 0000000000..1f7dd2d518 --- /dev/null +++ b/packages/app/src/pages/workspace/index.tsx @@ -0,0 +1,5 @@ +const Page = () => { + return
Hello, there is [workspace]/index.
; +}; + +export default Page; From 730084f8698e9bef4b7b97f26312578fb98a6e2c Mon Sep 17 00:00:00 2001 From: alt0 Date: Thu, 22 Dec 2022 15:30:39 +0800 Subject: [PATCH 3/4] fix: button nested issue --- .../components/workspace-slider-bar/index.tsx | 33 +++++++++---------- .../components/workspace-slider-bar/style.ts | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/packages/app/src/components/workspace-slider-bar/index.tsx b/packages/app/src/components/workspace-slider-bar/index.tsx index fe2492451a..ea9cee1636 100644 --- a/packages/app/src/components/workspace-slider-bar/index.tsx +++ b/packages/app/src/components/workspace-slider-bar/index.tsx @@ -74,6 +74,15 @@ export const WorkSpaceSliderBar = () => { const [showTip, setShowTip] = useState(false); const [show, setShow] = useLocalStorage('AFFINE_SLIDE_BAR', false, true); const { t } = useTranslation(); + + const paths = { + all: currentWorkspaceId ? `/workspace/${currentWorkspaceId}/all` : '', + favorite: currentWorkspaceId + ? `/workspace/${currentWorkspaceId}/favorite` + : '', + trash: currentWorkspaceId ? `/workspace/${currentWorkspaceId}/trash` : '', + }; + return ( <> @@ -88,21 +97,13 @@ export const WorkSpaceSliderBar = () => { > Quick search - - + + All pages - - + + Favourites @@ -132,12 +133,8 @@ export const WorkSpaceSliderBar = () => { - - + + Trash diff --git a/packages/app/src/components/workspace-slider-bar/style.ts b/packages/app/src/components/workspace-slider-bar/style.ts index 064590e93d..acc936f7ea 100644 --- a/packages/app/src/components/workspace-slider-bar/style.ts +++ b/packages/app/src/components/workspace-slider-bar/style.ts @@ -43,7 +43,7 @@ export const StyledArrowButton = styled.button<{ isShow: boolean }>( } ); -export const StyledListItem = styled.button<{ +export const StyledListItem = styled.div<{ active?: boolean; disabled?: boolean; }>(({ theme, active, disabled }) => { From dab8bd8eb49dd122a6da4916800d28bf36b67765 Mon Sep 17 00:00:00 2001 From: alt0 Date: Thu, 22 Dec 2022 15:36:12 +0800 Subject: [PATCH 4/4] fix: buffer length 0 issue --- .../providers/app-state-provider/dynamic-blocksuite.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx index e7d8447b3f..c2a803e529 100644 --- a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx +++ b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx @@ -91,10 +91,13 @@ const DynamicBlocksuite = ({ if (indexDBProvider) { (indexDBProvider as IndexedDBDocProvider)?.on('synced', async () => { const updates = await downloadWorkspace({ workspaceId }); - updates && + + if (updates.byteLength) { Workspace.Y.applyUpdate(workspace.doc, new Uint8Array(updates)); - // if after update, the space:meta is empty, then we need to get map with doc - workspace.doc.getMap('space:meta'); + // if after update, the space:meta is empty, then we need to get map with doc + workspace.doc.getMap('space:meta'); + } + resolve(workspace); }); } else {