From 31eab268a0bcef21a584a578b695aa362c4d53f2 Mon Sep 17 00:00:00 2001
From: Palanikannan M <akashmalinimurugu@gmail.com>
Date: Thu, 24 Apr 2025 17:08:09 +0530
Subject: [PATCH] fix: editor ref issues while locking/unlocking page

---
 web/core/components/pages/editor/page-root.tsx | 6 ++++++
 web/core/store/pages/project-page.store.ts     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/core/components/pages/editor/page-root.tsx b/web/core/components/pages/editor/page-root.tsx
index 91c3107ad41..2f1595e3307 100644
--- a/web/core/components/pages/editor/page-root.tsx
+++ b/web/core/components/pages/editor/page-root.tsx
@@ -74,6 +74,12 @@ export const PageRoot = observer((props: TPageRootProps) => {
     [page.editorRef, setEditorRef]
   );
 
+  useEffect(() => {
+    setTimeout(() => {
+      setEditorRef(editorRef.current);
+    }, 0);
+  }, [isContentEditable, setEditorRef]);
+
   const version = searchParams.get("version");
   useEffect(() => {
     if (!version) {
diff --git a/web/core/store/pages/project-page.store.ts b/web/core/store/pages/project-page.store.ts
index b2f7b6a1ef3..21f323f10bb 100644
--- a/web/core/store/pages/project-page.store.ts
+++ b/web/core/store/pages/project-page.store.ts
@@ -250,10 +250,10 @@ export class ProjectPageStore implements IProjectPageStore {
       });
 
       const page = await this.service.fetchById(workspaceSlug, projectId, pageId);
-      const pageInstance = page?.id ? this.getPageById(page.id) : undefined;
 
       runInAction(() => {
         if (page?.id) {
+          const pageInstance = this.getPageById(page.id);
           if (pageInstance) {
             pageInstance.mutateProperties(page, false);
           } else {