@atlaskit/editor-plugin-block-controls 3.13.7 → 3.13.9

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.13.9
+
+### Patch Changes
+
+- [#151481](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/151481)
+  [`57d45d9fbcb6d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/57d45d9fbcb6d) -
+  Remove FG platform_editor_controls_sticky_mask
+- Updated dependencies
+
+## 3.13.8
+
+### Patch Changes
+
+- [#152650](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/152650)
+  [`d5514d2d48aef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d5514d2d48aef) -
+  Refactor to use sharedPluginStateHookMigratorFactory
+
 ## 3.13.7
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils/drag-handle-positions.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shouldMaskNodeControls = exports.shouldBeSticky = exports.getTopPosition = exports.getNodeHeight = exports.getLeftPosition = exports.getControlHeightCSSValue = exports.getControlBottomCSSValue = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("../../ui/consts");
 var STICKY_NODES = ['panel', 'table', 'expand', 'layoutSection', 'bodiedExtension'];
@@ -77,6 +76,6 @@ var getControlHeightCSSValue = exports.getControlHeightCSSValue = function getCo
 var shouldMaskNodeControls = exports.shouldMaskNodeControls = function shouldMaskNodeControls(nodeType, isTopLevelNode) {
   return (
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    isTopLevelNode && ['table'].includes(nodeType) && (0, _platformFeatureFlags.fg)('platform_editor_controls_sticky_mask') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')
+    isTopLevelNode && ['table'].includes(nodeType) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')
   );
 };

package/dist/cjs/ui/block-menu.js

@@ -12,9 +12,23 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockMenuItems = require("./block-menu-items");
 var _consts = require("./consts");
+var useBlockMenuPluginState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var isMenuOpen = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.isMenuOpen');
+  var menuTriggerBy = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.menuTriggerBy');
+  return {
+    isMenuOpen: isMenuOpen,
+    menuTriggerBy: menuTriggerBy
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['blockControls']),
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  return {
+    isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen,
+    menuTriggerBy: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy
+  };
+});
 var BlockMenu = function BlockMenu(_ref) {
   var editorView = _ref.editorView,
     mountPoint = _ref.mountPoint,
@@ -22,22 +36,9 @@ var BlockMenu = function BlockMenu(_ref) {
     scrollableElement = _ref.scrollableElement,
     api = _ref.api,
     formatMessage = _ref.intl.formatMessage;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['blockControls'], {
-      disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true)
-    }),
-    blockControlsState = _useSharedPluginState.blockControlsState;
-
-  // isMenuOpen
-  var isMenuOpenSelector = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.isMenuOpen', {
-    disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', false)
-  });
-  var isMenuOpen = (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true) ? isMenuOpenSelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen;
-
-  // menuTriggerBy
-  var menuTriggerBySelector = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.menuTriggerBy', {
-    disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', false)
-  });
-  var menuTriggerBy = (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true) ? menuTriggerBySelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy;
+  var _useBlockMenuPluginSt = useBlockMenuPluginState(api),
+    isMenuOpen = _useBlockMenuPluginSt.isMenuOpen,
+    menuTriggerBy = _useBlockMenuPluginSt.menuTriggerBy;
   if (isMenuOpen) {
     return null;
   }

package/dist/cjs/ui/drag-handle-menu.js

@@ -8,16 +8,21 @@ exports.DragHandleMenu = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var useDragHandleMenuPluginState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var isMenuOpen = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.isMenuOpen');
+  return {
+    isMenuOpen: isMenuOpen
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['blockControls']),
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  return {
+    isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen
+  };
+});
 var DragHandleMenu = exports.DragHandleMenu = function DragHandleMenu(_ref) {
   var api = _ref.api;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['blockControls'], {
-      disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true)
-    }),
-    blockControlsState = _useSharedPluginState.blockControlsState;
-  var isMenuOpenSelector = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.isMenuOpen', {
-    disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', false)
-  });
-  var isMenuOpen = (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true) ? isMenuOpenSelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen;
+  var _useDragHandleMenuPlu = useDragHandleMenuPluginState(api),
+    isMenuOpen = _useDragHandleMenuPlu.isMenuOpen;
   return isMenuOpen ? /*#__PURE__*/_react.default.createElement("div", null, "menu") : null;
 };

package/dist/cjs/ui/drag-handle.js

@@ -248,6 +248,18 @@ var getNodeMargins = function getNodeMargins(node) {
   }
   return _consts.nodeMargins[nodeTypeName] || _consts.nodeMargins['default'];
 };
