@atlaskit/editor-plugin-show-diff 14.5.1 → 15.0.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 15.0.0
+
+### Minor Changes
+
+- [`d03fb7d6bfd0f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d03fb7d6bfd0f) -
+  Map attribution colour schemes onto ten ADS accent hues, render them with the bolder participant
+  treatment, and allocate the next available colour when participant hashes collide.
+- [`1d5a7cbfd029e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d5a7cbfd029e) -
+  The diff contributor tag is now drawn as plain DOM by its own widget decoration, following the
+  vanilla `@mention` node-view approach, so it needs no React portal into the editor. `react-dom`
+  stays a peer dependency for the rest of the plugin's React UI; `@atlaskit/tooltip`,
+  `@atlaskit/visually-hidden`, `@atlaskit/icon-lab` and `@atlaskit/logo` are no longer dependencies,
+  and only `@atlaskit/avatar`'s size constants are still used.
+
+  The tag's tooltip is now always the full "Changed by" label, rather than only appearing when the
+  name it draws is clipped.
+
+### Patch Changes
+
+- [`35f8ff3c9ce4f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/35f8ff3c9ce4f) -
+  Clean up the released `platform_editor_improve_inline_diffs` experiment and remove the obsolete
+  editor experiment migration entry point.
+- Updated dependencies
+
+## 14.5.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.5.1
 
 ### Patch Changes
@@ -38,15 +68,13 @@
 
 ### Minor Changes
 
-- [`844f6fce7d9c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/844f6fce7d9c4) -
-  Render the diff contributor tag from its own widget decoration instead of positioning an overlay
-  with CSS anchor positioning, and declare react-dom as a peer dependency for the portal into that
-  widget. Behind the confluence_ncs_step_diffing_version_history gate.
 - [`844f6fce7d9c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/844f6fce7d9c4) -
   [ux] Attributed diff changes now render a contributor tag naming who made the change, tinted to
   match the change's attribution colour, behind the `confluence_ncs_step_diffing_version_history`
-  gate. Adds an optional `contributorProfiles` list to the attributed `showDiff` params, from which
-  the plugin resolves the contributors it credits.
+  gate. The tag renders from its own widget decoration rather than a CSS-anchor-positioned overlay,
+  and `react-dom` is declared as a peer dependency for the portal into that widget. Adds an optional
+  `contributorProfiles` list to the attributed `showDiff` params, from which the plugin resolves the
+  contributors it credits.
 
 ### Patch Changes
 

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

@@ -11,7 +11,6 @@ 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 _deprecatedPlatformFeatureExperiments = require("@atlaskit/editor-common/deprecated-platform-feature-experiments");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
@@ -625,26 +624,21 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
-      var isAtomicInlineNodeFlag = (0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
-        return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
-      });
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
         change: change,
         colorScheme: colorScheme,
         isActive: isActive,
         isInserted: true,
-        isAtomicInlineNode: isAtomicInlineNodeFlag,
+        isAtomicInlineNode: true,
         inlineNodeName: change.inlineNodeName,
         // Suppress the border-bottom underline for atomic inline nodeviews —
         // it doesn't render on custom nodeview DOM elements and is unnecessary noise.
-        hideAddedDiffsUnderline: isAtomicInlineNodeFlag,
+        hideAddedDiffsUnderline: true,
         diffType: diffType
       })));
       // If we have the original node position, also render the old node as a "deleted" widget
       // so the user can see what it looked like before the change.
-      if (change.fromA !== undefined && change.toA !== undefined && (0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
-        return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
-      })) {
+      if (change.fromA !== undefined && change.toA !== undefined) {
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)({
           change: {
             fromA: change.fromA,

package/dist/cjs/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -219,7 +219,6 @@ var TEXT_BLOCK_TYPES = new Set(['paragraph', 'heading']);
  *   layoutColumn → layoutSection, tableCell/tableHeader → tableRow → table.
  */
 var RIGID_CHILD_TYPES = new Set(['layoutColumn', 'tableCell', 'tableHeader']);
-var TABLE_TYPE = 'table';
 
 /**
  * Emit a single whole-block (node-level) change covering both sides of a group. Used for
@@ -546,7 +545,7 @@ var classifyContainer = function classifyContainer(blockA, blockB, changes, orig
   var typeName = blockB.node.type.name;
 
   // Tables need cell-level counting across rows; handle them specially.
-  if (typeName === TABLE_TYPE) {
+  if (typeName === 'table') {
     return classifyTable(blockA, blockB, changes, originalDoc, newDoc, locale, thresholds);
   }
 

package/dist/cjs/pm-plugins/decorations/colorSchemes/attributions.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveContributors = exports.isContributorTagsEnabled = exports.isAttributionColoringEnabled = exports.getColorSchemeForChange = exports.getAttributionKeyForChange = exports.getAttributionKey = exports.createAttributionColorMap = exports.areAttributionColorGatesEnabled = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _utils = require("@atlaskit/editor-shared-styles/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -23,6 +23,19 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 
 /** Contributors addressed by attribution key. The key format is internal. */
 
+/** Maps the shared 18-slot telepointer palette onto the ten bolder diff colours. */
+var HASHED_PARTICIPANT_COLOR_SCHEMES = [].concat((0, _toConsumableArray2.default)(_types.PARTICIPANT_COLOR_SCHEMES), ['blue', 'red', 'orange', 'yellow', 'green', 'teal', 'purple', 'magenta']);
+var getAvailableColor = function getAvailableColor(hashedColor, allocatedColors) {
+  var startIndex = _types.PARTICIPANT_COLOR_SCHEMES.indexOf(hashedColor);
+  for (var offset = 0; offset < _types.PARTICIPANT_COLOR_SCHEMES.length; offset++) {
+    var color = _types.PARTICIPANT_COLOR_SCHEMES[(startIndex + offset) % _types.PARTICIPANT_COLOR_SCHEMES.length];
+    if (color && !allocatedColors.has(color)) {
+      return color;
+    }
+  }
+  return hashedColor;
+};
+
 /**
  * Normalise the attribution identity once so a valid lookup key always has a valid participant
  * colour seed. `userId` is primary; `agentId`, or `agentType` as its fallback, separates shared
@@ -118,6 +131,7 @@ var isContributorTagsEnabled = exports.isContributorTagsEnabled = function isCon
 };
 var createAttributionColorMap = exports.createAttributionColorMap = function createAttributionColorMap(stepAttributions) {
   var colors = new Map();
+  var allocatedColors = new Set();
   var _iterator2 = _createForOfIteratorHelper(stepAttributions),
     _step2;
   try {
@@ -129,10 +143,13 @@ var createAttributionColorMap = exports.createAttributionColorMap = function cre
       }
       var _getParticipantColor = (0, _utils.getParticipantColor)(identity.colorSeed),
         index = _getParticipantColor.index;
-      var participantColorScheme = _types.PARTICIPANT_COLOR_SCHEMES[index];
-      if (participantColorScheme) {
-        colors.set(identity.key, participantColorScheme);
+      var hashedColor = HASHED_PARTICIPANT_COLOR_SCHEMES[index];
+      if (!hashedColor) {
+        continue;
       }
+      var participantColorScheme = getAvailableColor(hashedColor, allocatedColors);
+      colors.set(identity.key, participantColorScheme);
+      allocatedColors.add(participantColorScheme);
     }
   } catch (err) {
     _iterator2.e(err);

package/dist/cjs/pm-plugins/decorations/colorSchemes/factory.js

@@ -68,8 +68,6 @@ exports.buildInsertedInlineStyle = buildInsertedInlineStyle;
 exports.getAccentTokens = getAccentTokens;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
-var _constants = require("@atlaskit/editor-shared-styles/constants");
-var _types = require("./types");
 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) { (0, _defineProperty2.default)(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; }
 // token() is a build-time transform needing static literals, so pre-compute every colour's
@@ -147,71 +145,23 @@ var textAccentMap = {
   gray: "var(--ds-text-accent-gray, #505258)",
   lime: "var(--ds-text-accent-lime, #4C6B1F)"
 };
-
-/** Pressed counterpart of each participant's diff-safe SVG background tint. */
-var participantPressedBackgroundMap = {
-  'red-bolder': bgSubtlerPressedMap.red,
-  'blue-bolder': bgSubtlerPressedMap.blue,
-  'green-bolder': bgSubtlerPressedMap.green,
-  'yellow-bolder': bgSubtlerPressedMap.yellow,
-  'purple-bolder': bgSubtlerPressedMap.purple,
-  'magenta-bolder': bgSubtlerPressedMap.magenta,
-  'teal-bolder': bgSubtlerPressedMap.teal,
-  'orange-bolder': bgSubtlerPressedMap.orange,
-  'lime-bolder': bgSubtlerPressedMap.lime,
-  'gray-bolder': bgSubtlerPressedMap.gray,
-  'blue-subtle': bgSubtlestPressedMap.blue,
-  'red-subtle': bgSubtlestPressedMap.red,
-  'orange-subtle': bgSubtlestPressedMap.orange,
-  'yellow-subtle': bgSubtlestPressedMap.yellow,
-  'green-subtle': bgSubtlestPressedMap.green,
-  'teal-subtle': bgSubtlestPressedMap.teal,
-  'purple-subtle': bgSubtlestPressedMap.purple,
-  'magenta-subtle': bgSubtlestPressedMap.magenta
-};
-/**
- * Telepointers can put inverse text directly on their bolder colour. Diff colours sit behind
- * arbitrary document content, so use the participant SVG tint and its matching pressed token for
- * diff backgrounds. Borders and rings use the exact participant colour, preserving all 18
- * bolder/subtle slots while keeping every value in the shared ADS participant palette.
- */
-var participantColorTokenSets = Object.fromEntries(_types.PARTICIPANT_COLOR_SCHEMES.map(function (scheme, index) {
-  var participantColor = _constants.participantColors[index];
-  if (!participantColor) {
-    throw new Error("Missing shared participant colour for show-diff slot ".concat(index));
-  }
-  return [scheme, {
-    backgroundSubtlest: participantColor.svgBackgroundColor,
-    backgroundSubtlestPressed: participantPressedBackgroundMap[scheme],
-    backgroundSubtler: participantColor.svgBackgroundColor,
-    backgroundSubtlerPressed: participantPressedBackgroundMap[scheme],
-    borderAccent: participantColor.backgroundColor,
-    // The first ten bolder colours are safe as accents on the editor surface. The
-    // remaining subtle colours use their paired dark participant text colour.
-    textAccent: index < 10 ? participantColor.backgroundColor : participantColor.textColor
-  }];
-}));
-var participantColorSchemeSet = new Set(_types.PARTICIPANT_COLOR_SCHEMES);
-var isParticipantColorScheme = function isParticipantColorScheme(color) {
-  return participantColorSchemeSet.has(color);
-};
 function bgSubtlest(color) {
-  return isParticipantColorScheme(color) ? participantColorTokenSets[color].backgroundSubtlest : bgSubtlestMap[color];
+  return bgSubtlestMap[color];
 }
 function bgSubtlestPressed(color) {
-  return isParticipantColorScheme(color) ? participantColorTokenSets[color].backgroundSubtlestPressed : bgSubtlestPressedMap[color];
+  return bgSubtlestPressedMap[color];
 }
 function bgSubtler(color) {
-  return isParticipantColorScheme(color) ? participantColorTokenSets[color].backgroundSubtler : bgSubtlerMap[color];
+  return bgSubtlerMap[color];
 }
 function bgSubtlerPressed(color) {
-  return isParticipantColorScheme(color) ? participantColorTokenSets[color].backgroundSubtlerPressed : bgSubtlerPressedMap[color];
+  return bgSubtlerPressedMap[color];
 }
 function borderAccent(color) {
-  return isParticipantColorScheme(color) ? participantColorTokenSets[color].borderAccent : borderAccentMap[color];
+  return borderAccentMap[color];
 }
 function textAccent(color) {
-  return isParticipantColorScheme(color) ? participantColorTokenSets[color].textAccent : textAccentMap[color];
+  return textAccentMap[color];
 }
 
 /** Presentation tokens for one diff colour, shared by highlights and contributor tags. */

package/dist/cjs/pm-plugins/decorations/colorSchemes/schemes.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.traditionalScheme = exports.standardScheme = exports.getLegacyColorScheme = exports.colorSchemeRegistry = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _types = require("./types");
 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) { (0, _defineProperty2.default)(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; }
 /** Green insertions, red deletions. */
@@ -71,30 +72,15 @@ var createAttributionScheme = function createAttributionScheme(color) {
     deletedCellColor: color
   });
 };
+var attributionColorSchemes = Object.fromEntries(_types.PARTICIPANT_COLOR_SCHEMES.map(function (color) {
+  return [color, createAttributionScheme(color)];
+}));
 
 /** Maps public schemes and attribution-only participant slots to their data objects. */
-var colorSchemeRegistry = exports.colorSchemeRegistry = {
-  'red-bolder': createAttributionScheme('red-bolder'),
-  'blue-bolder': createAttributionScheme('blue-bolder'),
-  'green-bolder': createAttributionScheme('green-bolder'),
-  'yellow-bolder': createAttributionScheme('yellow-bolder'),
-  'purple-bolder': createAttributionScheme('purple-bolder'),
-  'magenta-bolder': createAttributionScheme('magenta-bolder'),
-  'teal-bolder': createAttributionScheme('teal-bolder'),
-  'orange-bolder': createAttributionScheme('orange-bolder'),
-  'lime-bolder': createAttributionScheme('lime-bolder'),
-  'gray-bolder': createAttributionScheme('gray-bolder'),
-  'blue-subtle': createAttributionScheme('blue-subtle'),
-  'red-subtle': createAttributionScheme('red-subtle'),
-  'orange-subtle': createAttributionScheme('orange-subtle'),
-  'yellow-subtle': createAttributionScheme('yellow-subtle'),
-  'green-subtle': createAttributionScheme('green-subtle'),
-  'teal-subtle': createAttributionScheme('teal-subtle'),
-  'purple-subtle': createAttributionScheme('purple-subtle'),
-  'magenta-subtle': createAttributionScheme('magenta-subtle'),
+var colorSchemeRegistry = exports.colorSchemeRegistry = _objectSpread(_objectSpread({}, attributionColorSchemes), {}, {
   traditional: traditionalScheme,
   standard: standardScheme
-};
+});
 
 /** Attribution accents are impossible in the refactor-off cohort; fall back defensively. */
 var getLegacyColorScheme = exports.getLegacyColorScheme = function getLegacyColorScheme(colorScheme) {

package/dist/cjs/pm-plugins/decorations/colorSchemes/types.js

@@ -7,16 +7,14 @@ exports.PARTICIPANT_COLOR_SCHEMES = void 0;
 /** Schemes consumers may explicitly request through the show-diff API. */
 
 /** Attribution-only participant slots selected by the plugin, never by consumers. */
-var PARTICIPANT_COLOR_SCHEMES = exports.PARTICIPANT_COLOR_SCHEMES = ['red-bolder', 'blue-bolder', 'green-bolder', 'yellow-bolder', 'purple-bolder', 'magenta-bolder', 'teal-bolder', 'orange-bolder', 'lime-bolder', 'gray-bolder', 'blue-subtle', 'red-subtle', 'orange-subtle', 'yellow-subtle', 'green-subtle', 'teal-subtle', 'purple-subtle', 'magenta-subtle'];
+var PARTICIPANT_COLOR_SCHEMES = exports.PARTICIPANT_COLOR_SCHEMES = ['red', 'blue', 'green', 'yellow', 'purple', 'magenta', 'teal', 'orange', 'lime', 'gray'];
 
 /** ADS accent hues used by the public and participant colour schemes. */
 
 /** A public scheme or an attribution participant slot resolved internally for one change. */
 
-/** A colour value that the factory expands into a complete set of diff-safe ADS tokens. */
-
 /**
- * A show-diff colour scheme. Colour fields are ADS hues or shared participant slots that
- * `factory.ts` expands into token paths; the rest encode structural differences no colour can
- * express. Ring widths, padding, radius and pointer-events are fixed in the factory, not per scheme.
+ * A show-diff colour scheme. Colour fields are ADS hues that `factory.ts` expands into token paths;
+ * the rest encode structural differences no colour can express. Ring widths, padding, radius and
+ * pointer-events are fixed in the factory, not per scheme.
  */

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

@@ -25,7 +25,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var DEFAULT_COLOR_SCHEME = 'standard';
 /**
  * Extracts information about deleted table rows from a change
  */
@@ -137,7 +136,7 @@ var isEmptyRow = function isEmptyRow(rowNode) {
  */
 var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType) {
   var tr = document.createElement('tr');
-  var colors = _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
+  var colors = _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : 'standard'];
 
   // Inserted rows keep their natural styling; the row strikethrough is deletions only.
   if (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || !isInserted) {

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

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.unmountContributorTag = exports.mountContributorTag = exports.createContributorTagWidget = exports.createContributorTagHost = exports.CONTRIBUTOR_TAG_HOST_ATTRIBUTE = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("react");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _ContributorTagWidget = require("../../ui/ContributorTag/ContributorTagWidget");
+var _contributorTagController = require("../../ui/ContributorTag/contributorTagController");
 var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
 var _decorationKeys = require("./decorationKeys");
 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; }
@@ -23,23 +22,19 @@ var isContributorTagWidgetEnabled = function isContributorTagWidgetEnabled() {
 };
 
 /**
- * Everything a tag needs to mount itself into the document, plumbed down from the plugin. Absent in
+ * Everything a tag needs to draw itself into the document, plumbed down from the plugin. Absent in
  * unit tests that build decorations directly: the hosts are still emitted, they just stay empty.
  */
 
 /** A mounted tag, so whoever emitted the host can take it down again. */
 
 /**
- * Unique per mount rather than per diff, because ProseMirror draws a replacement widget before it
- * destroys the widget being replaced: on a shared key the outgoing widget's `destroy` would
- * unregister the incoming widget's portal.
- */
-var nextContributorTagPortalId = 0;
-
-/**
- * Renders the tag into `host` through the editor's portal provider, the way the rest of the editor
- * mounts React into decorations. The tag resolves its own model from plugin state, so a redraw of
- * the host re-parents the tag instead of stranding it, and `isActive` changes arrive as a re-render.
+ * Draws the tag into `host`. The tag resolves its own model from plugin state, so a redraw of the
+ * host re-parents the tag instead of stranding it, and `isActive` changes arrive as an update.
+ *
+ * Each mount owns its own controller and DOM, so when ProseMirror draws a replacement widget before
+ * destroying the one it replaces, the outgoing `destroy` cannot take the incoming tag down with it
+ * (EDITOR-8702).
  */
 var mountContributorTag = exports.mountContributorTag = function mountContributorTag(_ref) {
   var diffId = _ref.diffId,
@@ -48,24 +43,14 @@ var mountContributorTag = exports.mountContributorTag = function mountContributo
   if (!mountContext) {
     return undefined;
   }
-  var api = mountContext.api,
-    getEditorRoot = mountContext.getEditorRoot,
-    portalProviderAPI = mountContext.portalProviderAPI;
-  var key = "".concat(_decorationKeys.DecorationFamily.contributorTag, "-").concat(diffId, "-").concat(nextContributorTagPortalId++);
-  portalProviderAPI.render(function () {
-    return /*#__PURE__*/(0, _react.createElement)(_ContributorTagWidget.ContributorTagWidget, {
-      api: api,
-      diffId: diffId,
-      getEditorRoot: getEditorRoot
-    });
-  }, host, key);
-  return {
-    key: key,
-    portalProviderAPI: portalProviderAPI
-  };
+  var controller = new _contributorTagController.ContributorTagController(_objectSpread(_objectSpread({}, mountContext), {}, {
+    diffId: diffId
+  }));
+  controller.mount(host);
+  return controller;
 };
 var unmountContributorTag = exports.unmountContributorTag = function unmountContributorTag(mount) {
-  mount === null || mount === void 0 || mount.portalProviderAPI.remove(mount.key);
+  mount === null || mount === void 0 || mount.destroy();
 };
 
 /**

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

@@ -22,9 +22,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var displayNoneStyle = (0, _lazyNodeView.convertToInlineCss)({
   display: 'none'
 });
-var DEFAULT_COLOR_SCHEME = 'standard';
 var getColorScheme = function getColorScheme(colorScheme) {
-  return _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
+  return _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : 'standard'];
 };
 
 /**

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

@@ -9,11 +9,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
-var _deprecatedPlatformFeatureExperiments = require("@atlaskit/editor-common/deprecated-platform-feature-experiments");
 var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _diffableAttrs = require("./diffableAttrs");
 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) { (0, _defineProperty2.default)(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; }
@@ -86,26 +84,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     var nodeAtPos = doc.nodeAt(finalPos);
     var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
 
-    // date node: timestamp attribute change — highlight the date node itself (inline)
-    if (attrsToCheck.some(function (v) {
-      return dateAttrs.includes(v);
-    }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !(0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
-      return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
-    })) {
-      return {
-        fromB: finalPos,
-        toB: finalPos + nodeAtPos.nodeSize,
-        isInline: true,
-        inlineNodeName: 'date'
-      };
-    }
-
-    // The following inline node attr changes are gated behind platform_editor_improve_inline_diffs.
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
-    if ((0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
-      return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
-    }) && nodeAtPos) {
+    if (nodeAtPos) {
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
@@ -182,12 +163,8 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
   // Deduplicate by node position: multiple AttrSteps on the same node
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
-  // Gated behind the same experiment as the inline node attr changes that introduced
-  // the possibility of multiple ranges for the same node position.
   .filter(function (range, i, arr) {
-    return !(0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
-      return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
-    }) || arr.findIndex(function (r) {
+    return arr.findIndex(function (r) {
       return r.fromB === range.fromB;
     }) === i;
   });

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

@@ -25,9 +25,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * On cleanup (EDITOR-8281): drop the `isExperimentEnabled` dispatch and the `*Legacy` imports,
  * keeping the `*Next` bodies.
  */
-var DEFAULT_COLOR_SCHEME = 'standard';
 var getColorScheme = function getColorScheme(colorScheme) {
-  return _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
+  return _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : 'standard'];
 };
 
 /**

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

@@ -41,7 +41,7 @@ var dropOrphanedContributorTags = function dropOrphanedContributorTags(contribut
   });
   return liveTags.length === contributorTags.length ? contributorTags : liveTags;
 };
-var createPlugin = exports.createPlugin = function createPlugin(config, getIntl, api, portalProviderAPI, onEditorView) {
+var createPlugin = exports.createPlugin = function createPlugin(config, getIntl, api, onEditorView) {
   (0, _enforceCustomStepRegisters.enforceCustomStepRegisters)();
   var nodeViewSerializer = new _NodeViewSerializer.NodeViewSerializer({});
   var setNodeViewSerializer = function setNodeViewSerializer(editorView) {
@@ -58,14 +58,14 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
    * lifecycle, which decorations are calculated independently of.
    */
   var currentEditorView;
-  var tagMountContext = portalProviderAPI ? {
+  var tagMountContext = {
     api: api,
     getEditorRoot: function getEditorRoot() {
       var _currentEditorView$do, _currentEditorView;
       return (_currentEditorView$do = (_currentEditorView = currentEditorView) === null || _currentEditorView === void 0 ? void 0 : _currentEditorView.dom) !== null && _currentEditorView$do !== void 0 ? _currentEditorView$do : null;
     },
-    portalProviderAPI: portalProviderAPI
-  } : undefined;
+    getIntl: getIntl
+  };
   return new _safePlugin.SafePlugin({
     key: showDiffPluginKey,
     state: {

package/dist/cjs/showDiffPlugin.js

@@ -105,12 +105,11 @@ var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref3) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'showDiffPlugin',
-        // Contributor tags mount into their own decoration widgets through the portal
-        // provider, the way the rest of the editor renders React into decorations.
+        // Contributor tags draw themselves into their own decoration widgets — plain DOM, so
+        // no portal provider is needed here.
         plugin: function plugin(_ref8) {
-          var getIntl = _ref8.getIntl,
-            nodeViewPortalProviderAPI = _ref8.nodeViewPortalProviderAPI;
-          return (0, _main.createPlugin)(config, getIntl, api, nodeViewPortalProviderAPI, setEditorView);
+          var getIntl = _ref8.getIntl;
+          return (0, _main.createPlugin)(config, getIntl, api, setEditorView);
         }
       }];
     },