@milkdown/preset-gfm 6.1.3 → 6.2.0

package/src/table/nodes/util.ts

@@ -0,0 +1,107 @@
+/* Copyright 2021, Milkdown by Mirone. */
+import { Attrs, Node, ResolvedPos } from '@milkdown/prose/model';
+import { EditorState, NodeSelection } from '@milkdown/prose/state';
+
+import { CellSelection } from './cell-selection';
+import { tableNodeTypes } from './schema';
+import { TableMap } from './table-map';
+
+export function cellAround($pos: ResolvedPos) {
+    for (let d = $pos.depth - 1; d > 0; d--)
+        if ($pos.node(d).type.spec['tableRole'] == 'row') return $pos.node(0).resolve($pos.before(d + 1));
+    return undefined;
+}
+
+export function cellWrapping($pos: ResolvedPos) {
+    for (let d = $pos.depth; d > 0; d--) {
+        // Sometimes the cell can be in the same depth.
+        const role = $pos.node(d).type.spec['tableRole'];
+        if (role === 'cell' || role === 'header_cell') return $pos.node(d);
+    }
+    return null;
+}
+
+export function pointsAtCell($pos: ResolvedPos): Node | null {
+    if ($pos.parent.type.spec['tableRole'] == 'row') return $pos.nodeAfter;
+    return null;
+}
+
+export function moveCellForward($pos: ResolvedPos) {
+    return $pos.node(0).resolve($pos.pos + ($pos.nodeAfter as Node).nodeSize);
+}
+
+export function inSameTable($a: ResolvedPos, $b: ResolvedPos) {
+    return $a.depth == $b.depth && $a.pos >= $b.start(-1) && $a.pos <= $b.end(-1);
+}
+
+export function nextCell($pos: ResolvedPos, axis: string, dir: number) {
+    const start = $pos.start(-1),
+        map = TableMap.get($pos.node(-1));
+    const moved = map.nextCell($pos.pos - start, axis, dir);
+    return moved == null ? null : $pos.node(0).resolve(start + moved);
+}
+
+export function setAttr<T>(attrs: Attrs, name: string, value: T) {
+    const result: Record<string, unknown> = {};
+    for (const prop in attrs) result[prop] = attrs[prop];
+    result[name] = value;
+    return result as Attrs;
+}
+
+export function removeColSpan(attrs: Attrs, pos: number, n = 1) {
+    const result = setAttr(attrs, 'colspan', attrs['colspan'] - n) as Record<string, unknown>;
+    if (result['colwidth']) {
+        const widths = result['colwidth'] as number[];
+        result['colwidth'] = widths.slice();
+        widths.splice(pos, n);
+        if (!widths.some((w) => w > 0)) result['colwidth'] = null;
+    }
+    return result;
+}
+
+export function isInTable(state: EditorState) {
+    const $head = state.selection.$head;
+    for (let d = $head.depth; d > 0; d--) if ($head.node(d).type.spec['tableRole'] == 'row') return true;
+    return false;
+}
+
+export function selectionCell(state: EditorState) {
+    const sel = state.selection;
+    if (sel instanceof CellSelection) {
+        return sel.$anchorCell.pos > sel.$headCell.pos ? sel.$anchorCell : sel.$headCell;
+    } else if ((sel as NodeSelection).node && (sel as NodeSelection).node.type.spec['tableRole'] == 'cell') {
+        return sel.$anchor;
+    }
+    return cellAround(sel.$head) || cellNear(sel.$head);
+}
+
+function cellNear($pos: ResolvedPos) {
+    for (let after = $pos.nodeAfter, pos = $pos.pos; after; after = after.firstChild, pos++) {
+        const role = after.type.spec['tableRole'];
+        if (role == 'cell' || role == 'header_cell') return $pos.doc.resolve(pos);
+    }
+    for (let before = $pos.nodeBefore, pos = $pos.pos; before; before = before.lastChild, pos--) {
+        const role = before.type.spec['tableRole'];
+        if (role == 'cell' || role == 'header_cell') return $pos.doc.resolve(pos - before.nodeSize);
+    }
+    return;
+}
+
+export function addColSpan(attrs: Attrs, pos: number, n = 1) {
+    const result = setAttr(attrs, 'colspan', attrs['colspan'] + n) as Record<string, unknown>;
+    if (result['colwidth']) {
+        const widths = result['colwidth'] as number[];
+        result['colwidth'] = widths.slice();
+        for (let i = 0; i < n; i++) widths.splice(pos, 0, 0);
+    }
+    return result as Attrs;
+}
+
+export function columnIsHeader(map: TableMap, table: Node, col: number) {
+    const headerCell = tableNodeTypes(table.type.schema).header_cell;
+    for (let row = 0; row < map.height; row++) {
+        const pos = map.map[col + row * map.width] as number;
+        if ((table.nodeAt(pos) as Node).type != headerCell) return false;
+    }
+    return true;
+}

package/src/table/operator-plugin/actions.ts

@@ -1,6 +1,8 @@
 /* Copyright 2021, Milkdown by Mirone. */
 import { Ctx, ThemeIcon, themeManagerCtx } from '@milkdown/core';
-import { Command } from '@milkdown/prose/commands';
+import { Command } from '@milkdown/prose/state';
+import { EditorView } from '@milkdown/prose/view';
+
 import {
     addColumnAfter,
     addColumnBefore,
@@ -10,9 +12,7 @@ import {
     isInTable,
     selectedRect,
     setCellAttr,
-} from '@milkdown/prose/tables';
-import { EditorView } from '@milkdown/prose/view';
-
+} from '../nodes';
 import { addRowWithAlignment } from '../utils';
 import { getCellSelection, isFirstRowSelected } from './helper';
 

