@atlaskit/editor-tables 2.7.2 → 2.7.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-tables
 
+## 2.7.4
+
+### Patch Changes
+
+-   [#102210](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102210)
+    [`fe0d7aa7668a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fe0d7aa7668a) -
+    Set layout attribute for tables to align-left when inserted in full width editor
+
+## 2.7.3
+
+### Patch Changes
+
+-   [#94829](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/94829)
+    [`815fda434fe7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/815fda434fe7) -
+    [ED-22849] Align add column and row behaviour behind
+    platform_editor_table_duplicate_cell_colouring flag so that adding a column will copy cell
+    background from the left and adding a row will copy background colour from row above
+
 ## 2.7.2
 
 ### Patch Changes

package/dist/cjs/utils/add-column-at.js

@@ -9,7 +9,7 @@ var _addColumn = require("./add-column");
 var _cloneTr = require("./clone-tr");
 var _find = require("./find");
 // Returns a new transaction that adds a new column at index `columnIndex`.
-var addColumnAt = exports.addColumnAt = function addColumnAt(columnIndex) {
+var addColumnAt = exports.addColumnAt = function addColumnAt(columnIndex, isCellBackgroundDuplicated) {
   return function (tr) {
     var table = (0, _find.findTable)(tr.selection);
     if (table) {
@@ -19,7 +19,7 @@ var addColumnAt = exports.addColumnAt = function addColumnAt(columnIndex) {
           map: map,
           tableStart: table.start,
           table: table.node
-        }, columnIndex));
+        }, columnIndex, isCellBackgroundDuplicated));
       }
     }
     return tr;

package/dist/cjs/utils/add-column.js

@@ -19,7 +19,7 @@ function columnIsHeader(map, table, col) {
 }
 
 // Add a column at the given position in a table.
-function addColumn(tr, _ref, col) {
+function addColumn(tr, _ref, col, isCellBackgroundDuplicated) {
   var map = _ref.map,
     tableStart = _ref.tableStart,
     table = _ref.table;
@@ -44,6 +44,7 @@ function addColumn(tr, _ref, col) {
       row += attributes.rowspan - 1;
     } else {
       var type = void 0;
+      var attrs = {};
       if (refColumn === null) {
         type = (0, _tableNodeTypes.tableNodeTypes)(table.type.schema).cell;
       } else {
@@ -53,9 +54,14 @@ function addColumn(tr, _ref, col) {
           throw new Error("addColumn: invalid node at mapped pos ".concat(mappedPos));
         }
         type = _cell.type;
+        if (_cell.attrs.background && isCellBackgroundDuplicated) {
+          attrs = {
+            background: _cell.attrs.background
+          };
+        }
       }
       var _pos = map.positionAt(row, col, table);
-      tr.insert(tr.mapping.map(tableStart + _pos), type.createAndFill());
+      tr.insert(tr.mapping.map(tableStart + _pos), type.createAndFill(attrs));
     }
   }
   return tr;

package/dist/cjs/utils/add-row-at.js

@@ -88,7 +88,7 @@ var cloneRowAt = exports.cloneRowAt = function cloneRowAt(rowIndex) {
 };
 
 // Returns a new transaction that adds a new row at index `rowIndex`. Optionally clone the previous row.
-var addRowAt = exports.addRowAt = function addRowAt(rowIndex, clonePreviousRow) {
+var addRowAt = exports.addRowAt = function addRowAt(rowIndex, clonePreviousRow, isCellBackgroundDuplicated) {
   return function (tr) {
     var table = (0, _find.findTable)(tr.selection);
     if (table) {
@@ -102,7 +102,7 @@ var addRowAt = exports.addRowAt = function addRowAt(rowIndex, clonePreviousRow)
           map: map,
           tableStart: table.start,
           table: table.node
-        }, rowIndex));
+        }, rowIndex, isCellBackgroundDuplicated));
       }
     }
     return tr;

package/dist/cjs/utils/add-row.js

@@ -19,7 +19,7 @@ function rowIsHeader(map, table, row) {
   }
   return true;
 }
