From b86a5a2830fbc3eb88f435ba334b5a0600a8fa74 Mon Sep 17 00:00:00 2001
From: Peng Xiao <pengxiao@outlook.com>
Date: Fri, 5 Jan 2024 13:17:02 +0000
Subject: [PATCH] fix(core): sidebar extension sometimes not show (#5513)

---
 .../src/components/page-detail-editor.tsx     | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/packages/frontend/core/src/components/page-detail-editor.tsx b/packages/frontend/core/src/components/page-detail-editor.tsx
index 32943ae8e2..21b67a2854 100644
--- a/packages/frontend/core/src/components/page-detail-editor.tsx
+++ b/packages/frontend/core/src/components/page-detail-editor.tsx
@@ -9,15 +9,7 @@ import { fontStyleOptions } from '@toeverything/infra/atom';
 import clsx from 'clsx';
 import { useAtomValue } from 'jotai';
 import type { CSSProperties } from 'react';
-import {
-  memo,
-  Suspense,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
+import { memo, Suspense, useCallback, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { type PageMode, pageSettingFamily } from '../atoms';
@@ -96,14 +88,14 @@ const PageDetailEditorMain = memo(function PageDetailEditorMain({
     [isPublic, switchToEdgelessMode, pageId, switchToPageMode]
   );
 
-  const [editor, setEditor] = useState<AffineEditorContainer>();
+  const [, setActiveBlocksuiteEditor] = useActiveBlocksuiteEditor();
   const blockId = useRouterHash();
 
   const onLoadEditor = useCallback(
     (editor: AffineEditorContainer) => {
       // debug current detail editor
       globalThis.currentEditor = editor;
-      setEditor(editor);
+      setActiveBlocksuiteEditor(editor);
       const disposableGroup = new DisposableGroup();
       disposableGroup.add(
         page.slots.blockUpdated.once(() => {
@@ -121,18 +113,9 @@ const PageDetailEditorMain = memo(function PageDetailEditorMain({
         disposableGroup.dispose();
       };
     },
-    [onLoad, page]
+    [onLoad, page, setActiveBlocksuiteEditor]
   );
 
-  const [, setActiveBlocksuiteEditor] = useActiveBlocksuiteEditor();
-  const editorRef = useRef<AffineEditorContainer | null>(null);
-
-  useEffect(() => {
-    if (editor) {
-      setActiveBlocksuiteEditor(editorRef.current);
-    }
-  }, [editor, setActiveBlocksuiteEditor]);
-
   return (
     <Editor
       className={clsx(styles.editor, {
@@ -149,7 +132,6 @@ const PageDetailEditorMain = memo(function PageDetailEditorMain({
       onModeChange={setEditorMode}
       defaultSelectedBlockId={blockId}
       onLoadEditor={onLoadEditor}
-      ref={editorRef}
     />
   );
 });