@atlaskit/editor-plugin-table 27.0.2 → 27.0.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-table
 
+## 27.0.3
+
+### Patch Changes
+
+- [`ce7484d621739`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ce7484d621739) -
+  Fix table controls after editor remounts by refreshing stale toolbar anchors and publishing the
+  selected table ref before the first interaction, behind the
+  `platform_editor_table_toolbar_position_fix` experiment.
+
 ## 27.0.2
 
 ### Patch Changes

package/dist/cjs/ui/toolbar.js

@@ -35,6 +35,7 @@ var _customize = _interopRequireDefault(require("@atlaskit/icon/core/customize")
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
 var _shrinkHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/shrink-horizontal"));
 var _tableColumnsDistribute = _interopRequireDefault(require("@atlaskit/icon/core/table-columns-distribute"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -371,7 +372,32 @@ var getTableWrapperFromParentImpl = function getTableWrapperFromParentImpl(paren
   }
   return (0, _utils.closestElement)(tableRef, ".".concat(_types.TableCssClassName.TABLE_NODE_WRAPPER)) || undefined;
 };
+var cachedTableWrapperParent;
+var cachedTableWrapperEditorRoot;
+var cachedTableWrapper;
+var getCachedTableWrapperFromParent = function getCachedTableWrapperFromParent(parent, editorView) {
+  var _cachedTableWrapper;
+  var editorRoot = editorView.dom;
+  if (parent && parent === cachedTableWrapperParent && editorRoot === cachedTableWrapperEditorRoot && (_cachedTableWrapper = cachedTableWrapper) !== null && _cachedTableWrapper !== void 0 && _cachedTableWrapper.isConnected && editorRoot.isConnected && editorRoot.contains(parent) && editorRoot.contains(cachedTableWrapper) && parent.contains(cachedTableWrapper) && cachedTableWrapper.querySelector('table')) {
+    return cachedTableWrapper;
+  }
+  cachedTableWrapperParent = parent;
+  cachedTableWrapperEditorRoot = editorRoot;
+  cachedTableWrapper = undefined;
+  if (!parent || !parent.isConnected || !editorRoot.isConnected || !editorRoot.contains(parent)) {
+    return undefined;
+  }
+  if (!(parent instanceof HTMLElement)) {
+    return undefined;
+  }
+  var tableWrapper = getTableWrapperFromParentImpl(parent);
+  if (tableWrapper !== null && tableWrapper !== void 0 && tableWrapper.isConnected && editorRoot.contains(tableWrapper) && parent.contains(tableWrapper)) {
+    cachedTableWrapper = tableWrapper;
+  }
+  return cachedTableWrapper;
+};
 
+// Remove this function when cleaning up `platform_editor_table_toolbar_position_fix`
 // Create memoized version ONCE - reused across all calls
 var getMemoizedTableWrapperFromParent = (0, _memoizeOne.default)(getTableWrapperFromParentImpl);
 var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, api, editorAnalyticsAPI, getEditorView, options) {
@@ -422,7 +448,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
         var getDomRef = function getDomRef(editorView) {
           var domAtPos = editorView.domAtPos.bind(editorView);
           var parent = (0, _utils2.findParentDomRefOfType)(nodeType, domAtPos)(state.selection);
-          return getMemoizedTableWrapperFromParent(parent);
+          return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_toolbar_position_fix') ? getCachedTableWrapperFromParent(parent, editorView) : getMemoizedTableWrapperFromParent(parent);
         };
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
         var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];

package/dist/es2019/ui/toolbar.js

@@ -29,6 +29,7 @@ import CustomizeIcon from '@atlaskit/icon/core/customize';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import ShrinkHorizontalIcon from '@atlaskit/icon/core/shrink-horizontal';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -354,7 +355,32 @@ const getTableWrapperFromParentImpl = parent => {
   }
   return closestElement(tableRef, `.${TableCssClassName.TABLE_NODE_WRAPPER}`) || undefined;
 };
+let cachedTableWrapperParent;
+let cachedTableWrapperEditorRoot;
+let cachedTableWrapper;
+const getCachedTableWrapperFromParent = (parent, editorView) => {
+  var _cachedTableWrapper;
+  const editorRoot = editorView.dom;
+  if (parent && parent === cachedTableWrapperParent && editorRoot === cachedTableWrapperEditorRoot && (_cachedTableWrapper = cachedTableWrapper) !== null && _cachedTableWrapper !== void 0 && _cachedTableWrapper.isConnected && editorRoot.isConnected && editorRoot.contains(parent) && editorRoot.contains(cachedTableWrapper) && parent.contains(cachedTableWrapper) && cachedTableWrapper.querySelector('table')) {
+    return cachedTableWrapper;
+  }
+  cachedTableWrapperParent = parent;
+  cachedTableWrapperEditorRoot = editorRoot;
+  cachedTableWrapper = undefined;
+  if (!parent || !parent.isConnected || !editorRoot.isConnected || !editorRoot.contains(parent)) {
+    return undefined;
+  }
+  if (!(parent instanceof HTMLElement)) {
+    return undefined;
+  }
+  const tableWrapper = getTableWrapperFromParentImpl(parent);
+  if (tableWrapper !== null && tableWrapper !== void 0 && tableWrapper.isConnected && editorRoot.contains(tableWrapper) && parent.contains(tableWrapper)) {
+    cachedTableWrapper = tableWrapper;
+  }
+  return cachedTableWrapper;
+};
 
