From 8ee5d422cbd342600c4c18c6c9dc9100061252f2 Mon Sep 17 00:00:00 2001
From: zqran <uuxnet@gmail.com>
Date: Thu, 23 Feb 2023 16:22:00 +0800
Subject: [PATCH] feat: set the correct mode when loading the page (#1069)

Co-authored-by: Himself65 <himself65@outlook.com>
---
 .github/CLA.md                           |  1 +
 apps/web/src/components/editor/index.tsx |  1 +
 apps/web/src/hooks/use-page-helper.ts    |  1 +
 tests/quick-search.spec.ts               | 18 ++++++++++++------
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/CLA.md b/.github/CLA.md
index 49d32b31d..98c6d5d55 100644
--- a/.github/CLA.md
+++ b/.github/CLA.md
@@ -47,3 +47,4 @@ Example:
 
 - Dark Sky, @darkskygit, 2022/07/22
 - Lin Onetwo, @linonetwo, 2022/02/14
+- zqran, @zqran, 2023/02/17
diff --git a/apps/web/src/components/editor/index.tsx b/apps/web/src/components/editor/index.tsx
index b19032429..25968ee52 100644
--- a/apps/web/src/components/editor/index.tsx
+++ b/apps/web/src/components/editor/index.tsx
@@ -39,6 +39,7 @@ export const Editor = ({
 
     const editor = new EditorContainer();
     editor.page = page;
+    editor.mode = page.meta.mode as typeof editor.mode;
 
     editorContainer.current?.appendChild(editor);
     if (page.isEmpty) {
diff --git a/apps/web/src/hooks/use-page-helper.ts b/apps/web/src/hooks/use-page-helper.ts
index 51b2338b8..b5a364d23 100644
--- a/apps/web/src/hooks/use-page-helper.ts
+++ b/apps/web/src/hooks/use-page-helper.ts
@@ -62,6 +62,7 @@ export const usePageHelper = (): EditorHandlers => {
           addedPageId => {
             currentWorkspace.blocksuiteWorkspace?.setPageMeta(addedPageId, {
               title,
+              mode: 'page',
             });
             resolve(addedPageId);
           }
diff --git a/tests/quick-search.spec.ts b/tests/quick-search.spec.ts
index 03f16d68a..fbb7c7815 100644
--- a/tests/quick-search.spec.ts
+++ b/tests/quick-search.spec.ts
@@ -10,18 +10,24 @@ const openQuickSearchByShortcut = async (page: Page) =>
   await withCtrlOrMeta(page, () => page.keyboard.press('k', { delay: 50 }));
 
 async function assertTitle(page: Page, text: string) {
-  const locator = page.locator('.affine-default-page-block-title').nth(0);
-  const actual = await locator.inputValue();
-  expect(actual).toBe(text);
+  const edgeless = page.locator('affine-edgeless-page');
+  if (!edgeless) {
+    const locator = page.locator('.affine-default-page-block-title').nth(0);
+    const actual = await locator.inputValue();
+    expect(actual).toBe(text);
+  }
 }
 async function assertResultList(page: Page, texts: string[]) {
   const actual = await page.locator('[cmdk-item]').allInnerTexts();
   expect(actual).toEqual(texts);
 }
 async function titleIsFocused(page: Page) {
-  const title = page.locator('.affine-default-page-block-title');
-  await expect(title).toBeVisible();
-  await expect(title).toBeFocused();
+  const edgeless = page.locator('affine-edgeless-page');
+  if (!edgeless) {
+    const title = page.locator('.affine-default-page-block-title');
+    await expect(title).toBeVisible();
+    await expect(title).toBeFocused();
+  }
 }
 
 test.describe('Open quick search', () => {