@atlaskit/editor-plugin-table 10.1.3 → 10.2.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-table
 
+## 10.2.0
+
+### Minor Changes
+
+- [#119765](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/119765)
+  [`5a27b842be965`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5a27b842be965) -
+  Add deprecated label to `forceStaticToolbar` in floating toolbar property and remove its usage
+  across plugins
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.1.4
+
+### Patch Changes
+
+- [#115629](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/115629)
+  [`4c512c4a6282c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4c512c4a6282c) -
+  [ux] [ED-26544] Fix issue where sorting decorations were not being removed on edit mode on live
+  pages. Also ensured sorting decorations are reapplied in view mode. Added live page option to
+  integration testing page.
+
 ## 10.1.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/view-mode-sort/index.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _reactIntlNext = require("react-intl-next");
 var _v = _interopRequireDefault(require("uuid/v4"));
@@ -15,6 +15,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _types = require("@atlaskit/editor-common/types");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _SortingIconWrapper = require("../../ui/icons/SortingIconWrapper");
 var _pluginFactory = require("../plugin-factory");
 var _consts = require("./consts");
@@ -46,7 +47,13 @@ var createPlugin = exports.createPlugin = function createPlugin(api, nodeViewPor
         var _ref = ((_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState()) || {},
           mode = _ref.mode;
         if (mode !== 'view') {
-          return pluginState;
+          var _pluginState$decorati, _pluginState$decorati2;
+          var _sortingDecorations = pluginState === null || pluginState === void 0 || (_pluginState$decorati = pluginState.decorations) === null || _pluginState$decorati === void 0 ? void 0 : _pluginState$decorati.find(undefined, undefined, function (s) {
+            return (s === null || s === void 0 ? void 0 : s.type) === 'sorting-decoration';
+          });
+          return (0, _platformFeatureFlags.fg)('platform_editor_sort_decoration_fix_on_live_page') ? _objectSpread(_objectSpread({}, pluginState), {}, {
+            decorations: pluginState === null || pluginState === void 0 || (_pluginState$decorati2 = pluginState.decorations) === null || _pluginState$decorati2 === void 0 ? void 0 : _pluginState$decorati2.remove(_sortingDecorations)
+          }) : pluginState;
         }
         var decorations = pluginState.decorations,
           sort = pluginState.sort,
@@ -87,9 +94,12 @@ var createPlugin = exports.createPlugin = function createPlugin(api, nodeViewPor
          * Create decorations for the sorting icons
          */
         var decs = [];
+        var sortingDecorations = pluginState.decorations.find(undefined, undefined, function (spec) {
+          return spec.tableId === tableId && spec.type === 'sorting-decoration';
+        });
 
         // TODO - add support for keyboard only users
-        if (hoverTableMeta && !isTableInState || sortMeta) {
+        if (hoverTableMeta && !isTableInState || sortMeta || isTableInState && !sortingDecorations.length && (0, _platformFeatureFlags.fg)('platform_editor_sort_decoration_fix_on_live_page')) {
           allTables.forEach(function (table) {
             var _table = (0, _slicedToArray2.default)(table, 3),
               tableId = _table[0],
@@ -135,7 +145,9 @@ var createPlugin = exports.createPlugin = function createPlugin(api, nodeViewPor
               }, {
                 destroy: function destroy(node) {
                   nodeViewPortalProviderAPI.remove(decorationRenderKey);
-                }
+                },
+                type: 'sorting-decoration',
+                tableId: tableId
               }));
             });
           });

package/dist/cjs/tablePlugin.js

@@ -1,16 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
 var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _icons = require("@atlaskit/editor-common/icons");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
@@ -58,6 +60,8 @@ var _FloatingToolbarLabel = require("./ui/FloatingToolbarLabel/FloatingToolbarLa
 var _globalStyles = require("./ui/global-styles");
 var _TableFullWidthLabel = require("./ui/TableFullWidthLabel");
 var _toolbar = require("./ui/toolbar");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
@@ -607,6 +611,21 @@ var tablesPlugin = function tablesPlugin(_ref) {
       floatingToolbar: (0, _toolbar.getToolbarConfig)(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags, function () {
         return editorViewRef.current;
       }, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)((0, _createPluginConfig.pluginConfig)(options === null || options === void 0 ? void 0 : options.tableOptions))
+    },
+    usePluginHook: function usePluginHook(_ref23) {
+      var editorView = _ref23.editorView;
+      var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['editorViewMode']),
+        editorViewModeState = _useSharedPluginState.editorViewModeState;
+      var mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
+      (0, _react.useEffect)(function () {
+        var state = editorView.state,
+          dispatch = editorView.dispatch;
+        var tr = state.tr;
+        tr.setMeta('viewModeState', mode);
+        if (dispatch) {
+          dispatch(tr);
+        }
+      }, [editorView, mode]);
     }
   };
 };

package/dist/cjs/ui/toolbar.js

@@ -464,7 +464,6 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           },
           zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          forceStaticToolbar: true,
           items: [menu, separator(menu.hidden)].concat((0, _toConsumableArray2.default)(alignmentMenu), [separator(alignmentMenu.length === 0)], (0, _toConsumableArray2.default)(cellItems), (0, _toConsumableArray2.default)(columnSettingsItems), (0, _toConsumableArray2.default)(colorPicker), [
           // TODO: editor controls to move to overflow menu
           {

package/dist/es2019/pm-plugins/view-mode-sort/index.js

@@ -11,6 +11,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SortingIconWrapper } from '../../ui/icons/SortingIconWrapper';
 import { getPluginState } from '../plugin-factory';
 import { IS_DISABLED_CLASS_NAME, SORT_INDEX_DATA_ATTRIBUTE, SORTING_ICON_CLASS_NAME } from './consts';
@@ -32,7 +33,12 @@ export const createPlugin = (api, nodeViewPortalProviderAPI) => {
           mode
         } = ((_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState()) || {};
         if (mode !== 'view') {
-          return pluginState;
+          var _pluginState$decorati, _pluginState$decorati2;
+          const sortingDecorations = pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$decorati = pluginState.decorations) === null || _pluginState$decorati === void 0 ? void 0 : _pluginState$decorati.find(undefined, undefined, s => (s === null || s === void 0 ? void 0 : s.type) === 'sorting-decoration');
+          return fg('platform_editor_sort_decoration_fix_on_live_page') ? {
+            ...pluginState,
+            decorations: pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$decorati2 = pluginState.decorations) === null || _pluginState$decorati2 === void 0 ? void 0 : _pluginState$decorati2.remove(sortingDecorations)
+          } : pluginState;
         }
         let {
           decorations,
@@ -66,9 +72,10 @@ export const createPlugin = (api, nodeViewPortalProviderAPI) => {
          * Create decorations for the sorting icons
          */
         const decs = [];
+        const sortingDecorations = pluginState.decorations.find(undefined, undefined, spec => spec.tableId === tableId && spec.type === 'sorting-decoration');
 
         // TODO - add support for keyboard only users
-        if (hoverTableMeta && !isTableInState || sortMeta) {
+        if (hoverTableMeta && !isTableInState || sortMeta || isTableInState && !sortingDecorations.length && fg('platform_editor_sort_decoration_fix_on_live_page')) {
           allTables.forEach(table => {
             const [tableId, _node, pos] = table;
             const tableNode = tr.doc.nodeAt(tr.mapping.map(pos));
@@ -110,7 +117,9 @@ export const createPlugin = (api, nodeViewPortalProviderAPI) => {
               }, {
                 destroy: node => {
                   nodeViewPortalProviderAPI.remove(decorationRenderKey);
-                }
+                },
+                type: 'sorting-decoration',
+                tableId
               }));
             });
           });

package/dist/es2019/tablePlugin.js

@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { tableCell, tableCellWithNestedTable, tableHeader, tableHeaderWithNestedTable, tableRow, tableRowWithNestedTable } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { IconTable } from '@atlaskit/editor-common/icons';
 import { toggleTable, tooltip } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
@@ -603,6 +604,25 @@ const tablesPlugin = ({
         }
       }],
       floatingToolbar: getToolbarConfig(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags, () => editorViewRef.current, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(pluginConfig(options === null || options === void 0 ? void 0 : options.tableOptions))
+    },
+    usePluginHook({
+      editorView
+    }) {
+      const {
+        editorViewModeState
+      } = useSharedPluginState(api, ['editorViewMode']);
+      const mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
+      useEffect(() => {
+        const {
+          state,
+          dispatch
+        } = editorView;
+        const tr = state.tr;
+        tr.setMeta('viewModeState', mode);
+        if (dispatch) {
+          dispatch(tr);
+        }
+      }, [editorView, mode]);
     }
   };
 };

package/dist/es2019/ui/toolbar.js

@@ -436,7 +436,6 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
       },
       zIndex: akEditorFloatingPanelZIndex + 1,
       // Place the context menu slightly above the others
-      forceStaticToolbar: true,
       items: [menu, separator(menu.hidden), ...alignmentMenu, separator(alignmentMenu.length === 0), ...cellItems, ...columnSettingsItems, ...colorPicker,
       // TODO: editor controls to move to overflow menu
       {

package/dist/esm/pm-plugins/view-mode-sort/index.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -19,6 +19,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SortingIconWrapper } from '../../ui/icons/SortingIconWrapper';
 import { getPluginState } from '../plugin-factory';
 import { IS_DISABLED_CLASS_NAME, SORT_INDEX_DATA_ATTRIBUTE, SORTING_ICON_CLASS_NAME } from './consts';
@@ -41,7 +42,13 @@ export var createPlugin = function createPlugin(api, nodeViewPortalProviderAPI)
         var _ref = ((_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState()) || {},
           mode = _ref.mode;
         if (mode !== 'view') {
-          return pluginState;
+          var _pluginState$decorati, _pluginState$decorati2;
+          var _sortingDecorations = pluginState === null || pluginState === void 0 || (_pluginState$decorati = pluginState.decorations) === null || _pluginState$decorati === void 0 ? void 0 : _pluginState$decorati.find(undefined, undefined, function (s) {
+            return (s === null || s === void 0 ? void 0 : s.type) === 'sorting-decoration';
+          });
+          return fg('platform_editor_sort_decoration_fix_on_live_page') ? _objectSpread(_objectSpread({}, pluginState), {}, {
+            decorations: pluginState === null || pluginState === void 0 || (_pluginState$decorati2 = pluginState.decorations) === null || _pluginState$decorati2 === void 0 ? void 0 : _pluginState$decorati2.remove(_sortingDecorations)
+          }) : pluginState;
         }
         var decorations = pluginState.decorations,
           sort = pluginState.sort,
@@ -82,9 +89,12 @@ export var createPlugin = function createPlugin(api, nodeViewPortalProviderAPI)
          * Create decorations for the sorting icons
          */
         var decs = [];
+        var sortingDecorations = pluginState.decorations.find(undefined, undefined, function (spec) {
+          return spec.tableId === tableId && spec.type === 'sorting-decoration';
+        });
 
         // TODO - add support for keyboard only users
-        if (hoverTableMeta && !isTableInState || sortMeta) {
+        if (hoverTableMeta && !isTableInState || sortMeta || isTableInState && !sortingDecorations.length && fg('platform_editor_sort_decoration_fix_on_live_page')) {
           allTables.forEach(function (table) {
             var _table = _slicedToArray(table, 3),
               tableId = _table[0],
@@ -130,7 +140,9 @@ export var createPlugin = function createPlugin(api, nodeViewPortalProviderAPI)
               }, {
                 destroy: function destroy(node) {
                   nodeViewPortalProviderAPI.remove(decorationRenderKey);
-                }
+                },
+                type: 'sorting-decoration',
+                tableId: tableId
               }));
             });
           });

package/dist/esm/tablePlugin.js

@@ -1,11 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import React from 'react';
+import React, { useEffect } from 'react';
 import { tableCell, tableCellWithNestedTable, tableHeader, tableHeaderWithNestedTable, tableRow, tableRowWithNestedTable } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { IconTable } from '@atlaskit/editor-common/icons';
 import { toggleTable, tooltip } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
@@ -601,6 +602,21 @@ var tablesPlugin = function tablesPlugin(_ref) {
       floatingToolbar: getToolbarConfig(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags, function () {
         return editorViewRef.current;
       }, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(pluginConfig(options === null || options === void 0 ? void 0 : options.tableOptions))
+    },
+    usePluginHook: function usePluginHook(_ref23) {
+      var editorView = _ref23.editorView;
+      var _useSharedPluginState = useSharedPluginState(api, ['editorViewMode']),
+        editorViewModeState = _useSharedPluginState.editorViewModeState;
+      var mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
+      useEffect(function () {
+        var state = editorView.state,
+          dispatch = editorView.dispatch;
+        var tr = state.tr;
+        tr.setMeta('viewModeState', mode);
+        if (dispatch) {
+          dispatch(tr);
+        }
+      }, [editorView, mode]);
     }
   };
 };

package/dist/esm/ui/toolbar.js

@@ -456,7 +456,6 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           },
           zIndex: akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          forceStaticToolbar: true,
           items: [menu, separator(menu.hidden)].concat(_toConsumableArray(alignmentMenu), [separator(alignmentMenu.length === 0)], _toConsumableArray(cellItems), _toConsumableArray(columnSettingsItems), _toConsumableArray(colorPicker), [
           // TODO: editor controls to move to overflow menu
           {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.1.3",
+	"version": "10.2.0",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
 		"@atlaskit/adf-schema": "^47.2.1",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/custom-steps": "^0.10.0",
-		"@atlaskit/editor-common": "^100.2.0",
+		"@atlaskit/editor-common": "^100.3.0",
 		"@atlaskit/editor-palette": "2.0.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.0.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/primitives": "^14.1.0",
 		"@atlaskit/theme": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^3.2.0",
+		"@atlaskit/tmp-editor-statsig": "^3.3.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.2.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -179,6 +179,9 @@
 		},
 		"platform_editor_nested_tables_sticky_header_bug": {
 			"type": "boolean"
+		},
+		"platform_editor_sort_decoration_fix_on_live_page": {
+			"type": "boolean"
 		}
 	}
 }

package/src/pm-plugins/view-mode-sort/index.ts

@@ -15,6 +15,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 import type tablePlugin from '../../tablePlugin';
 import { SortingIconWrapper } from '../../ui/icons/SortingIconWrapper';
@@ -45,7 +46,18 @@ export const createPlugin = (
 				// does not appear correct when the plugin is created.
 				const { mode } = api.editorViewMode?.sharedState.currentState() || {};
 				if (mode !== 'view') {
-					return pluginState;
+					const sortingDecorations = pluginState?.decorations?.find(
+						undefined,
+						undefined,
+						(s) => s?.type === 'sorting-decoration',
+					);
+
+					return fg('platform_editor_sort_decoration_fix_on_live_page')
+						? {
+								...pluginState,
+								decorations: pluginState?.decorations?.remove(sortingDecorations),
+							}
+						: pluginState;
 				}
 				let { decorations, sort, allTables } = pluginState;
 
@@ -77,8 +89,20 @@ export const createPlugin = (
 				 */
 				const decs: Decoration[] = [];
 
+				const sortingDecorations = pluginState.decorations.find(
+					undefined,
+					undefined,
+					(spec) => spec.tableId === tableId && spec.type === 'sorting-decoration',
+				);
+
 				// TODO - add support for keyboard only users
-				if ((hoverTableMeta && !isTableInState) || sortMeta) {
+				if (
+					(hoverTableMeta && !isTableInState) ||
+					sortMeta ||
+					(isTableInState &&
+						!sortingDecorations.length &&
+						fg('platform_editor_sort_decoration_fix_on_live_page'))
+				) {
 					allTables.forEach((table) => {
 						const [tableId, _node, pos] = table;
 						const tableNode = tr.doc.nodeAt(tr.mapping.map(pos));
@@ -132,6 +156,8 @@ export const createPlugin = (
 										destroy: (node) => {
 											nodeViewPortalProviderAPI.remove(decorationRenderKey);
 										},
+										type: 'sorting-decoration',
+										tableId,
 									},
 								),
 							);

package/src/tablePlugin.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 
 import {
 	tableCell,
@@ -18,6 +18,7 @@ import {
 } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { IconTable } from '@atlaskit/editor-common/icons';
 import { toggleTable, tooltip } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
@@ -770,6 +771,19 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 				shouldUseIncreasedScalingPercent,
 			)(pluginConfig(options?.tableOptions)),
 		},
+		usePluginHook({ editorView }) {
+			const { editorViewModeState } = useSharedPluginState(api, ['editorViewMode']);
+			const mode = editorViewModeState?.mode;
+
+			useEffect(() => {
+				const { state, dispatch } = editorView;
+				const tr = state.tr;
+				tr.setMeta('viewModeState', mode);
+				if (dispatch) {
+					dispatch(tr);
+				}
+			}, [editorView, mode]);
+		},
 	};
 };
 

package/src/ui/toolbar.tsx

@@ -639,7 +639,6 @@ export const getToolbarConfig =
 				offset: [0, 18],
 				absoluteOffset: { top: -6 },
 				zIndex: akEditorFloatingPanelZIndex + 1, // Place the context menu slightly above the others
-				forceStaticToolbar: true,
 				items: [
 					menu,
 					separator(menu.hidden),