@atlaskit/editor-plugin-block-controls 20.1.2 → 20.1.4

package/dist/cjs/ui/block-controls-surface-components.js

@@ -0,0 +1,142 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getBlockControlsRightSurfaceComponents = exports.getBlockControlsLeftSurfaceComponents = exports.BlockControlsVisibilityProvider = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys");
+var _surfaceRenderer = require("@atlaskit/editor-ui-control-model/surface-renderer");
+var _partitionComponentsByPersistence = require("./utils/partition-components-by-persistence");
+var _visibilityContainer = require("./visibility-container");
+var _excluded = ["isHidden"];
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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; }
+var BlockControlsVisibilityContext = /*#__PURE__*/(0, _react.createContext)({
+  shouldHideHoverControls: false,
+  useCssStyles: false
+});
+var BlockControlItem = function BlockControlItem(_ref) {
+  var children = _ref.children;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    "data-editor-block-control-item": true
+  }, children);
+};
+var HoverBlockControlItem = function HoverBlockControlItem(_ref2) {
+  var children = _ref2.children;
+  var _useContext = (0, _react.useContext)(BlockControlsVisibilityContext),
+    shouldHideHoverControls = _useContext.shouldHideHoverControls,
+    useCssStyles = _useContext.useCssStyles;
+  return /*#__PURE__*/_react.default.createElement(BlockControlItem, null, /*#__PURE__*/_react.default.createElement(_visibilityContainer.VisibilityWrapper, {
+    shouldHide: shouldHideHoverControls,
+    useCssStyles: useCssStyles
+  }, children));
+};
+var PersistentBlockControlItem = function PersistentBlockControlItem(_ref3) {
+  var children = _ref3.children;
+  var _useContext2 = (0, _react.useContext)(BlockControlsVisibilityContext),
+    useCssStyles = _useContext2.useCssStyles;
+  return /*#__PURE__*/_react.default.createElement(BlockControlItem, null, /*#__PURE__*/_react.default.createElement(_visibilityContainer.VisibilityWrapper, {
+    shouldHide: false,
+    useCssStyles: useCssStyles
+  }, children));
+};
+var BlockControlsVisibilityProvider = exports.BlockControlsVisibilityProvider = function BlockControlsVisibilityProvider(_ref4) {
+  var children = _ref4.children,
+    shouldHideHoverControls = _ref4.shouldHideHoverControls,
+    useCssStyles = _ref4.useCssStyles;
+  var value = (0, _react.useMemo)(function () {
+    return {
+      shouldHideHoverControls: shouldHideHoverControls,
+      useCssStyles: useCssStyles
+    };
+  }, [shouldHideHoverControls, useCssStyles]);
+  return /*#__PURE__*/_react.default.createElement(BlockControlsVisibilityContext.Provider, {
+    value: value
+  }, children);
+};
+var withoutVisibilityPredicate = function withoutVisibilityPredicate(component) {
+  var _isHidden = component.isHidden,
+    visibleComponent = (0, _objectWithoutProperties2.default)(component, _excluded);
+  return visibleComponent;
+};
+
+/**
+ * Replaces the shared surface group with one stable wrapper group per visible control. The wrappers
+ * inherit each control's rank, so SurfaceRenderer keeps the registry order without re-evaluating
+ * the controls' visibility predicates.
+ */
+var getBlockControlsSurfaceComponents = function getBlockControlsSurfaceComponents(components, _ref5, surfaceContext) {
+  var _resolvedSurface$chil;
+  var group = _ref5.group,
+    section = _ref5.section,
+    surface = _ref5.surface;
+  var resolvedSurface = (0, _surfaceRenderer.resolveSurface)(components, surface);
+  var groupIdentity = (0, _surfaceRenderer.getComponentIdentity)(group);
+  var controls = (_resolvedSurface$chil = resolvedSurface.childrenMap.get(groupIdentity)) !== null && _resolvedSurface$chil !== void 0 ? _resolvedSurface$chil : [];
+  var visibleControls = controls.filter(function (control) {
+    var _control$isHidden, _control$isHidden2;
+    return !((_control$isHidden = (_control$isHidden2 = control.isHidden) === null || _control$isHidden2 === void 0 ? void 0 : _control$isHidden2.call(control, {
+      surfaceContext: surfaceContext
+    })) !== null && _control$isHidden !== void 0 ? _control$isHidden : false);
+  });
+  if (!resolvedSurface.root || visibleControls.length === 0) {
+    return undefined;
+  }
+  var controlIdentities = new Set(controls.map(_surfaceRenderer.getComponentIdentity));
+  var visibleControlIdentities = new Set(visibleControls.map(_surfaceRenderer.getComponentIdentity));
+  var _partitionComponentsB = (0, _partitionComponentsByPersistence.partitionComponentsByPersistence)(resolvedSurface.components.filter(function (component) {
+      var identity = (0, _surfaceRenderer.getComponentIdentity)(component);
+      return !controlIdentities.has(identity) || visibleControlIdentities.has(identity);
+    }), surface, surfaceContext),
+    persistentComponents = _partitionComponentsB.persistentComponents;
+  var persistentIdentities = new Set(persistentComponents.map(_surfaceRenderer.getComponentIdentity));
+  var structuralComponents = resolvedSurface.components.filter(function (component) {
+    var identity = (0, _surfaceRenderer.getComponentIdentity)(component);
+    return identity !== groupIdentity && !controlIdentities.has(identity);
+  }).map(withoutVisibilityPredicate);
+  var wrappedControls = visibleControls.flatMap(function (control) {
+    var _control$parents$find, _control$parents;
+    var identity = (0, _surfaceRenderer.getComponentIdentity)(control);
+    var rank = (_control$parents$find = (_control$parents = control.parents) === null || _control$parents === void 0 || (_control$parents = _control$parents.find(function (parent) {
+      return (0, _surfaceRenderer.getComponentIdentity)(parent) === groupIdentity;
+    })) === null || _control$parents === void 0 ? void 0 : _control$parents.rank) !== null && _control$parents$find !== void 0 ? _control$parents$find : 0;
+    var wrapper = {
+      component: persistentIdentities.has(identity) ? PersistentBlockControlItem : HoverBlockControlItem,
+      key: "block-control-item:".concat(identity),
+      parents: [_objectSpread(_objectSpread({}, section), {}, {
+        rank: rank
+      })],
+      type: 'group'
+    };
+    var visibleControl = _objectSpread(_objectSpread({}, withoutVisibilityPredicate(control)), {}, {
+      parents: [{
+        key: wrapper.key,
+        rank: 0,
+        type: wrapper.type
+      }]
+    });
+    return [wrapper, visibleControl];
+  });
+  return [].concat((0, _toConsumableArray2.default)(structuralComponents), (0, _toConsumableArray2.default)(wrappedControls));
+};
+var getBlockControlsLeftSurfaceComponents = exports.getBlockControlsLeftSurfaceComponents = function getBlockControlsLeftSurfaceComponents(components, surfaceContext) {
+  return getBlockControlsSurfaceComponents(components, {
+    group: _surfaceKeys.BLOCK_CONTROLS_LEFT_GROUP,
+    section: _surfaceKeys.BLOCK_CONTROLS_LEFT_SECTION,
+    surface: _surfaceKeys.BLOCK_CONTROLS_LEFT_SURFACE
+  }, surfaceContext);
+};
+var getBlockControlsRightSurfaceComponents = exports.getBlockControlsRightSurfaceComponents = function getBlockControlsRightSurfaceComponents(components, surfaceContext) {
+  return getBlockControlsSurfaceComponents(components, {
+    group: _surfaceKeys.BLOCK_CONTROLS_RIGHT_GROUP,
+    section: _surfaceKeys.BLOCK_CONTROLS_RIGHT_SECTION,
+    surface: _surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE
+  }, surfaceContext);
+};