package/src/table/operator-plugin/calc-pos.ts

@@ -1,9 +1,10 @@
 /* Copyright 2021, Milkdown by Mirone. */
 
 import { calculateNodePosition } from '@milkdown/prose';
-import { CellSelection } from '@milkdown/prose/tables';
 import { EditorView } from '@milkdown/prose/view';
 
+import { CellSelection } from '../nodes/cell-selection';
+
 export const calculatePosition = (view: EditorView, dom: HTMLElement) => {
     const { selection } = view.state as unknown as { selection: CellSelection };
     const isCol = selection.isColSelection();

package/src/table/operator-plugin/helper.ts

@@ -1,7 +1,8 @@
 /* Copyright 2021, Milkdown by Mirone. */
-import { CellSelection, TableMap } from '@milkdown/prose/tables';
 import { EditorView } from '@milkdown/prose/view';
 
+import { CellSelection } from '../nodes/cell-selection';
+import { TableMap } from '../nodes/table-map';
 import { Item } from './actions';
 
 export const getCellSelection = (view: EditorView): CellSelection => view.state.selection as unknown as CellSelection;

package/src/table/operator-plugin/index.ts

@@ -2,10 +2,10 @@
 
 import { Ctx } from '@milkdown/core';
 import { Plugin, PluginKey } from '@milkdown/prose/state';
-import { CellSelection } from '@milkdown/prose/tables';
 import { Decoration, DecorationSet } from '@milkdown/prose/view';
 import { Utils } from '@milkdown/utils';
 
+import { CellSelection } from '../nodes/cell-selection';
 import { CellPos, getCellsInColumn, getCellsInRow } from '../utils';
 import { createActions } from './actions';
 import { calculatePosition } from './calc-pos';

package/src/table/operator-plugin/widget.ts

@@ -1,7 +1,7 @@
 /* Copyright 2021, Milkdown by Mirone. */
 
 import { Ctx, ThemeIcon, themeManagerCtx } from '@milkdown/core';
-import { Decoration, WidgetDecorationSpec } from '@milkdown/prose/view';
+import { Decoration } from '@milkdown/prose/view';
 
 import { CellPos, selectLine, selectTable } from '../utils';
 import { ToolTipPos } from './constant';
@@ -21,19 +21,9 @@ const calculateClassName = (pos: ToolTipPos) => {
     }
 };
 
-export function createWidget(ctx: Ctx, cell: CellPos, pos: ToolTipPos.Point): Decoration<WidgetDecorationSpec>;
-export function createWidget(
-    ctx: Ctx,
-    cell: CellPos,
-    pos: ToolTipPos.Left,
-    index: number,
-): Decoration<WidgetDecorationSpec>;
-export function createWidget(
-    ctx: Ctx,
-    cell: CellPos,
-    pos: ToolTipPos.Top,
-    index: number,
-): Decoration<WidgetDecorationSpec>;
+export function createWidget(ctx: Ctx, cell: CellPos, pos: ToolTipPos.Point): Decoration;
+export function createWidget(ctx: Ctx, cell: CellPos, pos: ToolTipPos.Left, index: number): Decoration;
+export function createWidget(ctx: Ctx, cell: CellPos, pos: ToolTipPos.Top, index: number): Decoration;
 export function createWidget(ctx: Ctx, cell: CellPos, pos: ToolTipPos, index = 0) {
     return Decoration.widget(cell.pos + 1, (view) => {
         const div = document.createElement('div');

package/src/table/utils.ts

@@ -2,7 +2,10 @@
 import { cloneTr, findParentNode } from '@milkdown/prose';
 import { Node as ProsemirrorNode, Schema } from '@milkdown/prose/model';
 import { Selection, Transaction } from '@milkdown/prose/state';
-import { CellSelection, TableMap, tableNodeTypes, TableRect } from '@milkdown/prose/tables';
+
+import { CellSelection } from './nodes/cell-selection';
+import { tableNodeTypes } from './nodes/schema';
+import { Rect, TableMap } from './nodes/table-map';
 
 export type CellPos = {
     pos: number;
@@ -132,7 +135,7 @@ export const selectTable = (tr: Transaction) => {
     return tr;
 };
 
-export function addRowWithAlignment(tr: Transaction, { map, tableStart, table }: TableRect, row: number) {
+export function addRowWithAlignment(tr: Transaction, { map, tableStart, table }: Required<Rect>, row: number) {
     const rowPos = Array(row)
         .fill(0)
         .reduce((acc, _, i) => {

package/src/task-list-item.ts

@@ -3,6 +3,7 @@ import { createCmd, createCmdKey, editorViewCtx, ThemeTaskListItemType } from '@
 import { wrapIn } from '@milkdown/prose/commands';
 import { wrappingInputRule } from '@milkdown/prose/inputrules';
 import { liftListItem, sinkListItem, splitListItem } from '@milkdown/prose/schema-list';
+import { NodeView } from '@milkdown/prose/view';
 import { createNode, createShortcut } from '@milkdown/utils';
 
 import { SupportedKeys } from './supported-keys';
@@ -130,7 +131,7 @@ export const taskListItem = createNode<Keys>((utils) => {
                 },
             });
 
-            if (!renderer) return {};
+            if (!renderer) return {} as NodeView;
 
             const { dom, contentDOM, onUpdate } = renderer;
             onUpdate(currNode);