@milkdown/preset-gfm 7.15.5 → 7.16.0

package/lib/index.js

@@ -2,7 +2,7 @@ import { expectDomTypeError } from "@milkdown/exception";
 import { paragraphSchema, listItemSchema } from "@milkdown/preset-commonmark";
 import { InputRule } from "@milkdown/prose/inputrules";
 import { $markAttr, $markSchema, $inputRule, $useKeymap, $command, $nodeSchema, $prose, $remark } from "@milkdown/utils";
-import { tableNodes, TableMap, CellSelection, goToNextCell, isInTable, deleteTable, deleteColumn, deleteRow, selectedRect, addColumnBefore, addColumnAfter, setCellAttr, columnResizing, tableEditing } from "@milkdown/prose/tables";
+import { tableNodes, findTable, TableMap, CellSelection, goToNextCell, isInTable, moveTableRow, moveTableColumn, deleteTable, deleteColumn, deleteRow, selectedRect, addColumnBefore, addColumnAfter, setCellAttr, columnResizing, tableEditing } from "@milkdown/prose/tables";
 import { commandsCtx } from "@milkdown/core";
 import { markRule, findParentNodeClosestToPos, cloneTr, findParentNodeType } from "@milkdown/prose";
 import { toggleMark } from "@milkdown/prose/commands";
@@ -286,11 +286,6 @@ function createTable(ctx, rowsCount = 3, colsCount = 3) {
   );
   return tableSchema.type(ctx).create(null, rows);
 }
