@atlaskit/editor-plugin-table 5.4.22 → 5.4.24

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-table
 
+## 5.4.24
+
+### Patch Changes
+
+- Updated dependencies
+
+## 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

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.22",
+  "version": "5.4.24",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -29,9 +29,9 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.0.0",
     "@atlaskit/custom-steps": "^0.0.7",
-    "@atlaskit/editor-common": "^76.25.0",
+    "@atlaskit/editor-common": "^76.26.0",
     "@atlaskit/editor-palette": "1.5.2",
-    "@atlaskit/editor-plugin-analytics": "^0.3.0",
+    "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-content-insertion": "^0.1.0",
     "@atlaskit/editor-plugin-guideline": "^0.5.0",
     "@atlaskit/editor-plugin-selection": "^0.1.0",

package/src/__tests__/unit/analytics.ts

@@ -1,5 +1,5 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { DocBuilder } from '@atlaskit/editor-common/types';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
@@ -71,6 +71,7 @@ const analyticsPluginFake = () => ({
   name: 'analytics',
   actions: {
     attachAnalyticsEvent: mockAttachPayload.mockImplementation(() => () => {}),
+    fireAnalyticsEvent: jest.fn(),
   },
 });
 
@@ -81,6 +82,7 @@ describe('Table analytic events', () => {
   beforeEach(() => {
     editorAnalyticsAPIFake = {
       attachAnalyticsEvent: analyticFireMock,
+      fireAnalyticsEvent: jest.fn(),
     };
   });
 

package/src/__tests__/unit/commands/go-to-next-cell.ts

@@ -38,6 +38,7 @@ const tdNextFocus = td()(p('{nextFocus}'));
 describe('table plugin: goToNextCell', () => {
   const editorAnalyticsAPIFake: EditorAnalyticsAPI = {
     attachAnalyticsEvent: jest.fn().mockReturnValue(() => jest.fn()),
+    fireAnalyticsEvent: jest.fn(),
   };
   const createEditor = createProsemirrorEditorFactory();
   const preset = new Preset<LightEditorPlugin>()

package/src/__tests__/unit/commands.ts

@@ -327,6 +327,7 @@ describe('table plugin: actions', () => {
   describe('#handleCut', () => {
     const editorAnalyticsAPIFake: EditorAnalyticsAPI = {
       attachAnalyticsEvent: jest.fn().mockReturnValue(() => jest.fn()),
+      fireAnalyticsEvent: jest.fn(),
     };
 
     describe('when the entire table is selected', () => {

package/src/__tests__/unit/get-toolbar-config.ts

@@ -42,6 +42,7 @@ describe('getToolbarConfig', () => {
   const getEditorContainerWidth = () => ({ width: 500 });
   const editorAnalyticsAPIFake: EditorAnalyticsAPI = {
     attachAnalyticsEvent: jest.fn().mockReturnValue(() => jest.fn()),
+    fireAnalyticsEvent: jest.fn(),
   };
   const getEditorFeatureFlags: GetEditorFeatureFlags = jest
     .fn()

package/src/__tests__/unit/pm-plugins/table-local-id.ts

@@ -376,6 +376,7 @@ describe('table local id plugin', () => {
 
         const editorAnalyticsAPIFake: EditorAnalyticsAPI = {
           attachAnalyticsEvent: jest.fn().mockReturnValue(() => jest.fn()),
+          fireAnalyticsEvent: jest.fn(),
         };
 
         const {

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,