Merge remote-tracking branch 'origin/fix/ui-link' into fix/ui-link

OliverWales · Sep 2, 2023 · 8dd70df · 8dd70df
2 parents fe3a11d + a863f0e
commit 8dd70df
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 14 deletions.
diff --git a/.changeset/rotten-cobras-hang.md b/.changeset/rotten-cobras-hang.md
@@ -0,0 +1,6 @@
+---
+"@udecode/plate-utils": minor
+---
+
+- New prop in `createPrimitiveComponent`: `setProps` where the first parameter is the props returned by the "props hook". Returned attributes are passed to the component. You can use this prop to merge or override all props.
+- Plate components `className` and `style` props are now merged with the "props hook" ones if defined. To override instead of merging, use `setProps`.
diff --git a/packages/plate/CHANGELOG.md b/packages/plate/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @udecode/plate
 
+## 23.6.1
+
 ## 23.6.0
 
 ## 23.5.0

diff --git a/packages/plate/package.json b/packages/plate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate",
-  "version": "23.6.0",
+  "version": "23.6.1",
   "description": "Plate – a plugin system for slate",
   "license": "MIT",
   "homepage": "https://platejs.org",
@@ -63,13 +63,13 @@
     "@udecode/plate-reset-node": "23.6.0",
     "@udecode/plate-resizable": "23.6.0",
     "@udecode/plate-select": "23.6.0",
-    "@udecode/plate-serializer-csv": "23.6.0",
-    "@udecode/plate-serializer-docx": "23.6.0",
+    "@udecode/plate-serializer-csv": "23.6.1",
+    "@udecode/plate-serializer-docx": "23.6.1",
     "@udecode/plate-serializer-html": "23.6.0",
     "@udecode/plate-serializer-md": "23.6.0",
     "@udecode/plate-suggestion": "23.6.0",
     "@udecode/plate-tabbable": "23.6.0",
-    "@udecode/plate-table": "23.6.0",
+    "@udecode/plate-table": "23.6.1",
     "@udecode/plate-trailing-block": "23.6.0"
   },
   "peerDependencies": {

diff --git a/packages/serializer-csv/CHANGELOG.md b/packages/serializer-csv/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @udecode/plate-serializer-csv
 
+## 23.6.1
+
 ## 23.6.0
 
 ## 23.4.1

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

diff --git a/packages/serializer-docx/CHANGELOG.md b/packages/serializer-docx/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @udecode/plate-docx-serializer
 
+## 23.6.1
+
 ## 23.6.0
 
 ## 23.4.1

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

diff --git a/packages/table/CHANGELOG.md b/packages/table/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @udecode/plate-table
 
+## 23.6.1
+
+### Patch Changes
+
+- [#2594](https://github.com/udecode/plate/pull/2594) by [@OliverWales](https://github.com/OliverWales) – Fix column deletion early return
+
 ## 23.6.0
 
 ## 23.4.1

diff --git a/packages/table/package.json b/packages/table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-table",
-  "version": "23.6.0",
+  "version": "23.6.1",
   "description": "Table plugin for Plate",
   "license": "MIT",
   "homepage": "https://platejs.org",

diff --git a/packages/table/src/queries/isTableBorderHidden.spec.tsx b/packages/table/src/queries/isTableBorderHidden.spec.tsx
@@ -1,9 +1,9 @@
 /** @jsx jsx */
 
 import { createPlateEditor, PlateEditor } from '@udecode/plate-common';
-import { createTablePlugin } from '@udecode/plate-table';
 import { jsx } from '@udecode/plate-test-utils';
 
+import { createTablePlugin } from '../createTablePlugin';
 import { isTableBorderHidden } from './isTableBorderHidden';
 
 jsx;

diff --git a/packages/table/src/transforms/deleteColumn.spec.tsx b/packages/table/src/transforms/deleteColumn.spec.tsx
@@ -119,7 +119,7 @@ describe('deleteColumn', () => {
   });
 
   describe('when first row has 2 cells, second row has 1 cell, focus 11', () => {
-    it('should do nothing', () => {
+    it('should delete 11', () => {
       const input = (
         <editor>
           <htable>

diff --git a/packages/table/src/transforms/deleteColumn.ts b/packages/table/src/transforms/deleteColumn.ts
@@ -55,11 +55,17 @@ export const deleteColumn = <V extends Value>(editor: PlateEditor<V>) => {
       const replacePathPos = pathToDelete.length - 2;
 
       withoutNormalizing(editor, () => {
-        tableEntry[0].children.forEach((row, rowIdx) => {
+        tableNode.children.forEach((row, rowIdx) => {
           pathToDelete[replacePathPos] = rowIdx;
 
-          // for rows with different lengths
-          if ((row.children as TElement[]).length < replacePathPos + 1) return;
+          // for tables containing rows of different lengths
+          // - don't delete if only one cell in row
+          // - don't delete if row doesn't have this cell
+          if (
+            (row.children as TElement[]).length === 1 ||
+            colIndex > (row.children as TElement[]).length - 1
+          )
+            return;
 
           removeNodes(editor, {
             at: pathToDelete,