-function findTable($pos) {
-  return findParentNodeClosestToPos(
-    (node) => node.type.spec.tableRole === "table"
-  )($pos);
-}
 function getCellsInCol(columnIndexes, selection) {
   const table = findTable(selection.$from);
   if (!table) return void 0;
@@ -382,278 +377,6 @@ function addRowWithAlignment(ctx, tr, { map, tableStart, table }, row) {
   tr.insert(rowPos, tableRowSchema.type(ctx).create(null, cells));
   return tr;
 }
-function convertRowsToTable(tableNode, arrayOfNodes) {
-  const rowsPM = [];
-  const map = TableMap.get(tableNode);
-  for (let rowIndex = 0; rowIndex < map.height; rowIndex++) {
-    const row = tableNode.child(rowIndex);
-    const rowCells = [];
-    for (let colIndex = 0; colIndex < map.width; colIndex++) {
-      if (!arrayOfNodes[rowIndex][colIndex]) continue;
-      const cellPos = map.map[rowIndex * map.width + colIndex];
-      const cell = arrayOfNodes[rowIndex][colIndex];
-      const oldCell = tableNode.nodeAt(cellPos);
-      const newCell = oldCell.type.createChecked(
-        Object.assign({}, cell.attrs),
-        cell.content,
-        cell.marks
-      );
-      rowCells.push(newCell);
-    }
-    rowsPM.push(row.type.createChecked(row.attrs, rowCells, row.marks));
-  }
-  const newTable = tableNode.type.createChecked(
-    tableNode.attrs,
-    rowsPM,
-    tableNode.marks
-  );
-  return newTable;
-}
-function convertTableToRows(tableNode) {
-  const map = TableMap.get(tableNode);
-  const rows = [];
-  const rowCount = map.height;
-  const colCount = map.width;
-  for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-    const row = [];
-    for (let colIndex = 0; colIndex < colCount; colIndex++) {
-      let cellIndex = rowIndex * colCount + colIndex;
-      let cellPos = map.map[cellIndex];
-      if (rowIndex > 0) {
-        const topCellIndex = cellIndex - colCount;
-        const topCellPos = map.map[topCellIndex];
-        if (cellPos === topCellPos) {
-          row.push(null);
-          continue;
-        }
-      }
-      if (colIndex > 0) {
-        const leftCellIndex = cellIndex - 1;
-        const leftCellPos = map.map[leftCellIndex];
-        if (cellPos === leftCellPos) {
-          row.push(null);
-          continue;
-        }
-      }
-      if (!cellPos) {
-        row.push(null);
-      } else {
-        row.push(tableNode.nodeAt(cellPos));
-      }
-    }
-    rows.push(row);
-  }
-  return rows;
-}
-function getSelectionRangeInRow(tr, startRowIndex, endRowIndex = startRowIndex) {
-  let startIndex = startRowIndex;
-  let endIndex = endRowIndex;
-  for (let i = startRowIndex; i >= 0; i--) {
-    const cells = getCellsInRow(i, tr.selection);
-    if (cells) {
-      cells.forEach((cell) => {
-        const maybeEndIndex = cell.node.attrs.rowspan + i - 1;
-        if (maybeEndIndex >= startIndex) {
-          startIndex = i;
-        }
-        if (maybeEndIndex > endIndex) {
-          endIndex = maybeEndIndex;
-        }
-      });
-    }
-  }
-  for (let i = startRowIndex; i <= endIndex; i++) {
-    const cells = getCellsInRow(i, tr.selection);
-    if (cells) {
-      cells.forEach((cell) => {
-        const maybeEndIndex = cell.node.attrs.rowspan + i - 1;
-        if (cell.node.attrs.rowspan > 1 && maybeEndIndex > endIndex) {
-          endIndex = maybeEndIndex;
-        }
-      });
-    }
-  }
-  const indexes = [];
-  for (let i = startIndex; i <= endIndex; i++) {
-    const maybeCells = getCellsInRow(i, tr.selection);
-    if (maybeCells && maybeCells.length > 0) {
-      indexes.push(i);
-    }
-  }
-  startIndex = indexes[0];
-  endIndex = indexes[indexes.length - 1];
-  const firstSelectedRowCells = getCellsInRow(startIndex, tr.selection);
-  const firstColumnCells = getCellsInCol(0, tr.selection);
-  if (!firstSelectedRowCells || !firstColumnCells) {
-    return;
-  }
-  const $anchor = tr.doc.resolve(
-    firstSelectedRowCells[firstSelectedRowCells.length - 1].pos
-  );
-  let headCell;
-  for (let i = endIndex; i >= startIndex; i--) {
-    const rowCells = getCellsInRow(i, tr.selection);
-    if (rowCells && rowCells.length > 0) {
-      for (let j = firstColumnCells.length - 1; j >= 0; j--) {
-        if (firstColumnCells[j].pos === rowCells[0].pos) {
-          headCell = rowCells[0];
-          break;
-        }
-      }
-      if (headCell) {
-        break;
-      }
-    }
-  }
-  if (!headCell) {
-    return;
-  }
-  const $head = tr.doc.resolve(headCell.pos);
-  return { $anchor, $head, indexes };
-}
-function moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, directionOverride) {
-  const direction = indexesOrigin[0] > indexesTarget[0] ? -1 : 1;
-  const rowsExtracted = rows.splice(indexesOrigin[0], indexesOrigin.length);
-  const positionOffset = rowsExtracted.length % 2 === 0 ? 1 : 0;
-  let target;
-  {
-    target = direction === -1 ? indexesTarget[0] : indexesTarget[indexesTarget.length - 1] - positionOffset;
-  }
-  rows.splice(target, 0, ...rowsExtracted);
-  return rows;
-}
-function moveRow(moveRowParams) {
-  const { tr, origin, target, select, pos } = moveRowParams;
-  const $pos = tr.doc.resolve(pos);
-  const table = findTable($pos);
-  if (!table) return false;
-  const indexesOriginRow = getSelectionRangeInRow(tr, origin)?.indexes;
-  const indexesTargetRow = getSelectionRangeInRow(tr, target)?.indexes;
-  if (!indexesOriginRow || !indexesTargetRow) return false;
-  if (indexesOriginRow.includes(target)) return false;
-  const newTable = moveTableRow(
-    table.node,
-    indexesOriginRow,
-    indexesTargetRow
-  );
-  tr.replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
-  if (!select) return true;
-  const map = TableMap.get(newTable);
-  const start = table.start;
-  const index = target;
-  const lastCell = map.positionAt(index, map.width - 1, newTable);
-  const $lastCell = tr.doc.resolve(start + lastCell);
-  const firstCell = map.positionAt(index, 0, newTable);
-  const $firstCell = tr.doc.resolve(start + firstCell);
-  tr.setSelection(CellSelection.rowSelection($lastCell, $firstCell));
-  return true;
-}
-function moveTableRow(table, indexesOrigin, indexesTarget, direction) {
-  let rows = convertTableToRows(table);
-  rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget);
-  return convertRowsToTable(table, rows);
-}
-function getSelectionRangeInCol(tr, startColIndex, endColIndex = startColIndex) {
-  let startIndex = startColIndex;
-  let endIndex = endColIndex;
-  for (let i = startColIndex; i >= 0; i--) {
-    const cells = getCellsInCol(i, tr.selection);
-    if (cells) {
-      cells.forEach((cell) => {
-        const maybeEndIndex = cell.node.attrs.colspan + i - 1;
-        if (maybeEndIndex >= startIndex) {
-          startIndex = i;
-        }
-        if (maybeEndIndex > endIndex) {
-          endIndex = maybeEndIndex;
-        }
-      });
-    }
-  }
-  for (let i = startColIndex; i <= endIndex; i++) {
-    const cells = getCellsInCol(i, tr.selection);
-    if (cells) {
-      cells.forEach((cell) => {
-        const maybeEndIndex = cell.node.attrs.colspan + i - 1;
-        if (cell.node.attrs.colspan > 1 && maybeEndIndex > endIndex) {
-          endIndex = maybeEndIndex;
-        }
-      });
-    }
-  }
-  const indexes = [];
-  for (let i = startIndex; i <= endIndex; i++) {
-    const maybeCells = getCellsInCol(i, tr.selection);
-    if (maybeCells && maybeCells.length > 0) {
-      indexes.push(i);
-    }
-  }
-  startIndex = indexes[0];
-  endIndex = indexes[indexes.length - 1];
-  const firstSelectedColumnCells = getCellsInCol(startIndex, tr.selection);
-  const firstRowCells = getCellsInRow(0, tr.selection);
-  if (!firstSelectedColumnCells || !firstRowCells) {
-    return;
-  }
-  const $anchor = tr.doc.resolve(
-    firstSelectedColumnCells[firstSelectedColumnCells.length - 1].pos
-  );
-  let headCell;
-  for (let i = endIndex; i >= startIndex; i--) {
-    const columnCells = getCellsInCol(i, tr.selection);
-    if (columnCells && columnCells.length > 0) {
-      for (let j = firstRowCells.length - 1; j >= 0; j--) {
-        if (firstRowCells[j].pos === columnCells[0].pos) {
-          headCell = columnCells[0];
-          break;
-        }
-      }
-      if (headCell) {
-        break;
-      }
-    }
-  }
-  if (!headCell) {
-    return;
-  }
-  const $head = tr.doc.resolve(headCell.pos);
-  return { $anchor, $head, indexes };
-}
-function transpose(array) {
-  return array[0].map((_, i) => array.map((column) => column[i]));
-}
-function moveCol(moveColParams) {
-  const { tr, origin, target, select, pos } = moveColParams;
-  const $pos = tr.doc.resolve(pos);
-  const table = findTable($pos);
-  if (!table) return false;
-  const indexesOriginColumn = getSelectionRangeInCol(tr, origin)?.indexes;
-  const indexesTargetColumn = getSelectionRangeInCol(tr, target)?.indexes;
-  if (!indexesOriginColumn || !indexesTargetColumn) return false;
-  if (indexesOriginColumn.includes(target)) return false;
-  const newTable = moveTableCol(
-    table.node,
-    indexesOriginColumn,
-    indexesTargetColumn
-  );
-  tr.replaceWith(table.pos, table.pos + table.node.nodeSize, newTable);
-  if (!select) return true;
-  const map = TableMap.get(newTable);
-  const start = table.start;
-  const index = target;
-  const lastCell = map.positionAt(map.height - 1, index, newTable);
-  const $lastCell = tr.doc.resolve(start + lastCell);
-  const firstCell = map.positionAt(0, index, newTable);
-  const $firstCell = tr.doc.resolve(start + firstCell);
-  tr.setSelection(CellSelection.colSelection($lastCell, $firstCell));
-  return true;
-}
-function moveTableCol(table, indexesOrigin, indexesTarget, direction) {
-  let rows = transpose(convertTableToRows(table));
-  rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget);
-  rows = transpose(rows);
-  return convertRowsToTable(table, rows);
-}
 function getAllCellsInTable(selection) {
   const table = findTable(selection.$from);
   if (!table) return;
@@ -739,20 +462,11 @@ withMeta(insertTableCommand, {
 });
 const moveRowCommand = $command(
   "MoveRow",
-  () => ({ from, to, pos } = {}) => (state, dispatch) => {
-    const { tr } = state;
-    if (moveRow({
-      tr,
-      origin: from ?? 0,
-      target: to ?? 0,
-      pos: pos ?? state.selection.from,
-      select: true
-    })) {
-      dispatch?.(tr);
-      return true;
-    }
-    return false;
-  }
+  () => ({ from, to, pos } = {}) => moveTableRow({
+    from: from ?? 0,
+    to: to ?? 0,
+    pos
+  })
 );
 withMeta(moveRowCommand, {
   displayName: "Command<moveRowCommand>",
@@ -760,20 +474,11 @@ withMeta(moveRowCommand, {
 });
 const moveColCommand = $command(
   "MoveCol",
-  () => ({ from, to, pos } = {}) => (state, dispatch) => {
-    const { tr } = state;
-    if (moveCol({
-      tr,
-      origin: from ?? 0,
-      target: to ?? 0,
-      pos: pos ?? state.selection.from,
-      select: true
-    })) {
-      dispatch?.(tr);
-      return true;
-    }
-    return false;
-  }
+  () => ({ from, to, pos } = {}) => moveTableColumn({
+    from: from ?? 0,
+    to: to ?? 0,
+    pos
+  })
 );
 withMeta(moveColCommand, {
   displayName: "Command<moveColCommand>",
@@ -1317,7 +1022,6 @@ export {
   deleteSelectedCellsCommand,
   exitTable,
   extendListItemSchemaForTask,
-  findTable,
   footnoteDefinitionSchema,
   footnoteReferenceSchema,
   getAllCellsInTable,
@@ -1332,9 +1036,7 @@ export {
   keepTableAlignPlugin,
   keymap,
   markInputRules,
-  moveCol,
   moveColCommand,
-  moveRow,
   moveRowCommand,
   plugins,
   remarkGFMPlugin,