@atlaskit/editor-plugin-layout 16.0.12 → 16.0.14

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-layout
 
+## 16.0.14
+
+### Patch Changes
+
+- [`343c4a1cca800`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/343c4a1cca800) -
+  Fix editing image captions in layout columns behind the
+  `platform_editor_fix_edit_media_caption_in_layout` experiment.
+- Updated dependencies
+
+## 16.0.13
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 16.0.12
 
 ### Patch Changes

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

@@ -7,6 +7,7 @@ exports.selectIntoLayout = exports.isParagraphBlankSpaceTarget = exports.getMayb
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 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");
@@ -163,6 +164,14 @@ var getGapCursorTargetForBlankSpaceClick = exports.getGapCursorTargetForBlankSpa
     var onlyChild = columnNode.firstChild;
     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) {
+      // A caption is editable content inside a mediaSingle, not blank layout space. The
+      // image bounds below intentionally exclude the caption so clicks beside the image
+      // can place a gap cursor; bail out before that check when the click is on a caption.
+      var _target = event.target;
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_edit_media_caption_in_layout') && _target !== null && _target !== void 0 && _target.closest('[data-caption]')) {
+        return undefined;
+      }
+
       // 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

@@ -2,6 +2,7 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 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';
@@ -158,6 +159,14 @@ export const getGapCursorTargetForBlankSpaceClick = (view, event) => {
     const onlyChild = columnNode.firstChild;
     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) {
+      // A caption is editable content inside a mediaSingle, not blank layout space. The
+      // image bounds below intentionally exclude the caption so clicks beside the image
+      // can place a gap cursor; bail out before that check when the click is on a caption.
+      const target = event.target;
+      if (isExperimentEnabled('platform_editor_fix_edit_media_caption_in_layout') && target !== null && target !== void 0 && target.closest('[data-caption]')) {
+        return undefined;
+      }
+
       // 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

@@ -2,6 +2,7 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 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';
@@ -156,6 +157,14 @@ export var getGapCursorTargetForBlankSpaceClick = function getGapCursorTargetFor
     var onlyChild = columnNode.firstChild;
     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) {
+      // A caption is editable content inside a mediaSingle, not blank layout space. The
+      // image bounds below intentionally exclude the caption so clicks beside the image
+      // can place a gap cursor; bail out before that check when the click is on a caption.
+      var _target = event.target;
+      if (isExperimentEnabled('platform_editor_fix_edit_media_caption_in_layout') && _target !== null && _target !== void 0 && _target.closest('[data-caption]')) {
+        return undefined;
+      }
+
       // 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": "16.0.12",
+	"version": "16.0.14",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -24,8 +24,8 @@
 		"@atlaskit/adf-schema": "^57.0.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^15.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^16.0.0",
-		"@atlaskit/editor-plugin-block-menu": "^14.1.0",
+		"@atlaskit/editor-plugin-block-controls": "^16.1.0",
+		"@atlaskit/editor-plugin-block-menu": "^14.2.0",
 		"@atlaskit/editor-plugin-decorations": "^15.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^15.0.0",
 		"@atlaskit/editor-plugin-guideline": "^15.0.0",
@@ -37,20 +37,20 @@
 		"@atlaskit/editor-plugin-width": "^16.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
-		"@atlaskit/editor-toolbar": "^2.5.0",
-		"@atlaskit/editor-ui-control-model": "^2.7.0",
-		"@atlaskit/icon": "^37.4.0",
-		"@atlaskit/icon-lab": "^7.6.0",
+		"@atlaskit/editor-toolbar": "^2.6.0",
+		"@atlaskit/editor-ui-control-model": "^2.8.0",
+		"@atlaskit/icon": "^37.5.0",
+		"@atlaskit/icon-lab": "^7.7.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^156.0.0",
-		"@atlaskit/tokens": "^16.7.0",
+		"@atlaskit/tmp-editor-statsig": "^158.0.0",
+		"@atlaskit/tokens": "^16.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.12.0",
+		"@atlaskit/editor-common": "^119.16.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},