@atlaskit/editor-plugin-layout 23.0.4 → 23.0.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-layout
 
+## 23.0.6
+
+### Patch Changes
+
+- [`f1454b828555b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f1454b828555b) -
+  Clean up experiment `platform_editor_breakout_interaction_rerender`
+- Updated dependencies
+
+## 23.0.5
+
+### Patch Changes
+
+- [`d7f1f4ebb1cd3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d7f1f4ebb1cd3) -
+  Keep the shipped layout column delete shortcut behavior for explicitly selected columns. Remove
+  the `platform_editor_layout_column_delete_shortcut_fix` and
+  `platform_editor_layout_column_valign_rendering` experiment keys. Consumers of these keys must
+  remove their experiment reads and use the shipped behavior directly.
+- Updated dependencies
+
 ## 23.0.4
 
 ### Patch Changes

package/dist/cjs/nodeviews/index.js

@@ -75,9 +75,6 @@ var LayoutBreakoutResizer = function LayoutBreakoutResizer(_ref) {
     // put the selection into the first column of the layout
     (0, _utils.selectIntoLayout)(view, pos, 0);
   }, [getPos, view]);
-  if (interactionState === 'hasNotHadInteraction' && !(0, _expValEquals.expValEquals)('platform_editor_breakout_interaction_rerender', 'isEnabled', true)) {
-    return null;
-  }
   return /*#__PURE__*/_react.default.createElement(_resizer.BreakoutResizer, {
     getRef: forwardRef,
     getPos: getPos,
@@ -85,7 +82,7 @@ var LayoutBreakoutResizer = function LayoutBreakoutResizer(_ref) {
     nodeType: "layoutSection",
     getEditorWidth: getEditorWidth,
     disabled: (0, _editorExperiment.editorExperiment)('platform_editor_breakout_resizing', true) ? true : editorDisabled === true || !isBreakoutAvailable(view.state.schema),
-    hidden: interactionState === 'hasNotHadInteraction' && (0, _expValEquals.expValEquals)('platform_editor_breakout_interaction_rerender', 'isEnabled', true),
+    hidden: interactionState === 'hasNotHadInteraction',
     parentRef: parentRef,
     editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions,
     displayGuidelines: (0, _editorExperiment.editorExperiment)('single_column_layouts', true) ? displayGuidelines : undefined,

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

@@ -18,7 +18,6 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _consts = require("./consts");
 var _pluginKey = require("./plugin-key");
 var _layoutColumnDistribution = require("./utils/layout-column-distribution");
@@ -892,7 +891,7 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     // Only delete columns that are explicitly selected (a column NodeSelection or a selection
     // fully containing columns). This stops a bare caret inside a column — including inside
     // nested content such as a table — from deleting the whole column via the delete shortcut.
-    var selectedLayoutColumnsResult = (0, _expValEquals.expValEquals)('platform_editor_layout_column_delete_shortcut_fix', 'isEnabled', true) ? (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection) : (0, _layoutColumnSelection.getLayoutColumnsFromContentSelection)(tr.selection);
+    var selectedLayoutColumnsResult = (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection);
     if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
@@ -957,15 +956,12 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(_model.Fragment.fromArray(remainingColumns));
 
-    // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
-    // column NodeSelection whose post-delete landing is owned by the block-controls
-    // preserved-selection plugin, so we only restore the caret for the former.
+    // A text selection can fully contain columns. Restore its caret in a remaining column;
+    // block controls own the landing for a column NodeSelection.
     var hadTextSelection = tr.selection instanceof _state.TextSelection;
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
 
-    // Land the caret in a remaining column — the one now occupying the deleted slot, or the
-    // last column when the deleted slot no longer exists. Otherwise the replace above maps
-    // the caret out of the layout to the following paragraph.
+    // Keep a text selection within the layout after the selected columns are removed.
     var remainingColumnCount = remainingColumns.length;
     if (hadTextSelection && remainingColumnCount > 0) {
       var targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);

package/dist/es2019/nodeviews/index.js

@@ -58,9 +58,6 @@ const LayoutBreakoutResizer = ({
     // put the selection into the first column of the layout
     selectIntoLayout(view, pos, 0);
   }, [getPos, view]);
-  if (interactionState === 'hasNotHadInteraction' && !expValEquals('platform_editor_breakout_interaction_rerender', 'isEnabled', true)) {
-    return null;
-  }
   return /*#__PURE__*/React.createElement(BreakoutResizer, {
     getRef: forwardRef,
     getPos: getPos,
@@ -68,7 +65,7 @@ const LayoutBreakoutResizer = ({
     nodeType: "layoutSection",
     getEditorWidth: getEditorWidth,
     disabled: editorExperiment('platform_editor_breakout_resizing', true) ? true : editorDisabled === true || !isBreakoutAvailable(view.state.schema),
-    hidden: interactionState === 'hasNotHadInteraction' && expValEquals('platform_editor_breakout_interaction_rerender', 'isEnabled', true),
+    hidden: interactionState === 'hasNotHadInteraction',
     parentRef: parentRef,
     editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions,
     displayGuidelines: editorExperiment('single_column_layouts', true) ? displayGuidelines : undefined,

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

@@ -7,7 +7,6 @@ import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { DEFAULT_LAYOUT_COLUMN_VALIGN, EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 import { pluginKey } from './plugin-key';
 import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';
@@ -856,7 +855,7 @@ export const deleteLayoutColumn = ({
   // Only delete columns that are explicitly selected (a column NodeSelection or a selection
   // fully containing columns). This stops a bare caret inside a column — including inside
   // nested content such as a table — from deleting the whole column via the delete shortcut.
-  const selectedLayoutColumnsResult = expValEquals('platform_editor_layout_column_delete_shortcut_fix', 'isEnabled', true) ? getSelectedLayoutColumnsFromSelection(tr.selection) : getLayoutColumnsFromContentSelection(tr.selection);
+  const selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
   if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
     return null;
   }
@@ -916,15 +915,12 @@ export const deleteLayoutColumn = ({
   .reverse().reduce((widths, selectedIndex) => redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT), existingWidths);
   const updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));
 
-  // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
-  // column NodeSelection whose post-delete landing is owned by the block-controls
-  // preserved-selection plugin, so we only restore the caret for the former.
+  // A text selection can fully contain columns. Restore its caret in a remaining column;
+  // block controls own the landing for a column NodeSelection.
   const hadTextSelection = tr.selection instanceof TextSelection;
   tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
 
-  // Land the caret in a remaining column — the one now occupying the deleted slot, or the
-  // last column when the deleted slot no longer exists. Otherwise the replace above maps
-  // the caret out of the layout to the following paragraph.
+  // Keep a text selection within the layout after the selected columns are removed.
   const remainingColumnCount = remainingColumns.length;
   if (hadTextSelection && remainingColumnCount > 0) {
     const targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);

package/dist/esm/nodeviews/index.js

@@ -66,9 +66,6 @@ var LayoutBreakoutResizer = function LayoutBreakoutResizer(_ref) {
     // put the selection into the first column of the layout
     selectIntoLayout(view, pos, 0);
   }, [getPos, view]);
-  if (interactionState === 'hasNotHadInteraction' && !expValEquals('platform_editor_breakout_interaction_rerender', 'isEnabled', true)) {
-    return null;
-  }
   return /*#__PURE__*/React.createElement(BreakoutResizer, {
     getRef: forwardRef,
     getPos: getPos,
@@ -76,7 +73,7 @@ var LayoutBreakoutResizer = function LayoutBreakoutResizer(_ref) {
     nodeType: "layoutSection",
     getEditorWidth: getEditorWidth,
     disabled: editorExperiment('platform_editor_breakout_resizing', true) ? true : editorDisabled === true || !isBreakoutAvailable(view.state.schema),
-    hidden: interactionState === 'hasNotHadInteraction' && expValEquals('platform_editor_breakout_interaction_rerender', 'isEnabled', true),
+    hidden: interactionState === 'hasNotHadInteraction',
     parentRef: parentRef,
     editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions,
     displayGuidelines: editorExperiment('single_column_layouts', true) ? displayGuidelines : undefined,

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

@@ -10,7 +10,6 @@ import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { DEFAULT_LAYOUT_COLUMN_VALIGN, EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 import { pluginKey } from './plugin-key';
 import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';
@@ -882,7 +881,7 @@ export var deleteLayoutColumn = function deleteLayoutColumn() {
     // Only delete columns that are explicitly selected (a column NodeSelection or a selection
     // fully containing columns). This stops a bare caret inside a column — including inside
     // nested content such as a table — from deleting the whole column via the delete shortcut.
-    var selectedLayoutColumnsResult = expValEquals('platform_editor_layout_column_delete_shortcut_fix', 'isEnabled', true) ? getSelectedLayoutColumnsFromSelection(tr.selection) : getLayoutColumnsFromContentSelection(tr.selection);
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
     if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
@@ -947,15 +946,12 @@ export var deleteLayoutColumn = function deleteLayoutColumn() {
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));
 
-    // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
-    // column NodeSelection whose post-delete landing is owned by the block-controls
-    // preserved-selection plugin, so we only restore the caret for the former.
+    // A text selection can fully contain columns. Restore its caret in a remaining column;
+    // block controls own the landing for a column NodeSelection.
     var hadTextSelection = tr.selection instanceof TextSelection;
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
 
-    // Land the caret in a remaining column — the one now occupying the deleted slot, or the
-    // last column when the deleted slot no longer exists. Otherwise the replace above maps
-    // the caret out of the layout to the following paragraph.
+    // Keep a text selection within the layout after the selected columns are removed.
     var remainingColumnCount = remainingColumns.length;
     if (hadTextSelection && remainingColumnCount > 0) {
       var targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "23.0.4",
+	"version": "23.0.6",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -43,14 +43,14 @@
 		"@atlaskit/icon-lab": "^7.11.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^213.0.0",
+		"@atlaskit/tmp-editor-statsig": "^215.0.0",
 		"@atlaskit/tokens": "^20.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^126.2.0",
+		"@atlaskit/editor-common": "^126.3.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},