@atlaskit/editor-plugin-floating-toolbar 4.2.9 → 4.3.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 4.3.1
+
+### Patch Changes
+
+- [#181594](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/181594)
+  [`f7fa55cd505ce`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f7fa55cd505ce) -
+  Avoid using tables commands directly in floating toolbar plugin.
+- Updated dependencies
+
+## 4.3.0
+
+### Minor Changes
+
+- [#180495](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/180495)
+  [`eb0bc71e25f89`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eb0bc71e25f89) -
+  Cleaned up floating toolbar in ssr experiment
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.2.9
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -224,9 +224,7 @@ function ContentComponent(_ref5) {
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
     floatingToolbarData = _ref6.floatingToolbarData;
-  if ((0, _experiments.editorExperiment)('platform_editor_hide_floating_toolbar_in_ssr', true, {
-    exposure: true
-  }) && (0, _coreUtils.isSSR)()) {
+  if ((0, _coreUtils.isSSR)()) {
     return null;
   }
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {

package/dist/cjs/ui/Toolbar.js

@@ -24,12 +24,11 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorPalette = require("@atlaskit/editor-palette");
-var _commands = require("@atlaskit/editor-plugin-table/commands");
 var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _forceFocus = require("../pm-plugins/force-focus");
-var _commands2 = require("../pm-plugins/toolbar-data/commands");
+var _commands = require("../pm-plugins/toolbar-data/commands");
 var _Dropdown = _interopRequireDefault(require("./Dropdown"));
 var _EmojiPickerButton = require("./EmojiPickerButton");
 var _ExtensionsPlaceholder = require("./ExtensionsPlaceholder");
@@ -105,7 +104,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
         var ButtonIcon = item.icon;
         var onClickHandler = function onClickHandler() {
           if (item.confirmDialog) {
-            dispatchCommand((0, _commands2.showConfirmDialog)(idx));
+            dispatchCommand((0, _commands.showConfirmDialog)(idx));
           } else {
             dispatchCommand(item.onClick);
             if (item.focusEditoronEnter && !(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
@@ -584,38 +583,21 @@ var Toolbar = /*#__PURE__*/function (_Component) {
     };
     return _this;
   }
+
   // remove any decorations added by toolbar buttons i.e danger and selected styling
   // this prevents https://product-fabric.atlassian.net/browse/ED-10207
   (0, _inherits2.default)(Toolbar, _Component);
   return (0, _createClass2.default)(Toolbar, [{
-    key: "resetStylingLegacy",
-    value: function resetStylingLegacy(_ref3) {
-      var table = _ref3.table;
+    key: "resetStyling",
+    value: function resetStyling() {
       if (this.props.editorView) {
         var _this$props$api;
         var _this$props$editorVie2 = this.props.editorView,
           state = _this$props$editorVie2.state,
           dispatch = _this$props$editorVie2.dispatch;
-        if (table) {
-          return (0, _commands.clearHoverSelection)()(state, dispatch);
-        }
         (_this$props$api = this.props.api) === null || _this$props$api === void 0 || (_this$props$api = _this$props$api.decorations) === null || _this$props$api === void 0 || _this$props$api.actions.removeDecoration(state, dispatch);
       }
     }
-
-    // remove any decorations added by toolbar buttons i.e danger and selected styling
-    // this prevents https://product-fabric.atlassian.net/browse/ED-10207
-  }, {
-    key: "resetStyling",
-    value: function resetStyling() {
-      if (this.props.editorView) {
-        var _this$props$api2;
-        var _this$props$editorVie3 = this.props.editorView,
-          state = _this$props$editorVie3.state,
-          dispatch = _this$props$editorVie3.dispatch;
-        (_this$props$api2 = this.props.api) === null || _this$props$api2 === void 0 || (_this$props$api2 = _this$props$api2.decorations) === null || _this$props$api2 === void 0 || _this$props$api2.actions.removeDecoration(state, dispatch);
-      }
-    }
   }, {
     key: "setDisableScroll",
     value: function setDisableScroll(disabled) {
@@ -645,16 +627,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
     value: function componentDidUpdate(prevProps) {
       var _this$props;
       (0, _forceFocus.checkShouldForceFocusAndApply)((_this$props = this.props) === null || _this$props === void 0 ? void 0 : _this$props.editorView);
-      if ((0, _platformFeatureFlags.fg)('platform_editor_remove_slow_table_transactions')) {
-        if (this.props.node !== prevProps.node) {
-          this.resetStyling();
-        }
-      } else {
-        if (this.props.node !== prevProps.node) {
-          this.resetStylingLegacy({
-            table: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.node.type.name) === 'table'
-          });
-        }
+      if (this.props.node !== prevProps.node) {
+        this.resetStyling();
       }
     }
   }, {
@@ -666,13 +640,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
           dispatch = editorView.dispatch;
         dispatch((0, _forceFocus.forceFocusSelector)(null)(tr));
       }
-      if ((0, _platformFeatureFlags.fg)('platform_editor_remove_slow_table_transactions')) {
-        this.resetStyling();
-      } else {
-        this.resetStylingLegacy({
-          table: this.props.node.type.name === 'table'
-        });
-      }
+      this.resetStyling();
     }
   }, {
     key: "render",

package/dist/es2019/floatingToolbarPlugin.js

@@ -214,9 +214,7 @@ export function ContentComponent({
     configWithNodeInfo,
     floatingToolbarData
   } = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {};
-  if (editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
-    exposure: true
-  }) && isSSR()) {
+  if (isSSR()) {
     return null;
   }
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {

package/dist/es2019/ui/Toolbar.js

@@ -17,7 +17,6 @@ import { Announcer, FloatingToolbarButton as Button, FloatingToolbarSeparator as
 import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
-import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -544,34 +543,17 @@ class Toolbar extends Component {
       mounted: false
     };
   }
-  // remove any decorations added by toolbar buttons i.e danger and selected styling
-  // this prevents https://product-fabric.atlassian.net/browse/ED-10207
-  resetStylingLegacy({
-    table
-  }) {
-    if (this.props.editorView) {
-      var _this$props$api, _this$props$api$decor;
-      const {
-        state,
-        dispatch
-      } = this.props.editorView;
-      if (table) {
-        return clearHoverSelection()(state, dispatch);
-      }
-      (_this$props$api = this.props.api) === null || _this$props$api === void 0 ? void 0 : (_this$props$api$decor = _this$props$api.decorations) === null || _this$props$api$decor === void 0 ? void 0 : _this$props$api$decor.actions.removeDecoration(state, dispatch);
-    }
-  }
 
   // remove any decorations added by toolbar buttons i.e danger and selected styling
   // this prevents https://product-fabric.atlassian.net/browse/ED-10207
   resetStyling() {
     if (this.props.editorView) {
-      var _this$props$api2, _this$props$api2$deco;
+      var _this$props$api, _this$props$api$decor;
       const {
         state,
         dispatch
       } = this.props.editorView;
-      (_this$props$api2 = this.props.api) === null || _this$props$api2 === void 0 ? void 0 : (_this$props$api2$deco = _this$props$api2.decorations) === null || _this$props$api2$deco === void 0 ? void 0 : _this$props$api2$deco.actions.removeDecoration(state, dispatch);
+      (_this$props$api = this.props.api) === null || _this$props$api === void 0 ? void 0 : (_this$props$api$decor = _this$props$api.decorations) === null || _this$props$api$decor === void 0 ? void 0 : _this$props$api$decor.actions.removeDecoration(state, dispatch);
     }
   }
   setDisableScroll(disabled) {
@@ -596,16 +578,8 @@ class Toolbar extends Component {
   componentDidUpdate(prevProps) {
     var _this$props;
     checkShouldForceFocusAndApply((_this$props = this.props) === null || _this$props === void 0 ? void 0 : _this$props.editorView);
-    if (fg('platform_editor_remove_slow_table_transactions')) {
-      if (this.props.node !== prevProps.node) {
-        this.resetStyling();
-      }
-    } else {
-      if (this.props.node !== prevProps.node) {
-        this.resetStylingLegacy({
-          table: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.node.type.name) === 'table'
-        });
-      }
+    if (this.props.node !== prevProps.node) {
+      this.resetStyling();
     }
   }
   componentWillUnmount() {
@@ -621,13 +595,7 @@ class Toolbar extends Component {
       } = editorView;
       dispatch(forceFocusSelector(null)(tr));
     }
-    if (fg('platform_editor_remove_slow_table_transactions')) {
-      this.resetStyling();
-    } else {
-      this.resetStylingLegacy({
-        table: this.props.node.type.name === 'table'
-      });
-    }
+    this.resetStyling();
   }
   render() {
     const {

package/dist/esm/floatingToolbarPlugin.js

@@ -215,9 +215,7 @@ export function ContentComponent(_ref5) {
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
     floatingToolbarData = _ref6.floatingToolbarData;
-  if (editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
-    exposure: true
-  }) && isSSR()) {
+  if (isSSR()) {
     return null;
   }
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {

package/dist/esm/ui/Toolbar.js

@@ -24,7 +24,6 @@ import { Announcer, FloatingToolbarButton as Button, FloatingToolbarSeparator as
 import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
-import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -578,38 +577,21 @@ var Toolbar = /*#__PURE__*/function (_Component) {
     };
     return _this;
   }
+
   // remove any decorations added by toolbar buttons i.e danger and selected styling
   // this prevents https://product-fabric.atlassian.net/browse/ED-10207
   _inherits(Toolbar, _Component);
   return _createClass(Toolbar, [{
-    key: "resetStylingLegacy",
-    value: function resetStylingLegacy(_ref3) {
-      var table = _ref3.table;
+    key: "resetStyling",
+    value: function resetStyling() {
       if (this.props.editorView) {
         var _this$props$api;
         var _this$props$editorVie2 = this.props.editorView,
           state = _this$props$editorVie2.state,
           dispatch = _this$props$editorVie2.dispatch;
-        if (table) {
-          return clearHoverSelection()(state, dispatch);
-        }
         (_this$props$api = this.props.api) === null || _this$props$api === void 0 || (_this$props$api = _this$props$api.decorations) === null || _this$props$api === void 0 || _this$props$api.actions.removeDecoration(state, dispatch);
       }
     }
-
-    // remove any decorations added by toolbar buttons i.e danger and selected styling
-    // this prevents https://product-fabric.atlassian.net/browse/ED-10207
-  }, {
-    key: "resetStyling",
-    value: function resetStyling() {
-      if (this.props.editorView) {
-        var _this$props$api2;
-        var _this$props$editorVie3 = this.props.editorView,
-          state = _this$props$editorVie3.state,
-          dispatch = _this$props$editorVie3.dispatch;
-        (_this$props$api2 = this.props.api) === null || _this$props$api2 === void 0 || (_this$props$api2 = _this$props$api2.decorations) === null || _this$props$api2 === void 0 || _this$props$api2.actions.removeDecoration(state, dispatch);
-      }
-    }
   }, {
     key: "setDisableScroll",
     value: function setDisableScroll(disabled) {
@@ -639,16 +621,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
     value: function componentDidUpdate(prevProps) {
       var _this$props;
       checkShouldForceFocusAndApply((_this$props = this.props) === null || _this$props === void 0 ? void 0 : _this$props.editorView);
-      if (fg('platform_editor_remove_slow_table_transactions')) {
-        if (this.props.node !== prevProps.node) {
-          this.resetStyling();
-        }
-      } else {
-        if (this.props.node !== prevProps.node) {
-          this.resetStylingLegacy({
-            table: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.node.type.name) === 'table'
-          });
-        }
+      if (this.props.node !== prevProps.node) {
+        this.resetStyling();
       }
     }
   }, {
@@ -660,13 +634,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
           dispatch = editorView.dispatch;
         dispatch(forceFocusSelector(null)(tr));
       }
-      if (fg('platform_editor_remove_slow_table_transactions')) {
-        this.resetStyling();
-      } else {
-        this.resetStylingLegacy({
-          table: this.props.node.type.name === 'table'
-        });
-      }
+      this.resetStyling();
     }
   }, {
     key: "render",

package/dist/types/pm-plugins/commands.d.ts

@@ -1,4 +1,4 @@
-import { INPUT_METHOD, type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { type INPUT_METHOD, type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const copyNode: (nodeType: NodeType | Array<NodeType>, editorAnalyticsApi?: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD) => ({ tr }: {

package/dist/types-ts4.5/pm-plugins/commands.d.ts

@@ -1,4 +1,4 @@
-import { INPUT_METHOD, type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { type INPUT_METHOD, type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const copyNode: (nodeType: NodeType | Array<NodeType>, editorAnalyticsApi?: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD) => ({ tr }: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "4.2.9",
+	"version": "4.3.1",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,7 +27,7 @@
 		"@atlaskit/adf-utils": "^19.20.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/checkbox": "^17.1.0",
-		"@atlaskit/editor-common": "^107.4.0",
+		"@atlaskit/editor-common": "^107.6.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-context-panel": "^4.1.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/primitives": "^14.10.0",
 		"@atlaskit/select": "^21.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^8.6.0",
+		"@atlaskit/tmp-editor-statsig": "^8.7.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -127,9 +127,6 @@
 		"editor_a11y_remove_redundant_wrap_icon_label": {
 			"type": "boolean"
 		},
-		"platform_editor_remove_slow_table_transactions": {
-			"type": "boolean"
-		},
 		"platform_editor_user_intent_plugin": {
 			"type": "boolean"
 		},