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

package/dist/es2019/blockControlsPlugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BLOCK_CONTROLS_LEFT_GROUP, BLOCK_CONTROLS_LEFT_SECTION, BLOCK_CONTROLS_LEFT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
+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 { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -23,6 +23,7 @@ import { createSelectionPreservationPlugin } from './pm-plugins/selection-preser
 import { expandAndUpdateSelection } from './pm-plugins/utils/expand-and-update-selection';
 import { selectNode } from './pm-plugins/utils/getSelection';
 import { BlockControlsLeftSurfaces } from './ui/block-controls-left-surfaces';
+import { BlockControlsRightSurfaces } from './ui/block-controls-right-surfaces';
 import { getBlockControlsSurfaceDragHandleComponents } from './ui/block-controls-surface-drag-handle-registration';
 import { GlobalStylesWrapper } from './ui/global-styles';
 import { SurfaceEditorViewContext } from './ui/surface-editor-view-context';
@@ -37,6 +38,7 @@ export const blockControlsPlugin = ({
   const registryBlockControlsEnabled = isExperimentEnabled('platform_editor_block_control_migration');
   const surfaceNodePositionsEnabled = registryBlockControlsEnabled && isExperimentEnabled('platform_editor_collapsible_headings');
   const legacyBlockControlsEnabled = !registryBlockControlsEnabled;
+  const rightSurfaceEnabled = registryBlockControlsEnabled && isExperimentEnabled('platform_editor_block_control_right_surface');
   if (registryBlockControlsEnabled) {
     var _api$uiControlRegistr;
     api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register([BLOCK_CONTROLS_LEFT_SURFACE, {
@@ -54,6 +56,25 @@ export const blockControlsPlugin = ({
     }, ...getBlockControlsSurfaceDragHandleComponents({
       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 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.register([BLOCK_CONTROLS_RIGHT_SURFACE, {
+        ...BLOCK_CONTROLS_RIGHT_SECTION,
+        parents: [{
+          ...BLOCK_CONTROLS_RIGHT_SURFACE,
+          rank: 100
+        }]
+      }, {
+        ...BLOCK_CONTROLS_RIGHT_GROUP,
+        parents: [{
+          ...BLOCK_CONTROLS_RIGHT_SECTION,
+          rank: 100
+        }]
+      }]);
+    }
   }
   return {
     name: 'blockControls',
@@ -123,7 +144,7 @@ export const blockControlsPlugin = ({
         plugin: ({
           getIntl,
           nodeViewPortalProviderAPI
-        }) => createPlugin(api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled && legacyBlockControlsEnabled, legacyBlockControlsEnabled, surfaceNodePositionsEnabled)
+        }) => createPlugin(api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled && legacyBlockControlsEnabled, legacyBlockControlsEnabled, surfaceNodePositionsEnabled, rightSurfaceEnabled)
       }];
       if (editorExperiment('platform_editor_controls', 'variant1')) {
         pmPlugins.push({
@@ -446,7 +467,10 @@ export const blockControlsPlugin = ({
       }, /*#__PURE__*/React.createElement(BlockControlsLeftSurfaces, {
         api: api,
         editorView: editorView
-      })) : null);
+      }), rightSurfaceEnabled ? /*#__PURE__*/React.createElement(BlockControlsRightSurfaces, {
+        api: api,
+        editorView: editorView
+      }) : null) : null);
     }
   };
 };

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

@@ -1,7 +1,7 @@
 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';
@@ -231,7 +231,7 @@ const getDecorationAtPos = (state, decorations, pos, to) => {
   const nodeDecAtActivePos = nodeDecsAtActivePos.pop();
   return nodeDecAtActivePos;
 };
-export const apply = (api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled = false, quickInsertButtonEnabled = true, anchorRectCache, resizeObserverWidth, pragmaticCleanup, resolvedSurface) => {
+export const apply = (api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled = false, quickInsertButtonEnabled = true, anchorRectCache, resizeObserverWidth, pragmaticCleanup, resolvedSurfaces = []) => {
   var _api$limitedMode, _api$limitedMode$shar, _api$limitedMode$shar2, _meta$multiSelectDnD, _api$editorViewMode, _api$editorViewMode$s, _activeNode, _activeNode2, _meta$activeNode$hand, _activeNode3, _activeNode4, _meta$isDragging2, _meta$isDragging3, _meta$toggleMenu, _meta$toggleMenu2, _meta$toggleMenu3, _meta$toggleMenu4, _meta$toggleMenu5, _meta$toggleMenu6, _meta$toggleMenu7, _meta$toggleMenu8, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown, _meta$lastDragCancell;
   let {
     activeNode,
@@ -717,14 +717,14 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     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,
       newState,
       previousActiveNode,
-      resolvedSurface,
+      resolvedSurfaces,
       to,
       tr
     });
@@ -772,8 +772,8 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     isSelectedViaDragHandle: isSelectedViaDragHandleNew
   };
 };
-export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled = false, quickInsertButtonEnabled = true, legacyDragHandleEnabled = true, surfaceNodePositionsEnabled = false) => {
-  var _api$uiControlRegistr, _api$uiControlRegistr2;
+export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled = false, quickInsertButtonEnabled = true, legacyDragHandleEnabled = true, surfaceNodePositionsEnabled = false, rightSurfaceEnabled = false) => {
+  var _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
   const {
     formatMessage
   } = getIntl();
@@ -786,7 +786,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
     surfaceNodePositionsEnabled,
     toolbarFlagsEnabled
   };