package/dist/cjs/ui/utils/get-surface-placement.js

@@ -4,10 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toMeasuredSurfaceWrapperPlacement = exports.getSurfacePlacement = exports.getAnchoredSurfacePlacement = exports.getAbsoluteSurfacePlacement = void 0;
+exports.toMeasuredSurfaceWrapperPlacement = exports.getSurfacePlacement = exports.getLeftGutterSurfacePlacement = exports.getAnchoredSurfacePlacement = exports.getAnchoredLeftGutterSurfacePlacement = exports.getAbsoluteSurfacePlacement = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _dragHandlePositions = require("../../pm-plugins/utils/drag-handle-positions");
 var _consts = require("../consts");
+var _excluded = ["leftGutterBoundary"];
 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; }
 var getAbsoluteSurfacePlacement = exports.getAbsoluteSurfacePlacement = function getAbsoluteSurfacePlacement(_ref) {
@@ -50,18 +52,40 @@ var getSurfacePlacement = exports.getSurfacePlacement = function getSurfacePlace
   var gap = (0, _consts.dragHandleGap)(nodeType, parentNodeType);
   var top = nodeRect.top + (0, _consts.topPositionAdjustment)(nodeTypeWithLevel, layout);
   var height = (0, _dragHandlePositions.shouldBeSticky)(nodeType) ? nodeRect.height : undefined;
-  return side === 'right' ? {
-    left: nodeRect.right + gap,
-    top: top,
-    transform: '',
-    height: height
-  } : {
+  if (side === 'right') {
+    return {
+      left: nodeRect.right + gap,
+      top: top,
+      transform: '',
+      height: height
+    };
+  }
+  return {
     left: nodeRect.left,
     top: top,
     transform: "translateX(calc(-100% - ".concat(gap, "px))"),
     height: height
   };
 };
+/**
+ * Expands a measured left surface from the available gutter boundary to the target node.
+ */
+var getLeftGutterSurfacePlacement = exports.getLeftGutterSurfacePlacement = function getLeftGutterSurfacePlacement(_ref3) {
+  var leftGutterBoundary = _ref3.leftGutterBoundary,
+    options = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
+  var placement = getSurfacePlacement(_objectSpread(_objectSpread({}, options), {}, {
+    side: 'left'
+  }));
+  if (options.nodeType === 'layoutColumn') {
+    return placement;
+  }
+  var gap = (0, _consts.dragHandleGap)(options.nodeType, options.parentNodeType);
+  return _objectSpread(_objectSpread({}, placement), {}, {
+    left: leftGutterBoundary,
+    transform: '',
+    width: Math.max(0, options.nodeRect.left - leftGutterBoundary - gap)
+  });
+};
 
 /**
  * The insets to apply to a surface wrapper, plus whether that wrapper spans its target node.
@@ -82,12 +106,14 @@ var getSurfacePlacement = exports.getSurfacePlacement = function getSurfacePlace
 var toMeasuredSurfaceWrapperPlacement = exports.toMeasuredSurfaceWrapperPlacement = function toMeasuredSurfaceWrapperPlacement(placement) {
   return {
     isSticky: placement.height !== undefined,
-    style: {
+    style: _objectSpread({
       height: placement.height,
       left: placement.left,
       top: placement.top,
       transform: placement.transform
-    }
+    }, placement.width !== undefined ? {
+      width: placement.width
+    } : {})
   };
 };
 
@@ -103,13 +129,13 @@ var toMeasuredSurfaceWrapperPlacement = exports.toMeasuredSurfaceWrapperPlacemen
 var INVALID_ANCHOR_OFFSCREEN_PX = 9999;
 var INVALID_ANCHOR_FALLBACK_TOP = "-".concat(INVALID_ANCHOR_OFFSCREEN_PX, "px");
 var INVALID_ANCHOR_FALLBACK_BOTTOM = "".concat(INVALID_ANCHOR_OFFSCREEN_PX, "px");
-var getAnchoredSurfacePlacement = exports.getAnchoredSurfacePlacement = function getAnchoredSurfacePlacement(_ref3) {
-  var anchorName = _ref3.anchorName,
-    layout = _ref3.layout,
-    nodeType = _ref3.nodeType,
-    nodeTypeWithLevel = _ref3.nodeTypeWithLevel,
-    parentNodeType = _ref3.parentNodeType,
-    side = _ref3.side;
+var getAnchoredSurfacePlacement = exports.getAnchoredSurfacePlacement = function getAnchoredSurfacePlacement(_ref4) {
+  var anchorName = _ref4.anchorName,
+    layout = _ref4.layout,
+    nodeType = _ref4.nodeType,
+    nodeTypeWithLevel = _ref4.nodeTypeWithLevel,
+    parentNodeType = _ref4.parentNodeType,
+    side = _ref4.side;
   if (nodeType === 'layoutColumn') {
     // The column's horizontal midpoint, matching the measured `nodeRect.left + width / 2` and the
     // legacy drag handle's own layout-column formula. Side-independent.
@@ -139,4 +165,25 @@ var getAnchoredSurfacePlacement = exports.getAnchoredSurfacePlacement = function
       transform: side === 'right' ? '' : "translateX(calc(-100% - ".concat(gap, "px))")
     })
   };
+};
+/**
+ * Expands an anchored left surface across the available gutter without runtime measurement.
+ */
+var getAnchoredLeftGutterSurfacePlacement = exports.getAnchoredLeftGutterSurfacePlacement = function getAnchoredLeftGutterSurfacePlacement(options) {
+  var placement = getAnchoredSurfacePlacement(_objectSpread(_objectSpread({}, options), {}, {
+    side: 'left'
+  }));
+  if (options.nodeType === 'layoutColumn') {
+    return placement;
+  }
+  var gap = (0, _consts.dragHandleGap)(options.nodeType, options.parentNodeType);
+  return _objectSpread(_objectSpread({}, placement), {}, {
+    style: _objectSpread(_objectSpread({}, placement.style), {}, {
+      left: 0,
+      // In a `right` inset, `anchor(... left)` resolves from the containing block's right edge
+      // to the anchor's left edge. Adding the gap ends this wrapper just before the node.
+      right: "calc(anchor(".concat(options.anchorName, " left) + ").concat(gap, "px)"),
+      transform: ''
+    })
+  });
 };

package/dist/cjs/ui/visibility-container.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VisibilityContainer = void 0;
+exports.useBlockControlsVisibility = exports.VisibilityWrapper = exports.VisibilityContainer = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
@@ -57,13 +57,16 @@ var hiddenStylesCSS = (0, _react2.css)({
 var displayContentsStylesCSS = (0, _react2.css)({
   display: 'contents'
 });
-var VisibilityContainer = exports.VisibilityContainer = function VisibilityContainer(_ref) {
+
+/**
+ * Resolves visibility once so a surface can apply the same state to each rendered control without
+ * creating a plugin-state subscription and hide-delay timer for every control wrapper.
+ */
+var useBlockControlsVisibility = exports.useBlockControlsVisibility = function useBlockControlsVisibility(_ref) {
   var api = _ref.api,
-    children = _ref.children,
     controlSide = _ref.controlSide,
     forceVisibleOnMouseOut = _ref.forceVisibleOnMouseOut,
-    isPersistent = _ref.isPersistent,
-    shouldUseDisplayContents = _ref.shouldUseDisplayContents;
+    isPersistent = _ref.isPersistent;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['typeAhead', 'blockControls', 'editorViewMode', 'userIntent', 'showDiff'], function (states) {
       var _states$typeAheadStat, _states$blockControls, _states$blockControls2, _states$blockControls3, _states$editorViewMod, _states$userIntentSta, _states$showDiffState, _states$blockControls4;
       return {
@@ -139,9 +142,20 @@ var VisibilityContainer = exports.VisibilityContainer = function VisibilityConta
     };
   }, [shouldHideImmediate, isRightControlViewMode]);
   var shouldHide = isRightControlViewMode ? delayedShouldHide : shouldHideImmediate;
-  if ((0, _editorExperiment.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
+  var useCssStyles = (0, _editorExperiment.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
     exposure: true
-  })) {
+  });
+  return {
+    shouldHide: shouldHide,
+    useCssStyles: useCssStyles
+  };
+};
+var VisibilityWrapper = exports.VisibilityWrapper = function VisibilityWrapper(_ref2) {
+  var children = _ref2.children,
+    shouldHide = _ref2.shouldHide,
+    shouldUseDisplayContents = _ref2.shouldUseDisplayContents,
+    useCssStyles = _ref2.useCssStyles;
+  if (useCssStyles) {
     return (0, _react2.jsx)("div", {
       css: [baseStylesCSS, shouldHide ? hiddenStylesCSS : visibleStylesCSS, shouldUseDisplayContents && displayContentsStylesCSS]
     }, children);
@@ -151,4 +165,25 @@ var VisibilityContainer = exports.VisibilityContainer = function VisibilityConta
   , {
     xcss: [baseStyles, shouldHide ? hiddenStyles : visibleStyles, shouldUseDisplayContents && displayContentsStyles]
   }, children);
+};
+var VisibilityContainer = exports.VisibilityContainer = function VisibilityContainer(_ref3) {
+  var api = _ref3.api,
+    children = _ref3.children,
+    controlSide = _ref3.controlSide,
+    forceVisibleOnMouseOut = _ref3.forceVisibleOnMouseOut,
+    isPersistent = _ref3.isPersistent,
+    shouldUseDisplayContents = _ref3.shouldUseDisplayContents;
+  var _useBlockControlsVisi = useBlockControlsVisibility({
+      api: api,
+      controlSide: controlSide,
+      forceVisibleOnMouseOut: forceVisibleOnMouseOut,
+      isPersistent: isPersistent
+    }),
+    shouldHide = _useBlockControlsVisi.shouldHide,
+    useCssStyles = _useBlockControlsVisi.useCssStyles;
+  return (0, _react2.jsx)(VisibilityWrapper, {
+    shouldHide: shouldHide,
+    shouldUseDisplayContents: shouldUseDisplayContents,
+    useCssStyles: useCssStyles
+  }, children);
 };

package/dist/es2019/pm-plugins/selection-preservation/pm-plugin.js

@@ -2,7 +2,6 @@ import { bind } from 'bind-event-listener';
 import { getDocument } from '@atlaskit/browser-apis';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { key } from '../main';
 import { createPreservedSelection, mapPreservedSelection } from '../utils/selection';
 import { stopPreservingSelection } from './editor-commands';
@@ -44,16 +43,10 @@ export const createSelectionPreservationPlugin = api => () => {
     key: selectionPreservationPluginKey,
     state: {
       init() {
-        if (expValEquals('platform_editor_fix_selection_text_color_change', 'isEnabled', true)) {
-          return {
-            preservedSelection: undefined,
-            syncDomSelectionForDoc: undefined
-          };
-        } else {
-          return {
-            preservedSelection: undefined
-          };
-        }
+        return {
+          preservedSelection: undefined,
+          syncDomSelectionForDoc: undefined
+        };
       },
       apply(tr, pluginState) {
         const meta = getSelectionPreservationMeta(tr);
@@ -62,21 +55,15 @@ export const createSelectionPreservationPlugin = api => () => {
         };
         if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
           newState.preservedSelection = createPreservedSelection(tr.doc.resolve(tr.selection.from), tr.doc.resolve(tr.selection.to));
-          if (expValEquals('platform_editor_fix_selection_text_color_change', 'isEnabled', true)) {
-            newState.syncDomSelectionForDoc = undefined;
-          }
+          newState.syncDomSelectionForDoc = undefined;
         } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
           newState.preservedSelection = undefined;
-          if (expValEquals('platform_editor_fix_selection_text_color_change', 'isEnabled', true)) {
-            newState.syncDomSelectionForDoc = undefined;
-          }
+          newState.syncDomSelectionForDoc = undefined;
         } else if (tr.docChanged) {
           if (newState.preservedSelection) {
             newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
           }
-          if (expValEquals('platform_editor_fix_selection_text_color_change', 'isEnabled', true)) {
-            newState.syncDomSelectionForDoc = hasFormatSelectionSyncMeta(tr) ? tr.doc : undefined;
-          }
+          newState.syncDomSelectionForDoc = hasFormatSelectionSyncMeta(tr) ? tr.doc : undefined;
         }
         if (!compareSelections(newState.preservedSelection, pluginState.preservedSelection)) {
           if (newState.preservedSelection) {
@@ -187,23 +174,19 @@ export const createSelectionPreservationPlugin = api => () => {
           const activeNodeChanged = prevActiveNode !== currActiveNode;
           const docChanged = prevState.doc !== view.state.doc;
           const hasFormatSyncRequestForCurrentDoc = (currPluginState === null || currPluginState === void 0 ? void 0 : currPluginState.syncDomSelectionForDoc) === view.state.doc;
-          const shouldSyncDOMSelection = (hasPreservedSelection && (preservedSelectionChanged || activeNodeChanged) || expValEquals('platform_editor_fix_selection_text_color_change', 'isEnabled', true) && hasFormatSyncRequestForCurrentDoc) && docChanged;
+          const shouldSyncDOMSelection = (hasPreservedSelection && (preservedSelectionChanged || activeNodeChanged) || hasFormatSyncRequestForCurrentDoc) && docChanged;
           if (shouldSyncDOMSelection) {
             const syncSelection = view.state.selection;
-            if (expValEquals('platform_editor_fix_selection_text_color_change', 'isEnabled', true)) {
-              if (hasFormatSyncRequestForCurrentDoc) {
-                if (pendingFormatSelectionSyncFrame !== undefined) {
-                  cancelAnimationFrame(pendingFormatSelectionSyncFrame);
-                }
-                pendingFormatSelectionSyncFrame = requestAnimationFrame(() => {
-                  pendingFormatSelectionSyncFrame = undefined;
-                  syncDOMSelection(syncSelection, view, {
-                    focusEditor: true
-                  });
-                });
-              } else {
-                syncDOMSelection(syncSelection, view);
+            if (hasFormatSyncRequestForCurrentDoc) {
+              if (pendingFormatSelectionSyncFrame !== undefined) {
+                cancelAnimationFrame(pendingFormatSelectionSyncFrame);
               }
+              pendingFormatSelectionSyncFrame = requestAnimationFrame(() => {
+                pendingFormatSelectionSyncFrame = undefined;
+                syncDOMSelection(syncSelection, view, {
+                  focusEditor: true
+                });
+              });
             } else {
               syncDOMSelection(syncSelection, view);
             }

package/dist/es2019/ui/block-controls-left-surface.compiled.css

@@ -1,7 +1,13 @@
 ._zulpv77o{gap:var(--ds-space-025,2px)}._154iu2gc{top:var(--ds-space-100,8px)}
 ._17c61i8t{position-visibility:anchors-valid}
+._1bahesu3{justify-content:flex-end}
 ._1e0c1txw{display:flex}
+._1f38ffwv{container-name:block-controls-left-gutter}
 ._1pbyb4wl{z-index:100}
 ._4cvr1h6o{align-items:center}
+._7cca15wb{container-type:inline-size}
 ._kqsw1if8{position:sticky}
-._kqswstnw{position:absolute}
+._kqswstnw{position:absolute}
+._lcxvglyw{pointer-events:none}
+._w1y61wug>*{pointer-events:auto}
+@container block-controls-left-gutter (max-width: 67px){._19vrglyw>[data-editor-block-control-item]:nth-last-child(n+3){display:none}}

package/dist/es2019/ui/block-controls-left-surface.js

@@ -4,12 +4,16 @@ import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { BLOCK_CONTROL_UI_CONTEXT } from '@atlaskit/editor-common/block-controls/block-control-ui-context';
 import { BLOCK_CONTROLS_LEFT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
-import { SurfaceRenderer, willSurfaceRender } from '@atlaskit/editor-ui-control-model/surface-renderer';
+import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model/surface-renderer';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { BlockControlsVisibilityProvider } from './block-controls-surface-components';
 import { getBlockControlsSurfaceControlSide } from './block-controls-surface-context';
-import { partitionComponentsByPersistence } from './utils/partition-components-by-persistence';
-import { VisibilityContainer } from './visibility-container';
+import { useBlockControlsVisibility } from './visibility-container';
 const leftSurfaceOuterStyles = null;
+const leftSurfaceGutterStyles = {
+  container: "_1f38ffwv _7cca15wb _lcxvglyw",
+  row: "_1bahesu3 _lcxvglyw _w1y61wug _19vrglyw"
+};
 const leftSurfaceRowStyles = null;
 
 // Applied in addition to leftSurfaceRowStyles when the target node is sticky-eligible (e.g. long
@@ -17,8 +21,7 @@ const leftSurfaceRowStyles = null;
 // can stick near the top of the viewport instead of scrolling off with the node's top edge.
 // Keep in sync with STICKY_CONTROLS_TOP_MARGIN in ./consts (must be a static literal here).
 const leftSurfaceStickyStyles = null;
-/** Renders one left block-controls surface at a document position. */
-export const BlockControlsLeftSurface = ({
+const BlockControlsLeftSurfaceContent = ({
   api,
   components,
   forceVisibleOnMouseOut,
@@ -26,16 +29,18 @@ export const BlockControlsLeftSurface = ({
   source,
   surfaceContext
 }) => {
-  if (!placement || !willSurfaceRender(components, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext)) {
-    return null;
-  }
+  const blockControlsContext = surfaceContext.get(BLOCK_CONTROL_UI_CONTEXT);
+  const controlSide = getBlockControlsSurfaceControlSide(blockControlsContext, isExperimentEnabled('platform_editor_controls_reliable_anchor'));
   const {
-    hoverOnlyComponents,
-    persistentComponents
-  } = partitionComponentsByPersistence(components, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext);
-  const willRenderPersistent = willSurfaceRender(persistentComponents, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext);
-  const willRenderHoverOnly = willSurfaceRender(hoverOnlyComponents, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext);
+    shouldHide: shouldHideHoverControls,
+    useCssStyles
+  } = useBlockControlsVisibility({
+    api,
+    controlSide,
+    forceVisibleOnMouseOut
+  });
   const isSticky = placement.isSticky;
+  const isTopLevel = (blockControlsContext === null || blockControlsContext === void 0 ? void 0 : blockControlsContext.targetNode.parentType) === 'doc';
   return /*#__PURE__*/React.createElement("div", {
     "data-editor-block-controls-surface": true,
     "data-editor-block-controls-side": "left",
@@ -43,27 +48,37 @@ export const BlockControlsLeftSurface = ({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Placement is resolved per target node, from its runtime DOM geometry or from its CSS anchor.
     ,
     style: placement.style,
-    className: ax(["_kqswstnw _17c61i8t _1pbyb4wl"])
+    className: ax(["_kqswstnw _17c61i8t _1pbyb4wl", isTopLevel && leftSurfaceGutterStyles.container])
   }, /*#__PURE__*/React.createElement("div", {
-    className: ax(["_zulpv77o _4cvr1h6o _1e0c1txw", isSticky && "_kqsw1if8 _154iu2gc"])
-  }, willRenderHoverOnly && /*#__PURE__*/React.createElement(VisibilityContainer, {
-    api: api,
-    controlSide: getBlockControlsSurfaceControlSide(surfaceContext.get(BLOCK_CONTROL_UI_CONTEXT), isExperimentEnabled('platform_editor_controls_reliable_anchor')),
-    forceVisibleOnMouseOut: forceVisibleOnMouseOut,
-    shouldUseDisplayContents: true
+    className: ax(["_zulpv77o _4cvr1h6o _1e0c1txw", isTopLevel && leftSurfaceGutterStyles.row, isSticky && "_kqsw1if8 _154iu2gc"])
+  }, /*#__PURE__*/React.createElement(BlockControlsVisibilityProvider, {
+    shouldHideHoverControls: shouldHideHoverControls,
+    useCssStyles: useCssStyles
   }, /*#__PURE__*/React.createElement(SurfaceRenderer, {
-    components: hoverOnlyComponents,
+    components: components,
     surface: BLOCK_CONTROLS_LEFT_SURFACE,
     surfaceContext: surfaceContext
-  })), willRenderPersistent && /*#__PURE__*/React.createElement(VisibilityContainer, {
+  }))));
+};
+
+/** Renders one left block-controls surface at a document position. */
+export const BlockControlsLeftSurface = ({
+  api,
+  components,
+  forceVisibleOnMouseOut,
+  placement,
+  source,
+  surfaceContext
+}) => {
+  if (!placement) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(BlockControlsLeftSurfaceContent, {
     api: api,
-    controlSide: getBlockControlsSurfaceControlSide(surfaceContext.get(BLOCK_CONTROL_UI_CONTEXT), isExperimentEnabled('platform_editor_controls_reliable_anchor')),
+    components: components,
     forceVisibleOnMouseOut: forceVisibleOnMouseOut,
-    isPersistent: true,
-    shouldUseDisplayContents: true
-  }, /*#__PURE__*/React.createElement(SurfaceRenderer, {
-    components: persistentComponents,
-    surface: BLOCK_CONTROLS_LEFT_SURFACE,
+    placement: placement,
+    source: source,
     surfaceContext: surfaceContext
-  }))));
+  });
 };