@atlaskit/editor-tables 2.9.42 → 2.9.43

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-tables
 
+## 2.9.43
+
+### Patch Changes
+
+- [`1d245f9d74df5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d245f9d74df5) -
+  [ux] [EDITOR-1682] modify the logic in determineTableHeaderStateFromTableNode to read the 1st and
+  n_th cells instead of 1st and 2nd behind `platform_editor_analyse_table_with_merged_cells`
+- Updated dependencies
+
 ## 2.9.42
 
 ### Patch Changes

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

@@ -4,31 +4,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.determineTableHeaderStateFromTableNode = determineTableHeaderStateFromTableNode;
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function determineTableHeaderStateFromTableNode(table, tableMap, types) {
-  // We only really need to check the 2nd cell in the row/col if it's a header, since we only support a single full row/col header on the top & left
-  // of a table. We can assume that if the 2nd cell is a header then the entire row/col is a header.
-  // Be carefull though! when checking the 1st cell as it shares its header state with both row/cols.
-  // This means we wont be able to reliably identify header state on tables smaller the 2x2, however we can do best guess.
+  // We only really need to check the nth (last) cell in the row/col if it's a header, since we only support a single full row/col header on the top & left
+  // of a table. We can assume that if the nth (last) cell is also a header then the entire row/col is a header.
+  // Be careful though! when checking the 1st cell as it shares its header state with both row/cols.
+  // This means we won't be able to reliably identify header state on tables smaller than 2x2, however we can make a best guess.
 
   // This is a 3 bit mask;
   // bit: 0 = Identifies if the cell at (0, 0) (row, col - 0-based) is a header cell or not
-  // bit: 1 = Identifies if the cell at (0, 1) is a header cell or not
-  // bit: 2 = Identifies if the cell at (1, 0) is a header cell or not
+  // bit: 1 = Identifies if the cell at (0, n) is a header cell or not
+  // bit: 2 = Identifies if the cell at (n, 0) is a header cell or not
   var mask = 0;
+  var isExperimentEnabled = (0, _expValEquals.expValEquals)('platform_editor_analyse_table_with_merged_cells', 'isEnabled', true);
 
   // At minimum we should have 1 cell in the table.
   var topLeftCell = table.nodeAt(tableMap.map[0]);
   // If this cell is a header that could indicate
   mask |= topLeftCell && topLeftCell.type === types.header_cell ? 1 : 0;
   if (tableMap.width > 1) {
-    var cell = table.nodeAt(tableMap.map[1]);
-    // If the cell at (0, 1) is a header then we set the bit flag to indicate row headers are enabled, otherwise if it's
+    var cell = isExperimentEnabled ? table.nodeAt(tableMap.map[tableMap.width - 1]) : table.nodeAt(tableMap.map[1]);
+    // If the cell at (0, n) is a header then we set the bit flag to indicate row headers are enabled, otherwise if it's
     // not then we will set the col headers enabled flag (and vice versa in the branch below) only if the cell at (0,0)
     // was a header cell.
     mask |= cell && cell.type === types.header_cell ? 2 : 4 * (mask & 1);
   }
   if (tableMap.height > 1) {
-    var _cell = table.nodeAt(tableMap.map[tableMap.width]);
+    var _cell = isExperimentEnabled ? table.nodeAt(tableMap.map[tableMap.width * (tableMap.height - 1)]) : table.nodeAt(tableMap.map[tableMap.width]);
     mask |= _cell && _cell.type === types.header_cell ? 4 : 2 * (mask & 1);
   }
   return {

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

@@ -1,28 +1,30 @@
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export function determineTableHeaderStateFromTableNode(table, tableMap, types) {
-  // We only really need to check the 2nd cell in the row/col if it's a header, since we only support a single full row/col header on the top & left
-  // of a table. We can assume that if the 2nd cell is a header then the entire row/col is a header.
-  // Be carefull though! when checking the 1st cell as it shares its header state with both row/cols.
-  // This means we wont be able to reliably identify header state on tables smaller the 2x2, however we can do best guess.
+  // We only really need to check the nth (last) cell in the row/col if it's a header, since we only support a single full row/col header on the top & left
+  // of a table. We can assume that if the nth (last) cell is also a header then the entire row/col is a header.
+  // Be careful though! when checking the 1st cell as it shares its header state with both row/cols.
+  // This means we won't be able to reliably identify header state on tables smaller than 2x2, however we can make a best guess.
 
   // This is a 3 bit mask;
   // bit: 0 = Identifies if the cell at (0, 0) (row, col - 0-based) is a header cell or not
-  // bit: 1 = Identifies if the cell at (0, 1) is a header cell or not
-  // bit: 2 = Identifies if the cell at (1, 0) is a header cell or not
+  // bit: 1 = Identifies if the cell at (0, n) is a header cell or not
+  // bit: 2 = Identifies if the cell at (n, 0) is a header cell or not
   let mask = 0;
+  const isExperimentEnabled = expValEquals('platform_editor_analyse_table_with_merged_cells', 'isEnabled', true);
 
   // At minimum we should have 1 cell in the table.
   const topLeftCell = table.nodeAt(tableMap.map[0]);
   // If this cell is a header that could indicate
   mask |= topLeftCell && topLeftCell.type === types.header_cell ? 1 : 0;
   if (tableMap.width > 1) {
-    const cell = table.nodeAt(tableMap.map[1]);
-    // If the cell at (0, 1) is a header then we set the bit flag to indicate row headers are enabled, otherwise if it's
+    const cell = isExperimentEnabled ? table.nodeAt(tableMap.map[tableMap.width - 1]) : table.nodeAt(tableMap.map[1]);
+    // If the cell at (0, n) is a header then we set the bit flag to indicate row headers are enabled, otherwise if it's
     // not then we will set the col headers enabled flag (and vice versa in the branch below) only if the cell at (0,0)
     // was a header cell.
     mask |= cell && cell.type === types.header_cell ? 2 : 4 * (mask & 1);
   }
   if (tableMap.height > 1) {
-    const cell = table.nodeAt(tableMap.map[tableMap.width]);
+    const cell = isExperimentEnabled ? table.nodeAt(tableMap.map[tableMap.width * (tableMap.height - 1)]) : table.nodeAt(tableMap.map[tableMap.width]);
     mask |= cell && cell.type === types.header_cell ? 4 : 2 * (mask & 1);
   }
   return {

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

@@ -1,28 +1,30 @@
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export function determineTableHeaderStateFromTableNode(table, tableMap, types) {
-  // We only really need to check the 2nd cell in the row/col if it's a header, since we only support a single full row/col header on the top & left
-  // of a table. We can assume that if the 2nd cell is a header then the entire row/col is a header.
-  // Be carefull though! when checking the 1st cell as it shares its header state with both row/cols.
-  // This means we wont be able to reliably identify header state on tables smaller the 2x2, however we can do best guess.
+  // We only really need to check the nth (last) cell in the row/col if it's a header, since we only support a single full row/col header on the top & left
+  // of a table. We can assume that if the nth (last) cell is also a header then the entire row/col is a header.
+  // Be careful though! when checking the 1st cell as it shares its header state with both row/cols.
+  // This means we won't be able to reliably identify header state on tables smaller than 2x2, however we can make a best guess.
 
   // This is a 3 bit mask;
   // bit: 0 = Identifies if the cell at (0, 0) (row, col - 0-based) is a header cell or not
-  // bit: 1 = Identifies if the cell at (0, 1) is a header cell or not
-  // bit: 2 = Identifies if the cell at (1, 0) is a header cell or not
+  // bit: 1 = Identifies if the cell at (0, n) is a header cell or not
+  // bit: 2 = Identifies if the cell at (n, 0) is a header cell or not
   var mask = 0;
+  var isExperimentEnabled = expValEquals('platform_editor_analyse_table_with_merged_cells', 'isEnabled', true);
 
   // At minimum we should have 1 cell in the table.
   var topLeftCell = table.nodeAt(tableMap.map[0]);
   // If this cell is a header that could indicate
   mask |= topLeftCell && topLeftCell.type === types.header_cell ? 1 : 0;
   if (tableMap.width > 1) {
-    var cell = table.nodeAt(tableMap.map[1]);
-    // If the cell at (0, 1) is a header then we set the bit flag to indicate row headers are enabled, otherwise if it's
+    var cell = isExperimentEnabled ? table.nodeAt(tableMap.map[tableMap.width - 1]) : table.nodeAt(tableMap.map[1]);
+    // If the cell at (0, n) is a header then we set the bit flag to indicate row headers are enabled, otherwise if it's
     // not then we will set the col headers enabled flag (and vice versa in the branch below) only if the cell at (0,0)
     // was a header cell.
     mask |= cell && cell.type === types.header_cell ? 2 : 4 * (mask & 1);
   }
   if (tableMap.height > 1) {
-    var _cell = table.nodeAt(tableMap.map[tableMap.width]);
+    var _cell = isExperimentEnabled ? table.nodeAt(tableMap.map[tableMap.width * (tableMap.height - 1)]) : table.nodeAt(tableMap.map[tableMap.width]);
     mask |= _cell && _cell.type === types.header_cell ? 4 : 2 * (mask & 1);
   }
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-tables",
-	"version": "2.9.42",
+	"version": "2.9.43",
 	"description": "A package that contains common classes and utility functions for editor tables",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^35.0.0",
+		"@atlaskit/tmp-editor-statsig": "^35.4.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"devDependencies": {