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

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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; } }
@@ -7,7 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import rafSchedule from 'raf-schd';
 import { getDocument } from '@atlaskit/browser-apis';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { BLOCK_CONTROLS_LEFT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
+import { BLOCK_CONTROLS_LEFT_SURFACE, BLOCK_CONTROLS_RIGHT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
 import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { getNodeIdProvider } from '@atlaskit/editor-common/node-anchor';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
@@ -239,7 +240,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   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,
@@ -810,14 +811,14 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     var _latestActiveNode13, _latestActiveNode14;
     newActiveNode = isEmptyDoc || !(meta !== null && meta !== void 0 && meta.activeNode) && flags.legacyDragHandleEnabled && 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 = updateSurfaceNodePositions({
       activeNode: newActiveNode,
       currentPositions: surfaceNodePositions,
       from: from,
       newState: newState,
       previousActiveNode: previousActiveNode,
-      resolvedSurface: resolvedSurface,
+      resolvedSurfaces: resolvedSurfaces,
       to: to,
       tr: tr
     });
@@ -867,11 +868,12 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
 };
 export { _apply as apply };
 export var 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 = editorExperiment('advanced_layouts', true, {
@@ -883,7 +885,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
     surfaceNodePositionsEnabled: surfaceNodePositionsEnabled,
     toolbarFlagsEnabled: toolbarFlagsEnabled
   };
-  var resolvedSurface = surfaceNodePositionsEnabled ? resolveSurface((_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(BLOCK_CONTROLS_LEFT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [], BLOCK_CONTROLS_LEFT_SURFACE) : undefined;
+  var resolvedSurfaces = surfaceNodePositionsEnabled ? [resolveSurface((_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(BLOCK_CONTROLS_LEFT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [], BLOCK_CONTROLS_LEFT_SURFACE)].concat(_toConsumableArray(rightSurfaceEnabled ? [resolveSurface((_api$uiControlRegistr3 = api === null || api === void 0 || (_api$uiControlRegistr4 = api.uiControlRegistry) === null || _api$uiControlRegistr4 === void 0 ? void 0 : _api$uiControlRegistr4.actions.getComponents(BLOCK_CONTROLS_RIGHT_SURFACE)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [], BLOCK_CONTROLS_RIGHT_SURFACE)] : [])) : [];
   var anchorRectCache;
   if (!isAnchorSupported()) {
     anchorRectCache = new AnchorRectCache();
@@ -895,11 +897,11 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
     state: {
       init: function init(_config, editorState) {
         return _objectSpread(_objectSpread({}, initialState), {}, {
-          surfaceNodePositions: resolvedSurface ? getSurfaceNodePositions(editorState, resolvedSurface) : []
+          surfaceNodePositions: resolvedSurfaces.length > 0 ? 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/esm/pm-plugins/utils/surface-node-positions.js

@@ -7,19 +7,39 @@ var createSurfaceContextAtPosition = function createSurfaceContextAtPosition(sta
   var blockControlsContext = createBlockControlsSurfaceContextForPosition(state, position, activeNode);
   return blockControlsContext ? createSurfaceContext(BLOCK_CONTROL_UI_CONTEXT, blockControlsContext) : undefined;
 };
-export var 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 willComponentRender(root, childrenMap, surfaceContext);
+  });
+};
+export var 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 && willComponentRender(root, childrenMap, createSurfaceContextAtPosition(state, position, activeNode))) {
+    if (node.isBlock && willAnySurfaceRenderAt(surfaces, state, position, activeNode)) {
       positions.push(position);
     }
   });
@@ -28,25 +48,31 @@ export var getSurfaceNodePositions = function getSurfaceNodePositions(state, res
 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);
 };
-export var 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;
+export var 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) {
@@ -55,9 +81,9 @@ export var updateSurfaceNodePositions = function updateSurfaceNodePositions(_ref
     return result.pos;
   }).filter(function (position) {
     var node = newState.doc.nodeAt(position);
-    return Boolean((node === null || node === void 0 ? void 0 : node.isBlock) && root && 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(_toConsumableArray(mappedPositions), _toConsumableArray(changedPositions)))).sort(function (first, second) {
     return first - second;
   });

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

@@ -15,9 +15,9 @@ import { BLOCK_CONTROLS_LEFT_SURFACE } from '@atlaskit/editor-common/block-contr
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { createSurfaceContext } from '@atlaskit/editor-ui-control-model/create-surface-context';
 import { getNodeTypeWithLevel } from '../pm-plugins/decorations-common';
-import { createBlockControlsSurfaceContext, createBlockControlsSurfaceContextForPosition } from './block-controls-surface-context';
 import { BlockControlsLeftSurface } from './block-controls-left-surface';
-import { getBlockControlsLeftSurfaceTargets } from './block-controls-left-surface-targets';
+import { createBlockControlsSurfaceContext, createBlockControlsSurfaceContextForPosition } from './block-controls-surface-context';
+import { getBlockControlsSurfaceTargets } from './block-controls-surface-targets';
 import { getNodeContentElement } from './utils/get-node-content-element';
 import { getAbsoluteSurfacePlacement, getSurfacePlacement } from './utils/get-surface-placement';
 var EMPTY_SURFACE_POSITIONS = [];
@@ -37,7 +37,7 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
     surfaceNodePositions = _useSharedPluginState.surfaceNodePositions;
   var components = (_api$uiControlRegistr = (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(BLOCK_CONTROLS_LEFT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : EMPTY_SURFACE_COMPONENTS;
   var targets = useMemo(function () {
-    return getBlockControlsLeftSurfaceTargets(activeNode, surfaceNodePositions);
+    return getBlockControlsSurfaceTargets(activeNode, surfaceNodePositions);
   }, [activeNode, surfaceNodePositions]);
   var surfaces = useMemo(function () {
     return targets.flatMap(function (target) {
@@ -106,7 +106,8 @@ export var BlockControlsLeftSurfaces = function BlockControlsLeftSurfaces(_ref)
             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,
+            side: 'left'
           });
           nextPlacements.set(position, getAbsoluteSurfacePlacement({
             offsetParentRect: offsetParentRect,

package/dist/esm/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/esm/ui/block-controls-right-surface.js

@@ -0,0 +1,38 @@
+/* block-controls-right-surface.tsx generated by @compiled/babel-plugin v2.0.0 */
+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 { VisibilityContainer } from './visibility-container';
+var rightSurfaceStyles = null;
+/** Renders one right block-controls surface at a document position. */
+export var 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 || !willSurfaceRender(components, BLOCK_CONTROLS_RIGHT_SURFACE, surfaceContext)) {
+    return null;
+  }
+  var surface = /*#__PURE__*/React.createElement(SurfaceRenderer, {
+    components: components,
+    surface: BLOCK_CONTROLS_RIGHT_SURFACE,
+    surfaceContext: surfaceContext
+  });
+  return /*#__PURE__*/React.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: ax(["_zulpv77o _4cvr1h6o _1e0c1txw _kqswstnw _1pbyb4wl"])
+  }, /*#__PURE__*/React.createElement(VisibilityContainer, {
+    api: api,
+    controlSide: "right",
+    forceVisibleOnMouseOut: forceVisibleOnMouseOut,
+    shouldUseDisplayContents: true
+  }, surface));
+};

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

@@ -0,0 +1,213 @@
+/* block-controls-right-surfaces.tsx generated by @compiled/babel-plugin v2.0.0 */
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { ax, ix } from "@compiled/react/runtime";
+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) { _defineProperty(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; }
+import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { bind } from 'bind-event-listener';
+import { getDocument } from '@atlaskit/browser-apis';
+import { BLOCK_CONTROL_UI_CONTEXT } from '@atlaskit/editor-common/block-controls/block-control-ui-context';
+import { BLOCK_CONTROLS_RIGHT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { createSurfaceContext } from '@atlaskit/editor-ui-control-model/types';
+import { getNodeTypeWithLevel } from '../pm-plugins/decorations-common';
+import { BlockControlsRightSurface } from './block-controls-right-surface';
+import { createBlockControlsSurfaceContext, createBlockControlsSurfaceContextForPosition } from './block-controls-surface-context';
+import { getBlockControlsSurfaceTargets } from './block-controls-surface-targets';
+import { getNodeContentElement } from './utils/get-node-content-element';
+import { getAbsoluteSurfacePlacement, getSurfacePlacement } from './utils/get-surface-placement';
+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.
+ */
+export var BlockControlsRightSurfaces = function BlockControlsRightSurfaces(_ref) {
+  var _api$uiControlRegistr, _api$uiControlRegistr2;
+  var api = _ref.api,
+    editorView = _ref.editorView;
+  var _useSharedPluginState = 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(BLOCK_CONTROLS_RIGHT_SURFACE)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : EMPTY_SURFACE_COMPONENTS;
+  var targets = useMemo(function () {
+    return getBlockControlsSurfaceTargets(activeNode, surfaceNodePositions);
+  }, [activeNode, surfaceNodePositions]);
+  var surfaces = useMemo(function () {
+    return targets.flatMap(function (target) {
+      var context = target.source === 'stored' ? createBlockControlsSurfaceContextForPosition(editorView.state, target.position, activeNode) : createBlockControlsSurfaceContext(editorView, activeNode, target.source);
+      if (!context) {
+        return [];
+      }
+      var surfaceContext = createSurfaceContext(BLOCK_CONTROL_UI_CONTEXT, context);
+      return [_objectSpread(_objectSpread({}, target), {}, {
+        blockControlsContext: context,
+        surfaceContext: surfaceContext
+      })];
+    });
+  }, [activeNode, editorView, targets]);
+  var _useState = useState(new Map()),
+    _useState2 = _slicedToArray(_useState, 2),
+    placements = _useState2[0],
+    setPlacements = _useState2[1];
+  var animationFrameRef = useRef(undefined);
+  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: getNodeContentElement(targetElementRoot, blockControlsContext.targetNode.type.name),
+        targetElementRoot: targetElementRoot
+      }];
+    });
+    var offsetParent = editorView.dom.offsetParent;
+    var isDocumentOffsetParent = !offsetParent || offsetParent === ((_getDocument = 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 = getSurfacePlacement({
+            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,
+            side: 'right'
+          });
+          nextPlacements.set(position, 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 = bind(window, {
+      type: 'resize',
+      listener: schedulePositionUpdate
+    });
+    var unbindWindowScroll = bind(window, {
+      type: 'scroll',
+      listener: schedulePositionUpdate,
+      options: {
+        capture: true,
+        passive: true
+      }
+    });
+    var visualViewport = window.visualViewport;
+    var unbindVisualViewportResize = visualViewport ? bind(visualViewport, {
+      type: 'resize',
+      listener: schedulePositionUpdate
+    }) : undefined;
+    var unbindVisualViewportScroll = visualViewport ? bind(visualViewport, {
+      type: 'scroll',
+      listener: schedulePositionUpdate
+    }) : undefined;
+    var unbindTransitionEnd = 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.createElement(React.Fragment, null, surfaces.map(function (_ref3) {
+    var _activeNode$handleOpt;
+    var position = _ref3.position,
+      source = _ref3.source,
+      surfaceContext = _ref3.surfaceContext;
+    return /*#__PURE__*/React.createElement(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/{cjs/ui/block-controls-left-surface-targets.js → esm/ui/block-controls-surface-targets.js}

@@ -1,14 +1,14 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getBlockControlsLeftSurfaceTargets = 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. */
-var getBlockControlsLeftSurfaceTargets = exports.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.
+ */
+export var getBlockControlsSurfaceTargets = function getBlockControlsSurfaceTargets(activeNode, storedPositions) {
   var targetsByPosition = new Map();
   var _iterator = _createForOfIteratorHelper(storedPositions),
     _step;

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

@@ -15,25 +15,39 @@ export var getAbsoluteSurfacePlacement = function getAbsoluteSurfacePlacement(_r
 };
 
 /**
- * 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.
  */
 export var 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 = dragHandleGap(nodeType, parentNodeType);
+  var top = nodeRect.top + topPositionAdjustment(nodeTypeWithLevel, layout);
+  return side === 'right' ? {
+    left: nodeRect.right + gap,
+    top: top,
+    transform: ''
+  } : {
     left: nodeRect.left,
-    top: nodeRect.top + topPositionAdjustment(nodeTypeWithLevel, layout),
-    transform: "translateX(calc(-100% - ".concat(dragHandleGap(nodeType, parentNodeType), "px))")
+    top: top,
+    transform: "translateX(calc(-100% - ".concat(gap, "px))")
   };
 };

package/dist/types/pm-plugins/main.d.ts

@@ -19,7 +19,7 @@ export interface FlagType {
     toolbarFlagsEnabled: boolean;
 }
 export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
-export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, nodeDecorationRegistry: NodeDecorationFactory[], rightSideControlsEnabled?: boolean, quickInsertButtonEnabled?: boolean, anchorRectCache?: AnchorRectCache, resizeObserverWidth?: ResizeObserver, pragmaticCleanup?: (() => void) | null, resolvedSurface?: ResolvedSurface) => PluginState | {
+export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, nodeDecorationRegistry: NodeDecorationFactory[], rightSideControlsEnabled?: boolean, quickInsertButtonEnabled?: boolean, anchorRectCache?: AnchorRectCache, resizeObserverWidth?: ResizeObserver, pragmaticCleanup?: (() => void) | null, resolvedSurfaces?: readonly ResolvedSurface[]) => PluginState | {
     activeDropTargetNode: ActiveDropTargetNode | undefined;
     activeNode: any;
     blockMenuOptions: {
@@ -44,7 +44,7 @@ export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | und
     multiSelectDnD: MultiSelectDnD | undefined;
     surfaceNodePositions: number[];
 };
-export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, getIntl: () => IntlShape, nodeViewPortalProviderAPI: PortalProviderAPI, nodeDecorationRegistry: NodeDecorationFactory[], rightSideControlsEnabled?: boolean, quickInsertButtonEnabled?: boolean, legacyDragHandleEnabled?: boolean, surfaceNodePositionsEnabled?: boolean) => SafePlugin<PluginState | {
+export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, getIntl: () => IntlShape, nodeViewPortalProviderAPI: PortalProviderAPI, nodeDecorationRegistry: NodeDecorationFactory[], rightSideControlsEnabled?: boolean, quickInsertButtonEnabled?: boolean, legacyDragHandleEnabled?: boolean, surfaceNodePositionsEnabled?: boolean, rightSurfaceEnabled?: boolean) => SafePlugin<PluginState | {
     activeDropTargetNode: ActiveDropTargetNode | undefined;
     activeNode: any;
     blockMenuOptions: {

package/dist/types/pm-plugins/utils/surface-node-positions.d.ts

@@ -1,14 +1,14 @@
 import type { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
 import type { ResolvedSurface } from '@atlaskit/editor-ui-control-model/surface-renderer/types';
 import type { ActiveNode } from '../../blockControlsPluginType';
-export declare const getSurfaceNodePositions: (state: EditorState, resolvedSurface: ResolvedSurface, activeNode?: ActiveNode, from?: number, to?: number) => number[];
-export declare const updateSurfaceNodePositions: ({ activeNode, currentPositions, from, newState, previousActiveNode, resolvedSurface, to, tr, }: {
+export declare const getSurfaceNodePositions: (state: EditorState, resolvedSurfaces: readonly ResolvedSurface[], activeNode?: ActiveNode, from?: number, to?: number) => number[];
+export declare const updateSurfaceNodePositions: ({ activeNode, currentPositions, from, newState, previousActiveNode, resolvedSurfaces, to, tr, }: {
     activeNode: ActiveNode | null | undefined;
     currentPositions: number[];
     from: number;
     newState: EditorState;
     previousActiveNode: ActiveNode | null | undefined;
-    resolvedSurface: ResolvedSurface;
+    resolvedSurfaces: readonly ResolvedSurface[];
     to: number;
     tr: ReadonlyTransaction;
 }) => number[];

package/dist/types/ui/block-controls-left-surface.d.ts

@@ -8,14 +8,14 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model/surface-renderer';
 import type { SurfaceContext } from '@atlaskit/editor-ui-control-model/types';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
-import type { BlockControlsLeftSurfaceTarget } from './block-controls-left-surface-targets';
+import type { BlockControlsSurfaceTarget } from './block-controls-surface-targets';
 import type { SurfacePlacement } from './utils/get-surface-placement';
 type BlockControlsLeftSurfaceProps = {
     api: ExtractInjectionAPI<BlockControlsPlugin>;
     components: React.ComponentProps<typeof SurfaceRenderer>['components'];
     forceVisibleOnMouseOut: boolean;
     placement: SurfacePlacement | undefined;
-    source: BlockControlsLeftSurfaceTarget['source'];
+    source: BlockControlsSurfaceTarget['source'];
     surfaceContext: SurfaceContext;
 };
 /** Renders one left block-controls surface at a document position. */

package/dist/types/ui/block-controls-right-surface.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ * @jsxFrag React.Fragment
+ */
+import React from 'react';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model/surface-renderer';
+import type { SurfaceContext } from '@atlaskit/editor-ui-control-model/types';
+import type { BlockControlsPlugin } from '../blockControlsPluginType';
+import type { BlockControlsSurfaceTarget } from './block-controls-surface-targets';
+import type { SurfacePlacement } from './utils/get-surface-placement';
+type BlockControlsRightSurfaceProps = {
+    api: ExtractInjectionAPI<BlockControlsPlugin>;
+    components: React.ComponentProps<typeof SurfaceRenderer>['components'];
+    forceVisibleOnMouseOut: boolean;
+    placement: SurfacePlacement | undefined;
+    source: BlockControlsSurfaceTarget['source'];
+    surfaceContext: SurfaceContext;
+};
+/** Renders one right block-controls surface at a document position. */
+export declare const BlockControlsRightSurface: ({ api, components, forceVisibleOnMouseOut, placement, source, surfaceContext, }: BlockControlsRightSurfaceProps) => React.JSX.Element | null;
+export {};