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

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

@@ -0,0 +1,129 @@
+import React, { createContext, useContext, useMemo } from 'react';
+import { BLOCK_CONTROLS_LEFT_GROUP, BLOCK_CONTROLS_LEFT_SECTION, BLOCK_CONTROLS_LEFT_SURFACE, BLOCK_CONTROLS_RIGHT_GROUP, BLOCK_CONTROLS_RIGHT_SECTION, BLOCK_CONTROLS_RIGHT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
+import { getComponentIdentity, resolveSurface } from '@atlaskit/editor-ui-control-model/surface-renderer';
+import { partitionComponentsByPersistence } from './utils/partition-components-by-persistence';
+import { VisibilityWrapper } from './visibility-container';
+const BlockControlsVisibilityContext = /*#__PURE__*/createContext({
+  shouldHideHoverControls: false,
+  useCssStyles: false
+});
+const BlockControlItem = ({
+  children
+}) => /*#__PURE__*/React.createElement("div", {
+  "data-editor-block-control-item": true
+}, children);
+const HoverBlockControlItem = ({
+  children
+}) => {
+  const {
+    shouldHideHoverControls,
+    useCssStyles
+  } = useContext(BlockControlsVisibilityContext);
+  return /*#__PURE__*/React.createElement(BlockControlItem, null, /*#__PURE__*/React.createElement(VisibilityWrapper, {
+    shouldHide: shouldHideHoverControls,
+    useCssStyles: useCssStyles
+  }, children));
+};
+const PersistentBlockControlItem = ({
+  children
+}) => {
+  const {
+    useCssStyles
+  } = useContext(BlockControlsVisibilityContext);
+  return /*#__PURE__*/React.createElement(BlockControlItem, null, /*#__PURE__*/React.createElement(VisibilityWrapper, {
+    shouldHide: false,
+    useCssStyles: useCssStyles
+  }, children));
+};
+export const BlockControlsVisibilityProvider = ({
+  children,
+  shouldHideHoverControls,
+  useCssStyles
+}) => {
+  const value = useMemo(() => ({
+    shouldHideHoverControls,
+    useCssStyles
+  }), [shouldHideHoverControls, useCssStyles]);
+  return /*#__PURE__*/React.createElement(BlockControlsVisibilityContext.Provider, {
+    value: value
+  }, children);
+};
+const withoutVisibilityPredicate = component => {
+  const {
+    isHidden: _isHidden,
+    ...visibleComponent
+  } = component;
+  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.
+ */
+const getBlockControlsSurfaceComponents = (components, {
+  group,
+  section,
+  surface
+}, surfaceContext) => {
+  var _resolvedSurface$chil;
+  const resolvedSurface = resolveSurface(components, surface);
+  const groupIdentity = getComponentIdentity(group);
+  const controls = (_resolvedSurface$chil = resolvedSurface.childrenMap.get(groupIdentity)) !== null && _resolvedSurface$chil !== void 0 ? _resolvedSurface$chil : [];
+  const visibleControls = controls.filter(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
+    })) !== null && _control$isHidden !== void 0 ? _control$isHidden : false);
+  });
+  if (!resolvedSurface.root || visibleControls.length === 0) {
+    return undefined;
+  }
+  const controlIdentities = new Set(controls.map(getComponentIdentity));
+  const visibleControlIdentities = new Set(visibleControls.map(getComponentIdentity));
+  const {
+    persistentComponents
+  } = partitionComponentsByPersistence(resolvedSurface.components.filter(component => {
+    const identity = getComponentIdentity(component);
+    return !controlIdentities.has(identity) || visibleControlIdentities.has(identity);
+  }), surface, surfaceContext);
+  const persistentIdentities = new Set(persistentComponents.map(getComponentIdentity));
+  const structuralComponents = resolvedSurface.components.filter(component => {
+    const identity = getComponentIdentity(component);
+    return identity !== groupIdentity && !controlIdentities.has(identity);
+  }).map(withoutVisibilityPredicate);
+  const wrappedControls = visibleControls.flatMap(control => {
+    var _control$parents$find, _control$parents, _control$parents$find2;
+    const identity = getComponentIdentity(control);
+    const rank = (_control$parents$find = (_control$parents = control.parents) === null || _control$parents === void 0 ? void 0 : (_control$parents$find2 = _control$parents.find(parent => getComponentIdentity(parent) === groupIdentity)) === null || _control$parents$find2 === void 0 ? void 0 : _control$parents$find2.rank) !== null && _control$parents$find !== void 0 ? _control$parents$find : 0;
+    const wrapper = {
+      component: persistentIdentities.has(identity) ? PersistentBlockControlItem : HoverBlockControlItem,
+      key: `block-control-item:${identity}`,
+      parents: [{
+        ...section,
+        rank
+      }],
+      type: 'group'
+    };
+    const visibleControl = {
+      ...withoutVisibilityPredicate(control),
+      parents: [{
+        key: wrapper.key,
+        rank: 0,
+        type: wrapper.type
+      }]
+    };
+    return [wrapper, visibleControl];
+  });
+  return [...structuralComponents, ...wrappedControls];
+};
+export const getBlockControlsLeftSurfaceComponents = (components, surfaceContext) => getBlockControlsSurfaceComponents(components, {
+  group: BLOCK_CONTROLS_LEFT_GROUP,
+  section: BLOCK_CONTROLS_LEFT_SECTION,
+  surface: BLOCK_CONTROLS_LEFT_SURFACE
+}, surfaceContext);
+export const getBlockControlsRightSurfaceComponents = (components, surfaceContext) => getBlockControlsSurfaceComponents(components, {
+  group: BLOCK_CONTROLS_RIGHT_GROUP,
+  section: BLOCK_CONTROLS_RIGHT_SECTION,
+  surface: BLOCK_CONTROLS_RIGHT_SURFACE
+}, surfaceContext);

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