-function addRow(tr, _ref, row) {
+function addRow(tr, _ref, row, isCellBackgroundDuplicated) {
   var map = _ref.map,
     tableStart = _ref.tableStart,
     table = _ref.table;
@@ -47,6 +47,7 @@ function addRow(tr, _ref, row) {
       col += attrs.colspan - 1;
     } else {
       var type = void 0;
+      var _attrs = {};
       if (refRow == null) {
         type = (0, _tableNodeTypes.tableNodeTypes)(table.type.schema).cell;
       } else {
@@ -56,8 +57,13 @@ function addRow(tr, _ref, row) {
           throw new Error("addRow: invalid node at mapped pos ".concat(mappedPos));
         }
         type = cell.type;
+        if (cell.attrs.background && isCellBackgroundDuplicated) {
+          _attrs = {
+            background: cell.attrs.background
+          };
+        }
       }
-      cells.push(type.createAndFill());
+      cells.push(type.createAndFill(_attrs));
     }
   }
   var rowType = (0, _tableNodeTypes.tableNodeTypes)(table.type.schema).row;

package/dist/cjs/utils/create-table.js

@@ -26,7 +26,9 @@ var createTable = exports.createTable = function createTable(_ref) {
     _ref$withHeaderRow = _ref.withHeaderRow,
     withHeaderRow = _ref$withHeaderRow === void 0 ? true : _ref$withHeaderRow,
     cellContent = _ref.cellContent,
-    tableWidth = _ref.tableWidth;
+    tableWidth = _ref.tableWidth,
+    _ref$layout = _ref.layout,
+    layout = _ref$layout === void 0 ? undefined : _ref$layout;
   var _tableNodeTypes = (0, _tableNodeTypes2.tableNodeTypes)(schema),
     tableCell = _tableNodeTypes.cell,
     tableHeader = _tableNodeTypes.header_cell,
@@ -52,6 +54,7 @@ var createTable = exports.createTable = function createTable(_ref) {
   }
   return table.createChecked({
     localId: _uuid.uuid.generate(),
-    width: tableWidth !== null && tableWidth !== void 0 ? tableWidth : 760
+    width: tableWidth !== null && tableWidth !== void 0 ? tableWidth : 760,
+    layout: layout
   }, rows);
 };

package/dist/es2019/utils/add-column-at.js

@@ -4,7 +4,7 @@ import { cloneTr } from './clone-tr';
 import { findTable } from './find';
 
 // Returns a new transaction that adds a new column at index `columnIndex`.
-export const addColumnAt = columnIndex => tr => {
+export const addColumnAt = (columnIndex, isCellBackgroundDuplicated) => tr => {
   const table = findTable(tr.selection);
   if (table) {
     const map = TableMap.get(table.node);
@@ -13,7 +13,7 @@ export const addColumnAt = columnIndex => tr => {
         map,
         tableStart: table.start,
         table: table.node
-      }, columnIndex));
+      }, columnIndex, isCellBackgroundDuplicated));
     }
   }
   return tr;

package/dist/es2019/utils/add-column.js

@@ -16,7 +16,7 @@ export function addColumn(tr, {
   map,
   tableStart,
   table
-}, col) {
+}, col, isCellBackgroundDuplicated) {
   let refColumn = col > 0 ? -1 : 0;
   if (columnIsHeader(map, table, col + refColumn)) {
     refColumn = col === 0 || col === map.width ? null : 0;
@@ -38,6 +38,7 @@ export function addColumn(tr, {
       row += attributes.rowspan - 1;
     } else {
       let type;
+      let attrs = {};
       if (refColumn === null) {
         type = tableNodeTypes(table.type.schema).cell;
       } else {
@@ -47,9 +48,14 @@ export function addColumn(tr, {
           throw new Error(`addColumn: invalid node at mapped pos ${mappedPos}`);
         }
         type = cell.type;
+        if (cell.attrs.background && isCellBackgroundDuplicated) {
+          attrs = {
+            background: cell.attrs.background
+          };
+        }
       }
       const pos = map.positionAt(row, col, table);
-      tr.insert(tr.mapping.map(tableStart + pos), type.createAndFill());
+      tr.insert(tr.mapping.map(tableStart + pos), type.createAndFill(attrs));
     }
   }
   return tr;

package/dist/es2019/utils/add-row-at.js

@@ -73,7 +73,7 @@ export const cloneRowAt = rowIndex => tr => {
 };
 
 // Returns a new transaction that adds a new row at index `rowIndex`. Optionally clone the previous row.
-export const addRowAt = (rowIndex, clonePreviousRow) => tr => {
+export const addRowAt = (rowIndex, clonePreviousRow, isCellBackgroundDuplicated) => tr => {
   const table = findTable(tr.selection);
   if (table) {
     const map = TableMap.get(table.node);
@@ -86,7 +86,7 @@ export const addRowAt = (rowIndex, clonePreviousRow) => tr => {
         map,
         tableStart: table.start,
         table: table.node
-      }, rowIndex));
+      }, rowIndex, isCellBackgroundDuplicated));
     }
   }
   return tr;

