From e1928e0872e12bdace181acb519725ab6ffb8738 Mon Sep 17 00:00:00 2001
From: QiShaoXuan <qishaoxuan777@gmail.com>
Date: Tue, 13 Dec 2022 17:57:05 +0800
Subject: [PATCH 1/2] fix: fit new version of blocksuite

---
 .../src/components/edgeless-toolbar/index.tsx | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/app/src/components/edgeless-toolbar/index.tsx b/packages/app/src/components/edgeless-toolbar/index.tsx
index 1625f44398..e5f0db27d9 100644
--- a/packages/app/src/components/edgeless-toolbar/index.tsx
+++ b/packages/app/src/components/edgeless-toolbar/index.tsx
@@ -75,16 +75,18 @@ const toolbarList2 = [
 const UndoRedo = () => {
   const [canUndo, setCanUndo] = useState(false);
   const [canRedo, setCanRedo] = useState(false);
-  const { editor } = useEditor();
+  const { currentPage } = useEditor();
   useEffect(() => {
-    if (!editor) return;
-    const { space } = editor;
+    if (!currentPage) return;
 
-    space.signals.historyUpdated.on(() => {
-      setCanUndo(space.canUndo);
-      setCanRedo(space.canRedo);
+    currentPage.signals.historyUpdated.on(() => {
+      setCanUndo(currentPage.canUndo);
+      setCanRedo(currentPage.canRedo);
     });
-  }, [editor]);
+    return () => {
+      currentPage.signals.historyUpdated.dispose();
+    };
+  }, [currentPage]);
 
   return (
     <StyledToolbarWrapper>
@@ -92,7 +94,7 @@ const UndoRedo = () => {
         <StyledToolbarItem
           disable={!canUndo}
           onClick={() => {
-            editor?.space?.undo();
+            currentPage?.undo();
           }}
         >
           <UndoIcon />
@@ -102,7 +104,7 @@ const UndoRedo = () => {
         <StyledToolbarItem
           disable={!canRedo}
           onClick={() => {
-            editor?.space?.redo();
+            currentPage?.redo();
           }}
         >
           <RedoIcon />

From 447c6b869ee94930baa2be019ac8a961c355d7e5 Mon Sep 17 00:00:00 2001
From: QiShaoXuan <qishaoxuan777@gmail.com>
Date: Tue, 13 Dec 2022 17:47:41 +0800
Subject: [PATCH 2/2] fix: lint error

---
 packages/app/src/components/import/styles.ts              | 5 -----
 .../quick-search/content/searchResult/NotFound.tsx        | 2 ++
 packages/app/src/components/quick-search/index.tsx        | 8 ++++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/app/src/components/import/styles.ts b/packages/app/src/components/import/styles.ts
index 2211d01f70..580d8a1535 100644
--- a/packages/app/src/components/import/styles.ts
+++ b/packages/app/src/components/import/styles.ts
@@ -23,8 +23,3 @@ export const StyledButtonWrapper = styled.div(() => {
     },
   };
 });
-
-export const StyledLoadingWrapper = styled.div(() => {
-  return {
-  }
-})
diff --git a/packages/app/src/components/quick-search/content/searchResult/NotFound.tsx b/packages/app/src/components/quick-search/content/searchResult/NotFound.tsx
index 98554a3ead..d44a891b4d 100644
--- a/packages/app/src/components/quick-search/content/searchResult/NotFound.tsx
+++ b/packages/app/src/components/quick-search/content/searchResult/NotFound.tsx
@@ -2,7 +2,9 @@ import React from 'react';
 import { Command, useCommandState } from 'cmdk';
 
 const noResult = () => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const search = useCommandState(state => state.search);
+  // eslint-disable-next-line react/no-unescaped-entities
   return <Command.Empty>No results found for "{search}".</Command.Empty>;
 };
 
diff --git a/packages/app/src/components/quick-search/index.tsx b/packages/app/src/components/quick-search/index.tsx
index 4355c9ecf8..1c0fc5e0a4 100644
--- a/packages/app/src/components/quick-search/index.tsx
+++ b/packages/app/src/components/quick-search/index.tsx
@@ -26,9 +26,9 @@ export const QuickSearch = ({ open, onClose }: TransitionsModalProps) => {
   const [result, setResult] = useState({});
   const { pageList } = useEditor();
   const { triggerQuickSearchModal } = useModal();
-  useEffect(() => {
-    setResult(search(query, { enrich: true }));
-  }, [query]);
+  // useEffect(() => {
+  //   setResult(search(query, { enrich: true }));
+  // }, [query]);
   useEffect(() => {
     const down = (e: KeyboardEvent) => {
       if (e.key === 'k' && e.metaKey) {
@@ -44,7 +44,7 @@ export const QuickSearch = ({ open, onClose }: TransitionsModalProps) => {
     };
     document.addEventListener('keydown', down);
     return () => document.removeEventListener('keydown', down);
-  }, [open]);
+  }, [open, triggerQuickSearchModal]);
   return (
     <Modal open={open} onClose={onClose} wrapperPosition={['top', 'center']}>
       <ModalWrapper