@@ -43,18 +43,43 @@ export const getSurfacePlacement = ({
   const gap = dragHandleGap(nodeType, parentNodeType);
   const top = nodeRect.top + topPositionAdjustment(nodeTypeWithLevel, layout);
   const height = shouldBeSticky(nodeType) ? nodeRect.height : undefined;
-  return side === 'right' ? {
-    left: nodeRect.right + gap,
-    top,
-    transform: '',
-    height
-  } : {
+  if (side === 'right') {
+    return {
+      left: nodeRect.right + gap,
+      top,
+      transform: '',
+      height
+    };
+  }
+  return {
     left: nodeRect.left,
     top,
     transform: `translateX(calc(-100% - ${gap}px))`,
     height
   };
 };
+/**
+ * Expands a measured left surface from the available gutter boundary to the target node.
+ */
+export const getLeftGutterSurfacePlacement = ({
+  leftGutterBoundary,
+  ...options
+}) => {
+  const placement = getSurfacePlacement({
+    ...options,
+    side: 'left'
+  });
+  if (options.nodeType === 'layoutColumn') {
+    return placement;
+  }
+  const gap = dragHandleGap(options.nodeType, options.parentNodeType);
+  return {
+    ...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.
@@ -78,7 +103,10 @@ export const toMeasuredSurfaceWrapperPlacement = placement => ({
     height: placement.height,
     left: placement.left,
     top: placement.top,
-    transform: placement.transform
+    transform: placement.transform,
+    ...(placement.width !== undefined ? {
+      width: placement.width
+    } : {})
   }
 });
 
@@ -135,4 +163,28 @@ export const getAnchoredSurfacePlacement = ({
       transform: side === 'right' ? '' : `translateX(calc(-100% - ${gap}px))`
     }
   };
+};
+/**
+ * Expands an anchored left surface across the available gutter without runtime measurement.
+ */
+export const getAnchoredLeftGutterSurfacePlacement = options => {
+  const placement = getAnchoredSurfacePlacement({
+    ...options,
+    side: 'left'
+  });
+  if (options.nodeType === 'layoutColumn') {
+    return placement;
+  }
+  const gap = dragHandleGap(options.nodeType, options.parentNodeType);
+  return {
+    ...placement,
+    style: {
+      ...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(${options.anchorName} left) + ${gap}px)`,
+      transform: ''
+    }
+  };
 };

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

@@ -46,13 +46,16 @@ const hiddenStylesCSS = css({
 const displayContentsStylesCSS = css({
   display: 'contents'
 });
-export const VisibilityContainer = ({
+
+/**
+ * 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.
+ */
+export const useBlockControlsVisibility = ({
   api,
-  children,
   controlSide,
   forceVisibleOnMouseOut,
-  isPersistent,
-  shouldUseDisplayContents
+  isPersistent
 }) => {
   const {
     isTypeAheadOpen,
@@ -127,9 +130,21 @@ export const VisibilityContainer = ({
     };
   }, [shouldHideImmediate, isRightControlViewMode]);
   const shouldHide = isRightControlViewMode ? delayedShouldHide : shouldHideImmediate;
-  if (editorExperiment('platform_editor_preview_panel_responsiveness', true, {
+  const useCssStyles = editorExperiment('platform_editor_preview_panel_responsiveness', true, {
     exposure: true
-  })) {
+  });
+  return {
+    shouldHide,
+    useCssStyles
+  };
+};
+export const VisibilityWrapper = ({
+  children,
+  shouldHide,
+  shouldUseDisplayContents,
+  useCssStyles
+}) => {
+  if (useCssStyles) {
     return jsx("div", {
       css: [baseStylesCSS, shouldHide ? hiddenStylesCSS : visibleStylesCSS, shouldUseDisplayContents && displayContentsStylesCSS]
     }, children);
@@ -139,4 +154,27 @@ export const VisibilityContainer = ({
   , {
     xcss: [baseStyles, shouldHide ? hiddenStyles : visibleStyles, shouldUseDisplayContents && displayContentsStyles]
   }, children);
+};
+export const VisibilityContainer = ({
+  api,
+  children,
+  controlSide,
+  forceVisibleOnMouseOut,
+  isPersistent,
+  shouldUseDisplayContents
+}) => {
+  const {
+    shouldHide,
+    useCssStyles
+  } = useBlockControlsVisibility({
+    api,
+    controlSide,
+    forceVisibleOnMouseOut,
+    isPersistent
+  });
+  return jsx(VisibilityWrapper, {
+    shouldHide: shouldHide,
+    shouldUseDisplayContents: shouldUseDisplayContents,
+    useCssStyles: useCssStyles
+  }, children);
 };

package/dist/esm/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/esm/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';
 var leftSurfaceOuterStyles = null;
+var leftSurfaceGutterStyles = {
+  container: "_1f38ffwv _7cca15wb _lcxvglyw",
+  row: "_1bahesu3 _lcxvglyw _w1y61wug _19vrglyw"
+};
 var leftSurfaceRowStyles = null;
 
 // Applied in addition to leftSurfaceRowStyles when the target node is sticky-eligible (e.g. long
@@ -17,23 +21,24 @@ var 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).
 var leftSurfaceStickyStyles = null;
-/** Renders one left block-controls surface at a document position. */
-export var BlockControlsLeftSurface = function BlockControlsLeftSurface(_ref) {
+var BlockControlsLeftSurfaceContent = function BlockControlsLeftSurfaceContent(_ref) {
   var api = _ref.api,
     components = _ref.components,
     forceVisibleOnMouseOut = _ref.forceVisibleOnMouseOut,
     placement = _ref.placement,
     source = _ref.source,
     surfaceContext = _ref.surfaceContext;
-  if (!placement || !willSurfaceRender(components, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext)) {
-    return null;
-  }
-  var _partitionComponentsB = partitionComponentsByPersistence(components, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext),
-    hoverOnlyComponents = _partitionComponentsB.hoverOnlyComponents,
-    persistentComponents = _partitionComponentsB.persistentComponents;
-  var willRenderPersistent = willSurfaceRender(persistentComponents, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext);
-  var willRenderHoverOnly = willSurfaceRender(hoverOnlyComponents, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext);
+  var blockControlsContext = surfaceContext.get(BLOCK_CONTROL_UI_CONTEXT);
+  var controlSide = getBlockControlsSurfaceControlSide(blockControlsContext, isExperimentEnabled('platform_editor_controls_reliable_anchor'));
+  var _useBlockControlsVisi = useBlockControlsVisibility({
+      api: api,
+      controlSide: controlSide,
+      forceVisibleOnMouseOut: forceVisibleOnMouseOut
+    }),
+    shouldHideHoverControls = _useBlockControlsVisi.shouldHide,
+    useCssStyles = _useBlockControlsVisi.useCssStyles;
   var isSticky = placement.isSticky;
+  var 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",
@@ -41,27 +46,36 @@ export var BlockControlsLeftSurface = function BlockControlsLeftSurface(_ref) {
     // 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 var BlockControlsLeftSurface = function BlockControlsLeftSurface(_ref2) {
+  var api = _ref2.api,
+    components = _ref2.components,
+    forceVisibleOnMouseOut = _ref2.forceVisibleOnMouseOut,
+    placement = _ref2.placement,
+    source = _ref2.source,
+    surfaceContext = _ref2.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
-  }))));
+  });
 };

package/dist/esm/ui/block-controls-left-surfaces.js

@@ -15,14 +15,13 @@ import { BLOCK_CONTROLS_LEFT_SURFACE } from '@atlaskit/editor-common/block-contr
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { isCSSAnchorSupported } from '@atlaskit/editor-common/styles';
 import { createSurfaceContext } from '@atlaskit/editor-ui-control-model/create-surface-context';
-import { willSurfaceRender } from '@atlaskit/editor-ui-control-model/surface-renderer';
 import { getNodeTypeWithLevel } from '../pm-plugins/decorations-common';
 import { BlockControlsLeftSurface } from './block-controls-left-surface';
+import { getBlockControlsLeftSurfaceComponents } from './block-controls-surface-components';
 import { createBlockControlsSurfaceContextForPosition } from './block-controls-surface-context';
 import { getBlockControlsSurfaceTargets } from './block-controls-surface-targets';
 import { getNodeContentElement } from './utils/get-node-content-element';
-import { getAbsoluteSurfacePlacement, getAnchoredSurfacePlacement, getSurfacePlacement, toMeasuredSurfaceWrapperPlacement } from './utils/get-surface-placement';
-import { hasSurfaceControls } from './utils/has-surface-controls';
+import { getAbsoluteSurfacePlacement, getAnchoredLeftGutterSurfacePlacement, getAnchoredSurfacePlacement, getLeftGutterSurfacePlacement, getSurfacePlacement, toMeasuredSurfaceWrapperPlacement } from './utils/get-surface-placement';
 var EMPTY_SURFACE_POSITIONS = [];
 var EMPTY_SURFACE_ANCHORS = new Map();
 var EMPTY_SURFACE_COMPONENTS = [];
@@ -60,14 +59,20 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
         return [];
       }
       var surfaceContext = createSurfaceContext(BLOCK_CONTROL_UI_CONTEXT, context);
-      if (!hasSurfaceControls(components) || !willSurfaceRender(components, BLOCK_CONTROLS_LEFT_SURFACE, surfaceContext)) {
+      var surfaceComponents = getBlockControlsLeftSurfaceComponents(components, surfaceContext);
+      if (!surfaceComponents) {
         return [];
       }
       // The cache supplies the same anchor names used by ProseMirror decorations.
       var anchorName = isCSSAnchorSupported() ? surfaceAnchors.get(target.position) : undefined;
+      // Top-level controls can respond to the available left gutter without the surface
+      // host knowing which controls are registered or how they adapt.
+      var isTopLevel = context.targetNode.parentType === 'doc';
       return [_objectSpread(_objectSpread({}, target), {}, {
         anchorName: anchorName,
         blockControlsContext: context,
+        isTopLevel: isTopLevel,
+        surfaceComponents: surfaceComponents,
         surfaceContext: surfaceContext
       })];
     });
@@ -80,15 +85,22 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
     return new Map(surfaces.flatMap(function (_ref3) {
       var anchorName = _ref3.anchorName,
         blockControlsContext = _ref3.blockControlsContext,
+        isTopLevel = _ref3.isTopLevel,
         position = _ref3.position;
-      return anchorName ? [[position, getAnchoredSurfacePlacement({
+      if (!anchorName) {
+        return [];
+      }
+      var options = {
         anchorName: anchorName,
+        layout: blockControlsContext.targetNode.node.attrs.layout,
         nodeType: blockControlsContext.targetNode.type.name,
         nodeTypeWithLevel: getNodeTypeWithLevel(blockControlsContext.targetNode.node),
-        layout: blockControlsContext.targetNode.node.attrs.layout,
-        parentNodeType: blockControlsContext.targetNode.parentType === 'doc' ? undefined : blockControlsContext.targetNode.parentType,
+        parentNodeType: blockControlsContext.targetNode.parentType === 'doc' ? undefined : blockControlsContext.targetNode.parentType
+      };
+      var placement = isTopLevel ? getAnchoredLeftGutterSurfacePlacement(options) : getAnchoredSurfacePlacement(_objectSpread(_objectSpread({}, options), {}, {
         side: 'left'
-      })]] : [];
+      }));
+      return [[position, placement]];
     }));
   }, [surfaces]);
   // Only the surfaces that still need measuring drive the effect below, so a document of anchored
@@ -122,6 +134,7 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
     }
     var measurementTargets = measuredSurfaces.flatMap(function (_ref5) {
       var blockControlsContext = _ref5.blockControlsContext,
+        isTopLevel = _ref5.isTopLevel,
         position = _ref5.position;
       var targetNodeElement = editorView.nodeDOM(blockControlsContext.targetNode.pos);
       var targetElementRoot = targetNodeElement instanceof HTMLElement ? targetNodeElement : targetNodeElement === null || targetNodeElement === void 0 ? void 0 : targetNodeElement.parentElement;
@@ -130,6 +143,7 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
       }
       return [{
         blockControlsContext: blockControlsContext,
+        isTopLevel: isTopLevel,
         position: position,
         targetElement: getNodeContentElement(targetElementRoot, blockControlsContext.targetNode.type.name),
         targetElementRoot: targetElementRoot
@@ -149,23 +163,28 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var _targetElementRoot$ge;
+          var _targetElementRoot$ge, _offsetParentRect$lef;
           var _step$value = _step.value,
             blockControlsContext = _step$value.blockControlsContext,
+            isTopLevel = _step$value.isTopLevel,
             position = _step$value.position,
             targetElement = _step$value.targetElement,
             targetElementRoot = _step$value.targetElementRoot;
           if (!targetElementRoot.isConnected || !targetElement.isConnected) {
             continue;
           }
-          var placement = getSurfacePlacement({
+          var options = {
             layout: (_targetElementRoot$ge = targetElementRoot.getAttribute('layout')) !== null && _targetElementRoot$ge !== void 0 ? _targetElementRoot$ge : '',
             nodeRect: targetElement.getBoundingClientRect(),
             nodeType: blockControlsContext.targetNode.type.name,
             nodeTypeWithLevel: getNodeTypeWithLevel(blockControlsContext.targetNode.node),
-            parentNodeType: blockControlsContext.targetNode.parentType === 'doc' ? undefined : blockControlsContext.targetNode.parentType,
+            parentNodeType: blockControlsContext.targetNode.parentType === 'doc' ? undefined : blockControlsContext.targetNode.parentType
+          };
+          var placement = isTopLevel ? getLeftGutterSurfacePlacement(_objectSpread(_objectSpread({}, options), {}, {
+            leftGutterBoundary: (_offsetParentRect$lef = offsetParentRect === null || offsetParentRect === void 0 ? void 0 : offsetParentRect.left) !== null && _offsetParentRect$lef !== void 0 ? _offsetParentRect$lef : 0
+          })) : getSurfacePlacement(_objectSpread(_objectSpread({}, options), {}, {
             side: 'left'
-          });
+          }));
           nextPlacements.set(position, toMeasuredSurfaceWrapperPlacement(getAbsoluteSurfacePlacement({
             offsetParentRect: offsetParentRect,
             offsetParentScrollLeft: offsetParentScrollLeft,
@@ -251,10 +270,11 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
     var _activeNode$handleOpt, _anchoredPlacements$g;
     var position = _ref6.position,
       source = _ref6.source,
+      surfaceComponents = _ref6.surfaceComponents,
       surfaceContext = _ref6.surfaceContext;
     return /*#__PURE__*/React.createElement(BlockControlsLeftSurface, {
       api: api,
-      components: components,
+      components: surfaceComponents,
       forceVisibleOnMouseOut: Boolean(activeNode === null || activeNode === void 0 || (_activeNode$handleOpt = activeNode.handleOptions) === null || _activeNode$handleOpt === void 0 ? void 0 : _activeNode$handleOpt.isFocused),
       key: position,
       placement: (_anchoredPlacements$g = anchoredPlacements.get(position)) !== null && _anchoredPlacements$g !== void 0 ? _anchoredPlacements$g : placements.get(position),

package/dist/esm/ui/block-controls-right-surface.js

@@ -3,9 +3,9 @@ import "./block-controls-right-surface.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { BLOCK_CONTROLS_RIGHT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
-import { SurfaceRenderer, willSurfaceRender } from '@atlaskit/editor-ui-control-model/surface-renderer';
-import { partitionComponentsByPersistence } from './utils/partition-components-by-persistence';
-import { VisibilityContainer } from './visibility-container';
+import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model/surface-renderer';
+import { BlockControlsVisibilityProvider } from './block-controls-surface-components';
+import { useBlockControlsVisibility } from './visibility-container';
 var rightSurfaceOuterStyles = null;
 var rightSurfaceRowStyles = null;
 
@@ -14,22 +14,20 @@ var rightSurfaceRowStyles = 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).
 var rightSurfaceStickyStyles = null;
-/** Renders one right block-controls surface at a document position. */
-export var BlockControlsRightSurface = function BlockControlsRightSurface(_ref) {
+var BlockControlsRightSurfaceContent = function BlockControlsRightSurfaceContent(_ref) {
   var api = _ref.api,
     components = _ref.components,
     forceVisibleOnMouseOut = _ref.forceVisibleOnMouseOut,
     placement = _ref.placement,
     source = _ref.source,
     surfaceContext = _ref.surfaceContext;
-  if (!placement || !willSurfaceRender(components, BLOCK_CONTROLS_RIGHT_SURFACE, surfaceContext)) {
-    return null;
-  }
-  var _partitionComponentsB = partitionComponentsByPersistence(components, BLOCK_CONTROLS_RIGHT_SURFACE, surfaceContext),
-    hoverOnlyComponents = _partitionComponentsB.hoverOnlyComponents,
-    persistentComponents = _partitionComponentsB.persistentComponents;
-  var willRenderPersistent = willSurfaceRender(persistentComponents, BLOCK_CONTROLS_RIGHT_SURFACE, surfaceContext);
-  var willRenderHoverOnly = willSurfaceRender(hoverOnlyComponents, BLOCK_CONTROLS_RIGHT_SURFACE, surfaceContext);
+  var _useBlockControlsVisi = useBlockControlsVisibility({
+      api: api,
+      controlSide: 'right',
+      forceVisibleOnMouseOut: forceVisibleOnMouseOut
+    }),
+    shouldHideHoverControls = _useBlockControlsVisi.shouldHide,
+    useCssStyles = _useBlockControlsVisi.useCssStyles;
   var isSticky = placement.isSticky;
   return /*#__PURE__*/React.createElement("div", {
     "data-editor-block-controls-surface": true,
@@ -41,23 +39,33 @@ export var BlockControlsRightSurface = function BlockControlsRightSurface(_ref)
     className: ax(["_kqswstnw _17c61i8t _1pbyb4wl"])
   }, /*#__PURE__*/React.createElement("div", {
     className: ax(["_zulpv77o _4cvr1h6o _1e0c1txw", isSticky && "_kqsw1if8 _154iu2gc"])
-  }, willRenderPersistent && /*#__PURE__*/React.createElement(VisibilityContainer, {
-    api: api,
-    controlSide: "right",
-    isPersistent: true,
-    shouldUseDisplayContents: true
+  }, /*#__PURE__*/React.createElement(BlockControlsVisibilityProvider, {
+    shouldHideHoverControls: shouldHideHoverControls,
+    useCssStyles: useCssStyles
   }, /*#__PURE__*/React.createElement(SurfaceRenderer, {
-    components: persistentComponents,
+    components: components,
     surface: BLOCK_CONTROLS_RIGHT_SURFACE,
     surfaceContext: surfaceContext
-  })), willRenderHoverOnly && /*#__PURE__*/React.createElement(VisibilityContainer, {
+  }))));
+};
+
+/** Renders one right block-controls surface at a document position. */
+export var BlockControlsRightSurface = function BlockControlsRightSurface(_ref2) {
+  var api = _ref2.api,
+    components = _ref2.components,
+    forceVisibleOnMouseOut = _ref2.forceVisibleOnMouseOut,
+    placement = _ref2.placement,
+    source = _ref2.source,
+    surfaceContext = _ref2.surfaceContext;
+  if (!placement) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(BlockControlsRightSurfaceContent, {
     api: api,
-    controlSide: "right",
+    components: components,
     forceVisibleOnMouseOut: forceVisibleOnMouseOut,
-    shouldUseDisplayContents: true
-  }, /*#__PURE__*/React.createElement(SurfaceRenderer, {
-    components: hoverOnlyComponents,
-    surface: BLOCK_CONTROLS_RIGHT_SURFACE,
+    placement: placement,
+    source: source,
     surfaceContext: surfaceContext
-  }))));
+  });
 };