move indices update to useEffect

udecode · Nov 20, 2023 · 2b9861f · 2b9861f
1 parent 7dd65bd
commit 2b9861f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 63 deletions.
diff --git a/packages/table/src/components/TableElement/useTableElement.ts b/packages/table/src/components/TableElement/useTableElement.ts
@@ -30,10 +30,8 @@ export const useTableElementState = ({
 } = {}): TableElementState => {
   const editor = useEditorRef();
 
-  const { minColumnWidth, disableMarginLeft } = getPluginOptions<TablePlugin>(
-    editor,
-    ELEMENT_TABLE
-  );
+  const { minColumnWidth, disableMarginLeft, disableCellsMerging } =
+    getPluginOptions<TablePlugin>(editor, ELEMENT_TABLE);
 
   const element = useElement<TTableElement>();
   const selectedCells = useTableStore().get.selectedCells();
@@ -46,8 +44,10 @@ export const useTableElementState = ({
   let colSizes = useTableColSizes(element);
 
   useEffect(() => {
-    computeAllCellIndices(editor, element);
-  }, [editor, element]);
+    if (!disableCellsMerging) {
+      computeAllCellIndices(editor, element);
+    }
+  }, [editor, element, disableCellsMerging]);
 
   if (transformColSizes) {
     colSizes = transformColSizes(colSizes);

diff --git a/packages/table/src/withMergedCells.ts b/packages/table/src/withMergedCells.ts
diff --git a/packages/table/src/withTable.ts b/packages/table/src/withTable.ts
@@ -17,9 +17,6 @@ export const withTable = <
   editor: E,
   plugin: WithPlatePlugin<TablePlugin<V>, V, E>
 ) => {
-  editor = plugin.options.disableCellsMerging
-    ? editor
-    : withMergedCells<V, E>(editor);
   editor = withNormalizeTable<V, E>(editor);
   editor = withDeleteTable<V, E>(editor);
   editor = withGetFragmentTable<V, E>(editor);