fix(database): group as Database cannot keep inbound link (#6564)

toeverything · Mar 25, 2024 · 54c4024 · 54c4024
1 parent 8607e5d
commit 54c4024
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/packages/blocks/src/database-block/common/columns/rich-text/cell-renderer.ts b/packages/blocks/src/database-block/common/columns/rich-text/cell-renderer.ts
@@ -107,14 +107,13 @@ export class RichTextCell extends BaseCellRenderer<Y.Text> {
   }
 
   get inlineManager() {
-    assertExists(this.service);
-    return this.service.inlineManager;
+    return this.service?.inlineManager;
   }
   get attributesSchema() {
-    return this.inlineManager.getSchema();
+    return this.inlineManager?.getSchema();
   }
   get attributeRenderer() {
-    return this.inlineManager.getRenderer();
+    return this.inlineManager?.getRenderer();
   }
 
   @query('rich-text')
@@ -153,7 +152,8 @@ export class RichTextCell extends BaseCellRenderer<Y.Text> {
       .inlineEventSource=${this.topContenteditableElement}
       .attributesSchema=${this.attributesSchema}
       .attributeRenderer=${this.attributeRenderer}
-      .markdownShortcutHandler=${this.inlineManager.markdownShortcutHandler}
+      .embedChecker=${this.inlineManager?.embedChecker}
+      .markdownShortcutHandler=${this.inlineManager?.markdownShortcutHandler}
       .readonly=${true}
       class="affine-database-rich-text inline-editor"
     ></rich-text>`;
@@ -198,14 +198,13 @@ export class RichTextCellEditing extends BaseCellRenderer<Text> {
   }
 
   get inlineManager() {
-    assertExists(this.service);
-    return this.service.inlineManager;
+    return this.service?.inlineManager;
   }
   get attributesSchema() {
-    return this.inlineManager.getSchema();
+    return this.inlineManager?.getSchema();
   }
   get attributeRenderer() {
-    return this.inlineManager.getRenderer();
+    return this.inlineManager?.getRenderer();
   }
 
   @query('rich-text')
@@ -340,7 +339,8 @@ export class RichTextCellEditing extends BaseCellRenderer<Text> {
       .inlineEventSource=${this.topContenteditableElement}
       .attributesSchema=${this.attributesSchema}
       .attributeRenderer=${this.attributeRenderer}
-      .markdownShortcutHandler=${this.inlineManager.markdownShortcutHandler}
+      .embedChecker=${this.inlineManager?.embedChecker}
+      .markdownShortcutHandler=${this.inlineManager?.markdownShortcutHandler}
       class="affine-database-rich-text inline-editor"
     ></rich-text>`;
   }

diff --git a/packages/blocks/src/database-block/common/header-area/text.ts b/packages/blocks/src/database-block/common/header-area/text.ts
@@ -71,7 +71,20 @@ abstract class BaseTextCell extends BaseCellRenderer<unknown> {
   static override styles = styles;
   @property({ attribute: false })
   showIcon = false;
+  get service() {
+    const database = this.closest<DatabaseBlockComponent>('affine-database');
+    return database?.service;
+  }
 
+  get inlineManager() {
+    return this.service?.inlineManager;
+  }
+  get attributesSchema() {
+    return this.inlineManager?.getSchema();
+  }
+  get attributeRenderer() {
+    return this.inlineManager?.getRenderer();
+  }
   get topContenteditableElement() {
     const databaseBlock =
       this.closest<DatabaseBlockComponent>('affine-database');
@@ -150,11 +163,14 @@ export class HeaderAreaTextCell extends BaseTextCell {
     const yText = this.getYText(
       this.titleColumn.getValue(this.rowId) as Y.Text | string | undefined
     );
-
     return html`${this.renderIcon()}
       <rich-text
         .yText=${yText}
         .inlineEventSource=${this.topContenteditableElement}
+        .attributesSchema=${this.attributesSchema}
+        .attributeRenderer=${this.attributeRenderer}
+        .embedChecker=${this.inlineManager?.embedChecker}
+        .markdownShortcutHandler=${this.inlineManager?.markdownShortcutHandler}
         .readonly=${true}
         class="data-view-header-area-rich-text"
       ></rich-text>`;
@@ -191,11 +207,14 @@ export class HeaderAreaTextCellEditing extends BaseTextCell {
     const yText = this.getYText(
       this.titleColumn.getValue(this.rowId) as Y.Text | string | undefined
     );
-
     return html`${this.renderIcon()}
       <rich-text
         .yText=${yText}
         .inlineEventSource=${this.topContenteditableElement}
+        .attributesSchema=${this.attributesSchema}
+        .attributeRenderer=${this.attributeRenderer}
+        .embedChecker=${this.inlineManager?.embedChecker}
+        .markdownShortcutHandler=${this.inlineManager?.markdownShortcutHandler}
         .readonly=${this.readonly}
         class="data-view-header-area-rich-text"
       ></rich-text>`;