@atlaskit/editor-plugin-block-controls 17.2.5 → 17.3.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 17.3.0
+
+### Minor Changes
+
+- [`14f10ff093c15`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/14f10ff093c15) -
+  EDITOR-8770: Add the right control surface - currently only used in example page and behind
+  platform_editor_block_control_right_surface
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 17.2.5
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -32,6 +32,7 @@ var _pmPlugin2 = require("./pm-plugins/selection-preservation/pm-plugin");
 var _expandAndUpdateSelection2 = require("./pm-plugins/utils/expand-and-update-selection");
 var _getSelection = require("./pm-plugins/utils/getSelection");
 var _blockControlsLeftSurfaces = require("./ui/block-controls-left-surfaces");
+var _blockControlsRightSurfaces = require("./ui/block-controls-right-surfaces");
 var _blockControlsSurfaceDragHandleRegistration = require("./ui/block-controls-surface-drag-handle-registration");
 var _globalStyles = require("./ui/global-styles");
 var _surfaceEditorViewContext = require("./ui/surface-editor-view-context");
@@ -47,6 +48,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
   var registryBlockControlsEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_migration');
   var surfaceNodePositionsEnabled = registryBlockControlsEnabled && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_collapsible_headings');
   var legacyBlockControlsEnabled = !registryBlockControlsEnabled;
+  var rightSurfaceEnabled = registryBlockControlsEnabled && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_right_surface');
   if (registryBlockControlsEnabled) {
     var _api$uiControlRegistr;
     api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register([_surfaceKeys.BLOCK_CONTROLS_LEFT_SURFACE, _objectSpread(_objectSpread({}, _surfaceKeys.BLOCK_CONTROLS_LEFT_SECTION), {}, {
@@ -60,6 +62,21 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
     })].concat((0, _toConsumableArray2.default)((0, _blockControlsSurfaceDragHandleRegistration.getBlockControlsSurfaceDragHandleComponents)({
       api: api
     }))));
+    if (rightSurfaceEnabled) {
+      var _api$uiControlRegistr2;
+      // The right surface host stays generic: it only registers the toolbar/section/group
+      // hierarchy. Individual features contribute their own buttons into
+      // BLOCK_CONTROLS_RIGHT_GROUP from their own plugins, same as the left surface.
+      api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 || _api$uiControlRegistr2.actions.register([_surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE, _objectSpread(_objectSpread({}, _surfaceKeys.BLOCK_CONTROLS_RIGHT_SECTION), {}, {
+        parents: [_objectSpread(_objectSpread({}, _surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE), {}, {
+          rank: 100
+        })]
+      }), _objectSpread(_objectSpread({}, _surfaceKeys.BLOCK_CONTROLS_RIGHT_GROUP), {}, {
+        parents: [_objectSpread(_objectSpread({}, _surfaceKeys.BLOCK_CONTROLS_RIGHT_SECTION), {}, {
+          rank: 100
+        })]
+      })]);
+    }
   }
   return {
     name: 'blockControls',
@@ -129,7 +146,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         plugin: function plugin(_ref2) {
           var getIntl = _ref2.getIntl,
             nodeViewPortalProviderAPI = _ref2.nodeViewPortalProviderAPI;
-          return (0, _main.createPlugin)(api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled && legacyBlockControlsEnabled, legacyBlockControlsEnabled, surfaceNodePositionsEnabled);
+          return (0, _main.createPlugin)(api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled && legacyBlockControlsEnabled, legacyBlockControlsEnabled, surfaceNodePositionsEnabled, rightSurfaceEnabled);
         }
       }];
       if ((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
@@ -457,7 +474,10 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       }, /*#__PURE__*/_react.default.createElement(_blockControlsLeftSurfaces.BlockControlsLeftSurfaces, {
         api: api,
         editorView: editorView
-      })) : null);
+      }), rightSurfaceEnabled ? /*#__PURE__*/_react.default.createElement(_blockControlsRightSurfaces.BlockControlsRightSurfaces, {
+        api: api,
+        editorView: editorView
+      }) : null) : null);
     }
   };
 };