package/dist/es2019/utils/add-row.js

@@ -13,7 +13,7 @@ export function addRow(tr, {
   map,
   tableStart,
   table
-}, row) {
+}, row, isCellBackgroundDuplicated) {
   let rowPos = tableStart;
   for (let i = 0; i < row; i++) {
     rowPos += table.child(i).nodeSize;
@@ -41,6 +41,7 @@ export function addRow(tr, {
       col += attrs.colspan - 1;
     } else {
       let type;
+      let attrs = {};
       if (refRow == null) {
         type = tableNodeTypes(table.type.schema).cell;
       } else {
@@ -50,8 +51,13 @@ export function addRow(tr, {
           throw new Error(`addRow: invalid node at mapped pos ${mappedPos}`);
         }
         type = cell.type;
+        if (cell.attrs.background && isCellBackgroundDuplicated) {
+          attrs = {
+            background: cell.attrs.background
+          };
+        }
       }
-      cells.push(type.createAndFill());
+      cells.push(type.createAndFill(attrs));
     }
   }
   const rowType = tableNodeTypes(table.type.schema).row;

package/dist/es2019/utils/create-table.js

@@ -17,7 +17,9 @@ export const createTable = ({
   colsCount = 3,
   withHeaderRow = true,
   cellContent,
-  tableWidth
+  tableWidth,
+  // default to undefined so PM will use default value defined in schema
+  layout = undefined
 }) => {
   const {
     cell: tableCell,
@@ -45,6 +47,7 @@ export const createTable = ({
   }
   return table.createChecked({
     localId: uuid.generate(),
-    width: tableWidth !== null && tableWidth !== void 0 ? tableWidth : 760
+    width: tableWidth !== null && tableWidth !== void 0 ? tableWidth : 760,
+    layout
   }, rows);
 };

package/dist/esm/utils/add-column-at.js

@@ -4,7 +4,7 @@ import { cloneTr } from './clone-tr';
 import { findTable } from './find';
 
 // Returns a new transaction that adds a new column at index `columnIndex`.
-export var addColumnAt = function addColumnAt(columnIndex) {
+export var addColumnAt = function addColumnAt(columnIndex, isCellBackgroundDuplicated) {
   return function (tr) {
     var table = findTable(tr.selection);
     if (table) {
@@ -14,7 +14,7 @@ export var addColumnAt = function addColumnAt(columnIndex) {
           map: map,
           tableStart: table.start,
           table: table.node
-        }, columnIndex));
+        }, columnIndex, isCellBackgroundDuplicated));
       }
     }
     return tr;

package/dist/esm/utils/add-column.js

@@ -12,7 +12,7 @@ export function columnIsHeader(map, table, col) {
 }
 
 // Add a column at the given position in a table.
-export function addColumn(tr, _ref, col) {
+export function addColumn(tr, _ref, col, isCellBackgroundDuplicated) {
   var map = _ref.map,
     tableStart = _ref.tableStart,
     table = _ref.table;
@@ -37,6 +37,7 @@ export function addColumn(tr, _ref, col) {
       row += attributes.rowspan - 1;
     } else {
       var type = void 0;
+      var attrs = {};
       if (refColumn === null) {
         type = tableNodeTypes(table.type.schema).cell;
       } else {
@@ -46,9 +47,14 @@ export function addColumn(tr, _ref, col) {
           throw new Error("addColumn: invalid node at mapped pos ".concat(mappedPos));
         }
         type = _cell.type;
+        if (_cell.attrs.background && isCellBackgroundDuplicated) {
+          attrs = {
+            background: _cell.attrs.background
+          };
+        }
       }
       var _pos = map.positionAt(row, col, table);
-      tr.insert(tr.mapping.map(tableStart + _pos), type.createAndFill());
+      tr.insert(tr.mapping.map(tableStart + _pos), type.createAndFill(attrs));
     }
   }
   return tr;

package/dist/esm/utils/add-row-at.js

@@ -81,7 +81,7 @@ export var cloneRowAt = function cloneRowAt(rowIndex) {
 };
 
 // Returns a new transaction that adds a new row at index `rowIndex`. Optionally clone the previous row.
-export var addRowAt = function addRowAt(rowIndex, clonePreviousRow) {
+export var addRowAt = function addRowAt(rowIndex, clonePreviousRow, isCellBackgroundDuplicated) {
   return function (tr) {
     var table = findTable(tr.selection);
     if (table) {
@@ -95,7 +95,7 @@ export var addRowAt = function addRowAt(rowIndex, clonePreviousRow) {
           map: map,
           tableStart: table.start,
           table: table.node
-        }, rowIndex));
+        }, rowIndex, isCellBackgroundDuplicated));
       }
     }
     return tr;