+var useDragHandlePluginState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var macroInteractionUpdates = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'featureFlags.macroInteractionUpdates');
+  return {
+    macroInteractionUpdates: macroInteractionUpdates
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['featureFlags']),
+    featureFlagsState = _useSharedPluginState.featureFlagsState;
+  return {
+    macroInteractionUpdates: featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates
+  };
+});
 var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   var _api$core2, _api$blockControls3, _api$analytics2, _api$core4;
   var view = _ref.view,
@@ -274,14 +286,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     dragHandleDisabled = _useState6[0],
     setDragHandleDisabled = _useState6[1];
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['featureFlags'], {
-      disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true)
-    }),
-    featureFlagsState = _useSharedPluginState.featureFlagsState;
-  var macroInteractionUpdatesSelector = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'featureFlags.macroInteractionUpdates', {
-    disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', false)
-  });
-  var macroInteractionUpdates = (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true) ? macroInteractionUpdatesSelector : featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates;
+  var _useDragHandlePluginS = useDragHandlePluginState(api),
+    macroInteractionUpdates = _useDragHandlePluginS.macroInteractionUpdates;
   var selection = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'selection.selection');
   var isShiftDown = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.isShiftDown');
   var hasHadInteraction = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'interaction.hasHadInteraction') !== false;

package/dist/cjs/ui/drop-target.js

@@ -180,6 +180,18 @@ var HoverZone = function HoverZone(_ref) {
     heightStyle, isFullHeightInLayout && fullHeightStyleAdjustZIndexStyle]
   });
 };
+var useDropTargetPluginState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var lineLength = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'width.lineLength');
+  return {
+    lineLength: lineLength
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width']),
+    widthState = _useSharedPluginState.widthState;
+  return {
+    lineLength: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength
+  };
+});
 var DropTarget = exports.DropTarget = function DropTarget(props) {
   var _api$blockControls;
   var api = props.api,
@@ -196,16 +208,8 @@ var DropTarget = exports.DropTarget = function DropTarget(props) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isDraggedOver = _useState2[0],
     setIsDraggedOver = _useState2[1];
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width'], {
-      disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true)
-    }),
-    widthState = _useSharedPluginState.widthState;
-
-  // lineLength
-  var lineLengthSelector = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'width.lineLength', {
-    disabled: (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', false)
-  });
-  var lineLength = (0, _experiments.editorExperiment)('platform_editor_usesharedpluginstateselector', true) ? lineLengthSelector : widthState === null || widthState === void 0 ? void 0 : widthState.lineLength;
+  var _useDropTargetPluginS = useDropTargetPluginState(api),
+    lineLength = _useDropTargetPluginS.lineLength;
   var isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
   var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     activeNode = _ref2.activeNode;

package/dist/es2019/pm-plugins/utils/drag-handle-positions.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, DRAG_HANDLE_H1_TOP_ADJUSTMENT, DRAG_HANDLE_H2_TOP_ADJUSTMENT, DRAG_HANDLE_H4_TOP_ADJUSTMENT, DRAG_HANDLE_H5_TOP_ADJUSTMENT, DRAG_HANDLE_H6_TOP_ADJUSTMENT, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT, DRAG_HANDLE_WIDTH, dragHandleGap } from '../../ui/consts';
 const STICKY_NODES = ['panel', 'table', 'expand', 'layoutSection', 'bodiedExtension'];
@@ -69,6 +68,6 @@ export const getControlHeightCSSValue = (nodeHeight, isSticky, isTopLevelNode, f
 export const shouldMaskNodeControls = (nodeType, isTopLevelNode) => {
   return (
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    isTopLevelNode && ['table'].includes(nodeType) && fg('platform_editor_controls_sticky_mask') && editorExperiment('platform_editor_controls', 'variant1')
+    isTopLevelNode && ['table'].includes(nodeType) && editorExperiment('platform_editor_controls', 'variant1')
   );
 };

package/dist/es2019/ui/block-menu.js

@@ -1,13 +1,28 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getBlockMenuItems, menuItemsCallback } from './block-menu-items';
 import { BLOCK_MENU_WIDTH } from './consts';
