Merge branch 'main' into feat/jotai-factory

udecode · Dec 6, 2023 · 55aeeb0 · 55aeeb0
2 parents 7a363f9 + b807c40
commit 55aeeb0
Show file tree

Hide file tree

Showing 24 changed files with 105 additions and 38 deletions.
diff --git a/apps/www/content/docs/link.mdx b/apps/www/content/docs/link.mdx
@@ -33,7 +33,9 @@ import { createLinkPlugin } from '@udecode/plate-link';
 
 const plugins = [
   // ...otherPlugins,
-  createLinkPlugin(),
+  createLinkPlugin({
+    renderAfterEditable: LinkFloatingToolbar
+  }),
 ];
 ```
 

diff --git a/packages/floating/CHANGELOG.md b/packages/floating/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @udecode/plate-floating
 
+## 26.0.4
+
+### Patch Changes
+
+- [#2777](https://github.com/udecode/plate/pull/2777) by [@zbeyens](https://github.com/zbeyens) – Vendor: remove radix-ui package
+
 ## 25.0.1
 
 ## 25.0.0

diff --git a/packages/floating/package.json b/packages/floating/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-floating",
-  "version": "25.0.1",
+  "version": "26.0.4",
   "description": "Floating UI for Plate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -41,7 +41,6 @@
   "dependencies": {
     "@floating-ui/core": "^1.3.1",
     "@floating-ui/react": "^0.22.3",
-    "@radix-ui/react-dropdown-menu": "^2.0.5",
     "@udecode/plate-common": "25.0.1"
   },
   "peerDependencies": {

diff --git a/packages/floating/src/libs/index.ts b/packages/floating/src/libs/index.ts
@@ -3,4 +3,3 @@
  */
 
 export * from './floating-ui';
-export * from './radix-ui';
diff --git a/packages/floating/src/libs/radix-ui.ts b/packages/floating/src/libs/radix-ui.ts
diff --git a/packages/link/CHANGELOG.md b/packages/link/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @udecode/plate-link
 
+## 26.0.4
+
 ## 25.0.1
 
 ## 25.0.0

diff --git a/packages/link/package.json b/packages/link/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-link",
-  "version": "25.0.1",
+  "version": "26.0.4",
   "description": "Link plugin for Plate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "25.0.1",
-    "@udecode/plate-floating": "25.0.1",
+    "@udecode/plate-floating": "26.0.4",
     "@udecode/plate-normalizers": "25.0.1"
   },
   "peerDependencies": {

diff --git a/packages/plate/CHANGELOG.md b/packages/plate/CHANGELOG.md
@@ -1,5 +1,9 @@
 # @udecode/plate
 
+## 26.0.5
+
+## 26.0.4
+
 ## 26.0.3
 
 ## 26.0.2

diff --git a/packages/plate/package.json b/packages/plate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate",
-  "version": "26.0.3",
+  "version": "26.0.5",
   "description": "Plate – a plugin system for slate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -53,7 +53,7 @@
     "@udecode/plate-comments": "26.0.0",
     "@udecode/plate-common": "25.0.1",
     "@udecode/plate-find-replace": "25.0.1",
-    "@udecode/plate-floating": "25.0.1",
+    "@udecode/plate-floating": "26.0.4",
     "@udecode/plate-font": "25.0.1",
     "@udecode/plate-heading": "25.0.1",
     "@udecode/plate-highlight": "25.0.1",
@@ -62,23 +62,23 @@
     "@udecode/plate-indent-list": "25.0.1",
     "@udecode/plate-kbd": "25.0.1",
     "@udecode/plate-line-height": "25.0.1",
-    "@udecode/plate-link": "25.0.1",
+    "@udecode/plate-link": "26.0.4",
     "@udecode/plate-list": "25.0.1",
     "@udecode/plate-media": "25.0.1",
     "@udecode/plate-mention": "25.0.1",
     "@udecode/plate-node-id": "25.0.1",
     "@udecode/plate-normalizers": "25.0.1",
     "@udecode/plate-paragraph": "25.0.1",
     "@udecode/plate-reset-node": "25.0.1",
-    "@udecode/plate-resizable": "25.0.1",
+    "@udecode/plate-resizable": "26.0.5",
     "@udecode/plate-select": "25.0.1",
-    "@udecode/plate-serializer-csv": "26.0.3",
-    "@udecode/plate-serializer-docx": "26.0.3",
+    "@udecode/plate-serializer-csv": "26.0.5",
+    "@udecode/plate-serializer-docx": "26.0.5",
     "@udecode/plate-serializer-html": "26.0.0",
-    "@udecode/plate-serializer-md": "25.0.1",
+    "@udecode/plate-serializer-md": "26.0.4",
     "@udecode/plate-suggestion": "25.0.1",
     "@udecode/plate-tabbable": "25.0.1",
-    "@udecode/plate-table": "26.0.3",
+    "@udecode/plate-table": "26.0.5",
     "@udecode/plate-trailing-block": "25.0.1"
   },
   "peerDependencies": {

diff --git a/packages/resizable/CHANGELOG.md b/packages/resizable/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @udecode/plate-resizable
 
+## 26.0.5
+
+### Patch Changes
+
+- [#2781](https://github.com/udecode/plate/pull/2781) by [@dimaanj](https://github.com/dimaanj) – Add initial size for resize handle
+
 ## 25.0.1
 
 ## 25.0.0

diff --git a/packages/resizable/package.json b/packages/resizable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-resizable",
-  "version": "25.0.1",
+  "version": "26.0.5",
   "description": "Resize components",
   "license": "MIT",
   "homepage": "https://platejs.org",

diff --git a/packages/serializer-csv/CHANGELOG.md b/packages/serializer-csv/CHANGELOG.md
@@ -1,5 +1,9 @@
 # @udecode/plate-serializer-csv
 
+## 26.0.5
+
+## 26.0.4
+
 ## 26.0.3
 
 ## 26.0.2

diff --git a/packages/serializer-csv/package.json b/packages/serializer-csv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-serializer-csv",
-  "version": "26.0.3",
+  "version": "26.0.5",
   "description": "CSV serializer plugin for Plate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "25.0.1",
-    "@udecode/plate-table": "26.0.3",
+    "@udecode/plate-table": "26.0.5",
     "papaparse": "^5.4.1"
   },
   "peerDependencies": {

diff --git a/packages/serializer-docx/CHANGELOG.md b/packages/serializer-docx/CHANGELOG.md
@@ -1,5 +1,9 @@
 # @udecode/plate-docx-serializer
 
+## 26.0.5
+
+## 26.0.4
+
 ## 26.0.3
 
 ## 26.0.2

diff --git a/packages/serializer-docx/package.json b/packages/serializer-docx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-serializer-docx",
-  "version": "26.0.3",
+  "version": "26.0.5",
   "description": "Docx serializer plugin for Plate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -45,7 +45,7 @@
     "@udecode/plate-indent-list": "25.0.1",
     "@udecode/plate-media": "25.0.1",
     "@udecode/plate-paragraph": "25.0.1",
-    "@udecode/plate-table": "26.0.3",
+    "@udecode/plate-table": "26.0.5",
     "validator": "^13.9.0"
   },
   "peerDependencies": {

diff --git a/packages/serializer-md/CHANGELOG.md b/packages/serializer-md/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @udecode/plate-md-serializer
 
+## 26.0.4
+
 ## 25.0.1
 
 ## 25.0.0

diff --git a/packages/serializer-md/package.json b/packages/serializer-md/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-serializer-md",
-  "version": "25.0.1",
+  "version": "26.0.4",
   "description": "Markdown serializer plugin for Plate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -45,7 +45,7 @@
     "@udecode/plate-common": "25.0.1",
     "@udecode/plate-heading": "25.0.1",
     "@udecode/plate-horizontal-rule": "25.0.1",
-    "@udecode/plate-link": "25.0.1",
+    "@udecode/plate-link": "26.0.4",
     "@udecode/plate-list": "25.0.1",
     "@udecode/plate-media": "25.0.1",
     "@udecode/plate-paragraph": "25.0.1",

diff --git a/packages/table/CHANGELOG.md b/packages/table/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @udecode/plate-table
 
+## 26.0.5
+
+## 26.0.4
+
+### Patch Changes
+
+- [#2776](https://github.com/udecode/plate/pull/2776) by [@dimaanj](https://github.com/dimaanj) – Fix unmerging a single column
+
 ## 26.0.3
 
 ### Patch Changes

diff --git a/packages/table/package.json b/packages/table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-table",
-  "version": "26.0.3",
+  "version": "26.0.5",
   "description": "Table plugin for Plate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "25.0.1",
-    "@udecode/plate-resizable": "25.0.1",
+    "@udecode/plate-resizable": "26.0.5",
     "lodash": "^4.17.21"
   },
   "peerDependencies": {

diff --git a/packages/table/src/merge/computeCellIndices.ts b/packages/table/src/merge/computeCellIndices.ts
@@ -1,6 +1,7 @@
 import { getPluginOptions, PlateEditor, Value } from '@udecode/plate-common';
 
 import { ELEMENT_TABLE } from '../createTablePlugin';
+import { getRowSpan } from '../queries/getRowSpan';
 import {
   TablePlugin,
   TTableCellElement,
@@ -40,15 +41,16 @@ export function computeCellIndices<V extends Value>(
     prevRow.children.forEach((pC) => {
       const prevCell = pC as TTableCellElement;
       const prevIndices = options?._cellIndices?.get(prevCell);
+      const _rowSpan = getRowSpan(prevCell);
       if (prevIndices) {
         const { col: prevColIndex } = prevIndices;
         if (
           // colIndex affects
           prevColIndex <= colIndex &&
           // rowSpan affects
-          prevCell.rowSpan &&
-          prevCell.rowSpan > 1 &&
-          rowIndex - _rowIndex < prevCell.rowSpan
+          _rowSpan &&
+          _rowSpan > 1 &&
+          rowIndex - _rowIndex < _rowSpan
         ) {
           colIndex += prevCell.colSpan || 1;
         }

diff --git a/packages/table/src/merge/isTableRectangular.ts b/packages/table/src/merge/isTableRectangular.ts
@@ -1,3 +1,4 @@
+import { getRowSpan } from '../queries/getRowSpan';
 import { TTableCellElement, TTableElement, TTableRowElement } from '../types';
 
 const allEqual = (arr: number[]) => arr.every((val) => val === arr[0]);
@@ -14,7 +15,7 @@ export const isTableRectangular = (table?: TTableElement) => {
       const cellElem = cell as TTableCellElement;
 
       Array.from({
-        length: cellElem?.rowSpan || 1,
+        length: getRowSpan(cellElem) || 1,
       } as ArrayLike<number>).forEach((_, i) => {
         if (!arr[rI + i]) {
           arr[rI + i] = 0;

diff --git a/packages/table/src/merge/unmergeTableCells.ts b/packages/table/src/merge/unmergeTableCells.ts
@@ -13,6 +13,7 @@ import {
 import { ELEMENT_TABLE, ELEMENT_TR } from '../createTablePlugin';
 import { getTableGridAbove } from '../queries';
 import { getColSpan } from '../queries/getColSpan';
+import { getRowSpan } from '../queries/getRowSpan';
 import { TablePlugin, TTableCellElement, TTableRowElement } from '../types';
 import { getEmptyCellNode } from '../utils';
 import { getCellIndices } from './getCellIndices';
@@ -45,8 +46,8 @@ export const unmergeTableCells = <V extends Value = Value>(
 
     const cellPath = path.slice(-2);
     const [rowPath, colPath] = cellPath;
-    const colSpan = cellElem.colSpan as number;
-    const rowSpan = cellElem.rowSpan as number;
+    const colSpan = getColSpan(cellElem as TTableCellElement);
+    const rowSpan = getRowSpan(cellElem as TTableCellElement);
 
     // Generate an array of column paths from the colspan
     const colPaths: number[] = [];
@@ -69,8 +70,12 @@ export const unmergeTableCells = <V extends Value = Value>(
         at: [...tablePath, row],
         match: { type: getPluginType(editor, ELEMENT_TR) },
       })!; // TODO: improve typing
-      const rowEl = rowEntry[0] as TTableRowElement;
 
+      if (!rowEntry) {
+        return newColPath;
+      }
+
+      const rowEl = rowEntry[0] as TTableRowElement;
       for (const item of rowEl.children) {
         const { col: c } = getCellIndices(
           cellIndices!,
@@ -93,16 +98,39 @@ export const unmergeTableCells = <V extends Value = Value>(
     for (let i = 0; i < rowSpan; i++) {
       const currentRowPath = rowPath + i;
       const pathForNextRows = getColPathForRow(currentRowPath);
-      for (let j = 0; j < colPaths.length; j++) {
-        const currentColPath = i === 0 ? colPaths[j] : pathForNextRows;
+      const newRowChildren = [];
+      const _rowPath = [...tablePath, currentRowPath];
+      const rowEntry = findNode(editor, {
+        at: _rowPath,
+        match: { type: getPluginType(editor, ELEMENT_TABLE) },
+      });
 
-        const pathForNewCell = [...tablePath, currentRowPath, currentColPath];
+      for (let j = 0; j < colPaths.length; j++) {
         const cellToInsert =
           i === 0 && j === 0
             ? createEmptyCell(cellElem.children)
             : createEmptyCell();
 
-        insertElements(editor, cellToInsert, { at: pathForNewCell });
+        // if row exists, insert into it, otherwise insert row
+        if (rowEntry) {
+          const currentColPath = i === 0 ? colPaths[j] : pathForNextRows;
+          const pathForNewCell = [...tablePath, currentRowPath, currentColPath];
+
+          insertElements(editor, cellToInsert, { at: pathForNewCell });
+        } else {
+          newRowChildren.push(cellToInsert);
+        }
+      }
+
+      if (!rowEntry) {
+        insertElements(
+          editor,
+          {
+            type: getPluginType(editor, ELEMENT_TR),
+            children: newRowChildren,
+          },
+          { at: _rowPath }
+        );
       }
     }
   });

diff --git a/packages/table/src/merge/useTableMergeState.ts b/packages/table/src/merge/useTableMergeState.ts
@@ -11,6 +11,8 @@ import { useReadOnly, useSelected } from 'slate-react';
 
 import { ELEMENT_TABLE } from '../createTablePlugin';
 import { getTableGridAbove } from '../queries';
+import { getColSpan } from '../queries/getColSpan';
+import { getRowSpan } from '../queries/getRowSpan';
 import { useTableStore } from '../stores';
 import { TablePlugin } from '../types';
 import { isTableRectangular } from './isTableRectangular';
@@ -56,8 +58,8 @@ export const useTableMergeState = () => {
     collapsed &&
     selectedCellEntries &&
     selectedCellEntries.length === 1 &&
-    ((selectedCellEntries[0][0] as any)?.colSpan > 1 ||
-      (selectedCellEntries[0][0] as any)?.rowSpan > 1);
+    (getColSpan(selectedCellEntries[0][0] as any) > 1 ||
+      getRowSpan(selectedCellEntries[0][0] as any) > 1);
 
   return { canMerge, canUnmerge };
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@
		*/

		export * from './floating-ui';
		export * from './radix-ui';