package/dist/esm/utils/add-row.js

@@ -12,7 +12,7 @@ function rowIsHeader(map, table, row) {
   }
   return true;
 }
-export function addRow(tr, _ref, row) {
+export function addRow(tr, _ref, row, isCellBackgroundDuplicated) {
   var map = _ref.map,
     tableStart = _ref.tableStart,
     table = _ref.table;
@@ -40,6 +40,7 @@ export function addRow(tr, _ref, row) {
       col += attrs.colspan - 1;
     } else {
       var type = void 0;
+      var _attrs = {};
       if (refRow == null) {
         type = tableNodeTypes(table.type.schema).cell;
       } else {
@@ -49,8 +50,13 @@ export function addRow(tr, _ref, row) {
           throw new Error("addRow: invalid node at mapped pos ".concat(mappedPos));
         }
         type = cell.type;
+        if (cell.attrs.background && isCellBackgroundDuplicated) {
+          _attrs = {
+            background: cell.attrs.background
+          };
+        }
       }
-      cells.push(type.createAndFill());
+      cells.push(type.createAndFill(_attrs));
     }
   }
   var rowType = tableNodeTypes(table.type.schema).row;

package/dist/esm/utils/create-table.js

@@ -20,7 +20,9 @@ export var createTable = function createTable(_ref) {
     _ref$withHeaderRow = _ref.withHeaderRow,
     withHeaderRow = _ref$withHeaderRow === void 0 ? true : _ref$withHeaderRow,
     cellContent = _ref.cellContent,
-    tableWidth = _ref.tableWidth;
+    tableWidth = _ref.tableWidth,
+    _ref$layout = _ref.layout,
+    layout = _ref$layout === void 0 ? undefined : _ref$layout;
   var _tableNodeTypes = tableNodeTypes(schema),
     tableCell = _tableNodeTypes.cell,
     tableHeader = _tableNodeTypes.header_cell,
@@ -46,6 +48,7 @@ export var createTable = function createTable(_ref) {
   }
   return table.createChecked({
     localId: uuid.generate(),
-    width: tableWidth !== null && tableWidth !== void 0 ? tableWidth : 760
+    width: tableWidth !== null && tableWidth !== void 0 ? tableWidth : 760,
+    layout: layout
   }, rows);
 };

package/dist/types/utils/add-column-at.d.ts

@@ -1,2 +1,2 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const addColumnAt: (columnIndex: number) => (tr: Transaction) => Transaction;
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const addColumnAt: (columnIndex: number, isCellBackgroundDuplicated?: boolean) => (tr: Transaction) => Transaction;

package/dist/types/utils/add-column.d.ts

@@ -1,5 +1,5 @@
-import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { TableContext, TableMap } from '../table-map';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TableContext, TableMap } from '../table-map';
 export declare function columnIsHeader(map: TableMap, table: PMNode, col: number): boolean;