+const useBlockMenuPluginState = sharedPluginStateHookMigratorFactory(api => {
+  const isMenuOpen = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen');
+  const menuTriggerBy = useSharedPluginStateSelector(api, 'blockControls.menuTriggerBy');
+  return {
+    isMenuOpen,
+    menuTriggerBy
+  };
+}, api => {
+  const {
+    blockControlsState
+  } = useSharedPluginState(api, ['blockControls']);
+  return {
+    isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen,
+    menuTriggerBy: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy
+  };
+});
 const BlockMenu = ({
   editorView,
   mountPoint,
@@ -19,22 +34,9 @@ const BlockMenu = ({
   }
 }) => {
   const {
-    blockControlsState
-  } = useSharedPluginState(api, ['blockControls'], {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-  });
-
-  // isMenuOpen
-  const isMenuOpenSelector = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  const isMenuOpen = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? isMenuOpenSelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen;
-
-  // menuTriggerBy
-  const menuTriggerBySelector = useSharedPluginStateSelector(api, 'blockControls.menuTriggerBy', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  const menuTriggerBy = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? menuTriggerBySelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy;
+    isMenuOpen,
+    menuTriggerBy
+  } = useBlockMenuPluginState(api);
   if (isMenuOpen) {
     return null;
   }

package/dist/es2019/ui/drag-handle-menu.js

@@ -1,18 +1,24 @@
 import React from 'react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+const useDragHandleMenuPluginState = sharedPluginStateHookMigratorFactory(api => {
+  const isMenuOpen = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen');
+  return {
+    isMenuOpen
+  };
+}, api => {
+  const {
+    blockControlsState
+  } = useSharedPluginState(api, ['blockControls']);
+  return {
+    isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen
+  };
+});
 export const DragHandleMenu = ({
   api
 }) => {
   const {
-    blockControlsState
-  } = useSharedPluginState(api, ['blockControls'], {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-  });
-  const isMenuOpenSelector = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  const isMenuOpen = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? isMenuOpenSelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen;
+    isMenuOpen
+  } = useDragHandleMenuPluginState(api);
   return isMenuOpen ? /*#__PURE__*/React.createElement("div", null, "menu") : null;
 };

package/dist/es2019/ui/drag-handle.js

