@atlaskit/editor-plugin-show-diff 18.0.0 → 19.0.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 19.0.0
+
+### Minor Changes
+
+- [`9ea47a518fc7c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9ea47a518fc7c) -
+  Cleanup `feature_gate` `platform_editor_diff_inline_mark_changes`. Non-smart diffs permanently use
+  the mark-aware token encoder, so formatting-only edits produce a change, and deleted-side widgets
+  are permanently rendered with an empty mark set so they do not inherit the marks of the
+  surrounding new document.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 18.0.0
 
 ### Patch Changes

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

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.selectTokenEncoder = void 0;
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _attrAwareTokenEncoder = require("./attrAwareTokenEncoder");
 var _markAwareTokenEncoder = require("./markAwareTokenEncoder");
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.
@@ -23,14 +20,8 @@ var selectTokenEncoder = exports.selectTokenEncoder = function selectTokenEncode
       shouldHideMarkOnlyDeletions: false
     };
   }
-  if ((0, _fg.fg)('platform_editor_diff_inline_mark_changes')) {
-    return {
-      tokenEncoder: _markAwareTokenEncoder.markAwareTokenEncoder,
-      shouldHideMarkOnlyDeletions: true
-    };
-  }
   return {
-    tokenEncoder: undefined,
-    shouldHideMarkOnlyDeletions: false
+    tokenEncoder: _markAwareTokenEncoder.markAwareTokenEncoder,
+    shouldHideMarkOnlyDeletions: true
   };
 };

package/dist/cjs/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -555,7 +555,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       decorations.push(leftAnchor);
     }
   }
-  decorations.push(_view.Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
+  decorations.push(_view.Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
     attributionKey: canTagWidget ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
@@ -568,9 +568,12 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     // placeBelow anchors at the end of the new content, so render on the
     // trailing side (1); otherwise render before the new content (-1).
     side: placeBelow ? 1 : -1
-  }))), (0, _fg.fg)('platform_editor_diff_inline_mark_changes') && {
-    marks: []
-  }), {}, {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text in the NEW document. `dom` already carries the original marks, so a
+    // formatting change would render the deleted side wrapped in the very mark the edit
+    // introduced — unbolded text shown struck through but still bold.
+    marks: [],
     destroy: function destroy() {
       var _constrainMediaObserv2;
       (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 || _constrainMediaObserv2.disconnect();

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.createDeletedLineBreakWidget = exports.createDeletedLineBreakDecoration = exports.RETURN_GLYPH = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _isExtendedEnabled = require("../../isExtendedEnabled");
 var _decorationKeys = require("../decorationKeys");
 var _wrapBlockNodeView = require("./wrapBlockNodeView");
@@ -100,7 +99,9 @@ var createDeletedLineBreakDecoration = exports.createDeletedLineBreakDecoration
     diffType: diffType
   }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && side !== undefined && {
     side: side
-  }))), (0, _fg.fg)('platform_editor_diff_inline_mark_changes') && {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text. The glyph carries its own deleted styling and must not inherit them.
     marks: []
   }));
 };

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

@@ -1,11 +1,8 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { markAwareTokenEncoder } from './markAwareTokenEncoder';
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.
@@ -17,14 +14,8 @@ export const selectTokenEncoder = useAttrAwareEncoder => {
       shouldHideMarkOnlyDeletions: false
     };
   }
-  if (fg('platform_editor_diff_inline_mark_changes')) {
-    return {
-      tokenEncoder: markAwareTokenEncoder,
-      shouldHideMarkOnlyDeletions: true
-    };
-  }
   return {
-    tokenEncoder: undefined,
-    shouldHideMarkOnlyDeletions: false
+    tokenEncoder: markAwareTokenEncoder,
+    shouldHideMarkOnlyDeletions: true
   };
 };

package/dist/es2019/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -560,9 +560,7 @@ export const createNodeChangedDecorationWidget = ({
     // adjacent text in the NEW document. `dom` already carries the original marks, so a
     // formatting change would render the deleted side wrapped in the very mark the edit
     // introduced — unbolded text shown struck through but still bold.
-    ...(fg('platform_editor_diff_inline_mark_changes') && {
-      marks: []
-    }),
+    marks: [],
     destroy: () => {
       var _constrainMediaObserv2;
       (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 ? void 0 : _constrainMediaObserv2.disconnect();

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

@@ -1,5 +1,4 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { buildDiffDecorationSpec, scrollMarginTopValue } from '../decorationKeys';
 import { createContentWrapper } from './wrapBlockNodeView';
@@ -94,7 +93,5 @@ export const createDeletedLineBreakDecoration = ({
   }),
   // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
   // adjacent text. The glyph carries its own deleted styling and must not inherit them.
-  ...(fg('platform_editor_diff_inline_mark_changes') && {
-    marks: []
-  })
+  marks: []
 });

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

@@ -1,11 +1,8 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { markAwareTokenEncoder } from './markAwareTokenEncoder';
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.
@@ -17,14 +14,8 @@ export var selectTokenEncoder = function selectTokenEncoder(useAttrAwareEncoder)
       shouldHideMarkOnlyDeletions: false
     };
   }
-  if (fg('platform_editor_diff_inline_mark_changes')) {
-    return {
-      tokenEncoder: markAwareTokenEncoder,
-      shouldHideMarkOnlyDeletions: true
-    };
-  }
   return {
-    tokenEncoder: undefined,
-    shouldHideMarkOnlyDeletions: false
+    tokenEncoder: markAwareTokenEncoder,
+    shouldHideMarkOnlyDeletions: true
   };
 };

package/dist/esm/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -548,7 +548,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       decorations.push(leftAnchor);
     }
   }
-  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
+  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
     attributionKey: canTagWidget ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
@@ -561,9 +561,12 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     // placeBelow anchors at the end of the new content, so render on the
     // trailing side (1); otherwise render before the new content (-1).
     side: placeBelow ? 1 : -1
-  }))), fg('platform_editor_diff_inline_mark_changes') && {
-    marks: []
-  }), {}, {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text in the NEW document. `dom` already carries the original marks, so a
+    // formatting change would render the deleted side wrapped in the very mark the edit
+    // introduced — unbolded text shown struck through but still bold.
+    marks: [],
     destroy: function destroy() {
       var _constrainMediaObserv2;
       (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 || _constrainMediaObserv2.disconnect();

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

@@ -2,7 +2,6 @@ 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 { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { buildDiffDecorationSpec, scrollMarginTopValue } from '../decorationKeys';
 import { createContentWrapper } from './wrapBlockNodeView';
@@ -94,7 +93,9 @@ export var createDeletedLineBreakDecoration = function createDeletedLineBreakDec
     diffType: diffType
   }, isExtendedEnabled(diffType) && side !== undefined && {
     side: side
-  }))), fg('platform_editor_diff_inline_mark_changes') && {
+  }))), {}, {
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text. The glyph carries its own deleted styling and must not inherit them.
     marks: []
   }));
 };

package/dist/types/pm-plugins/calculateDiff/selectTokenEncoder.d.ts

@@ -2,14 +2,12 @@ import type { TokenEncoder } from 'prosemirror-changeset';
 export type TokenEncoderSelection = {
     /** Non-smart mark-aware path only; lets callers suppress a duplicate deleted side. */
     shouldHideMarkOnlyDeletions: boolean;
-    /** Encoder to hand to `ChangeSet.create`. `undefined` means the library default. */
-    tokenEncoder: TokenEncoder<string | number> | undefined;
+    /** Encoder to hand to `ChangeSet.create`. */
+    tokenEncoder: TokenEncoder<string | number>;
 };
 /**
- * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
- * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
- *
- * With the gate off this returns what both callers computed before it existed.
+ * Single place the token encoder is chosen, shared by `calculateDiffDecorations` and
+ * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
  * into the token.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "18.0.0",
+	"version": "19.0.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,12 +27,12 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.6.0",
 		"@atlaskit/agent-color": "^1.0.0",
-		"@atlaskit/avatar": "^28.0.0",
+		"@atlaskit/avatar": "^29.0.0",
 		"@atlaskit/custom-steps": "^1.1.0",
-		"@atlaskit/editor-plugin-accessibility-utils": "^20.0.0",
-		"@atlaskit/editor-plugin-analytics": "^20.0.0",
-		"@atlaskit/editor-plugin-limited-mode": "^17.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^18.0.0",
+		"@atlaskit/editor-plugin-accessibility-utils": "^21.0.0",
+		"@atlaskit/editor-plugin-analytics": "^21.0.0",
+		"@atlaskit/editor-plugin-limited-mode": "^18.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^19.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
 		"@atlaskit/editor-tables": "^3.2.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/tmp-editor-statsig": "^205.0.0",
-		"@atlaskit/tokens": "^19.0.0",
+		"@atlaskit/tokens": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"bind-event-listener": "^3.0.0",
@@ -53,25 +53,25 @@
 		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^18.3.0",
-		"@atlaskit/editor-core": "^230.0.0",
-		"@atlaskit/editor-json-transformer": "^9.8.0",
+		"@atlaskit/editor-core": "^231.0.0",
+		"@atlaskit/editor-json-transformer": "^10.0.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
-		"@atlaskit/form": "^17.2.0",
+		"@atlaskit/form": "^18.0.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/textarea": "^10.2.0",
 		"@atlaskit/textfield": "^10.2.0",
 		"@atlaskit/util-data-test": "^19.1.0",
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
-		"@atlassian/editor-ai-injected-editors": "^34.0.0",
-		"@atlassian/editor-plugin-ai": "^74.0.0",
+		"@atlassian/editor-ai-injected-editors": "^35.0.0",
+		"@atlassian/editor-plugin-ai": "^75.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": "^124.0.0",
+		"@atlaskit/editor-common": "^125.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"
@@ -101,9 +101,6 @@
 		},
 		"platform_editor_reduce_diff_attr_sensitivity": {
 			"type": "boolean"
-		},
-		"platform_editor_diff_inline_mark_changes": {
-			"type": "boolean"
 		}
 	}
 }