@atlaskit/editor-plugin-block-controls 4.0.2 → 4.0.4

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 4.0.4
+
+### Patch Changes
+
+- [#181011](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/181011)
+  [`bf9c278fde34d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bf9c278fde34d) -
+  [ED-27887] Clean up platform_editor_controls_widget_visibility
+- Updated dependencies
+
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.0.2
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -36,12 +36,10 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         }
       }];
       if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-        if ((0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility')) {
-          pmPlugins.push({
-            name: 'blockControlsInteractionTrackingPlugin',
-            plugin: _pmPlugin.createInteractionTrackingPlugin
-          });
-        }
+        pmPlugins.push({
+          name: 'blockControlsInteractionTrackingPlugin',
+          plugin: _pmPlugin.createInteractionTrackingPlugin
+        });
         pmPlugins.push({
           name: 'firstNodeDec',
           plugin: _firstNodeDecPlugin.firstNodeDecPlugin

package/dist/cjs/pm-plugins/decorations-drag-handle.js

@@ -137,7 +137,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     // 		key,
     // 	);
 
-    if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility')) {
+    if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
       _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dragHandle.DragHandleWithVisibility, {
         view: view,
         api: api,

package/dist/cjs/pm-plugins/decorations-quick-insert-button.js

@@ -88,37 +88,19 @@ var quickInsertButtonDecoration = exports.quickInsertButtonDecoration = function
       element.appendChild(vanillaElement);
       return element;
     }
-
-    // all changes already under experiment
-    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility')) {
-      nodeViewPortalProviderAPI.render(function () {
-        return /*#__PURE__*/(0, _react.createElement)(_quickInsertButton.QuickInsertWithVisibility, {
-          api: api,
-          getPos: getPos,
-          formatMessage: formatMessage,
-          view: view,
-          nodeType: nodeType,
-          anchorName: anchorName,
-          rootAnchorName: rootAnchorName,
-          rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
-          anchorRectCache: anchorRectCache
-        });
-      }, element, key);
-    } else {
-      nodeViewPortalProviderAPI.render(function () {
-        return /*#__PURE__*/(0, _react.createElement)(_quickInsertButton.TypeAheadControl, {
-          api: api,
-          getPos: getPos,
-          formatMessage: formatMessage,
-          view: view,
-          nodeType: nodeType,
-          anchorName: anchorName,
-          rootAnchorName: rootAnchorName,
-          rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
-          anchorRectCache: anchorRectCache
-        });
-      }, element, key);
-    }
+    nodeViewPortalProviderAPI.render(function () {
+      return /*#__PURE__*/(0, _react.createElement)(_quickInsertButton.QuickInsertWithVisibility, {
+        api: api,
+        getPos: getPos,
+        formatMessage: formatMessage,
+        view: view,
+        nodeType: nodeType,
+        anchorName: anchorName,
+        rootAnchorName: rootAnchorName,
+        rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
+        anchorRectCache: anchorRectCache
+      });
+    }, element, key);
     return element;
   }, widgetSpec);
 };

package/dist/cjs/pm-plugins/utils/getSelection.js

@@ -103,7 +103,7 @@ var newGetSelection = function newGetSelection(tr, start) {
   return new _state.TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
 };
 var getSelection = exports.getSelection = function getSelection(tr, start) {
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility')) {
+  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     return newGetSelection(tr, start);
   }
   return oldGetSelection(tr, start);
@@ -134,7 +134,7 @@ var setCursorPositionAtMovedNode = exports.setCursorPositionAtMovedNode = functi
   }
 
   // this is a fix for empty paragraph selection - can safely use start position as the paragraph is empty
-  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'paragraph' && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility')) {
+  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'paragraph' && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     var _selection = new _state.TextSelection(tr.doc.resolve(start));
     tr.setSelection(_selection);
     return tr;

package/dist/cjs/ui/global-styles.js

@@ -307,6 +307,6 @@ var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWra
     disabled: !(0, _expValEquals.expValEquals)('platform_editor_block_controls_perf_optimization', 'isEnabled', true) || !(0, _platformFeatureFlags.fg)('platform_editor_block_controls_perf_opt_patch_1')
   });
   return (0, _react.jsx)(_react.Global, {
-    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility') ? undefined : withInlineNodeStyle, (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, (0, _experiments.editorExperiment)('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, (0, _platformFeatureFlags.fg)('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
+    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, (0, _experiments.editorExperiment)('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, (0, _platformFeatureFlags.fg)('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
   });
 };

package/dist/cjs/ui/quick-insert-button.js

@@ -19,7 +19,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _add = _interopRequireDefault(require("@atlaskit/icon/core/add"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
@@ -36,15 +35,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
-var disabledStyles = (0, _primitives.xcss)({
-  pointerEvents: 'none',
-  ':hover': {
-    backgroundColor: 'color.background.disabled'
-  },
-  ':active': {
-    backgroundColor: 'color.background.disabled'
-  }
-});
 var stickyButtonStyles = (0, _primitives.xcss)({
   top: '0',
   position: 'sticky',
@@ -74,9 +64,6 @@ var containerStaticStyles = (0, _primitives.xcss)({
   position: 'absolute',
   zIndex: 'card'
 });
-var disabledContainerStyles = (0, _primitives.xcss)({
-  cursor: 'not-allowed'
-});
 var tooltipContainerStyles = (0, _react2.css)({
   top: '8px',
   bottom: '-8px',
@@ -114,7 +101,6 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
     rootNodeType = _ref.rootNodeType,
     anchorRectCache = _ref.anchorRectCache;
   var macroInteractionUpdates = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'featureFlags.macroInteractionUpdates');
-  var isTypeAheadOpen = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'typeAhead.isOpen');
   var _useState = (0, _react.useState)({
       display: 'none'
     }),
@@ -290,13 +276,12 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
       testId: "editor-quick-insert-button",
       type: "button",
       "aria-label": formatMessage(_messages.blockControlsMessages.insert),
-      xcss: [stickyButtonStyles, isTypeAheadOpen && !(0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility') ? disabledStyles : undefined],
+      xcss: [stickyButtonStyles],
       onClick: handleQuickInsert,
-      onMouseDown: handleMouseDown,
-      isDisabled: !(0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility') && isTypeAheadOpen
+      onMouseDown: handleMouseDown
     }, (0, _react2.jsx)(_add.default, {
       label: "add",
-      color: isTypeAheadOpen && !(0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility') ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon-subtle, #626F86)",
+      color: "var(--ds-icon-subtle, #626F86)",
       size: "small"
     })));
   };
@@ -304,7 +289,7 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
   // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
   , {
     style: positionStyles,
-    xcss: [containerStaticStyles, isTypeAheadOpen && !(0, _platformFeatureFlags.fg)('platform_editor_controls_widget_visibility') && disabledContainerStyles]
+    xcss: [containerStaticStyles]
   }, (0, _react2.jsx)("span", {
     css: [tooltipContainerStyles, tooltipContainerStylesStickyHeader, tooltipContainerStylesStickyHeaderWithMarksFix]
   }, tooltipPressable()));

package/dist/es2019/blockControlsPlugin.js

@@ -25,12 +25,10 @@ export const blockControlsPlugin = ({
       }) => createPlugin(api, getIntl, nodeViewPortalProviderAPI)
     }];
     if (editorExperiment('platform_editor_controls', 'variant1')) {
-      if (fg('platform_editor_controls_widget_visibility')) {
-        pmPlugins.push({
-          name: 'blockControlsInteractionTrackingPlugin',
-          plugin: createInteractionTrackingPlugin
-        });
-      }
+      pmPlugins.push({
+        name: 'blockControlsInteractionTrackingPlugin',
+        plugin: createInteractionTrackingPlugin
+      });
       pmPlugins.push({
         name: 'firstNodeDec',
         plugin: firstNodeDecPlugin

package/dist/es2019/pm-plugins/decorations-drag-handle.js

@@ -129,7 +129,7 @@ export const dragHandleDecoration = ({
     // 		key,
     // 	);
 
-    if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility')) {
+    if (editorExperiment('platform_editor_controls', 'variant1')) {
       ReactDOM.render( /*#__PURE__*/createElement(DragHandleWithVisibility, {
         view,
         api,

package/dist/es2019/pm-plugins/decorations-quick-insert-button.js

@@ -3,7 +3,7 @@ import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { QuickInsertWithVisibility, TypeAheadControl } from '../ui/quick-insert-button';
+import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
 import { getActiveBlockMarks } from './utils/marks';
 import { createVanillaButton } from './vanilla-quick-insert';
 const TYPE_QUICK_INSERT = 'INSERT_BUTTON';
@@ -80,33 +80,17 @@ export const quickInsertButtonDecoration = ({
       element.appendChild(vanillaElement);
       return element;
     }
-
-    // all changes already under experiment
-    if (fg('platform_editor_controls_widget_visibility')) {
-      nodeViewPortalProviderAPI.render(() => /*#__PURE__*/createElement(QuickInsertWithVisibility, {
-        api,
-        getPos,
-        formatMessage,
-        view,
-        nodeType,
-        anchorName,
-        rootAnchorName,
-        rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
-        anchorRectCache
-      }), element, key);
-    } else {
-      nodeViewPortalProviderAPI.render(() => /*#__PURE__*/createElement(TypeAheadControl, {
-        api,
-        getPos,
-        formatMessage,
-        view,
-        nodeType,
-        anchorName,
-        rootAnchorName,
-        rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
-        anchorRectCache
-      }), element, key);
-    }
+    nodeViewPortalProviderAPI.render(() => /*#__PURE__*/createElement(QuickInsertWithVisibility, {
+      api,
+      getPos,
+      formatMessage,
+      view,
+      nodeType,
+      anchorName,
+      rootAnchorName,
+      rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
+      anchorRectCache
+    }), element, key);
     return element;
   }, widgetSpec);
 };

package/dist/es2019/pm-plugins/utils/getSelection.js

@@ -99,7 +99,7 @@ const newGetSelection = (tr, start) => {
   return new TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
 };
 export const getSelection = (tr, start) => {
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     return newGetSelection(tr, start);
   }
   return oldGetSelection(tr, start);
@@ -130,7 +130,7 @@ export const setCursorPositionAtMovedNode = (tr, start) => {
   }
 
   // this is a fix for empty paragraph selection - can safely use start position as the paragraph is empty
-  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'paragraph' && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility')) {
+  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'paragraph' && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && editorExperiment('platform_editor_controls', 'variant1')) {
     const selection = new TextSelection(tr.doc.resolve(start));
     tr.setSelection(selection);
     return tr;

package/dist/es2019/ui/global-styles.js

@@ -340,6 +340,6 @@ export const GlobalStylesWrapper = ({
     disabled: !expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true) || !fg('platform_editor_block_controls_perf_opt_patch_1')
   });
   return jsx(Global, {
-    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, fg('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
+    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, editorExperiment('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, fg('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
   });
 };

package/dist/es2019/ui/quick-insert-button.js

@@ -16,7 +16,6 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import AddIcon from '@atlaskit/icon/core/add';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Pressable, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { getControlBottomCSSValue, getControlHeightCSSValue, getNodeHeight, getTopPosition, shouldBeSticky } from '../pm-plugins/utils/drag-handle-positions';
@@ -27,15 +26,6 @@ import { isInTextSelection, isNestedNodeSelected, isNonEditableBlock, isSelectio
 import { createNewLine } from './utils/editor-commands';
 import { VisibilityContainer } from './visibility-container';
 const TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
-const disabledStyles = xcss({
-  pointerEvents: 'none',
-  ':hover': {
-    backgroundColor: 'color.background.disabled'
-  },
-  ':active': {
-    backgroundColor: 'color.background.disabled'
-  }
-});
 const stickyButtonStyles = xcss({
   top: '0',
   position: 'sticky',
@@ -65,9 +55,6 @@ const containerStaticStyles = xcss({
   position: 'absolute',
   zIndex: 'card'
 });
-const disabledContainerStyles = xcss({
-  cursor: 'not-allowed'
-});
 const tooltipContainerStyles = css({
   top: '8px',
   bottom: '-8px',
@@ -106,7 +93,6 @@ export const TypeAheadControl = ({
   anchorRectCache
 }) => {
   const macroInteractionUpdates = useSharedPluginStateSelector(api, 'featureFlags.macroInteractionUpdates');
-  const isTypeAheadOpen = useSharedPluginStateSelector(api, 'typeAhead.isOpen');
   const [positionStyles, setPositionStyles] = useState({
     display: 'none'
   });
@@ -285,20 +271,19 @@ export const TypeAheadControl = ({
     testId: "editor-quick-insert-button",
     type: "button",
     "aria-label": formatMessage(messages.insert),
-    xcss: [stickyButtonStyles, isTypeAheadOpen && !fg('platform_editor_controls_widget_visibility') ? disabledStyles : undefined],
+    xcss: [stickyButtonStyles],
     onClick: handleQuickInsert,
-    onMouseDown: handleMouseDown,
-    isDisabled: !fg('platform_editor_controls_widget_visibility') && isTypeAheadOpen
+    onMouseDown: handleMouseDown
   }, jsx(AddIcon, {
     label: "add",
-    color: isTypeAheadOpen && !fg('platform_editor_controls_widget_visibility') ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon-subtle, #626F86)",
+    color: "var(--ds-icon-subtle, #626F86)",
     size: "small"
   })));
   return jsx(Box
   // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
   , {
     style: positionStyles,
-    xcss: [containerStaticStyles, isTypeAheadOpen && !fg('platform_editor_controls_widget_visibility') && disabledContainerStyles]
+    xcss: [containerStaticStyles]
   }, jsx("span", {
     css: [tooltipContainerStyles, tooltipContainerStylesStickyHeader, tooltipContainerStylesStickyHeaderWithMarksFix]
   }, tooltipPressable()));

package/dist/esm/blockControlsPlugin.js

@@ -29,12 +29,10 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         }
       }];
       if (editorExperiment('platform_editor_controls', 'variant1')) {
-        if (fg('platform_editor_controls_widget_visibility')) {
-          pmPlugins.push({
-            name: 'blockControlsInteractionTrackingPlugin',
-            plugin: createInteractionTrackingPlugin
-          });
-        }
+        pmPlugins.push({
+          name: 'blockControlsInteractionTrackingPlugin',
+          plugin: createInteractionTrackingPlugin
+        });
         pmPlugins.push({
           name: 'firstNodeDec',
           plugin: firstNodeDecPlugin

package/dist/esm/pm-plugins/decorations-drag-handle.js

@@ -130,7 +130,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
     // 		key,
     // 	);
 
-    if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility')) {
+    if (editorExperiment('platform_editor_controls', 'variant1')) {
       ReactDOM.render( /*#__PURE__*/createElement(DragHandleWithVisibility, {
         view: view,
         api: api,

package/dist/esm/pm-plugins/decorations-quick-insert-button.js

@@ -3,7 +3,7 @@ import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { QuickInsertWithVisibility, TypeAheadControl } from '../ui/quick-insert-button';
+import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
 import { getActiveBlockMarks } from './utils/marks';
 import { createVanillaButton } from './vanilla-quick-insert';
 var TYPE_QUICK_INSERT = 'INSERT_BUTTON';
@@ -81,37 +81,19 @@ export var quickInsertButtonDecoration = function quickInsertButtonDecoration(_r
       element.appendChild(vanillaElement);
       return element;
     }
-
-    // all changes already under experiment
-    if (fg('platform_editor_controls_widget_visibility')) {
-      nodeViewPortalProviderAPI.render(function () {
-        return /*#__PURE__*/createElement(QuickInsertWithVisibility, {
-          api: api,
-          getPos: getPos,
-          formatMessage: formatMessage,
-          view: view,
-          nodeType: nodeType,
-          anchorName: anchorName,
-          rootAnchorName: rootAnchorName,
-          rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
-          anchorRectCache: anchorRectCache
-        });
-      }, element, key);
-    } else {
-      nodeViewPortalProviderAPI.render(function () {
-        return /*#__PURE__*/createElement(TypeAheadControl, {
-          api: api,
-          getPos: getPos,
-          formatMessage: formatMessage,
-          view: view,
-          nodeType: nodeType,
-          anchorName: anchorName,
-          rootAnchorName: rootAnchorName,
-          rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
-          anchorRectCache: anchorRectCache
-        });
-      }, element, key);
-    }
+    nodeViewPortalProviderAPI.render(function () {
+      return /*#__PURE__*/createElement(QuickInsertWithVisibility, {
+        api: api,
+        getPos: getPos,
+        formatMessage: formatMessage,
+        view: view,
+        nodeType: nodeType,
+        anchorName: anchorName,
+        rootAnchorName: rootAnchorName,
+        rootNodeType: rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType,
+        anchorRectCache: anchorRectCache
+      });
+    }, element, key);
     return element;
   }, widgetSpec);
 };

package/dist/esm/pm-plugins/utils/getSelection.js

@@ -97,7 +97,7 @@ var newGetSelection = function newGetSelection(tr, start) {
   return new TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
 };
 export var getSelection = function getSelection(tr, start) {
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     return newGetSelection(tr, start);
   }
   return oldGetSelection(tr, start);
@@ -128,7 +128,7 @@ export var setCursorPositionAtMovedNode = function setCursorPositionAtMovedNode(
   }
 
   // this is a fix for empty paragraph selection - can safely use start position as the paragraph is empty
-  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'paragraph' && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility')) {
+  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'paragraph' && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && editorExperiment('platform_editor_controls', 'variant1')) {
     var _selection = new TextSelection(tr.doc.resolve(start));
     tr.setSelection(_selection);
     return tr;

package/dist/esm/ui/global-styles.js

@@ -300,6 +300,6 @@ export var GlobalStylesWrapper = function GlobalStylesWrapper(_ref) {
     disabled: !expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true) || !fg('platform_editor_block_controls_perf_opt_patch_1')
   });
   return jsx(Global, {
-    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_widget_visibility') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, fg('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
+    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, editorExperiment('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, fg('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
   });
 };

package/dist/esm/ui/quick-insert-button.js

@@ -20,7 +20,6 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import AddIcon from '@atlaskit/icon/core/add';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Pressable, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { getControlBottomCSSValue, getControlHeightCSSValue, getNodeHeight, getTopPosition, shouldBeSticky } from '../pm-plugins/utils/drag-handle-positions';
@@ -31,15 +30,6 @@ import { isInTextSelection, isNestedNodeSelected, isNonEditableBlock, isSelectio
 import { createNewLine } from './utils/editor-commands';
 import { VisibilityContainer } from './visibility-container';
 var TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
-var disabledStyles = xcss({
-  pointerEvents: 'none',
-  ':hover': {
-    backgroundColor: 'color.background.disabled'
-  },
-  ':active': {
-    backgroundColor: 'color.background.disabled'
-  }
-});
 var stickyButtonStyles = xcss({
   top: '0',
   position: 'sticky',
@@ -69,9 +59,6 @@ var containerStaticStyles = xcss({
   position: 'absolute',
   zIndex: 'card'
 });
-var disabledContainerStyles = xcss({
-  cursor: 'not-allowed'
-});
 var tooltipContainerStyles = css({
   top: '8px',
   bottom: '-8px',
@@ -109,7 +96,6 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
     rootNodeType = _ref.rootNodeType,
     anchorRectCache = _ref.anchorRectCache;
   var macroInteractionUpdates = useSharedPluginStateSelector(api, 'featureFlags.macroInteractionUpdates');
-  var isTypeAheadOpen = useSharedPluginStateSelector(api, 'typeAhead.isOpen');
   var _useState = useState({
       display: 'none'
     }),
@@ -285,13 +271,12 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
       testId: "editor-quick-insert-button",
       type: "button",
       "aria-label": formatMessage(messages.insert),
-      xcss: [stickyButtonStyles, isTypeAheadOpen && !fg('platform_editor_controls_widget_visibility') ? disabledStyles : undefined],
+      xcss: [stickyButtonStyles],
       onClick: handleQuickInsert,
-      onMouseDown: handleMouseDown,
-      isDisabled: !fg('platform_editor_controls_widget_visibility') && isTypeAheadOpen
+      onMouseDown: handleMouseDown
     }, jsx(AddIcon, {
       label: "add",
-      color: isTypeAheadOpen && !fg('platform_editor_controls_widget_visibility') ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon-subtle, #626F86)",
+      color: "var(--ds-icon-subtle, #626F86)",
       size: "small"
     })));
   };
@@ -299,7 +284,7 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
   , {
     style: positionStyles,
-    xcss: [containerStaticStyles, isTypeAheadOpen && !fg('platform_editor_controls_widget_visibility') && disabledContainerStyles]
+    xcss: [containerStaticStyles]
   }, jsx("span", {
     css: [tooltipContainerStyles, tooltipContainerStylesStickyHeader, tooltipContainerStylesStickyHeaderWithMarksFix]
   }, tooltipPressable()));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "4.0.2",
+	"version": "4.0.4",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^47.6.0",
+		"@atlaskit/adf-schema": "^49.0.6",
 		"@atlaskit/editor-plugin-accessibility-utils": "^3.0.0",
 		"@atlaskit/editor-plugin-analytics": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^3.0.0",
@@ -53,9 +53,9 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^14.10.0",
-		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.1.0",
-		"@atlaskit/tokens": "^5.4.0",
+		"@atlaskit/theme": "^19.0.0",
+		"@atlaskit/tmp-editor-statsig": "^9.6.0",
+		"@atlaskit/tokens": "^5.5.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.7.0",
+		"@atlaskit/editor-common": "^107.8.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -152,9 +152,6 @@
 		"platform_editor_fix_safari_cursor_hidden_empty": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_widget_visibility": {
-			"type": "boolean"
-		},
 		"platform_editor_drag_and_drop_perf_analytics": {
 			"type": "boolean"
 		},