+// Remove this function when cleaning up `platform_editor_table_toolbar_position_fix`
 // Create memoized version ONCE - reused across all calls
 const getMemoizedTableWrapperFromParent = memoizeOne(getTableWrapperFromParentImpl);
 export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAPI, getEditorView, options, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => config => (state, intl) => {
@@ -400,7 +426,7 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
     const getDomRef = editorView => {
       const domAtPos = editorView.domAtPos.bind(editorView);
       const parent = findParentDomRefOfType(nodeType, domAtPos)(state.selection);
-      return getMemoizedTableWrapperFromParent(parent);
+      return isExperimentEnabled('platform_editor_table_toolbar_position_fix') ? getCachedTableWrapperFromParent(parent, editorView) : getMemoizedTableWrapperFromParent(parent);
     };
     const menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
     const alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];

package/dist/esm/ui/toolbar.js

@@ -35,6 +35,7 @@ import CustomizeIcon from '@atlaskit/icon/core/customize';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import ShrinkHorizontalIcon from '@atlaskit/icon/core/shrink-horizontal';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -364,7 +365,32 @@ var getTableWrapperFromParentImpl = function getTableWrapperFromParentImpl(paren
   }
   return closestElement(tableRef, ".".concat(TableCssClassName.TABLE_NODE_WRAPPER)) || undefined;
 };
+var cachedTableWrapperParent;
+var cachedTableWrapperEditorRoot;
+var cachedTableWrapper;
+var getCachedTableWrapperFromParent = function getCachedTableWrapperFromParent(parent, editorView) {
+  var _cachedTableWrapper;
+  var editorRoot = editorView.dom;
+  if (parent && parent === cachedTableWrapperParent && editorRoot === cachedTableWrapperEditorRoot && (_cachedTableWrapper = cachedTableWrapper) !== null && _cachedTableWrapper !== void 0 && _cachedTableWrapper.isConnected && editorRoot.isConnected && editorRoot.contains(parent) && editorRoot.contains(cachedTableWrapper) && parent.contains(cachedTableWrapper) && cachedTableWrapper.querySelector('table')) {
+    return cachedTableWrapper;
+  }
+  cachedTableWrapperParent = parent;
+  cachedTableWrapperEditorRoot = editorRoot;
+  cachedTableWrapper = undefined;
+  if (!parent || !parent.isConnected || !editorRoot.isConnected || !editorRoot.contains(parent)) {
+    return undefined;
+  }
+  if (!(parent instanceof HTMLElement)) {
+    return undefined;
+  }
+  var tableWrapper = getTableWrapperFromParentImpl(parent);
+  if (tableWrapper !== null && tableWrapper !== void 0 && tableWrapper.isConnected && editorRoot.contains(tableWrapper) && parent.contains(tableWrapper)) {
+    cachedTableWrapper = tableWrapper;
+  }
+  return cachedTableWrapper;
+};
 
+// Remove this function when cleaning up `platform_editor_table_toolbar_position_fix`
 // Create memoized version ONCE - reused across all calls
 var getMemoizedTableWrapperFromParent = memoizeOne(getTableWrapperFromParentImpl);
 export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, api, editorAnalyticsAPI, getEditorView, options) {
@@ -415,7 +441,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
         var getDomRef = function getDomRef(editorView) {
           var domAtPos = editorView.domAtPos.bind(editorView);
           var parent = findParentDomRefOfType(nodeType, domAtPos)(state.selection);
-          return getMemoizedTableWrapperFromParent(parent);
+          return isExperimentEnabled('platform_editor_table_toolbar_position_fix') ? getCachedTableWrapperFromParent(parent, editorView) : getMemoizedTableWrapperFromParent(parent);
         };
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
         var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "27.0.2",
+	"version": "27.0.3",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -42,7 +42,7 @@
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/editor-toolbar": "^2.4.0",
-		"@atlaskit/editor-ui-control-model": "^2.6.0",
+		"@atlaskit/editor-ui-control-model": "^2.7.0",
 		"@atlaskit/icon": "^37.3.0",
 		"@atlaskit/icon-lab": "^7.5.0",
 		"@atlaskit/insm": "^2.0.0",