@atlaskit/editor-plugin-layout 13.4.0 → 13.5.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-layout
 
+## 13.5.0
+
+### Minor Changes
+
+- [`9425f3fa081e4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9425f3fa081e4) -
+  Fix nested content selection inside layouts
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.4.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/utils/index.js

@@ -8,6 +8,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 
@@ -58,6 +59,14 @@ var selectIntoLayout = exports.selectIntoLayout = function selectIntoLayout(view
     return tr;
   }
 };
+/**
+ * These node views can fill a layout column while leaving visually blank space that ProseMirror
+ * cannot map to a document position. Interactive atomic nodes must receive clicks normally.
+ */
+var supportsBlankSpaceGapCursorFallback = function supportsBlankSpaceGapCursorFallback(node) {
+  return (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaSingle' || (node === null || node === void 0 ? void 0 : node.type.name) === 'expand';
+};
+
 /**
  * For a blank-space click inside a layout column — above the first child (middle/bottom-aligned
  * columns) or below the last child (any alignment) — return the ProseMirror position and side
@@ -152,10 +161,8 @@ var getGapCursorTargetForBlankSpaceClick = exports.getGapCursorTargetForBlankSpa
   // so the above/below checks never fired.
   if (columnNode.childCount === 1) {
     var onlyChild = columnNode.firstChild;
-    // Exclude `panel`: its wrapper makes `view.nodeDOM` non-null and intercepts clicks, so the
-    // guard below would wrongly fire for in-panel blank-space clicks (which have their own
-    // native gap cursor).
-    if (onlyChild && onlyChild.type.name !== 'paragraph' && onlyChild.type.name !== 'panel') {
+    var shouldHandleAtomicChild = (0, _expValEquals.expValEquals)('platform_editor_layout_column_selection_fix', 'isEnabled', true) ? supportsBlankSpaceGapCursorFallback(onlyChild) : (onlyChild === null || onlyChild === void 0 ? void 0 : onlyChild.type.name) !== 'paragraph' && (onlyChild === null || onlyChild === void 0 ? void 0 : onlyChild.type.name) !== 'panel';
+    if (onlyChild && shouldHandleAtomicChild) {
       // Bail when the click is on the child's own content. For media the wrapper is full-width
       // so test against the <img> rect; resolve it only for a direct mediaSingle child (else
       // getContentRect could grab an image nested in an expand and break its toggle).

package/dist/es2019/pm-plugins/utils/index.js

@@ -3,6 +3,7 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const getMaybeLayoutSection = state => {
   const {
@@ -55,6 +56,12 @@ export const selectIntoLayout = (view, posOfLayout, childIndex = 0) => {
     return tr;
   }
 };
+/**
+ * These node views can fill a layout column while leaving visually blank space that ProseMirror
+ * cannot map to a document position. Interactive atomic nodes must receive clicks normally.
+ */
+const supportsBlankSpaceGapCursorFallback = node => (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaSingle' || (node === null || node === void 0 ? void 0 : node.type.name) === 'expand';
+
 /**
  * For a blank-space click inside a layout column — above the first child (middle/bottom-aligned
  * columns) or below the last child (any alignment) — return the ProseMirror position and side
@@ -149,10 +156,8 @@ export const getGapCursorTargetForBlankSpaceClick = (view, event) => {
   // so the above/below checks never fired.
   if (columnNode.childCount === 1) {
     const onlyChild = columnNode.firstChild;
-    // Exclude `panel`: its wrapper makes `view.nodeDOM` non-null and intercepts clicks, so the
-    // guard below would wrongly fire for in-panel blank-space clicks (which have their own
-    // native gap cursor).
-    if (onlyChild && onlyChild.type.name !== 'paragraph' && onlyChild.type.name !== 'panel') {
+    const shouldHandleAtomicChild = expValEquals('platform_editor_layout_column_selection_fix', 'isEnabled', true) ? supportsBlankSpaceGapCursorFallback(onlyChild) : (onlyChild === null || onlyChild === void 0 ? void 0 : onlyChild.type.name) !== 'paragraph' && (onlyChild === null || onlyChild === void 0 ? void 0 : onlyChild.type.name) !== 'panel';
+    if (onlyChild && shouldHandleAtomicChild) {
       // Bail when the click is on the child's own content. For media the wrapper is full-width
       // so test against the <img> rect; resolve it only for a direct mediaSingle child (else
       // getContentRect could grab an image nested in an expand and break its toggle).

package/dist/esm/pm-plugins/utils/index.js

@@ -3,6 +3,7 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var getMaybeLayoutSection = function getMaybeLayoutSection(state) {
   var _state$schema$nodes = state.schema.nodes,
@@ -51,6 +52,14 @@ export var selectIntoLayout = function selectIntoLayout(view, posOfLayout) {
     return tr;
   }
 };
+/**
+ * These node views can fill a layout column while leaving visually blank space that ProseMirror
+ * cannot map to a document position. Interactive atomic nodes must receive clicks normally.
+ */
+var supportsBlankSpaceGapCursorFallback = function supportsBlankSpaceGapCursorFallback(node) {
+  return (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaSingle' || (node === null || node === void 0 ? void 0 : node.type.name) === 'expand';
+};
+
 /**
  * For a blank-space click inside a layout column — above the first child (middle/bottom-aligned
  * columns) or below the last child (any alignment) — return the ProseMirror position and side
@@ -145,10 +154,8 @@ export var getGapCursorTargetForBlankSpaceClick = function getGapCursorTargetFor
   // so the above/below checks never fired.
   if (columnNode.childCount === 1) {
     var onlyChild = columnNode.firstChild;
-    // Exclude `panel`: its wrapper makes `view.nodeDOM` non-null and intercepts clicks, so the
-    // guard below would wrongly fire for in-panel blank-space clicks (which have their own
-    // native gap cursor).
-    if (onlyChild && onlyChild.type.name !== 'paragraph' && onlyChild.type.name !== 'panel') {
+    var shouldHandleAtomicChild = expValEquals('platform_editor_layout_column_selection_fix', 'isEnabled', true) ? supportsBlankSpaceGapCursorFallback(onlyChild) : (onlyChild === null || onlyChild === void 0 ? void 0 : onlyChild.type.name) !== 'paragraph' && (onlyChild === null || onlyChild === void 0 ? void 0 : onlyChild.type.name) !== 'panel';
+    if (onlyChild && shouldHandleAtomicChild) {
       // Bail when the click is on the child's own content. For media the wrapper is full-width
       // so test against the <img> rect; resolve it only for a direct mediaSingle child (else
       // getContentRect could grab an image nested in an expand and break its toggle).

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "13.4.0",
+	"version": "13.5.0",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,7 +21,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^56.2.0",
+		"@atlaskit/adf-schema": "^56.3.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^12.1.0",
 		"@atlaskit/editor-plugin-block-controls": "^13.4.0",
@@ -42,14 +42,14 @@
 		"@atlaskit/icon": "^37.2.0",
 		"@atlaskit/icon-lab": "^7.4.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^135.7.0",
+		"@atlaskit/tmp-editor-statsig": "^135.8.0",
 		"@atlaskit/tokens": "^16.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.45.0",
+		"@atlaskit/editor-common": "^116.46.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},