package/dist/cjs/pm-plugins/main.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.key = exports.getDecorations = exports.getBlockControlsMeta = exports.createPlugin = exports.apply = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _browserApis = require("@atlaskit/browser-apis");
@@ -246,7 +247,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   var anchorRectCache = arguments.length > 10 ? arguments[10] : undefined;
   var resizeObserverWidth = arguments.length > 11 ? arguments[11] : undefined;
   var pragmaticCleanup = arguments.length > 12 ? arguments[12] : undefined;
-  var resolvedSurface = arguments.length > 13 ? arguments[13] : undefined;
+  var resolvedSurfaces = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : [];
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
     isResizerResizing = currentState.isResizerResizing,
@@ -817,14 +818,14 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     var _latestActiveNode13, _latestActiveNode14;
     newActiveNode = isEmptyDoc || !(meta !== null && meta !== void 0 && meta.activeNode) && flags.legacyDragHandleEnabled && (0, _decorationsDragHandle.findHandleDec)(decorations, (_latestActiveNode13 = latestActiveNode) === null || _latestActiveNode13 === void 0 ? void 0 : _latestActiveNode13.pos, (_latestActiveNode14 = latestActiveNode) === null || _latestActiveNode14 === void 0 ? void 0 : _latestActiveNode14.pos).length === 0 ? null : latestActiveNode;
   }