@@ -10,7 +10,7 @@ import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { tableControlsSpacing } from '@atlaskit/editor-common/styles';
@@ -240,6 +240,19 @@ const getNodeMargins = node => {
   }
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
+const useDragHandlePluginState = sharedPluginStateHookMigratorFactory(api => {
+  const macroInteractionUpdates = useSharedPluginStateSelector(api, 'featureFlags.macroInteractionUpdates');
+  return {
+    macroInteractionUpdates
+  };
+}, api => {
+  const {
+    featureFlagsState
+  } = useSharedPluginState(api, ['featureFlags']);
+  return {
+    macroInteractionUpdates: featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates
+  };
+});
 export const DragHandle = ({
   view,
   api,
@@ -258,14 +271,8 @@ export const DragHandle = ({
   const [dragHandleSelected, setDragHandleSelected] = useState(false);
   const [dragHandleDisabled, setDragHandleDisabled] = useState(false);
   const {
-    featureFlagsState
-  } = useSharedPluginState(api, ['featureFlags'], {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-  });
-  const macroInteractionUpdatesSelector = useSharedPluginStateSelector(api, 'featureFlags.macroInteractionUpdates', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  const macroInteractionUpdates = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? macroInteractionUpdatesSelector : featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates;
+    macroInteractionUpdates
+  } = useDragHandlePluginState(api);
   const selection = useSharedPluginStateSelector(api, 'selection.selection');
   const isShiftDown = useSharedPluginStateSelector(api, 'blockControls.isShiftDown');
   const hasHadInteraction = useSharedPluginStateSelector(api, 'interaction.hasHadInteraction') !== false;

package/dist/es2019/ui/drop-target.js

@@ -7,7 +7,7 @@ import { Fragment, useEffect, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -168,6 +168,19 @@ const HoverZone = ({
     heightStyle, isFullHeightInLayout && fullHeightStyleAdjustZIndexStyle]
   });
 };
+const useDropTargetPluginState = sharedPluginStateHookMigratorFactory(api => {
+  const lineLength = useSharedPluginStateSelector(api, 'width.lineLength');
+  return {
+    lineLength
+  };
+}, api => {
+  const {
+    widthState
+  } = useSharedPluginState(api, ['width']);
+  return {
+    lineLength: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength
+  };
+});
 export const DropTarget = props => {
   var _api$blockControls;
   const {
@@ -183,16 +196,8 @@ export const DropTarget = props => {
   } = props;
   const [isDraggedOver, setIsDraggedOver] = useState(false);
   const {
-    widthState
-  } = useSharedPluginState(api, ['width'], {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-  });
-
-  // lineLength
-  const lineLengthSelector = useSharedPluginStateSelector(api, 'width.lineLength', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  const lineLength = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? lineLengthSelector : widthState === null || widthState === void 0 ? void 0 : widthState.lineLength;
+    lineLength
+  } = useDropTargetPluginState(api);
   const isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
   const {
     activeNode

package/dist/esm/pm-plugins/utils/drag-handle-positions.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT, DRAG_HANDLE_H1_TOP_ADJUSTMENT, DRAG_HANDLE_H2_TOP_ADJUSTMENT, DRAG_HANDLE_H4_TOP_ADJUSTMENT, DRAG_HANDLE_H5_TOP_ADJUSTMENT, DRAG_HANDLE_H6_TOP_ADJUSTMENT, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT, DRAG_HANDLE_WIDTH, dragHandleGap } from '../../ui/consts';
 var STICKY_NODES = ['panel', 'table', 'expand', 'layoutSection', 'bodiedExtension'];
@@ -71,6 +70,6 @@ export var getControlHeightCSSValue = function getControlHeightCSSValue(nodeHeig
 export var shouldMaskNodeControls = function shouldMaskNodeControls(nodeType, isTopLevelNode) {
   return (
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    isTopLevelNode && ['table'].includes(nodeType) && fg('platform_editor_controls_sticky_mask') && editorExperiment('platform_editor_controls', 'variant1')
+    isTopLevelNode && ['table'].includes(nodeType) && editorExperiment('platform_editor_controls', 'variant1')
   );
 };

package/dist/esm/ui/block-menu.js

@@ -1,13 +1,27 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getBlockMenuItems, menuItemsCallback } from './block-menu-items';
 import { BLOCK_MENU_WIDTH } from './consts';
+var useBlockMenuPluginState = sharedPluginStateHookMigratorFactory(function (api) {
+  var isMenuOpen = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen');
+  var menuTriggerBy = useSharedPluginStateSelector(api, 'blockControls.menuTriggerBy');
+  return {
+    isMenuOpen: isMenuOpen,
+    menuTriggerBy: menuTriggerBy
+  };
+}, function (api) {
+  var _useSharedPluginState = useSharedPluginState(api, ['blockControls']),
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  return {
+    isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen,
+    menuTriggerBy: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy
+  };
+});
 var BlockMenu = function BlockMenu(_ref) {
   var editorView = _ref.editorView,
     mountPoint = _ref.mountPoint,
@@ -15,22 +29,9 @@ var BlockMenu = function BlockMenu(_ref) {
     scrollableElement = _ref.scrollableElement,
     api = _ref.api,
     formatMessage = _ref.intl.formatMessage;
-  var _useSharedPluginState = useSharedPluginState(api, ['blockControls'], {
-      disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-    }),
-    blockControlsState = _useSharedPluginState.blockControlsState;
-
-  // isMenuOpen
-  var isMenuOpenSelector = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  var isMenuOpen = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? isMenuOpenSelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen;
-
-  // menuTriggerBy
-  var menuTriggerBySelector = useSharedPluginStateSelector(api, 'blockControls.menuTriggerBy', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  var menuTriggerBy = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? menuTriggerBySelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy;
+  var _useBlockMenuPluginSt = useBlockMenuPluginState(api),
+    isMenuOpen = _useBlockMenuPluginSt.isMenuOpen,
+    menuTriggerBy = _useBlockMenuPluginSt.menuTriggerBy;
   if (isMenuOpen) {
     return null;
   }

package/dist/esm/ui/drag-handle-menu.js

@@ -1,16 +1,21 @@
 import React from 'react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+var useDragHandleMenuPluginState = sharedPluginStateHookMigratorFactory(function (api) {
+  var isMenuOpen = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen');
+  return {
+    isMenuOpen: isMenuOpen
+  };
+}, function (api) {
+  var _useSharedPluginState = useSharedPluginState(api, ['blockControls']),
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  return {
+    isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen
+  };
+});
 export var DragHandleMenu = function DragHandleMenu(_ref) {
   var api = _ref.api;
-  var _useSharedPluginState = useSharedPluginState(api, ['blockControls'], {
-      disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-    }),
-    blockControlsState = _useSharedPluginState.blockControlsState;
-  var isMenuOpenSelector = useSharedPluginStateSelector(api, 'blockControls.isMenuOpen', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  var isMenuOpen = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? isMenuOpenSelector : blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen;
+  var _useDragHandleMenuPlu = useDragHandleMenuPluginState(api),
+    isMenuOpen = _useDragHandleMenuPlu.isMenuOpen;
   return isMenuOpen ? /*#__PURE__*/React.createElement("div", null, "menu") : null;
 };

package/dist/esm/ui/drag-handle.js

@@ -15,7 +15,7 @@ import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { tableControlsSpacing } from '@atlaskit/editor-common/styles';
@@ -245,6 +245,18 @@ var getNodeMargins = function getNodeMargins(node) {
   }
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
+var useDragHandlePluginState = sharedPluginStateHookMigratorFactory(function (api) {
+  var macroInteractionUpdates = useSharedPluginStateSelector(api, 'featureFlags.macroInteractionUpdates');
+  return {
+    macroInteractionUpdates: macroInteractionUpdates
+  };
+}, function (api) {
+  var _useSharedPluginState = useSharedPluginState(api, ['featureFlags']),
+    featureFlagsState = _useSharedPluginState.featureFlagsState;
+  return {
+    macroInteractionUpdates: featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates
+  };
+});
 export var DragHandle = function DragHandle(_ref) {
   var _api$core2, _api$blockControls3, _api$analytics2, _api$core4;
   var view = _ref.view,
@@ -271,14 +283,8 @@ export var DragHandle = function DragHandle(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     dragHandleDisabled = _useState6[0],
     setDragHandleDisabled = _useState6[1];
-  var _useSharedPluginState = useSharedPluginState(api, ['featureFlags'], {
-      disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-    }),
-    featureFlagsState = _useSharedPluginState.featureFlagsState;
-  var macroInteractionUpdatesSelector = useSharedPluginStateSelector(api, 'featureFlags.macroInteractionUpdates', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  var macroInteractionUpdates = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? macroInteractionUpdatesSelector : featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates;
+  var _useDragHandlePluginS = useDragHandlePluginState(api),
+    macroInteractionUpdates = _useDragHandlePluginS.macroInteractionUpdates;
   var selection = useSharedPluginStateSelector(api, 'selection.selection');
   var isShiftDown = useSharedPluginStateSelector(api, 'blockControls.isShiftDown');
   var hasHadInteraction = useSharedPluginStateSelector(api, 'interaction.hasHadInteraction') !== false;

package/dist/esm/ui/drop-target.js

@@ -9,7 +9,7 @@ import { Fragment, useEffect, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -172,6 +172,18 @@ var HoverZone = function HoverZone(_ref) {
     heightStyle, isFullHeightInLayout && fullHeightStyleAdjustZIndexStyle]
   });
 };
+var useDropTargetPluginState = sharedPluginStateHookMigratorFactory(function (api) {
+  var lineLength = useSharedPluginStateSelector(api, 'width.lineLength');
+  return {
+    lineLength: lineLength
+  };
+}, function (api) {
+  var _useSharedPluginState = useSharedPluginState(api, ['width']),
+    widthState = _useSharedPluginState.widthState;
+  return {
+    lineLength: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength
+  };
+});
 export var DropTarget = function DropTarget(props) {
   var _api$blockControls;
   var api = props.api,
@@ -188,16 +200,8 @@ export var DropTarget = function DropTarget(props) {
     _useState2 = _slicedToArray(_useState, 2),
     isDraggedOver = _useState2[0],
     setIsDraggedOver = _useState2[1];
-  var _useSharedPluginState = useSharedPluginState(api, ['width'], {
-      disabled: editorExperiment('platform_editor_usesharedpluginstateselector', true)
-    }),
-    widthState = _useSharedPluginState.widthState;
-
-  // lineLength
-  var lineLengthSelector = useSharedPluginStateSelector(api, 'width.lineLength', {
-    disabled: editorExperiment('platform_editor_usesharedpluginstateselector', false)
-  });
-  var lineLength = editorExperiment('platform_editor_usesharedpluginstateselector', true) ? lineLengthSelector : widthState === null || widthState === void 0 ? void 0 : widthState.lineLength;
+  var _useDropTargetPluginS = useDropTargetPluginState(api),
+    lineLength = _useDropTargetPluginS.lineLength;
   var isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
   var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     activeNode = _ref2.activeNode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.13.7",
+	"version": "3.13.9",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
 		"@atlaskit/editor-plugin-interaction": "^1.0.0",
 		"@atlaskit/editor-plugin-metrics": "^3.4.0",
-		"@atlaskit/editor-plugin-quick-insert": "^2.4.0",
+		"@atlaskit/editor-plugin-quick-insert": "^2.5.0",
 		"@atlaskit/editor-plugin-selection": "^2.2.0",
 		"@atlaskit/editor-plugin-type-ahead": "^2.6.0",
 		"@atlaskit/editor-plugin-user-intent": "^0.1.0",
@@ -178,9 +178,6 @@
 		"platform_editor_user_intent_plugin": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_sticky_mask": {
-			"type": "boolean"
-		},
 		"platform_editor_no_selection_until_interaction": {
 			"type": "boolean"
 		},