@atlaskit/editor-plugin-table 5.4.21 → 5.4.23

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-table
 
+## 5.4.23
+
+### Patch Changes
+
+- [#59370](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59370) [`eb7463620368`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eb7463620368) - [ux] ED-21355:When table drag and drop enable not show cell options on table toolbar.
+
+## 5.4.22
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.4.21
 
 ### Patch Changes

package/dist/cjs/plugins/table/toolbar.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getToolbarMenuConfig = exports.getToolbarConfig = exports.getToolbarCellOptionsConfig = exports.getClosestSelectionRect = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = require("@emotion/react");
 var _customSteps = require("@atlaskit/custom-steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -281,7 +282,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
       if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
         var nodeType = state.schema.nodes.table;
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI);
-        var cellItems = getCellItems(config, state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI);
+        var cellItems;
+        cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(config, state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI);
         var colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI);
 
         // Check if we need to show confirm dialog for delete button
@@ -332,7 +334,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           },
           zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          items: [menu, separator(menu.hidden)].concat(cellItems, colorPicker, [{
+          items: [menu, separator(menu.hidden)].concat((0, _toConsumableArray2.default)(cellItems), colorPicker, [{
             type: 'extensions-placeholder',
             separator: 'end'
           }, {

package/dist/es2019/plugins/table/toolbar.js

@@ -271,7 +271,8 @@ export const getToolbarConfig = (getEditorContainerWidth, editorAnalyticsAPI, ge
   if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
     const nodeType = state.schema.nodes.table;
     const menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI);
-    const cellItems = getCellItems(config, state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI);
+    let cellItems;
+    cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(config, state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI);
     const colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI);
 
     // Check if we need to show confirm dialog for delete button

package/dist/esm/plugins/table/toolbar.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
@@ -270,7 +271,8 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
       if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
         var nodeType = state.schema.nodes.table;
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI);
-        var cellItems = getCellItems(config, state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI);
+        var cellItems;
+        cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(config, state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI);
         var colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI);
 
         // Check if we need to show confirm dialog for delete button
@@ -321,7 +323,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           },
           zIndex: akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          items: [menu, separator(menu.hidden)].concat(cellItems, colorPicker, [{
+          items: [menu, separator(menu.hidden)].concat(_toConsumableArray(cellItems), colorPicker, [{
             type: 'extensions-placeholder',
             separator: 'end'
           }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "5.4.21",
+  "version": "5.4.23",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
     "@atlaskit/editor-tables": "^2.3.0",
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.1",
-    "@atlaskit/pragmatic-drag-and-drop": "^0.24.0",
+    "@atlaskit/pragmatic-drag-and-drop": "^0.25.0",
     "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^0.8.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^0.12.0",
     "@atlaskit/primitives": "^1.13.0",

package/src/plugins/table/toolbar.tsx

@@ -426,14 +426,17 @@ export const getToolbarConfig =
         editorAnalyticsAPI,
       );
 
-      const cellItems = getCellItems(
-        config,
-        state,
-        getEditorView(),
-        intl,
-        getEditorContainerWidth,
-        editorAnalyticsAPI,
-      );
+      let cellItems: Array<FloatingToolbarItem<Command>>;
+      cellItems = pluginState.isDragAndDropEnabled
+        ? []
+        : getCellItems(
+            config,
+            state,
+            getEditorView(),
+            intl,
+            getEditorContainerWidth,
+            editorAnalyticsAPI,
+          );
       const colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI);
 
       // Check if we need to show confirm dialog for delete button
@@ -486,7 +489,6 @@ export const getToolbarConfig =
 
         return element;
       };
-
       return {
         title: 'Table floating controls',
         getDomRef,