fix(store): bring back remove page for subdoc (toeverything#3221)

Flrande · Jun 27, 2023 · 3cc34af · 3cc34af
1 parent 3682f92
commit 3cc34af
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/packages/blocks/src/__internal__/rich-text/reference-node.ts b/packages/blocks/src/__internal__/rich-text/reference-node.ts
@@ -101,10 +101,11 @@ export class AffineReference extends WithDisposable(ShadowlessElement) {
     const refMeta = [...page.workspace.meta.pageMetas].find(
       page => page.id === refAttribute.pageId
     );
-    assertExists(refMeta);
-    this._refMeta = {
-      ...refMeta,
-    };
+    this._refMeta = refMeta
+      ? {
+          ...refMeta,
+        }
+      : undefined;
   };
 
   private _onClick(e: MouseEvent) {

diff --git a/packages/playground/src/components/debug-menu.ts b/packages/playground/src/components/debug-menu.ts
@@ -701,8 +701,9 @@ function getTabGroupTemplate({
     style="display: flex; overflow: hidden;"
     @sl-tab-show=${(e: CustomEvent<{ name: string }>) => {
       const otherPage = workspace.getPage(e.detail.name);
-      if (!otherPage) throw new Error('page not found');
-      editor.page = otherPage;
+      if (otherPage) {
+        editor.page = otherPage;
+      }
     }}
   >
     ${pageList.map(

diff --git a/packages/store/src/__tests__/workspace.unit.spec.ts b/packages/store/src/__tests__/workspace.unit.spec.ts
@@ -332,9 +332,9 @@ describe('addBlock', () => {
 
     // @ts-expect-error
     assert.equal(workspace._pages.size, 1);
-    assert.deepEqual(
-      serializeWorkspace(page0.doc).spaces['space:page0'].blocks,
-      {}
+    assert.equal(
+      serializeWorkspace(page0.doc).spaces['space:page0'],
+      undefined
     );
 
     workspace.removePage(page1.id);

diff --git a/packages/store/src/space.ts b/packages/store/src/space.ts
@@ -71,6 +71,11 @@ export class Space<
     return this;
   }
 
+  remove() {
+    this.destroy();
+    this.doc.spaces.delete(this.prefixedId);
+  }
+
   destroy() {
     this._ySpaceDoc.destroy();
     this._onLoadSlot.dispose();

diff --git a/packages/store/src/workspace/page.ts b/packages/store/src/workspace/page.ts
@@ -124,10 +124,6 @@ export class Page extends Space<FlatBlockMap> {
     return this._root;
   }
 
-  getYBlockById(id: string) {
-    return this._yBlocks.get(id);
-  }
-
   get isEmpty() {
     return this._yBlocks.size === 0;
   }

diff --git a/packages/store/src/workspace/workspace.ts b/packages/store/src/workspace/workspace.ts
@@ -198,6 +198,7 @@ export class Workspace {
     this.meta.pageMetaRemoved.on(id => {
       const page = this.getPage(id) as Page;
       this._store.removeSpace(page);
+      page.remove();
       this.slots.pageRemoved.emit(id);
     });
   }