@atlaskit/editor-plugin-show-diff 25.1.0 → 26.0.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 26.0.0
+
+### Patch Changes
+
+- [`b5f8a82f07fc6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b5f8a82f07fc6) -
+  Preserve spacing between panel replacement diffs at the start of a table cell or other container
+  behind platform_editor_ai_show_diff_patch_2.
+- [`0f0ca74ca517a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0f0ca74ca517a) -
+  Add the `@atlaskit/editor-common/ai-xstate-migration` (`isAiXstateMigrationEnabled`) and
+  `@atlaskit/editor-common/ai-xstate-migration-no-exposure` (`isAiXstateMigrationEnabledNoExposure`)
+  entrypoints, which enable the AI xstate migration when either the Confluence
+  (`platform_editor_ai_xstate_migration`) or Jira (`platform_editor_ai_xstate_migration_jira`, a
+  platform feature experiment) experiment is on. Use the helper wherever the xstate migration is
+  checked.
+- Updated dependencies
+
 ## 25.1.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -11,6 +11,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
+var _aiXstateMigrationNoExposure = require("@atlaskit/editor-common/ai-xstate-migration-no-exposure");
 var _areDocsEqualByBlockStructureAndText = require("@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
@@ -18,7 +19,6 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _unsafeExpValNoExposure = require("@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _attributions = require("../decorations/colorSchemes/attributions");
 var _createAnchorDecorationWidgets = require("../decorations/createAnchorDecorationWidgets");
 var _createBlockChangedDecoration = require("../decorations/createBlockChangedDecoration");
@@ -679,7 +679,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       // For a large inserted table, skip the per-cell inline decorations that
       // freeze the browser on re-render. Only active when Review moment is
       // eligible (xstate + M1).
-      var useCoarseTableDecoration = isSmartNodeLevel && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_ai_xstate_migration', 'isEnabled', true) && (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true && isLargeInsertedTableRange(tr.doc, change.fromB, change.toB);
+      var useCoarseTableDecoration = isSmartNodeLevel && (0, _aiXstateMigrationNoExposure.isAiXstateMigrationEnabledNoExposure)() && (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true && isLargeInsertedTableRange(tr.doc, change.fromB, change.toB);
       // Whether the deleted-content widget will actually be rendered for this
       // change. Used to decide if indicator anchor positions should be adjusted
       // inward — when the widget is present the anchor must stay at the block
@@ -939,7 +939,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       })));
       // If the original node position is known (e.g. a panel type change), also render
       // the old block node as a "deleted" widget so the reviewer sees the before/after.
