refactor: add table row types

marktext · Dec 22, 2023 · f90e2ca · f90e2ca
1 parent da310f9
commit f90e2ca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/lib/block/gfm/table/row.ts b/lib/block/gfm/table/row.ts
@@ -1,14 +1,16 @@
 import Parent from '@muya/block/base/parent';
 import ContainerQueryBlock from '@muya/block/mixins/containerQueryBlock';
 import ScrollPage from '@muya/block/scrollPage';
+import Muya from '@muya/index';
 import { mixins } from '@muya/utils';
 import { ITableRowState } from '../../../state/types';
+import TableBodyCell from './cell';
 
 @mixins(ContainerQueryBlock)
 class TableRow extends Parent {
   static blockName = 'table.row';
 
-  static create(muya, state) {
+  static create(muya: Muya, state: ITableRowState) {
     const row = new TableRow(muya);
 
     row.append(
@@ -27,7 +29,7 @@ class TableRow extends Parent {
     return [...pPath, offset];
   }
 
-  constructor(muya) {
+  constructor(muya: Muya) {
     super(muya);
     this.tagName = 'tr';
 
@@ -38,7 +40,7 @@ class TableRow extends Parent {
   getState(): ITableRowState {
     const state: ITableRowState = {
       name: 'table.row',
-      children: this.map((node) => node.getState()),
+      children: this.map((node) => (node as TableBodyCell).getState()),
     };
 
     return state;

diff --git a/lib/block/mixins/containerQueryBlock.ts b/lib/block/mixins/containerQueryBlock.ts
@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
-import type { Path } from 'ot-json1';
 import Content from '../base/content';
 import Parent from '../base/parent';
+import { TBlockPath } from '../types';
 
 interface ContainerQueryBlock {
   find(p: number): Parent | Content;
 }
 class ContainerQueryBlock {
-  queryBlock(path: [string, ...Path]) {
-    if (/children|meta|align|type|lang/.test(path[0])) {
+  queryBlock(path: TBlockPath) {
+    if (typeof path[0] === 'string' && /children|meta|align|type|lang/.test(path[0])) {
       path.shift();
     }
 

diff --git a/lib/block/mixins/leafQueryBlock.ts b/lib/block/mixins/leafQueryBlock.ts
@@ -1,9 +1,9 @@
-import type { Path } from 'ot-json1';
+import { TBlockPath } from '../types';
 
 class LeafQueryBlock {
   public firstChild: unknown;
 
-  queryBlock(path: Path) {
+  queryBlock(path: TBlockPath) {
     return path.length && path[0] === 'text' ? this.firstChild : this;
   }
 }

diff --git a/lib/block/scrollPage/index.ts b/lib/block/scrollPage/index.ts
@@ -16,7 +16,7 @@ interface IBlurFocus {
 }
 
 class ScrollPage extends Parent {
-  private blurFocus: IBlurFocus = { blur: null, focus: null };
+  private _blurFocus: IBlurFocus = { blur: null, focus: null };
 
   static blockName = 'scrollpage';
 
@@ -116,17 +116,17 @@ class ScrollPage extends Parent {
   }
 
   handleBlurFromContent(block: Content) {
-    this.blurFocus.blur = block;
+    this._blurFocus.blur = block;
     requestAnimationFrame(this.updateActiveStatus);
   }
 
   handleFocusFromContent(block: Content) {
-    this.blurFocus.focus = block;
+    this._blurFocus.focus = block;
     requestAnimationFrame(this.updateActiveStatus);
   }
 
   private updateActiveStatus = () => {
-    const { blur, focus } = this.blurFocus;
+    const { blur, focus } = this._blurFocus;
 
     if (blur == null && focus == null) {
       return;
@@ -161,7 +161,7 @@ class ScrollPage extends Parent {
       });
     }
 
-    this.blurFocus = {
+    this._blurFocus = {
       blur: null,
       focus: null,
     };