@atlaskit/editor-plugin-table 13.0.5 → 13.0.7

package/dist/es2019/nodeviews/TableComponentWithSharedState.js

@@ -1,14 +1,29 @@
 import React from 'react';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { findTable } from '@atlaskit/editor-tables';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import TableComponent from './TableComponent';
 
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
+/**
+ * Use useSharedPluginState to control re-renders from plugin dependencies
+ */
+export const TableComponentWithSharedState = ({
+  view,
+  options,
+  getNode,
+  dispatchAnalyticsEvent,
+  api,
+  getEditorFeatureFlags,
+  eventDispatcher,
+  allowColumnResizing,
+  allowControls,
+  getPos,
+  forwardRef,
+  allowTableAlignment,
+  allowTableResizing
+}) => {
   const {
     isTableResizing,
     isHeaderColumnEnabled,
@@ -55,100 +70,7 @@ const useSharedState = sharedPluginStateHookMigratorFactory(api => {
       interaction: (_states$interactionSt = states.interactionState) === null || _states$interactionSt === void 0 ? void 0 : _states$interactionSt.interactionState
     };
   });
-  return {
-    tableState: undefined,
-    widthState: undefined,
-    isTableResizing,
-    isHeaderColumnEnabled,
-    isHeaderRowEnabled,
-    ordering,
-    isResizing,
-    isInDanger,
-    hoveredCell,
-    hoveredRows,
-    isTableHovered,
-    isWholeTableInDanger,
-    isFullscreen,
-    selection,
-    mode,
-    width,
-    lineLength,
-    interaction
-  };
-}, api => {
-  const {
-    widthState,
-    tableState,
-    mediaState,
-    selectionState,
-    editorViewModeState,
-    interactionState
-  } = useSharedPluginState(api, ['width', 'table', 'media', 'selection', 'editorViewMode', 'interaction']);
-  const tableStateInternal = tableState;
-  return {
-    tableState,
-    widthState,
-    isTableResizing: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.isTableResizing,
-    isHeaderColumnEnabled: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.isHeaderColumnEnabled,
-    isHeaderRowEnabled: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.isHeaderRowEnabled,
-    ordering: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.ordering,
-    isResizing: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.isResizing,
-    isInDanger: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.isInDanger,
-    hoveredCell: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.hoveredCell,
-    hoveredRows: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.hoveredRows,
-    isTableHovered: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.isTableHovered,
-    isWholeTableInDanger: tableStateInternal === null || tableStateInternal === void 0 ? void 0 : tableStateInternal.isWholeTableInDanger,
-    isFullscreen: mediaState === null || mediaState === void 0 ? void 0 : mediaState.isFullscreen,
-    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection,
-    mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    width: widthState === null || widthState === void 0 ? void 0 : widthState.width,
-    lineLength: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength,
-    interaction: interactionState === null || interactionState === void 0 ? void 0 : interactionState.interactionState
-  };
-});
-
-/**
- * Use useSharedPluginState to control re-renders from plugin dependencies
- */
-export const TableComponentWithSharedState = ({
-  view,
-  options,
-  getNode,
-  dispatchAnalyticsEvent,
-  api,
-  getEditorFeatureFlags,
-  eventDispatcher,
-  allowColumnResizing,
-  allowControls,
-  getPos,
-  forwardRef,
-  allowTableAlignment,
-  allowTableResizing
-}) => {
-  const {
-    tableState,
-    widthState,
-    mode,
-    hoveredCell,
-    hoveredRows,
-    isFullscreen,
-    isHeaderColumnEnabled,
-    isHeaderRowEnabled,
-    isInDanger,
-    isResizing,
-    isTableHovered,
-    isTableResizing,
-    isWholeTableInDanger,
-    lineLength,
-    ordering,
-    selection,
-    width,
-    interaction
-  } = useSharedState(api);
   const isLivePageViewMode = mode === 'view';
-  if (expValEquals('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false) && !tableState) {
-    return null;
-  }
 
   /**
    *  ED-19810
@@ -182,13 +104,10 @@ export const TableComponentWithSharedState = ({
     ordering: ordering,
     isResizing: isResizing,
     getNode: getNode,
-    containerWidth: editorExperiment('platform_editor_usesharedpluginstatewithselector', true) ? {
+    containerWidth: {
       width: width !== null && width !== void 0 ? width : 0,
       lineLength
-    } :
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    widthState,
+    },
     contentDOM: forwardRef,
     getEditorFeatureFlags: getEditorFeatureFlags,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,

package/dist/es2019/nodeviews/TableContainer.js

@@ -3,7 +3,7 @@ import React, { forwardRef, useCallback, useEffect, useMemo, useRef, useState }
 import classNames from 'classnames';
 import { CHANGE_ALIGNMENT_REASON, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { akEditorDefaultLayoutWidth, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout, akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -36,32 +36,6 @@ const InnerContainer = /*#__PURE__*/forwardRef(({
     "data-testid": "table-container"
   }, children);
 });
-const useAlignmentTableContainerSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  const {
-    isFullWidthModeEnabled,
-    wasFullWidthModeEnabled
-  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['table'], states => {
-    var _states$tableState, _states$tableState2;
-    return {
-      isFullWidthModeEnabled: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.isFullWidthModeEnabled,
-      wasFullWidthModeEnabled: (_states$tableState2 = states.tableState) === null || _states$tableState2 === void 0 ? void 0 : _states$tableState2.wasFullWidthModeEnabled
-    };
-  });
-  return {
-    tableState: undefined,
-    isFullWidthModeEnabled,
-    wasFullWidthModeEnabled
-  };
-}, pluginInjectionApi => {
-  const {
-    tableState
-  } = useSharedPluginState(pluginInjectionApi, ['table']);
-  return {
-    tableState,
-    isFullWidthModeEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled,
-    wasFullWidthModeEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.wasFullWidthModeEnabled
-  };
-});
 const AlignmentTableContainer = ({
   node,
   children,
@@ -71,14 +45,16 @@ const AlignmentTableContainer = ({
 }) => {
   const alignment = node.attrs.layout !== ALIGN_START ? ALIGN_CENTER : ALIGN_START;
   const {
-    tableState,
     isFullWidthModeEnabled,
     wasFullWidthModeEnabled
-  } = useAlignmentTableContainerSharedState(pluginInjectionApi);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['table'], states => {
+    var _states$tableState, _states$tableState2;
+    return {
+      isFullWidthModeEnabled: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.isFullWidthModeEnabled,
+      wasFullWidthModeEnabled: (_states$tableState2 = states.tableState) === null || _states$tableState2 === void 0 ? void 0 : _states$tableState2.wasFullWidthModeEnabled
+    };
+  });
   useEffect(() => {
-    if (!tableState && expValEquals('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
-      return;
-    }
     if (editorView && getPos) {
       const {
         state,
@@ -97,7 +73,7 @@ const AlignmentTableContainer = ({
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editorView, tableState, isFullWidthModeEnabled, wasFullWidthModeEnabled, node]);
+  }, [editorView, isFullWidthModeEnabled, wasFullWidthModeEnabled, node]);
   const style = useMemo(() => {
     return getAlignmentStyle(alignment);
   }, [alignment]);
@@ -142,25 +118,6 @@ const selector = states => ({
   tableState: states.tableState,
   editorViewModeState: states.editorViewModeState
 });
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const {
-    tableState,
-    editorViewModeState
-  } = useSharedPluginStateWithSelector(api, ['table', 'editorViewMode'], selector);
-  return {
-    tableState,
-    editorViewModeState
-  };
-}, api => {
-  const {
-    tableState,
-    editorViewModeState
-  } = useSharedPluginState(api, ['table', 'editorViewMode']);
-  return {
-    tableState,
-    editorViewModeState
-  };
-});
 const getPadding = containerWidth => {
   return containerWidth <= akEditorFullPageNarrowBreakout && expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? akEditorGutterPaddingReduced : akEditorGutterPaddingDynamic();
 };
@@ -189,7 +146,7 @@ const ResizableTableContainerLegacy = /*#__PURE__*/React.memo(({
   const {
     tableState,
     editorViewModeState
-  } = useSharedState(pluginInjectionApi);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['table', 'editorViewMode'], selector);
   const isFullWidthModeEnabled = tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled;
   const mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
   const updateContainerHeight = useCallback(height => {
@@ -386,7 +343,7 @@ const ResizableTableContainerNext = /*#__PURE__*/React.memo(({
   const {
     tableState,
     editorViewModeState
-  } = useSharedState(pluginInjectionApi);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['table', 'editorViewMode'], selector);
   const isFullWidthModeEnabled = tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled;
   const mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
   const updateContainerHeight = useCallback(height => {

package/dist/es2019/nodeviews/TableResizer.js

@@ -4,7 +4,7 @@ import { useIntl } from 'react-intl-next';
 import { CHANGE_ALIGNMENT_REASON, INPUT_METHOD, TABLE_OVERFLOW_CHANGE_TRIGGER } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { getGuidelinesWithHighlights } from '@atlaskit/editor-common/guideline';
-import { sharedPluginStateHookMigratorFactory, useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { focusTableResizer, ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { logException } from '@atlaskit/editor-common/monitoring';
@@ -103,21 +103,6 @@ const selector = states => {
     widthToWidest: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.widthToWidest
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const {
-    widthToWidest
-  } = useSharedPluginStateWithSelector(api, ['table'], selector);
-  return {
-    widthToWidest
-  };
-}, api => {
-  const {
-    tableState
-  } = useSharedPluginState(api, ['table']);
-  return {
-    widthToWidest: tableState === null || tableState === void 0 ? void 0 : tableState.widthToWidest
-  };
-});
 export const TableResizer = ({
   children,
   width,
@@ -153,7 +138,7 @@ export const TableResizer = ({
   const interactionState = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.interactionState');
   const {
     widthToWidest
-  } = useSharedState(pluginInjectionApi);
+  } = useSharedPluginStateWithSelector(pluginInjectionApi, ['table'], selector);
 
   // used to reposition tooltip when table is resizing via keyboard
   const updateTooltip = React.useRef();

package/dist/es2019/pm-plugins/drag-and-drop/plugin.js

@@ -3,9 +3,11 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getCellsInRow, getSelectedCellInfo } from '@atlaskit/editor-tables/utils';
+import { insm } from '@atlaskit/insm';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getPluginState as getTablePluginState } from '../plugin-factory';
 import { pluginKey as tablePluginKey } from '../plugin-key';
 import { insertColgroupFromNode } from '../table-resizing/utils/colgroup';
@@ -30,12 +32,20 @@ const destroyFn = (editorView, editorAnalyticsAPI, isTableScalingEnabled, isTabl
       return type === 'table-row';
     },
     onDragStart() {
+      if (expValEquals('cc_editor_interactivity_monitoring', 'isEnabled', true)) {
+        var _insm$session;
+        (_insm$session = insm.session) === null || _insm$session === void 0 ? void 0 : _insm$session.startFeature('tableDragAndDrop');
+      }
       // auto scroller doesn't work when scroll-behavior: smooth is set, this monitor temporarily removes it via inline styles
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       editorPageScrollContainer.style.setProperty('scroll-behavior', 'unset');
     },
     onDrop() {
+      if (expValEquals('cc_editor_interactivity_monitoring', 'isEnabled', true)) {
+        var _insm$session2;
+        (_insm$session2 = insm.session) === null || _insm$session2 === void 0 ? void 0 : _insm$session2.endFeature('tableDragAndDrop');
+      }
       // 'null' will remove the inline style
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -78,6 +88,10 @@ const destroyFn = (editorView, editorAnalyticsAPI, isTableScalingEnabled, isTabl
     onDragStart: ({
       location
     }) => {
+      if (expValEquals('cc_editor_interactivity_monitoring', 'isEnabled', true)) {
+        var _insm$session3;
+        (_insm$session3 = insm.session) === null || _insm$session3 === void 0 ? void 0 : _insm$session3.startFeature('tableDragAndDrop');
+      }
       toggleDragMenu(false)(editorView.state, editorView.dispatch);
     },
     onDrag(event) {
@@ -129,6 +143,10 @@ const destroyFn = (editorView, editorAnalyticsAPI, isTableScalingEnabled, isTabl
         var _event$source, _event$source$data, _event$source2, _event$source2$data;
         // If we're able to determine the source type of the dropped element then we should report to analytics that
         // the drop event was cancelled. Otherwise we will cancel silently.
+        if (expValEquals('cc_editor_interactivity_monitoring', 'isEnabled', true)) {
+          var _insm$session4;
+          (_insm$session4 = insm.session) === null || _insm$session4 === void 0 ? void 0 : _insm$session4.endFeature('tableDragAndDrop');
+        }
         if ((event === null || event === void 0 ? void 0 : (_event$source = event.source) === null || _event$source === void 0 ? void 0 : (_event$source$data = _event$source.data) === null || _event$source$data === void 0 ? void 0 : _event$source$data.type) === 'table-row' || (event === null || event === void 0 ? void 0 : (_event$source2 = event.source) === null || _event$source2 === void 0 ? void 0 : (_event$source2$data = _event$source2.data) === null || _event$source2$data === void 0 ? void 0 : _event$source2$data.type) === 'table-column') {
           var _event$source$data2;
           return clearDropTargetWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.DRAG_AND_DROP, event.source.data.type, (_event$source$data2 = event.source.data) === null || _event$source$data2 === void 0 ? void 0 : _event$source$data2.indexes, TABLE_STATUS.CANCELLED, tr)(editorView.state, editorView.dispatch);
@@ -157,6 +175,10 @@ const destroyFn = (editorView, editorAnalyticsAPI, isTableScalingEnabled, isTabl
         clearDropTargetWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.DRAG_AND_DROP, sourceType, sourceIndexes,
         // This event is mrked as invalid because the user is attempting to drop an element in an area which has merged cells.
         TABLE_STATUS.INVALID, tr)(editorView.state, editorView.dispatch);
+        if (expValEquals('cc_editor_interactivity_monitoring', 'isEnabled', true)) {
+          var _insm$session5;
+          (_insm$session5 = insm.session) === null || _insm$session5 === void 0 ? void 0 : _insm$session5.endFeature('tableDragAndDrop');
+        }
         return;
       }
       requestAnimationFrame(() => {
@@ -187,6 +209,10 @@ const destroyFn = (editorView, editorAnalyticsAPI, isTableScalingEnabled, isTabl
           }
         }
         editorView.focus();
+        if (expValEquals('cc_editor_interactivity_monitoring', 'isEnabled', true)) {
+          var _insm$session6;
+          (_insm$session6 = insm.session) === null || _insm$session6 === void 0 ? void 0 : _insm$session6.endFeature('tableDragAndDrop');
+        }
       });
     }
   }));