-  const resolvedSurface = surfaceNodePositionsEnabled ? resolveSurface((_api$uiControlRegistr = api === null || api === void 0 ? 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;
+  const resolvedSurfaces = surfaceNodePositionsEnabled ? [resolveSurface((_api$uiControlRegistr = api === null || api === void 0 ? 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), ...(rightSurfaceEnabled ? [resolveSurface((_api$uiControlRegistr3 = api === null || api === void 0 ? 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)] : [])] : [];
   let anchorRectCache;
   if (!isAnchorSupported()) {
     anchorRectCache = new AnchorRectCache();
@@ -799,10 +799,10 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
       init(_config, editorState) {
         return {
           ...initialState,
-          surfaceNodePositions: resolvedSurface ? getSurfaceNodePositions(editorState, resolvedSurface) : []
+          surfaceNodePositions: resolvedSurfaces.length > 0 ? getSurfaceNodePositions(editorState, resolvedSurfaces) : []
         };
       },
-      apply: (tr, currentState, _, newState) => apply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled, anchorRectCache, resizeObserverWidth, pragmaticCleanup, resolvedSurface)
+      apply: (tr, currentState, _, newState) => apply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled, anchorRectCache, resizeObserverWidth, pragmaticCleanup, resolvedSurfaces)
     },
     props: {
       decorations: state => {

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

@@ -6,19 +6,35 @@ const createSurfaceContextAtPosition = (state, position, activeNode) => {
   const blockControlsContext = createBlockControlsSurfaceContextForPosition(state, position, activeNode);
   return blockControlsContext ? createSurfaceContext(BLOCK_CONTROL_UI_CONTEXT, blockControlsContext) : undefined;
 };
-export const getSurfaceNodePositions = (state, resolvedSurface, activeNode, from = 0, to = state.doc.content.size) => {
-  const {
-    root,
-    childrenMap
-  } = resolvedSurface;
-  if (!root) {
+
+/**
+ * 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()`.
+ */
+const willAnySurfaceRenderAt = (surfaces, state, position, activeNode) => {
+  const surfaceContext = createSurfaceContextAtPosition(state, position, activeNode);
+  return surfaces.some(({
+    childrenMap,
+    root
+  }) => willComponentRender(root, childrenMap, surfaceContext));
+};
+export const getSurfaceNodePositions = (state, resolvedSurfaces, activeNode, from = 0, to = state.doc.content.size) => {
+  const surfaces = resolvedSurfaces.flatMap(({
+    childrenMap,
+    root
+  }) => root ? [{
+    childrenMap,
+    root
+  }] : []);
+  if (surfaces.length === 0) {
     return [];
   }
   const positions = [];
   const start = Math.max(0, from);
   const end = Math.min(state.doc.content.size, Math.max(start, to));
   state.doc.nodesBetween(start, end, (node, position) => {
-    if (node.isBlock && willComponentRender(root, childrenMap, createSurfaceContextAtPosition(state, position, activeNode))) {
+    if (node.isBlock && willAnySurfaceRenderAt(surfaces, state, position, activeNode)) {
       positions.push(position);
     }
   });
@@ -31,7 +47,7 @@ export const updateSurfaceNodePositions = ({
   from,
   newState,
   previousActiveNode,
-  resolvedSurface,
+  resolvedSurfaces,
   to,
   tr
 }) => {
@@ -41,16 +57,19 @@ export const updateSurfaceNodePositions = ({
   }
   const nextActiveNode = activeNode !== null && activeNode !== void 0 ? activeNode : undefined;
   if (activeNodeChanged) {
-    return getSurfaceNodePositions(newState, resolvedSurface, nextActiveNode);
+    return getSurfaceNodePositions(newState, resolvedSurfaces, nextActiveNode);
   }
-  const {
-    root,
-    childrenMap
-  } = resolvedSurface;
+  const surfaces = resolvedSurfaces.flatMap(({
+    childrenMap,
+    root
+  }) => root ? [{
+    childrenMap,
+    root
+  }] : []);
   const mappedPositions = currentPositions.map(position => tr.mapping.mapResult(position, -1)).filter(result => !result.deleted).map(result => result.pos).filter(position => {
     const 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));
   });
-  const changedPositions = getSurfaceNodePositions(newState, resolvedSurface, nextActiveNode, from - 1, to + 1);
+  const changedPositions = getSurfaceNodePositions(newState, resolvedSurfaces, nextActiveNode, from - 1, to + 1);
   return Array.from(new Set([...mappedPositions, ...changedPositions])).sort((first, second) => first - second);
 };

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

@@ -8,9 +8,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';
 const EMPTY_SURFACE_POSITIONS = [];
@@ -31,7 +31,7 @@ export const BlockControlsLeftSurfaces = ({
     };
   });
   const 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;
-  const targets = useMemo(() => getBlockControlsLeftSurfaceTargets(activeNode, surfaceNodePositions), [activeNode, surfaceNodePositions]);
+  const targets = useMemo(() => getBlockControlsSurfaceTargets(activeNode, surfaceNodePositions), [activeNode, surfaceNodePositions]);
   const surfaces = useMemo(() => targets.flatMap(target => {
     const context = target.source === 'stored' ? createBlockControlsSurfaceContextForPosition(editorView.state, target.position, activeNode) : createBlockControlsSurfaceContext(editorView, activeNode, target.source);
     if (!context) {
@@ -93,7 +93,8 @@ export const BlockControlsLeftSurfaces = ({
           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,

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

@@ -0,0 +1,39 @@
+/* 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';
+const rightSurfaceStyles = null;
+/** Renders one right block-controls surface at a document position. */
+export const BlockControlsRightSurface = ({
+  api,
+  components,
+  forceVisibleOnMouseOut,
+  placement,
+  source,
+  surfaceContext
+}) => {
+  if (!placement || !willSurfaceRender(components, BLOCK_CONTROLS_RIGHT_SURFACE, surfaceContext)) {
+    return null;
+  }
+  const 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/es2019/ui/block-controls-right-surfaces.js

@@ -0,0 +1,187 @@
+/* block-controls-right-surfaces.tsx generated by @compiled/babel-plugin v2.0.0 */
+import { ax, ix } from "@compiled/react/runtime";
+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';
+const EMPTY_SURFACE_POSITIONS = [];
+const 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 const BlockControlsRightSurfaces = ({
+  api,
+  editorView
+}) => {
+  var _api$uiControlRegistr, _api$uiControlRegistr2;
+  const {
+    activeNode,
+    surfaceNodePositions
+  } = useSharedPluginStateWithSelector(api, ['blockControls'], 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
+    };
+  });
+  const 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;
+  const targets = useMemo(() => getBlockControlsSurfaceTargets(activeNode, surfaceNodePositions), [activeNode, surfaceNodePositions]);
+  const surfaces = useMemo(() => targets.flatMap(target => {
+    const context = target.source === 'stored' ? createBlockControlsSurfaceContextForPosition(editorView.state, target.position, activeNode) : createBlockControlsSurfaceContext(editorView, activeNode, target.source);
+    if (!context) {
+      return [];
+    }
+    const surfaceContext = createSurfaceContext(BLOCK_CONTROL_UI_CONTEXT, context);
+    return [{
+      ...target,
+      blockControlsContext: context,
+      surfaceContext
+    }];
+  }), [activeNode, editorView, targets]);
+  const [placements, setPlacements] = useState(new Map());
+  const animationFrameRef = useRef(undefined);
+  useLayoutEffect(() => {
+    var _getDocument;
+    if (surfaces.length === 0) {
+      setPlacements(new Map());
+      return;
+    }
+    const measurementTargets = surfaces.flatMap(({
+      blockControlsContext,
+      position
+    }) => {
+      const targetNodeElement = editorView.nodeDOM(blockControlsContext.targetNode.pos);
+      const targetElementRoot = targetNodeElement instanceof HTMLElement ? targetNodeElement : targetNodeElement === null || targetNodeElement === void 0 ? void 0 : targetNodeElement.parentElement;
+      if (!targetElementRoot) {
+        return [];
+      }
+      return [{
+        blockControlsContext,
+        position,
+        targetElement: getNodeContentElement(targetElementRoot, blockControlsContext.targetNode.type.name),
+        targetElementRoot
+      }];
+    });
+    const offsetParent = editorView.dom.offsetParent;
+    const isDocumentOffsetParent = !offsetParent || offsetParent === ((_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.body);
+    const scrollingOffsetParent = offsetParent instanceof HTMLElement && !isDocumentOffsetParent ? offsetParent : undefined;
+    const updatePositions = () => {
+      var _scrollingOffsetParen, _scrollingOffsetParen2;
+      animationFrameRef.current = undefined;
+      const offsetParentRect = offsetParent === null || offsetParent === void 0 ? void 0 : offsetParent.getBoundingClientRect();
+      const offsetParentScrollTop = (_scrollingOffsetParen = scrollingOffsetParent === null || scrollingOffsetParent === void 0 ? void 0 : scrollingOffsetParent.scrollTop) !== null && _scrollingOffsetParen !== void 0 ? _scrollingOffsetParen : window.scrollY;
+      const offsetParentScrollLeft = (_scrollingOffsetParen2 = scrollingOffsetParent === null || scrollingOffsetParent === void 0 ? void 0 : scrollingOffsetParent.scrollLeft) !== null && _scrollingOffsetParen2 !== void 0 ? _scrollingOffsetParen2 : window.scrollX;
+      const nextPlacements = new Map();
+      for (const {
+        blockControlsContext,
+        position,
+        targetElement,
+        targetElementRoot
+      } of measurementTargets) {
+        var _targetElementRoot$ge;
+        if (!targetElementRoot.isConnected || !targetElement.isConnected) {
+          continue;
+        }
+        const 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,
+          offsetParentScrollLeft,
+          offsetParentScrollTop,
+          placement
+        }));
+      }
+      setPlacements(nextPlacements);
+    };
+    const schedulePositionUpdate = () => {
+      if (animationFrameRef.current === undefined) {
+        animationFrameRef.current = requestAnimationFrame(updatePositions);
+      }
+    };
+    updatePositions();
+    const resizeObserver = new ResizeObserver(schedulePositionUpdate);
+    const observedElements = new Set([editorView.dom]);
+    for (const {
+      targetElement
+    } of measurementTargets) {
+      observedElements.add(targetElement);
+    }
+    if (offsetParent instanceof HTMLElement) {
+      observedElements.add(offsetParent);
+    }
+    observedElements.forEach(element => resizeObserver.observe(element));
+    const unbindWindowResize = bind(window, {
+      type: 'resize',
+      listener: schedulePositionUpdate
+    });
+    const unbindWindowScroll = bind(window, {
+      type: 'scroll',
+      listener: schedulePositionUpdate,
+      options: {
+        capture: true,
+        passive: true
+      }
+    });
+    const visualViewport = window.visualViewport;
+    const unbindVisualViewportResize = visualViewport ? bind(visualViewport, {
+      type: 'resize',
+      listener: schedulePositionUpdate
+    }) : undefined;
+    const unbindVisualViewportScroll = visualViewport ? bind(visualViewport, {
+      type: 'scroll',
+      listener: schedulePositionUpdate
+    }) : undefined;
+    const unbindTransitionEnd = bind(editorView.dom, {
+      type: 'transitionend',
+      listener: schedulePositionUpdate,
+      options: {
+        capture: true
+      }
+    });
+    return () => {
+      if (animationFrameRef.current !== undefined) {
+        cancelAnimationFrame(animationFrameRef.current);
+        animationFrameRef.current = undefined;
+      }
+      resizeObserver.disconnect();
+      unbindWindowResize();
+      unbindWindowScroll();
+      unbindVisualViewportResize === null || unbindVisualViewportResize === void 0 ? void 0 : unbindVisualViewportResize();
+      unbindVisualViewportScroll === null || unbindVisualViewportScroll === void 0 ? void 0 : unbindVisualViewportScroll();
+      unbindTransitionEnd();
+    };
+  }, [editorView, surfaces]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, surfaces.map(({
+    position,
+    source,
+    surfaceContext
+  }) => {
+    var _activeNode$handleOpt;
+    return /*#__PURE__*/React.createElement(BlockControlsRightSurface, {
+      api: api,
+      components: components,
+      forceVisibleOnMouseOut: Boolean(activeNode === null || activeNode === void 0 ? 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/es2019/ui/{block-controls-left-surface-targets.js → block-controls-surface-targets.js}

@@ -1,5 +1,11 @@
-/** Combines hover-driven and stored surface positions into one deduplicated list. */
-export const 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 const getBlockControlsSurfaceTargets = (activeNode, storedPositions) => {
   const targetsByPosition = new Map();
   for (const position of storedPositions) {
     targetsByPosition.set(position, {

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

@@ -14,26 +14,40 @@ export const getAbsoluteSurfacePlacement = ({
 };
 
 /**
- * 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 const getSurfacePlacement = ({
   layout,
   nodeRect,
   nodeType,
   nodeTypeWithLevel,
-  parentNodeType
+  parentNodeType,
+  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 {
+  const gap = dragHandleGap(nodeType, parentNodeType);
+  const top = nodeRect.top + topPositionAdjustment(nodeTypeWithLevel, layout);
+  return side === 'right' ? {
+    left: nodeRect.right + gap,
+    top,
+    transform: ''
+  } : {
     left: nodeRect.left,
-    top: nodeRect.top + topPositionAdjustment(nodeTypeWithLevel, layout),
-    transform: `translateX(calc(-100% - ${dragHandleGap(nodeType, parentNodeType)}px))`
+    top,
+    transform: `translateX(calc(-100% - ${gap}px))`
   };
 };

package/dist/esm/blockControlsPlugin.js

@@ -3,7 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 from 'react';
-import { BLOCK_CONTROLS_LEFT_GROUP, BLOCK_CONTROLS_LEFT_SECTION, BLOCK_CONTROLS_LEFT_SURFACE } from '@atlaskit/editor-common/block-controls/surface-keys';
+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 { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -27,6 +27,7 @@ import { createSelectionPreservationPlugin } from './pm-plugins/selection-preser
 import { expandAndUpdateSelection as _expandAndUpdateSelection } from './pm-plugins/utils/expand-and-update-selection';
 import { selectNode } from './pm-plugins/utils/getSelection';
 import { BlockControlsLeftSurfaces } from './ui/block-controls-left-surfaces';
+import { BlockControlsRightSurfaces } from './ui/block-controls-right-surfaces';
 import { getBlockControlsSurfaceDragHandleComponents } from './ui/block-controls-surface-drag-handle-registration';
 import { GlobalStylesWrapper } from './ui/global-styles';
 import { SurfaceEditorViewContext } from './ui/surface-editor-view-context';
@@ -40,6 +41,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
   var registryBlockControlsEnabled = isExperimentEnabled('platform_editor_block_control_migration');
   var surfaceNodePositionsEnabled = registryBlockControlsEnabled && isExperimentEnabled('platform_editor_collapsible_headings');
   var legacyBlockControlsEnabled = !registryBlockControlsEnabled;
+  var rightSurfaceEnabled = registryBlockControlsEnabled && 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([BLOCK_CONTROLS_LEFT_SURFACE, _objectSpread(_objectSpread({}, BLOCK_CONTROLS_LEFT_SECTION), {}, {
@@ -53,6 +55,21 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
     })].concat(_toConsumableArray(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([BLOCK_CONTROLS_RIGHT_SURFACE, _objectSpread(_objectSpread({}, BLOCK_CONTROLS_RIGHT_SECTION), {}, {
+        parents: [_objectSpread(_objectSpread({}, BLOCK_CONTROLS_RIGHT_SURFACE), {}, {
+          rank: 100
+        })]
+      }), _objectSpread(_objectSpread({}, BLOCK_CONTROLS_RIGHT_GROUP), {}, {
+        parents: [_objectSpread(_objectSpread({}, BLOCK_CONTROLS_RIGHT_SECTION), {}, {
+          rank: 100
+        })]
+      })]);
+    }
   }
   return {
     name: 'blockControls',
@@ -122,7 +139,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         plugin: function plugin(_ref2) {
           var getIntl = _ref2.getIntl,
             nodeViewPortalProviderAPI = _ref2.nodeViewPortalProviderAPI;
-          return createPlugin(api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled && legacyBlockControlsEnabled, legacyBlockControlsEnabled, surfaceNodePositionsEnabled);
+          return createPlugin(api, getIntl, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled, quickInsertButtonEnabled && legacyBlockControlsEnabled, legacyBlockControlsEnabled, surfaceNodePositionsEnabled, rightSurfaceEnabled);
         }
       }];
       if (editorExperiment('platform_editor_controls', 'variant1')) {
@@ -450,7 +467,10 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       }, /*#__PURE__*/React.createElement(BlockControlsLeftSurfaces, {
         api: api,
         editorView: editorView
-      })) : null);
+      }), rightSurfaceEnabled ? /*#__PURE__*/React.createElement(BlockControlsRightSurfaces, {
+        api: api,
+        editorView: editorView
+      }) : null) : null);
     }
   };
 };