@atlaskit/editor-plugin-block-menu 6.0.41 → 6.0.43

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.43
+
+### Patch Changes
+
+- [`61ffb7d51ff40`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/61ffb7d51ff40) -
+  [ux] Ensure that when a transform to an expand happens, its localId is present so that it remains
+  'expanded'
+- Updated dependencies
+
+## 6.0.42
+
+### Patch Changes
+
+- [`f0de8d658199d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f0de8d658199d) -
+  [ux] Ensure if table transform occurs, the result remains selected
+- Updated dependencies
+
 ## 6.0.41
 
 ### Patch Changes

package/dist/cjs/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.wrapMixedContentStep = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _marks = require("../marks");
 var _types = require("../types");
 var _utils = require("../utils");
@@ -35,7 +36,15 @@ var createTextContentContainer = function createTextContentContainer(textContent
  * Creates a regular container with node content.
  */
 var createNodeContentContainer = function createNodeContentContainer(nodeContent, targetNodeType) {
-  return targetNodeType.createAndFill({}, nodeContent);
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object, preserving the expandedState WeakMap entry set in transformNode.ts.
+  // To clean up: remove the if-else, always use the flag-on branch.
+  var isExpandType = targetNodeType.name === 'expand' || targetNodeType.name === 'nestedExpand';
+  var nodeAttrs = isExpandType && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  return targetNodeType.createAndFill(nodeAttrs, nodeContent);
 };
 
 /**
@@ -70,7 +79,14 @@ var handleEmptyContainerEdgeCase = function handleEmptyContainerEdgeCase(result,
     return emptyCodeBlock ? [emptyCodeBlock].concat((0, _toConsumableArray2.default)(result)) : result;
   }
   var emptyParagraph = schema.nodes.paragraph.create();
-  var emptyContainer = targetNodeType.create({}, emptyParagraph);
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Same localId pre-assignment rationale as createNodeContentContainer above.
+  // To clean up: remove the if-else, always use the flag-on branch.
+  var isExpandType = targetNodeTypeName === 'expand' || targetNodeTypeName === 'nestedExpand';
+  var emptyContainerAttrs = isExpandType && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  var emptyContainer = targetNodeType.create(emptyContainerAttrs, emptyParagraph);
   return [emptyContainer].concat((0, _toConsumableArray2.default)(result));
 };
 

package/dist/cjs/editor-commands/transform-node-utils/utils.js

@@ -1,13 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isTextNode = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.createTextContent = exports.convertTextNodeToParagraph = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("./types");
+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; }
 /**
  * Determines if a node is a text node (heading or paragraph).
  * Text nodes can have their content converted to paragraphs when they can't be wrapped directly.
@@ -79,9 +84,17 @@ var convertNestedExpandToExpand = exports.convertNestedExpandToExpand = function
   if (!expandType) {
     return null;
   }
-  return expandType.createAndFill({
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object, preserving the expandedState WeakMap entry set in transformNode.ts.
+  // To clean up: remove the if-else, always include localId in attrs.
+  var localIdAttr = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  return expandType.createAndFill(_objectSpread({
     title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
-  }, node.content);
+  }, localIdAttr), node.content);
 };
 
 /**
@@ -95,9 +108,16 @@ var convertExpandToNestedExpand = exports.convertExpandToNestedExpand = function
   if (!nestedExpandType) {
     return null;
   }
-  return nestedExpandType.createAndFill({
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Same localId pre-assignment rationale as convertNestedExpandToExpand above.
+  // To clean up: remove the if-else, always include localId in attrs.
+  var localIdAttr = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  return nestedExpandType.createAndFill(_objectSpread({
     title: ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.title) || ''
-  }, node.content);
+  }, localIdAttr), node.content);
 };
 
 /**

package/dist/cjs/editor-commands/transform-node-utils/wrapStep.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapStep = void 0;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _marks = require("./marks");
 var _utils = require("./utils");
 /**
@@ -27,6 +28,17 @@ var wrapStep = exports.wrapStep = function wrapStep(nodes, context) {
       return node;
     });
   }
-  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, (0, _marks.removeDisallowedMarks)(processedNodes, schema.nodes[targetNodeTypeName]));
+  var targetNodeType = schema.nodes[targetNodeTypeName];
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object (via setNodeAttribute), which would invalidate the expandedState WeakMap entry set
+  // in transformNode.ts and cause the expand to render as collapsed.
+  // To clean up: remove the if-else, always use the flag-on branch (isExpandType with uuid).
+  var isExpandType = targetNodeTypeName === 'expand' || targetNodeTypeName === 'nestedExpand';
+  var nodeAttrs = isExpandType && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  var outputNode = targetNodeType.createAndFill(nodeAttrs, (0, _marks.removeDisallowedMarks)(processedNodes, schema.nodes[targetNodeTypeName]));
   return outputNode ? [outputNode] : nodes;
 };

package/dist/cjs/editor-commands/transformNode.js

@@ -5,10 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformNode = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _expand = require("@atlaskit/editor-common/expand");
 var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _editorTables = require("@atlaskit/editor-tables");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _isNestedNode = require("../ui/utils/isNestedNode");
 var _transform2 = require("./transform-node-utils/transform");
 var _utils = require("./transforms/utils");
@@ -50,6 +53,23 @@ var transformNode = exports.transformNode = function transformNode(api) {
       });
       var content = resultNodes.length > 0 ? resultNodes : sourceNodes;
       var sliceStart = isList ? $from.pos - 1 : $from.pos;
+
+      // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+      // Pre-populates the expandedState WeakMap so ExpandNodeView initializes newly created
+      // expand/nestedExpand nodes as expanded rather than collapsed. Works in conjunction with
+      // the localId pre-assignment in the transform steps — without a pre-assigned localId the
+      // localId plugin's appendTransaction replaces the node object (via setNodeAttribute),
+      // invalidating this WeakMap entry. The else branch preserves the previous behaviour.
+      // To clean up: remove the if-else block and keep only the flag-on body.
+      if ((0, _platformFeatureFlags.fg)('platform_editor_block_menu_expand_localid_fix')) {
+        var expand = nodes.expand,
+          nestedExpand = nodes.nestedExpand;
+        content.forEach(function (node) {
+          if (node.type === expand || node.type === nestedExpand) {
+            _expand.expandedState.set(node, true);
+          }
+        });
+      }
       if (preservedSelection instanceof _state.NodeSelection && preservedSelection.node.type === nodes.mediaSingle) {
         var _api$blockControls2;
         // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
@@ -76,6 +96,26 @@ var transformNode = exports.transformNode = function transformNode(api) {
       } else {
         tr.replaceWith(sliceStart, $to.pos, content);
       }
+
+      // [FEATURE FLAG: platform_editor_table_transform_selection_fix]
+      // Fixes table cell selection not being preserved after transform to expand/layout.
+      // When a table with CellSelection is transformed, we need to re-select the wrapper node.
+      // To clean up: remove the if-else block and keep only the flag-on behavior.
+      if (preservedSelection instanceof _editorTables.CellSelection && (0, _platformFeatureFlags.fg)('platform_editor_table_transform_selection_fix')) {
+        var insertedNode = tr.doc.nodeAt($from.pos);
+        var isSelectable = insertedNode && _state.NodeSelection.isSelectable(insertedNode);
+        if (isSelectable) {
+          var _api$blockControls3;
+          var nodeSelection = _state.NodeSelection.create(tr.doc, $from.pos);
+          tr.setSelection(nodeSelection);
+
+          // Update preserved selection to match the new NodeSelection
+          // This prevents appendTransaction from restoring the old table selection positions
+          api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.startPreservingSelection()({
+            tr: tr
+          });
+        }
+      }
       (0, _performanceMeasures.stopMeasure)(measureId, function (duration, startTime) {
         var _api$analytics;
         api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({

package/dist/es2019/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -1,4 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { removeDisallowedMarks } from '../marks';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
 import { convertTextNodeToParagraph, createTextContent, isTextNode } from '../utils';
@@ -28,7 +29,15 @@ const createTextContentContainer = (textContentArray, targetNodeType, schema) =>
  * Creates a regular container with node content.
  */
 const createNodeContentContainer = (nodeContent, targetNodeType) => {
-  return targetNodeType.createAndFill({}, nodeContent);
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object, preserving the expandedState WeakMap entry set in transformNode.ts.
+  // To clean up: remove the if-else, always use the flag-on branch.
+  const isExpandType = targetNodeType.name === 'expand' || targetNodeType.name === 'nestedExpand';
+  const nodeAttrs = isExpandType && fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  return targetNodeType.createAndFill(nodeAttrs, nodeContent);
 };
 
 /**
@@ -63,7 +72,14 @@ const handleEmptyContainerEdgeCase = (result, hasCreatedContainer, fromNode, tar
     return emptyCodeBlock ? [emptyCodeBlock, ...result] : result;
   }
   const emptyParagraph = schema.nodes.paragraph.create();
-  const emptyContainer = targetNodeType.create({}, emptyParagraph);
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Same localId pre-assignment rationale as createNodeContentContainer above.
+  // To clean up: remove the if-else, always use the flag-on branch.
+  const isExpandType = targetNodeTypeName === 'expand' || targetNodeTypeName === 'nestedExpand';
+  const emptyContainerAttrs = isExpandType && fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  const emptyContainer = targetNodeType.create(emptyContainerAttrs, emptyParagraph);
   return [emptyContainer, ...result];
 };
 

package/dist/es2019/editor-commands/transform-node-utils/utils.js

@@ -1,6 +1,7 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { NODE_CATEGORY_BY_TYPE } from './types';
 
 /**
@@ -75,8 +76,17 @@ export const convertNestedExpandToExpand = (node, schema) => {
   if (!expandType) {
     return null;
   }
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object, preserving the expandedState WeakMap entry set in transformNode.ts.
+  // To clean up: remove the if-else, always include localId in attrs.
+  const localIdAttr = fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
   return expandType.createAndFill({
-    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
+    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || '',
+    ...localIdAttr
   }, node.content);
 };
 
@@ -91,8 +101,16 @@ export const convertExpandToNestedExpand = (node, schema) => {
   if (!nestedExpandType) {
     return null;
   }
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Same localId pre-assignment rationale as convertNestedExpandToExpand above.
+  // To clean up: remove the if-else, always include localId in attrs.
+  const localIdAttr = fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
   return nestedExpandType.createAndFill({
-    title: ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.title) || ''
+    title: ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.title) || '',
+    ...localIdAttr
   }, node.content);
 };
 

package/dist/es2019/editor-commands/transform-node-utils/wrapStep.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { removeDisallowedMarks } from './marks';
 import { convertExpandToNestedExpand } from './utils';
 
@@ -24,6 +25,17 @@ export const wrapStep = (nodes, context) => {
       return node;
     });
   }
-  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, removeDisallowedMarks(processedNodes, schema.nodes[targetNodeTypeName]));
+  const targetNodeType = schema.nodes[targetNodeTypeName];
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object (via setNodeAttribute), which would invalidate the expandedState WeakMap entry set
+  // in transformNode.ts and cause the expand to render as collapsed.
+  // To clean up: remove the if-else, always use the flag-on branch (isExpandType with uuid).
+  const isExpandType = targetNodeTypeName === 'expand' || targetNodeTypeName === 'nestedExpand';
+  const nodeAttrs = isExpandType && fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  const outputNode = targetNodeType.createAndFill(nodeAttrs, removeDisallowedMarks(processedNodes, schema.nodes[targetNodeTypeName]));
   return outputNode ? [outputNode] : nodes;
 };

package/dist/es2019/editor-commands/transformNode.js

@@ -1,8 +1,11 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { expandedState } from '@atlaskit/editor-common/expand';
 import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { expandSelectionToBlockRange, getSourceNodesFromSelectionRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
+import { CellSelection } from '@atlaskit/editor-tables';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { convertNodesToTargetType } from './transform-node-utils/transform';
 import { isListNode } from './transforms/utils';
@@ -46,6 +49,25 @@ export const transformNode = api => (targetType, metadata) => ({
   });
   const content = resultNodes.length > 0 ? resultNodes : sourceNodes;
   const sliceStart = isList ? $from.pos - 1 : $from.pos;
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-populates the expandedState WeakMap so ExpandNodeView initializes newly created
+  // expand/nestedExpand nodes as expanded rather than collapsed. Works in conjunction with
+  // the localId pre-assignment in the transform steps — without a pre-assigned localId the
+  // localId plugin's appendTransaction replaces the node object (via setNodeAttribute),
+  // invalidating this WeakMap entry. The else branch preserves the previous behaviour.
+  // To clean up: remove the if-else block and keep only the flag-on body.
+  if (fg('platform_editor_block_menu_expand_localid_fix')) {
+    const {
+      expand,
+      nestedExpand
+    } = nodes;
+    content.forEach(node => {
+      if (node.type === expand || node.type === nestedExpand) {
+        expandedState.set(node, true);
+      }
+    });
+  }
   if (preservedSelection instanceof NodeSelection && preservedSelection.node.type === nodes.mediaSingle) {
     var _api$blockControls2;
     // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
@@ -68,6 +90,26 @@ export const transformNode = api => (targetType, metadata) => ({
   } else {
     tr.replaceWith(sliceStart, $to.pos, content);
   }
+
+  // [FEATURE FLAG: platform_editor_table_transform_selection_fix]
+  // Fixes table cell selection not being preserved after transform to expand/layout.
+  // When a table with CellSelection is transformed, we need to re-select the wrapper node.
+  // To clean up: remove the if-else block and keep only the flag-on behavior.
+  if (preservedSelection instanceof CellSelection && fg('platform_editor_table_transform_selection_fix')) {
+    const insertedNode = tr.doc.nodeAt($from.pos);
+    const isSelectable = insertedNode && NodeSelection.isSelectable(insertedNode);
+    if (isSelectable) {
+      var _api$blockControls3;
+      const nodeSelection = NodeSelection.create(tr.doc, $from.pos);
+      tr.setSelection(nodeSelection);
+
+      // Update preserved selection to match the new NodeSelection
+      // This prevents appendTransaction from restoring the old table selection positions
+      api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.startPreservingSelection()({
+        tr
+      });
+    }
+  }
   stopMeasure(measureId, (duration, startTime) => {
     var _api$analytics, _api$analytics$action;
     api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.attachAnalyticsEvent({

package/dist/esm/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -1,5 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { removeDisallowedMarks } from '../marks';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
 import { convertTextNodeToParagraph, createTextContent, isTextNode } from '../utils';
@@ -29,7 +30,15 @@ var createTextContentContainer = function createTextContentContainer(textContent
  * Creates a regular container with node content.
  */
 var createNodeContentContainer = function createNodeContentContainer(nodeContent, targetNodeType) {
-  return targetNodeType.createAndFill({}, nodeContent);
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object, preserving the expandedState WeakMap entry set in transformNode.ts.
+  // To clean up: remove the if-else, always use the flag-on branch.
+  var isExpandType = targetNodeType.name === 'expand' || targetNodeType.name === 'nestedExpand';
+  var nodeAttrs = isExpandType && fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  return targetNodeType.createAndFill(nodeAttrs, nodeContent);
 };
 
 /**
@@ -64,7 +73,14 @@ var handleEmptyContainerEdgeCase = function handleEmptyContainerEdgeCase(result,
     return emptyCodeBlock ? [emptyCodeBlock].concat(_toConsumableArray(result)) : result;
   }
   var emptyParagraph = schema.nodes.paragraph.create();
-  var emptyContainer = targetNodeType.create({}, emptyParagraph);
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Same localId pre-assignment rationale as createNodeContentContainer above.
+  // To clean up: remove the if-else, always use the flag-on branch.
+  var isExpandType = targetNodeTypeName === 'expand' || targetNodeTypeName === 'nestedExpand';
+  var emptyContainerAttrs = isExpandType && fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  var emptyContainer = targetNodeType.create(emptyContainerAttrs, emptyParagraph);
   return [emptyContainer].concat(_toConsumableArray(result));
 };
 

package/dist/esm/editor-commands/transform-node-utils/utils.js

@@ -1,6 +1,10 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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 { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { NODE_CATEGORY_BY_TYPE } from './types';
 
 /**
@@ -74,9 +78,17 @@ export var convertNestedExpandToExpand = function convertNestedExpandToExpand(no
   if (!expandType) {
     return null;
   }
-  return expandType.createAndFill({
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object, preserving the expandedState WeakMap entry set in transformNode.ts.
+  // To clean up: remove the if-else, always include localId in attrs.
+  var localIdAttr = fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  return expandType.createAndFill(_objectSpread({
     title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
-  }, node.content);
+  }, localIdAttr), node.content);
 };
 
 /**
@@ -90,9 +102,16 @@ export var convertExpandToNestedExpand = function convertExpandToNestedExpand(no
   if (!nestedExpandType) {
     return null;
   }
-  return nestedExpandType.createAndFill({
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Same localId pre-assignment rationale as convertNestedExpandToExpand above.
+  // To clean up: remove the if-else, always include localId in attrs.
+  var localIdAttr = fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  return nestedExpandType.createAndFill(_objectSpread({
     title: ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.title) || ''
-  }, node.content);
+  }, localIdAttr), node.content);
 };
 
 /**

package/dist/esm/editor-commands/transform-node-utils/wrapStep.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { removeDisallowedMarks } from './marks';
 import { convertExpandToNestedExpand } from './utils';
 
@@ -22,6 +23,17 @@ export var wrapStep = function wrapStep(nodes, context) {
       return node;
     });
   }
-  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, removeDisallowedMarks(processedNodes, schema.nodes[targetNodeTypeName]));
+  var targetNodeType = schema.nodes[targetNodeTypeName];
+
+  // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+  // Pre-assigns a localId so the localId plugin's appendTransaction does not replace the node
+  // object (via setNodeAttribute), which would invalidate the expandedState WeakMap entry set
+  // in transformNode.ts and cause the expand to render as collapsed.
+  // To clean up: remove the if-else, always use the flag-on branch (isExpandType with uuid).
+  var isExpandType = targetNodeTypeName === 'expand' || targetNodeTypeName === 'nestedExpand';
+  var nodeAttrs = isExpandType && fg('platform_editor_block_menu_expand_localid_fix') ? {
+    localId: crypto.randomUUID()
+  } : {};
+  var outputNode = targetNodeType.createAndFill(nodeAttrs, removeDisallowedMarks(processedNodes, schema.nodes[targetNodeTypeName]));
   return outputNode ? [outputNode] : nodes;
 };

package/dist/esm/editor-commands/transformNode.js

@@ -1,8 +1,11 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { expandedState } from '@atlaskit/editor-common/expand';
 import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { expandSelectionToBlockRange, getSourceNodesFromSelectionRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
+import { CellSelection } from '@atlaskit/editor-tables';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { convertNodesToTargetType } from './transform-node-utils/transform';
 import { isListNode } from './transforms/utils';
@@ -44,6 +47,23 @@ export var transformNode = function transformNode(api) {
       });
       var content = resultNodes.length > 0 ? resultNodes : sourceNodes;
       var sliceStart = isList ? $from.pos - 1 : $from.pos;
+
+      // [FEATURE FLAG: platform_editor_block_menu_expand_localid_fix]
+      // Pre-populates the expandedState WeakMap so ExpandNodeView initializes newly created
+      // expand/nestedExpand nodes as expanded rather than collapsed. Works in conjunction with
+      // the localId pre-assignment in the transform steps — without a pre-assigned localId the
+      // localId plugin's appendTransaction replaces the node object (via setNodeAttribute),
+      // invalidating this WeakMap entry. The else branch preserves the previous behaviour.
+      // To clean up: remove the if-else block and keep only the flag-on body.
+      if (fg('platform_editor_block_menu_expand_localid_fix')) {
+        var expand = nodes.expand,
+          nestedExpand = nodes.nestedExpand;
+        content.forEach(function (node) {
+          if (node.type === expand || node.type === nestedExpand) {
+            expandedState.set(node, true);
+          }
+        });
+      }
       if (preservedSelection instanceof NodeSelection && preservedSelection.node.type === nodes.mediaSingle) {
         var _api$blockControls2;
         // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
@@ -70,6 +90,26 @@ export var transformNode = function transformNode(api) {
       } else {
         tr.replaceWith(sliceStart, $to.pos, content);
       }
+
+      // [FEATURE FLAG: platform_editor_table_transform_selection_fix]
+      // Fixes table cell selection not being preserved after transform to expand/layout.
+      // When a table with CellSelection is transformed, we need to re-select the wrapper node.
+      // To clean up: remove the if-else block and keep only the flag-on behavior.
+      if (preservedSelection instanceof CellSelection && fg('platform_editor_table_transform_selection_fix')) {
+        var insertedNode = tr.doc.nodeAt($from.pos);
+        var isSelectable = insertedNode && NodeSelection.isSelectable(insertedNode);
+        if (isSelectable) {
+          var _api$blockControls3;
+          var nodeSelection = NodeSelection.create(tr.doc, $from.pos);
+          tr.setSelection(nodeSelection);
+
+          // Update preserved selection to match the new NodeSelection
+          // This prevents appendTransaction from restoring the old table selection positions
+          api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.startPreservingSelection()({
+            tr: tr
+          });
+        }
+      }
       stopMeasure(measureId, function (duration, startTime) {
         var _api$analytics;
         api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.41",
+	"version": "6.0.43",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/dropdown-menu": "^16.4.0",
 		"@atlaskit/editor-plugin-analytics": "^7.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^8.3.0",
+		"@atlaskit/editor-plugin-block-controls": "^8.4.0",
 		"@atlaskit/editor-plugin-decorations": "^7.0.0",
 		"@atlaskit/editor-plugin-selection": "^7.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^5.0.0",
@@ -46,13 +46,13 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^25.0.0",
+		"@atlaskit/tmp-editor-statsig": "^25.6.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.12.0",
+		"@atlaskit/editor-common": "^111.15.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -96,8 +96,14 @@
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		},
+		"platform_editor_block_menu_expand_localid_fix": {
+			"type": "boolean"
+		},
 		"platform_editor_block_menu_v2_patch_2": {
 			"type": "boolean"
+		},
+		"platform_editor_table_transform_selection_fix": {
+			"type": "boolean"
 		}
 	}
 }

package/tsconfig.json

@@ -1,5 +1,4 @@
 {
 	"extends": "../../../tsconfig.json",
-	"include": ["src/**/*.ts", "src/**/*.tsx", "../editor-common/src/block-menu/messages.ts"],
-	"compilerOptions": {}
+	"include": ["src/**/*.ts", "src/**/*.tsx", "../editor-common/src/block-menu/messages.ts"]
 }