-  if (flags.surfaceNodePositionsEnabled && resolvedSurface) {
+  if (flags.surfaceNodePositionsEnabled && resolvedSurfaces.length > 0) {
     surfaceNodePositions = (0, _surfaceNodePositions.updateSurfaceNodePositions)({
       activeNode: newActiveNode,
       currentPositions: surfaceNodePositions,
       from: from,
       newState: newState,
       previousActiveNode: previousActiveNode,
-      resolvedSurface: resolvedSurface,
+      resolvedSurfaces: resolvedSurfaces,
       to: to,
       tr: tr
     });
@@ -873,11 +874,12 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   };
 };
 var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry) {
-  var _api$uiControlRegistr, _api$uiControlRegistr2;
+  var _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
   var rightSideControlsEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var quickInsertButtonEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
   var legacyDragHandleEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
   var surfaceNodePositionsEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+  var rightSurfaceEnabled = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
   var _getIntl = getIntl(),
     formatMessage = _getIntl.formatMessage;
   var isAdvancedLayoutEnabled = (0, _editorExperiment.editorExperiment)('advanced_layouts', true, {
@@ -889,7 +891,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
     surfaceNodePositionsEnabled: surfaceNodePositionsEnabled,
     toolbarFlagsEnabled: toolbarFlagsEnabled
   };
-  var resolvedSurface = surfaceNodePositionsEnabled ? (0, _surfaceRenderer.resolveSurface)((_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_surfaceKeys.BLOCK_CONTROLS_LEFT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [], _surfaceKeys.BLOCK_CONTROLS_LEFT_SURFACE) : undefined;
+  var resolvedSurfaces = surfaceNodePositionsEnabled ? [(0, _surfaceRenderer.resolveSurface)((_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_surfaceKeys.BLOCK_CONTROLS_LEFT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [], _surfaceKeys.BLOCK_CONTROLS_LEFT_SURFACE)].concat((0, _toConsumableArray2.default)(rightSurfaceEnabled ? [(0, _surfaceRenderer.resolveSurface)((_api$uiControlRegistr3 = api === null || api === void 0 || (_api$uiControlRegistr4 = api.uiControlRegistry) === null || _api$uiControlRegistr4 === void 0 ? void 0 : _api$uiControlRegistr4.actions.getComponents(_surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [], _surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE)] : [])) : [];
   var anchorRectCache;
   if (!(0, _anchorUtils.isAnchorSupported)()) {
     anchorRectCache = new _anchorUtils.AnchorRectCache();
@@ -901,11 +903,11 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
     state: {
       init: function init(_config, editorState) {
         return _objectSpread(_objectSpread({}, initialState), {}, {
-          surfaceNodePositions: resolvedSurface ? (0, _surfaceNodePositions.getSurfaceNodePositions)(editorState, resolvedSurface) : []
+          surfaceNodePositions: resolvedSurfaces.length > 0 ? (0, _surfaceNodePositions.getSurfaceNodePositions)(editorState, resolvedSurfaces) : []
         });
       },
       apply: function apply(tr, currentState, _, newState) {
-        return _apply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled, anchorRectCache, resizeObserverWidth, pragmaticCleanup, resolvedSurface);
+        return _apply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled, anchorRectCache, resizeObserverWidth, pragmaticCleanup, resolvedSurfaces);
       }
     },
     props: {

package/dist/cjs/pm-plugins/utils/surface-node-positions.js

@@ -14,19 +14,39 @@ var createSurfaceContextAtPosition = function createSurfaceContextAtPosition(sta
   var blockControlsContext = (0, _blockControlsSurfaceContext.createBlockControlsSurfaceContextForPosition)(state, position, activeNode);
   return blockControlsContext ? (0, _types.createSurfaceContext)(_blockControlUiContext.BLOCK_CONTROL_UI_CONTEXT, blockControlsContext) : undefined;
 };
-var getSurfaceNodePositions = exports.getSurfaceNodePositions = function getSurfaceNodePositions(state, resolvedSurface, activeNode) {
+
+/**
+ * A position qualifies as soon as ANY of the given surfaces would render something for it.
+ * The surface context depends only on state/position/activeNode, not on which surface is being
+ * checked, so it's built once here rather than once per surface inside the `.some()`.
+ */
+var willAnySurfaceRenderAt = function willAnySurfaceRenderAt(surfaces, state, position, activeNode) {
+  var surfaceContext = createSurfaceContextAtPosition(state, position, activeNode);
+  return surfaces.some(function (_ref) {
+    var childrenMap = _ref.childrenMap,
+      root = _ref.root;
+    return (0, _surfaceRenderer.willComponentRender)(root, childrenMap, surfaceContext);
+  });
+};
+var getSurfaceNodePositions = exports.getSurfaceNodePositions = function getSurfaceNodePositions(state, resolvedSurfaces, activeNode) {
   var from = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
   var to = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : state.doc.content.size;
-  var root = resolvedSurface.root,
-    childrenMap = resolvedSurface.childrenMap;
-  if (!root) {
+  var surfaces = resolvedSurfaces.flatMap(function (_ref2) {
+    var childrenMap = _ref2.childrenMap,
+      root = _ref2.root;
+    return root ? [{
+      childrenMap: childrenMap,
+      root: root
+    }] : [];
+  });
+  if (surfaces.length === 0) {
     return [];
   }
   var positions = [];
   var start = Math.max(0, from);
   var end = Math.min(state.doc.content.size, Math.max(start, to));
   state.doc.nodesBetween(start, end, function (node, position) {
-    if (node.isBlock && (0, _surfaceRenderer.willComponentRender)(root, childrenMap, createSurfaceContextAtPosition(state, position, activeNode))) {
+    if (node.isBlock && willAnySurfaceRenderAt(surfaces, state, position, activeNode)) {
       positions.push(position);
     }
   });
@@ -35,25 +55,31 @@ var getSurfaceNodePositions = exports.getSurfaceNodePositions = function getSurf
 var hasActiveNodeChanged = function hasActiveNodeChanged(previousActiveNode, activeNode) {
   return (previousActiveNode === null || previousActiveNode === void 0 ? void 0 : previousActiveNode.pos) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) || (previousActiveNode === null || previousActiveNode === void 0 ? void 0 : previousActiveNode.nodeType) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || (previousActiveNode === null || previousActiveNode === void 0 ? void 0 : previousActiveNode.rootPos) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.rootPos);
 };
-var updateSurfaceNodePositions = exports.updateSurfaceNodePositions = function updateSurfaceNodePositions(_ref) {
-  var activeNode = _ref.activeNode,
-    currentPositions = _ref.currentPositions,
-    from = _ref.from,
-    newState = _ref.newState,
-    previousActiveNode = _ref.previousActiveNode,
-    resolvedSurface = _ref.resolvedSurface,
-    to = _ref.to,
-    tr = _ref.tr;
+var updateSurfaceNodePositions = exports.updateSurfaceNodePositions = function updateSurfaceNodePositions(_ref3) {
+  var activeNode = _ref3.activeNode,
+    currentPositions = _ref3.currentPositions,
+    from = _ref3.from,
+    newState = _ref3.newState,
+    previousActiveNode = _ref3.previousActiveNode,
+    resolvedSurfaces = _ref3.resolvedSurfaces,
+    to = _ref3.to,
+    tr = _ref3.tr;
   var activeNodeChanged = hasActiveNodeChanged(previousActiveNode, activeNode);
   if (!tr.docChanged && !activeNodeChanged) {
     return currentPositions;
   }
   var nextActiveNode = activeNode !== null && activeNode !== void 0 ? activeNode : undefined;
   if (activeNodeChanged) {
-    return getSurfaceNodePositions(newState, resolvedSurface, nextActiveNode);
+    return getSurfaceNodePositions(newState, resolvedSurfaces, nextActiveNode);
   }
-  var root = resolvedSurface.root,
-    childrenMap = resolvedSurface.childrenMap;
+  var surfaces = resolvedSurfaces.flatMap(function (_ref4) {
+    var childrenMap = _ref4.childrenMap,
+      root = _ref4.root;
+    return root ? [{
+      childrenMap: childrenMap,
+      root: root
+    }] : [];
+  });
   var mappedPositions = currentPositions.map(function (position) {
     return tr.mapping.mapResult(position, -1);
   }).filter(function (result) {
@@ -62,9 +88,9 @@ var updateSurfaceNodePositions = exports.updateSurfaceNodePositions = function u
     return result.pos;
   }).filter(function (position) {
     var node = newState.doc.nodeAt(position);
-    return Boolean((node === null || node === void 0 ? void 0 : node.isBlock) && root && (0, _surfaceRenderer.willComponentRender)(root, childrenMap, createSurfaceContextAtPosition(newState, position, nextActiveNode)));
+    return Boolean((node === null || node === void 0 ? void 0 : node.isBlock) && willAnySurfaceRenderAt(surfaces, newState, position, nextActiveNode));
   });
-  var changedPositions = getSurfaceNodePositions(newState, resolvedSurface, nextActiveNode, from - 1, to + 1);
+  var changedPositions = getSurfaceNodePositions(newState, resolvedSurfaces, nextActiveNode, from - 1, to + 1);
   return Array.from(new Set([].concat((0, _toConsumableArray2.default)(mappedPositions), (0, _toConsumableArray2.default)(changedPositions)))).sort(function (first, second) {
     return first - second;
   });

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

@@ -18,9 +18,9 @@ var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys"
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _createSurfaceContext = require("@atlaskit/editor-ui-control-model/create-surface-context");
 var _decorationsCommon = require("../pm-plugins/decorations-common");
-var _blockControlsSurfaceContext = require("./block-controls-surface-context");
 var _blockControlsLeftSurface = require("./block-controls-left-surface");
-var _blockControlsLeftSurfaceTargets = require("./block-controls-left-surface-targets");
+var _blockControlsSurfaceContext = require("./block-controls-surface-context");
+var _blockControlsSurfaceTargets = require("./block-controls-surface-targets");
 var _getNodeContentElement = require("./utils/get-node-content-element");
 var _getSurfacePlacement = require("./utils/get-surface-placement");
 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); }
@@ -46,7 +46,7 @@ var BlockControlsLeftSurfaces = exports.BlockControlsLeftSurfaces = function Blo
     surfaceNodePositions = _useSharedPluginState.surfaceNodePositions;
   var components = (_api$uiControlRegistr = (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_surfaceKeys.BLOCK_CONTROLS_LEFT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : EMPTY_SURFACE_COMPONENTS;
   var targets = (0, _react.useMemo)(function () {
-    return (0, _blockControlsLeftSurfaceTargets.getBlockControlsLeftSurfaceTargets)(activeNode, surfaceNodePositions);
+    return (0, _blockControlsSurfaceTargets.getBlockControlsSurfaceTargets)(activeNode, surfaceNodePositions);
   }, [activeNode, surfaceNodePositions]);
   var surfaces = (0, _react.useMemo)(function () {
     return targets.flatMap(function (target) {
@@ -115,7 +115,8 @@ var BlockControlsLeftSurfaces = exports.BlockControlsLeftSurfaces = function Blo
             nodeRect: targetElement.getBoundingClientRect(),
             nodeType: blockControlsContext.targetNode.type.name,
             nodeTypeWithLevel: (0, _decorationsCommon.getNodeTypeWithLevel)(blockControlsContext.targetNode.node),
-            parentNodeType: blockControlsContext.targetNode.parentType === 'doc' ? undefined : blockControlsContext.targetNode.parentType
+            parentNodeType: blockControlsContext.targetNode.parentType === 'doc' ? undefined : blockControlsContext.targetNode.parentType,
+            side: 'left'
           });
           nextPlacements.set(position, (0, _getSurfacePlacement.getAbsoluteSurfacePlacement)({
             offsetParentRect: offsetParentRect,

package/dist/cjs/ui/block-controls-right-surface.compiled.css

@@ -0,0 +1,4 @@
+._zulpv77o{gap:var(--ds-space-025,2px)}._1e0c1txw{display:flex}
+._1pbyb4wl{z-index:100}
+._4cvr1h6o{align-items:center}
+._kqswstnw{position:absolute}

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

@@ -0,0 +1,45 @@
+/* block-controls-right-surface.tsx generated by @compiled/babel-plugin v2.0.0 */
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BlockControlsRightSurface = void 0;
+require("./block-controls-right-surface.compiled.css");
+var _runtime = require("@compiled/react/runtime");
+var _react = _interopRequireDefault(require("react"));
+var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys");
+var _surfaceRenderer = require("@atlaskit/editor-ui-control-model/surface-renderer");
+var _visibilityContainer = require("./visibility-container");
+var rightSurfaceStyles = null;
+/** Renders one right block-controls surface at a document position. */
+var BlockControlsRightSurface = exports.BlockControlsRightSurface = function BlockControlsRightSurface(_ref) {
+  var api = _ref.api,
+    components = _ref.components,
+    forceVisibleOnMouseOut = _ref.forceVisibleOnMouseOut,
+    placement = _ref.placement,
+    source = _ref.source,
+    surfaceContext = _ref.surfaceContext;
+  if (!placement || !(0, _surfaceRenderer.willSurfaceRender)(components, _surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE, surfaceContext)) {
+    return null;
+  }
+  var surface = /*#__PURE__*/_react.default.createElement(_surfaceRenderer.SurfaceRenderer, {
+    components: components,
+    surface: _surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE,
+    surfaceContext: surfaceContext
+  });
+  return /*#__PURE__*/_react.default.createElement("div", {
+    "data-editor-block-controls-surface": true,
+    "data-testid": source === 'stored' ? 'block-controls-right-surface-stored' : source === 'active' ? 'block-controls-right-surface-active' : 'block-controls-right-surface'
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Placement is resolved from the target node's runtime DOM geometry.
+    ,
+    style: placement,
+    className: (0, _runtime.ax)(["_zulpv77o _4cvr1h6o _1e0c1txw _kqswstnw _1pbyb4wl"])
+  }, /*#__PURE__*/_react.default.createElement(_visibilityContainer.VisibilityContainer, {
+    api: api,
+    controlSide: "right",
+    forceVisibleOnMouseOut: forceVisibleOnMouseOut,
+    shouldUseDisplayContents: true
+  }, surface));
+};

package/dist/cjs/ui/block-controls-right-surfaces.js

@@ -0,0 +1,222 @@
+/* block-controls-right-surfaces.tsx generated by @compiled/babel-plugin v2.0.0 */
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BlockControlsRightSurfaces = void 0;
+var _runtime = require("@compiled/react/runtime");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireWildcard(require("react"));
+var _bindEventListener = require("bind-event-listener");
+var _browserApis = require("@atlaskit/browser-apis");
+var _blockControlUiContext = require("@atlaskit/editor-common/block-controls/block-control-ui-context");
+var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys");
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _types = require("@atlaskit/editor-ui-control-model/types");
+var _decorationsCommon = require("../pm-plugins/decorations-common");
+var _blockControlsRightSurface = require("./block-controls-right-surface");
+var _blockControlsSurfaceContext = require("./block-controls-surface-context");
+var _blockControlsSurfaceTargets = require("./block-controls-surface-targets");
+var _getNodeContentElement = require("./utils/get-node-content-element");
+var _getSurfacePlacement = require("./utils/get-surface-placement");
+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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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 EMPTY_SURFACE_POSITIONS = [];
+var EMPTY_SURFACE_COMPONENTS = [];
+/**
+ * Registry-backed right surface tree. Mirrors the left surface's single-tree, measured-placement
+ * approach, but keeps its own components lookup, targets, placements and measurement lifecycle so
+ * the right surface never depends on the left surface's render pass.
+ */
+var BlockControlsRightSurfaces = exports.BlockControlsRightSurfaces = function BlockControlsRightSurfaces(_ref) {
+  var _api$uiControlRegistr, _api$uiControlRegistr2;
+  var api = _ref.api,
+    editorView = _ref.editorView;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls'], function (states) {
+      var _states$blockControls, _states$blockControls2, _states$blockControls3;
+      return {
+        activeNode: (_states$blockControls = states.blockControlsState) === null || _states$blockControls === void 0 ? void 0 : _states$blockControls.activeNode,
+        surfaceNodePositions: (_states$blockControls2 = (_states$blockControls3 = states.blockControlsState) === null || _states$blockControls3 === void 0 ? void 0 : _states$blockControls3.surfaceNodePositions) !== null && _states$blockControls2 !== void 0 ? _states$blockControls2 : EMPTY_SURFACE_POSITIONS
+      };
+    }),
+    activeNode = _useSharedPluginState.activeNode,
+    surfaceNodePositions = _useSharedPluginState.surfaceNodePositions;
+  var components = (_api$uiControlRegistr = (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_surfaceKeys.BLOCK_CONTROLS_RIGHT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : EMPTY_SURFACE_COMPONENTS;
+  var targets = (0, _react.useMemo)(function () {
+    return (0, _blockControlsSurfaceTargets.getBlockControlsSurfaceTargets)(activeNode, surfaceNodePositions);
+  }, [activeNode, surfaceNodePositions]);
+  var surfaces = (0, _react.useMemo)(function () {
+    return targets.flatMap(function (target) {
+      var context = target.source === 'stored' ? (0, _blockControlsSurfaceContext.createBlockControlsSurfaceContextForPosition)(editorView.state, target.position, activeNode) : (0, _blockControlsSurfaceContext.createBlockControlsSurfaceContext)(editorView, activeNode, target.source);
+      if (!context) {
+        return [];
+      }
+      var surfaceContext = (0, _types.createSurfaceContext)(_blockControlUiContext.BLOCK_CONTROL_UI_CONTEXT, context);
+      return [_objectSpread(_objectSpread({}, target), {}, {
+        blockControlsContext: context,
+        surfaceContext: surfaceContext
+      })];
+    });
+  }, [activeNode, editorView, targets]);
+  var _useState = (0, _react.useState)(new Map()),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    placements = _useState2[0],
+    setPlacements = _useState2[1];
+  var animationFrameRef = (0, _react.useRef)(undefined);
+  (0, _react.useLayoutEffect)(function () {
+    var _getDocument;
+    if (surfaces.length === 0) {
+      setPlacements(new Map());
+      return;
+    }
+    var measurementTargets = surfaces.flatMap(function (_ref2) {
+      var blockControlsContext = _ref2.blockControlsContext,
+        position = _ref2.position;
+      var targetNodeElement = editorView.nodeDOM(blockControlsContext.targetNode.pos);
+      var targetElementRoot = targetNodeElement instanceof HTMLElement ? targetNodeElement : targetNodeElement === null || targetNodeElement === void 0 ? void 0 : targetNodeElement.parentElement;
+      if (!targetElementRoot) {
+        return [];
+      }
+      return [{
+        blockControlsContext: blockControlsContext,
+        position: position,
+        targetElement: (0, _getNodeContentElement.getNodeContentElement)(targetElementRoot, blockControlsContext.targetNode.type.name),
+        targetElementRoot: targetElementRoot
+      }];
+    });
+    var offsetParent = editorView.dom.offsetParent;
+    var isDocumentOffsetParent = !offsetParent || offsetParent === ((_getDocument = (0, _browserApis.getDocument)()) === null || _getDocument === void 0 ? void 0 : _getDocument.body);
+    var scrollingOffsetParent = offsetParent instanceof HTMLElement && !isDocumentOffsetParent ? offsetParent : undefined;
+    var updatePositions = function updatePositions() {
+      var _scrollingOffsetParen, _scrollingOffsetParen2;
+      animationFrameRef.current = undefined;
+      var offsetParentRect = offsetParent === null || offsetParent === void 0 ? void 0 : offsetParent.getBoundingClientRect();
+      var offsetParentScrollTop = (_scrollingOffsetParen = scrollingOffsetParent === null || scrollingOffsetParent === void 0 ? void 0 : scrollingOffsetParent.scrollTop) !== null && _scrollingOffsetParen !== void 0 ? _scrollingOffsetParen : window.scrollY;
+      var offsetParentScrollLeft = (_scrollingOffsetParen2 = scrollingOffsetParent === null || scrollingOffsetParent === void 0 ? void 0 : scrollingOffsetParent.scrollLeft) !== null && _scrollingOffsetParen2 !== void 0 ? _scrollingOffsetParen2 : window.scrollX;
+      var nextPlacements = new Map();
+      var _iterator = _createForOfIteratorHelper(measurementTargets),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _targetElementRoot$ge;
+          var _step$value = _step.value,
+            blockControlsContext = _step$value.blockControlsContext,
+            position = _step$value.position,
+            targetElement = _step$value.targetElement,
+            targetElementRoot = _step$value.targetElementRoot;
+          if (!targetElementRoot.isConnected || !targetElement.isConnected) {
+            continue;
+          }
+          var placement = (0, _getSurfacePlacement.getSurfacePlacement)({
+            layout: (_targetElementRoot$ge = targetElementRoot.getAttribute('layout')) !== null && _targetElementRoot$ge !== void 0 ? _targetElementRoot$ge : '',
+            nodeRect: targetElement.getBoundingClientRect(),
+            nodeType: blockControlsContext.targetNode.type.name,
+            nodeTypeWithLevel: (0, _decorationsCommon.getNodeTypeWithLevel)(blockControlsContext.targetNode.node),
+            parentNodeType: blockControlsContext.targetNode.parentType === 'doc' ? undefined : blockControlsContext.targetNode.parentType,
+            side: 'right'
+          });
+          nextPlacements.set(position, (0, _getSurfacePlacement.getAbsoluteSurfacePlacement)({
+            offsetParentRect: offsetParentRect,
+            offsetParentScrollLeft: offsetParentScrollLeft,
+            offsetParentScrollTop: offsetParentScrollTop,
+            placement: placement
+          }));
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      setPlacements(nextPlacements);
+    };
+    var schedulePositionUpdate = function schedulePositionUpdate() {
+      if (animationFrameRef.current === undefined) {
+        animationFrameRef.current = requestAnimationFrame(updatePositions);
+      }
+    };
+    updatePositions();
+    var resizeObserver = new ResizeObserver(schedulePositionUpdate);
+    var observedElements = new Set([editorView.dom]);
+    var _iterator2 = _createForOfIteratorHelper(measurementTargets),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var targetElement = _step2.value.targetElement;
+        observedElements.add(targetElement);
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    if (offsetParent instanceof HTMLElement) {
+      observedElements.add(offsetParent);
+    }
+    observedElements.forEach(function (element) {
+      return resizeObserver.observe(element);
+    });
+    var unbindWindowResize = (0, _bindEventListener.bind)(window, {
+      type: 'resize',
+      listener: schedulePositionUpdate
+    });
+    var unbindWindowScroll = (0, _bindEventListener.bind)(window, {
+      type: 'scroll',
+      listener: schedulePositionUpdate,
+      options: {
+        capture: true,
+        passive: true
+      }
+    });
+    var visualViewport = window.visualViewport;
+    var unbindVisualViewportResize = visualViewport ? (0, _bindEventListener.bind)(visualViewport, {
+      type: 'resize',
+      listener: schedulePositionUpdate
+    }) : undefined;
+    var unbindVisualViewportScroll = visualViewport ? (0, _bindEventListener.bind)(visualViewport, {
+      type: 'scroll',
+      listener: schedulePositionUpdate
+    }) : undefined;
+    var unbindTransitionEnd = (0, _bindEventListener.bind)(editorView.dom, {
+      type: 'transitionend',
+      listener: schedulePositionUpdate,
+      options: {
+        capture: true
+      }
+    });
+    return function () {
+      if (animationFrameRef.current !== undefined) {
+        cancelAnimationFrame(animationFrameRef.current);
+        animationFrameRef.current = undefined;
+      }
+      resizeObserver.disconnect();
+      unbindWindowResize();
+      unbindWindowScroll();
+      unbindVisualViewportResize === null || unbindVisualViewportResize === void 0 || unbindVisualViewportResize();
+      unbindVisualViewportScroll === null || unbindVisualViewportScroll === void 0 || unbindVisualViewportScroll();
+      unbindTransitionEnd();
+    };
+  }, [editorView, surfaces]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, surfaces.map(function (_ref3) {
+    var _activeNode$handleOpt;
+    var position = _ref3.position,
+      source = _ref3.source,
+      surfaceContext = _ref3.surfaceContext;
+    return /*#__PURE__*/_react.default.createElement(_blockControlsRightSurface.BlockControlsRightSurface, {
+      api: api,
+      components: components,
+      forceVisibleOnMouseOut: Boolean(activeNode === null || activeNode === void 0 || (_activeNode$handleOpt = activeNode.handleOptions) === null || _activeNode$handleOpt === void 0 ? void 0 : _activeNode$handleOpt.isFocused),
+      key: position,
+      placement: placements.get(position),
+      source: source,
+      surfaceContext: surfaceContext
+    });
+  }));
+};

package/dist/{esm/ui/block-controls-left-surface-targets.js → cjs/ui/block-controls-surface-targets.js}

@@ -1,8 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getBlockControlsSurfaceTargets = void 0;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-/** Combines hover-driven and stored surface positions into one deduplicated list. */
-export var getBlockControlsLeftSurfaceTargets = function getBlockControlsLeftSurfaceTargets(activeNode, storedPositions) {
+/**
+ * Combines hover-driven and stored surface positions into one deduplicated list.
+ * Shared by both the left and right surfaces: this is pure position bookkeeping with no
+ * surface-specific behavior, so there's nothing to keep independent between them. What *is*
+ * kept independent is each surface's own React tree (component lookup, measurement effects,
+ * observers) — see block-controls-left-surfaces.tsx / block-controls-right-surfaces.tsx.
+ */
+var getBlockControlsSurfaceTargets = exports.getBlockControlsSurfaceTargets = function getBlockControlsSurfaceTargets(activeNode, storedPositions) {
   var targetsByPosition = new Map();
   var _iterator = _createForOfIteratorHelper(storedPositions),
     _step;

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

@@ -22,25 +22,39 @@ var getAbsoluteSurfacePlacement = exports.getAbsoluteSurfacePlacement = function
 };
 
 /**
- * Positions the Task 1 left surface beside the legacy drag-handle slot.
- * The surface's own width is handled by the transform, so later controls do not require measuring it.
+ * Positions the surface beside the legacy drag-handle slot, on either the left or right edge
+ * of the target node. Node-type-specific gap/top-adjustment maths (layouts, tables, media, cards,
+ * extensions, etc.) live in one place so left/right edge cases can't drift out of sync.
+ *
+ * The left side grows away from the node without knowing its own width, so it needs
+ * `translateX(-100%)` to anchor its right edge at `nodeRect.left` and extend backward. The right
+ * side grows in the normal box-flow direction (away from the node, into the margin), so the gap
+ * can be folded straight into `left` with no transform needed.
  */
 var getSurfacePlacement = exports.getSurfacePlacement = function getSurfacePlacement(_ref2) {
   var layout = _ref2.layout,
     nodeRect = _ref2.nodeRect,
     nodeType = _ref2.nodeType,
     nodeTypeWithLevel = _ref2.nodeTypeWithLevel,
-    parentNodeType = _ref2.parentNodeType;
+    parentNodeType = _ref2.parentNodeType,
+    side = _ref2.side;
   if (nodeType === 'layoutColumn') {
+    // nodeRect.left + width/2 === nodeRect.right - width/2 — side-independent.
     return {
       left: nodeRect.left + nodeRect.width / 2,
       top: nodeRect.top,
       transform: 'translate(-50%, -50%)'
     };
   }
-  return {
+  var gap = (0, _consts.dragHandleGap)(nodeType, parentNodeType);
+  var top = nodeRect.top + (0, _consts.topPositionAdjustment)(nodeTypeWithLevel, layout);
+  return side === 'right' ? {
+    left: nodeRect.right + gap,
+    top: top,
+    transform: ''
+  } : {
     left: nodeRect.left,
-    top: nodeRect.top + (0, _consts.topPositionAdjustment)(nodeTypeWithLevel, layout),
-    transform: "translateX(calc(-100% - ".concat((0, _consts.dragHandleGap)(nodeType, parentNodeType), "px))")
+    top: top,
+    transform: "translateX(calc(-100% - ".concat(gap, "px))")
   };
 };