-      var isSmartNodeLevelAttrChange = diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_ai_xstate_migration', 'isEnabled', true) && (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true;
+      var isSmartNodeLevelAttrChange = diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') && (0, _aiXstateMigrationNoExposure.isAiXstateMigrationEnabledNoExposure)() && (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true;
       if (isSmartNodeLevelAttrChange && change.fromA !== undefined && change.toA !== undefined) {
         var placeBelow = deletedDiffPlacement === 'bottom';
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)({

package/dist/cjs/pm-plugins/decorations/utils/createNodeShapedMarginSpacer.js

@@ -4,16 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createNodeShapedMarginSpacer = void 0;
+var _panel = require("@atlaskit/editor-common/styles/panel");
+var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 /**
  * Node types that can safely be reduced to an empty shell.
  *
  * A shell only replicates a margin if it collapses to nothing itself, which needs zero height and
- * no vertical border or padding. Textblocks and lists qualify; nodes with intrinsic sizing (tables
- * are `display: table`, media has a measured height) or a painted box (a zero-height panel is a
- * visible stripe of background) do not, and are left alone.
+ * no vertical border or padding. Textblocks and lists qualify; panels need their painted box
+ * hidden and their flex layout removed. Nodes with intrinsic sizing (tables are `display: table`,
+ * media has a measured height) are left alone.
  */
 var isShapeableNode = function isShapeableNode(node) {
-  return node.isTextblock || ['bulletList', 'orderedList'].includes(node.type.name);
+  return node.isTextblock || ['bulletList', 'orderedList'].includes(node.type.name) || (0, _nodeTypeUtils.getBaseNodeTypeName)(node.type) === 'panel';
 };
 
 /**
@@ -57,6 +59,13 @@ var createNodeShapedMarginSpacer = exports.createNodeShapedMarginSpacer = functi
   serialized.dataset.testid = testId;
   serialized.setAttribute('aria-hidden', 'true');
   serialized.contentEditable = 'false';
+  if ((0, _nodeTypeUtils.getBaseNodeTypeName)(node.type) === 'panel') {
+    // Schema serialization lacks the node view's class, which carries the panel's margin.
+    // Hide the painted shell and allow its margins to collapse through a zero-height block.
+    serialized.classList.add(_panel.PanelSharedCssClassName.prefix);
+    serialized.style.display = 'block';
+    serialized.style.visibility = 'hidden';
+  }
 
   // Zero height with no vertical border or padding keeps the spacer self-collapsing: its margins
   // stay adjoining, so they collapse with the neighbours into a single margin equal to the largest

package/dist/es2019/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -1,6 +1,7 @@
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { isAiXstateMigrationEnabledNoExposure } from '@atlaskit/editor-common/ai-xstate-migration-no-exposure';
 import { areDocsEqualByBlockStructureAndText } from '@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Mapping } from '@atlaskit/editor-prosemirror/transform';
@@ -8,7 +9,6 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { createAttributionColorMap, getAttributionKey, getAttributionKeyForChange, getColorSchemeForChange, isAttributionColoringEnabled, isContributorTagsEnabled } from '../decorations/colorSchemes/attributions';
 import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
@@ -615,7 +615,7 @@ const calculateDiffDecorationsInner = ({
       // For a large inserted table, skip the per-cell inline decorations that
       // freeze the browser on re-render. Only active when Review moment is
       // eligible (xstate + M1).
-      const useCoarseTableDecoration = isSmartNodeLevel && expValEqualsNoExposure('platform_editor_ai_xstate_migration', 'isEnabled', true) && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true && isLargeInsertedTableRange(tr.doc, change.fromB, change.toB);
+      const useCoarseTableDecoration = isSmartNodeLevel && isAiXstateMigrationEnabledNoExposure() && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true && isLargeInsertedTableRange(tr.doc, change.fromB, change.toB);
       // Whether the deleted-content widget will actually be rendered for this
       // change. Used to decide if indicator anchor positions should be adjusted
       // inward — when the widget is present the anchor must stay at the block
@@ -845,7 +845,7 @@ const calculateDiffDecorationsInner = ({
       }));
       // If the original node position is known (e.g. a panel type change), also render
       // the old block node as a "deleted" widget so the reviewer sees the before/after.
-      const isSmartNodeLevelAttrChange = diffType === 'smart' && fg('platform_editor_ai_smart_diff') && expValEqualsNoExposure('platform_editor_ai_xstate_migration', 'isEnabled', true) && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true;
+      const isSmartNodeLevelAttrChange = diffType === 'smart' && fg('platform_editor_ai_smart_diff') && isAiXstateMigrationEnabledNoExposure() && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true;
       if (isSmartNodeLevelAttrChange && change.fromA !== undefined && change.toA !== undefined) {
         const placeBelow = deletedDiffPlacement === 'bottom';
         decorations.push(...createNodeChangedDecorationWidget({

package/dist/es2019/pm-plugins/decorations/utils/createNodeShapedMarginSpacer.js

@@ -1,12 +1,14 @@
+import { PanelSharedCssClassName } from '@atlaskit/editor-common/styles/panel';
+import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 /**
  * Node types that can safely be reduced to an empty shell.
  *
  * A shell only replicates a margin if it collapses to nothing itself, which needs zero height and
- * no vertical border or padding. Textblocks and lists qualify; nodes with intrinsic sizing (tables
- * are `display: table`, media has a measured height) or a painted box (a zero-height panel is a
- * visible stripe of background) do not, and are left alone.
+ * no vertical border or padding. Textblocks and lists qualify; panels need their painted box
+ * hidden and their flex layout removed. Nodes with intrinsic sizing (tables are `display: table`,
+ * media has a measured height) are left alone.
  */
-const isShapeableNode = node => node.isTextblock || ['bulletList', 'orderedList'].includes(node.type.name);
+const isShapeableNode = node => node.isTextblock || ['bulletList', 'orderedList'].includes(node.type.name) || getBaseNodeTypeName(node.type) === 'panel';
 
 /**
  * An invisible element shaped like `node`, used to supply the top margin `node` no longer gets.
@@ -50,6 +52,13 @@ export const createNodeShapedMarginSpacer = ({
   serialized.dataset.testid = testId;
   serialized.setAttribute('aria-hidden', 'true');
   serialized.contentEditable = 'false';
+  if (getBaseNodeTypeName(node.type) === 'panel') {
+    // Schema serialization lacks the node view's class, which carries the panel's margin.
+    // Hide the painted shell and allow its margins to collapse through a zero-height block.
+    serialized.classList.add(PanelSharedCssClassName.prefix);
+    serialized.style.display = 'block';
+    serialized.style.visibility = 'hidden';
+  }
 
   // Zero height with no vertical border or padding keeps the spacer self-collapsing: its margins
   // stay adjoining, so they collapse with the neighbours into a single margin equal to the largest

package/dist/esm/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -9,6 +9,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { isAiXstateMigrationEnabledNoExposure } from '@atlaskit/editor-common/ai-xstate-migration-no-exposure';
 import { areDocsEqualByBlockStructureAndText } from '@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Mapping } from '@atlaskit/editor-prosemirror/transform';
@@ -16,7 +17,6 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { createAttributionColorMap, getAttributionKey, getAttributionKeyForChange, getColorSchemeForChange, isAttributionColoringEnabled, isContributorTagsEnabled } from '../decorations/colorSchemes/attributions';
 import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
@@ -672,7 +672,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       // For a large inserted table, skip the per-cell inline decorations that
       // freeze the browser on re-render. Only active when Review moment is
       // eligible (xstate + M1).
-      var useCoarseTableDecoration = isSmartNodeLevel && expValEqualsNoExposure('platform_editor_ai_xstate_migration', 'isEnabled', true) && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true && isLargeInsertedTableRange(tr.doc, change.fromB, change.toB);
+      var useCoarseTableDecoration = isSmartNodeLevel && isAiXstateMigrationEnabledNoExposure() && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true && isLargeInsertedTableRange(tr.doc, change.fromB, change.toB);
       // Whether the deleted-content widget will actually be rendered for this
       // change. Used to decide if indicator anchor positions should be adjusted
       // inward — when the widget is present the anchor must stay at the block
@@ -932,7 +932,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       })));
       // If the original node position is known (e.g. a panel type change), also render
       // the old block node as a "deleted" widget so the reviewer sees the before/after.
-      var isSmartNodeLevelAttrChange = diffType === 'smart' && fg('platform_editor_ai_smart_diff') && expValEqualsNoExposure('platform_editor_ai_xstate_migration', 'isEnabled', true) && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true;
+      var isSmartNodeLevelAttrChange = diffType === 'smart' && fg('platform_editor_ai_smart_diff') && isAiXstateMigrationEnabledNoExposure() && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true;
       if (isSmartNodeLevelAttrChange && change.fromA !== undefined && change.toA !== undefined) {
         var placeBelow = deletedDiffPlacement === 'bottom';
         decorations.push.apply(decorations, _toConsumableArray(createNodeChangedDecorationWidget({

package/dist/esm/pm-plugins/decorations/utils/createNodeShapedMarginSpacer.js

@@ -1,13 +1,15 @@
+import { PanelSharedCssClassName } from '@atlaskit/editor-common/styles/panel';
+import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 /**
  * Node types that can safely be reduced to an empty shell.
  *
  * A shell only replicates a margin if it collapses to nothing itself, which needs zero height and
- * no vertical border or padding. Textblocks and lists qualify; nodes with intrinsic sizing (tables
- * are `display: table`, media has a measured height) or a painted box (a zero-height panel is a
- * visible stripe of background) do not, and are left alone.
+ * no vertical border or padding. Textblocks and lists qualify; panels need their painted box
+ * hidden and their flex layout removed. Nodes with intrinsic sizing (tables are `display: table`,
+ * media has a measured height) are left alone.
  */
 var isShapeableNode = function isShapeableNode(node) {
-  return node.isTextblock || ['bulletList', 'orderedList'].includes(node.type.name);
+  return node.isTextblock || ['bulletList', 'orderedList'].includes(node.type.name) || getBaseNodeTypeName(node.type) === 'panel';
 };
 
 /**
@@ -51,6 +53,13 @@ export var createNodeShapedMarginSpacer = function createNodeShapedMarginSpacer(
   serialized.dataset.testid = testId;
   serialized.setAttribute('aria-hidden', 'true');
   serialized.contentEditable = 'false';
+  if (getBaseNodeTypeName(node.type) === 'panel') {
+    // Schema serialization lacks the node view's class, which carries the panel's margin.
+    // Hide the painted shell and allow its margins to collapse through a zero-height block.
+    serialized.classList.add(PanelSharedCssClassName.prefix);
+    serialized.style.display = 'block';
+    serialized.style.visibility = 'hidden';
+  }
 
   // Zero height with no vertical border or padding keeps the spacer self-collapsing: its margins
   // stay adjoining, so they collapse with the neighbours into a single margin equal to the largest

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "25.1.0",
+	"version": "26.0.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,10 +29,10 @@
 		"@atlaskit/agent-color": "^1.0.0",
 		"@atlaskit/avatar": "^30.0.0",
 		"@atlaskit/custom-steps": "^1.1.0",
-		"@atlaskit/editor-plugin-accessibility-utils": "^27.0.0",
-		"@atlaskit/editor-plugin-analytics": "^27.0.0",
-		"@atlaskit/editor-plugin-limited-mode": "^24.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^25.0.0",
+		"@atlaskit/editor-plugin-accessibility-utils": "^28.0.0",
+		"@atlaskit/editor-plugin-analytics": "^28.0.0",
+		"@atlaskit/editor-plugin-limited-mode": "^25.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^26.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.5.0",
 		"@atlaskit/editor-tables": "^3.2.0",
@@ -53,7 +53,7 @@
 		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^21.0.0",
-		"@atlaskit/editor-core": "^237.0.0",
+		"@atlaskit/editor-core": "^238.0.0",
 		"@atlaskit/editor-json-transformer": "^10.0.0",
 		"@atlaskit/editor-plugins": "^16.2.0",
 		"@atlaskit/form": "^18.2.0",
@@ -63,15 +63,15 @@
 		"@atlaskit/util-data-test": "^19.1.0",
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
-		"@atlassian/editor-ai-injected-editors": "^41.0.0",
-		"@atlassian/editor-plugin-ai": "^81.3.0",
+		"@atlassian/editor-ai-injected-editors": "^42.0.0",
+		"@atlassian/editor-plugin-ai": "^82.0.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^131.6.0",
+		"@atlaskit/editor-common": "^132.0.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"