-export declare function addColumn(tr: Transaction, { map, tableStart, table }: TableContext, col: number): Transaction;
+export declare function addColumn(tr: Transaction, { map, tableStart, table }: TableContext, col: number, isCellBackgroundDuplicated?: boolean): Transaction;

package/dist/types/utils/add-row-at.d.ts

@@ -1,3 +1,3 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const cloneRowAt: (rowIndex: number) => (tr: Transaction) => Transaction;
-export declare const addRowAt: (rowIndex: number, clonePreviousRow?: boolean) => (tr: Transaction) => Transaction;
+export declare const addRowAt: (rowIndex: number, clonePreviousRow?: boolean, isCellBackgroundDuplicated?: boolean) => (tr: Transaction) => Transaction;

package/dist/types/utils/add-row.d.ts

@@ -1,3 +1,3 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { TableContext } from '../table-map';
-export declare function addRow(tr: Transaction, { map, tableStart, table }: TableContext, row: number): Transaction;
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TableContext } from '../table-map';
+export declare function addRow(tr: Transaction, { map, tableStart, table }: TableContext, row: number, isCellBackgroundDuplicated?: boolean): Transaction;

package/dist/types/utils/create-table.d.ts

@@ -6,6 +6,7 @@ type CreateTableProps = {
     withHeaderRow?: boolean;
     cellContent?: PMNode;
     tableWidth?: number;
+    layout?: string;
 };
-export declare const createTable: ({ schema, rowsCount, colsCount, withHeaderRow, cellContent, tableWidth, }: CreateTableProps) => PMNode;
+export declare const createTable: ({ schema, rowsCount, colsCount, withHeaderRow, cellContent, tableWidth, layout }: CreateTableProps) => PMNode;
 export {};

package/dist/types-ts4.5/utils/add-column-at.d.ts

@@ -1,2 +1,2 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const addColumnAt: (columnIndex: number) => (tr: Transaction) => Transaction;
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const addColumnAt: (columnIndex: number, isCellBackgroundDuplicated?: boolean) => (tr: Transaction) => Transaction;

package/dist/types-ts4.5/utils/add-column.d.ts

@@ -1,5 +1,5 @@
-import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { TableContext, TableMap } from '../table-map';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TableContext, TableMap } from '../table-map';
 export declare function columnIsHeader(map: TableMap, table: PMNode, col: number): boolean;
-export declare function addColumn(tr: Transaction, { map, tableStart, table }: TableContext, col: number): Transaction;
+export declare function addColumn(tr: Transaction, { map, tableStart, table }: TableContext, col: number, isCellBackgroundDuplicated?: boolean): Transaction;

package/dist/types-ts4.5/utils/add-row-at.d.ts

@@ -1,3 +1,3 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const cloneRowAt: (rowIndex: number) => (tr: Transaction) => Transaction;
-export declare const addRowAt: (rowIndex: number, clonePreviousRow?: boolean) => (tr: Transaction) => Transaction;
+export declare const addRowAt: (rowIndex: number, clonePreviousRow?: boolean, isCellBackgroundDuplicated?: boolean) => (tr: Transaction) => Transaction;

package/dist/types-ts4.5/utils/add-row.d.ts

@@ -1,3 +1,3 @@
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { TableContext } from '../table-map';
-export declare function addRow(tr: Transaction, { map, tableStart, table }: TableContext, row: number): Transaction;
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TableContext } from '../table-map';
+export declare function addRow(tr: Transaction, { map, tableStart, table }: TableContext, row: number, isCellBackgroundDuplicated?: boolean): Transaction;

package/dist/types-ts4.5/utils/create-table.d.ts

@@ -6,6 +6,7 @@ type CreateTableProps = {
     withHeaderRow?: boolean;
     cellContent?: PMNode;
     tableWidth?: number;
+    layout?: string;
 };
-export declare const createTable: ({ schema, rowsCount, colsCount, withHeaderRow, cellContent, tableWidth, }: CreateTableProps) => PMNode;
+export declare const createTable: ({ schema, rowsCount, colsCount, withHeaderRow, cellContent, tableWidth, layout }: CreateTableProps) => PMNode;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-tables",
-  "version": "2.7.2",
+  "version": "2.7.4",
   "description": "A package that contains common classes and utility functions for editor tables",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"