npm - @atlaskit/editor-plugin-track-changes - Versions diffs - 12.0.3 → 12.1.1 - Mend

@atlaskit/editor-plugin-track-changes 12.0.3 → 12.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/CHANGELOG.md +19 -0
package/dist/cjs/pm-plugins/keymaps.js +4 -2
package/dist/cjs/pm-plugins/main.js +6 -0
package/dist/cjs/pm-plugins/types.js +1 -0
package/dist/cjs/trackChangesPlugin.js +28 -7
package/dist/cjs/ui/TrackChangesToolbarButton.js +11 -5
package/dist/es2019/pm-plugins/keymaps.js +5 -3
package/dist/es2019/pm-plugins/main.js +7 -0
package/dist/es2019/pm-plugins/types.js +1 -0
package/dist/es2019/trackChangesPlugin.js +25 -5
package/dist/es2019/ui/TrackChangesToolbarButton.js +11 -5
package/dist/esm/pm-plugins/keymaps.js +4 -2
package/dist/esm/pm-plugins/main.js +6 -0
package/dist/esm/pm-plugins/types.js +1 -0
package/dist/esm/trackChangesPlugin.js +28 -7
package/dist/esm/ui/TrackChangesToolbarButton.js +11 -5
package/dist/types/pm-plugins/main.d.ts +6 -0
package/dist/types/pm-plugins/types.d.ts +2 -1
package/dist/types/trackChangesPluginType.d.ts +17 -0
package/package.json +6 -6
package/tsconfig.json +5 -15

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-track-changes
+## 12.1.1
+### Patch Changes
+- Updated dependencies
+## 12.1.0
+### Minor Changes
+- [`dcb19ae73b101`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dcb19ae73b101) -
+  [CCI-18040] Disable the main toolbar's View changes (track changes) button and its keyboard
+  shortcut while the AI Review moment is visible. Adds a setToggleChangesDisabled command and
+  isToggleChangesDisabled shared state to the track changes plugin.
+### Patch Changes
+- Updated dependencies
 ## 12.0.3
 ### Patch Changes

package/dist/cjs/pm-plugins/keymaps.js CHANGED Viewed

@@ -18,8 +18,10 @@ function keymapPlugin(api) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     _keymaps.toggleViewChanges.common, function () {
       var _api$trackChanges, _api$trackChanges2;
-      var isShowDiffAvailable = api === null || api === void 0 || (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 || (_api$trackChanges = _api$trackChanges.sharedState.currentState()) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.isShowDiffAvailable;
-      if (!isShowDiffAvailable) {
+      var trackChangesState = api === null || api === void 0 || (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.sharedState.currentState();
+      // Mirror the toolbar button: no changes to show, or another plugin currently owns
+      // the diff decorations (e.g. the AI Review moment is visible).
+      if (!(trackChangesState !== null && trackChangesState !== void 0 && trackChangesState.isShowDiffAvailable) || trackChangesState !== null && trackChangesState !== void 0 && trackChangesState.isToggleChangesDisabled) {
         return false;
       }
       var result = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$trackChanges2 = api.trackChanges) === null || _api$trackChanges2 === void 0 ? void 0 : _api$trackChanges2.commands.toggleChanges);

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

@@ -59,12 +59,18 @@ var createTrackChangesPlugin = exports.createTrackChangesPlugin = function creat
           steps: [],
           shouldChangesBeDisplayed: false,
           isShowDiffAvailable: false,
+          isToggleChangesDisabled: false,
           allocations: new Set()
         };
       },
       apply: function apply(tr, state) {
         var _api$history, _state$steps$at$alloc, _state$steps$at;
         var metadata = tr.getMeta(trackChangesPluginKey);
+        if (metadata && metadata.action === _types.TOGGLE_TRACK_CHANGES_ACTION.SET_TOGGLE_CHANGES_DISABLED) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            isToggleChangesDisabled: Boolean(metadata.isDisabled)
+          });
+        }
         if (metadata && metadata.action === _types.TOGGLE_TRACK_CHANGES_ACTION.RESET_BASELINE) {
           return _objectSpread(_objectSpread({}, state), {}, {
             steps: [],

package/dist/cjs/pm-plugins/types.js CHANGED Viewed

@@ -7,5 +7,6 @@ exports.TOGGLE_TRACK_CHANGES_ACTION = void 0;
 var TOGGLE_TRACK_CHANGES_ACTION = exports.TOGGLE_TRACK_CHANGES_ACTION = /*#__PURE__*/function (TOGGLE_TRACK_CHANGES_ACTION) {
   TOGGLE_TRACK_CHANGES_ACTION["TOGGLE_TRACK_CHANGES"] = "TOGGLE_TRACK_CHANGES";
   TOGGLE_TRACK_CHANGES_ACTION["RESET_BASELINE"] = "RESET_BASELINE";
+  TOGGLE_TRACK_CHANGES_ACTION["SET_TOGGLE_CHANGES_DISABLED"] = "SET_TOGGLE_CHANGES_DISABLED";
   return TOGGLE_TRACK_CHANGES_ACTION;
 }({});

package/dist/cjs/trackChangesPlugin.js CHANGED Viewed

@@ -49,15 +49,34 @@ var trackChangesPlugin = exports.trackChangesPlugin = function trackChangesPlugi
     },
     commands: {
       toggleChanges: function toggleChanges(_ref2) {
+        var _api$trackChanges;
         var tr = _ref2.tr;
+        // Another plugin currently owns the diff decorations (e.g. the AI Review moment),
+        // so toggling would fight over the same diff — bail out.
+        if (api !== null && api !== void 0 && (_api$trackChanges = api.trackChanges) !== null && _api$trackChanges !== void 0 && (_api$trackChanges = _api$trackChanges.sharedState.currentState()) !== null && _api$trackChanges !== void 0 && _api$trackChanges.isToggleChangesDisabled) {
+          return null;
+        }
         return tr.setMeta(_main.trackChangesPluginKey, {
           action: _types.TOGGLE_TRACK_CHANGES_ACTION.TOGGLE_TRACK_CHANGES
         });
       },
-      resetBaseline: function resetBaseline(_ref3) {
-        var _api$trackChanges;
-        var tr = _ref3.tr;
-        if (!(api !== null && api !== void 0 && (_api$trackChanges = api.trackChanges) !== null && _api$trackChanges !== void 0 && (_api$trackChanges = _api$trackChanges.sharedState.currentState()) !== null && _api$trackChanges !== void 0 && _api$trackChanges.isShowDiffAvailable)) {
+      setToggleChangesDisabled: function setToggleChangesDisabled(isDisabled) {
+        return function (_ref3) {
+          var _api$trackChanges2;
+          var tr = _ref3.tr;
+          if ((api === null || api === void 0 || (_api$trackChanges2 = api.trackChanges) === null || _api$trackChanges2 === void 0 || (_api$trackChanges2 = _api$trackChanges2.sharedState.currentState()) === null || _api$trackChanges2 === void 0 ? void 0 : _api$trackChanges2.isToggleChangesDisabled) === isDisabled) {
+            return null;
+          }
+          return tr.setMeta(_main.trackChangesPluginKey, {
+            action: _types.TOGGLE_TRACK_CHANGES_ACTION.SET_TOGGLE_CHANGES_DISABLED,
+            isDisabled: isDisabled
+          });
+        };
+      },
+      resetBaseline: function resetBaseline(_ref4) {
+        var _api$trackChanges3;
+        var tr = _ref4.tr;
+        if (!(api !== null && api !== void 0 && (_api$trackChanges3 = api.trackChanges) !== null && _api$trackChanges3 !== void 0 && (_api$trackChanges3 = _api$trackChanges3.sharedState.currentState()) !== null && _api$trackChanges3 !== void 0 && _api$trackChanges3.isShowDiffAvailable)) {
           return null;
         }
         return tr.setMeta(_main.trackChangesPluginKey, {
@@ -66,16 +85,18 @@ var trackChangesPlugin = exports.trackChangesPlugin = function trackChangesPlugi
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _trackChangesPluginKe, _trackChangesPluginKe2;
+      var _trackChangesPluginKe, _trackChangesPluginKe2, _trackChangesPluginKe3;
       if (!editorState) {
         return {
           isDisplayingChanges: false,
-          isShowDiffAvailable: false
+          isShowDiffAvailable: false,
+          isToggleChangesDisabled: false
         };
       }
       return {
         isDisplayingChanges: Boolean((_trackChangesPluginKe = _main.trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe === void 0 ? void 0 : _trackChangesPluginKe.shouldChangesBeDisplayed),
-        isShowDiffAvailable: Boolean((_trackChangesPluginKe2 = _main.trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe2 === void 0 ? void 0 : _trackChangesPluginKe2.isShowDiffAvailable)
+        isShowDiffAvailable: Boolean((_trackChangesPluginKe2 = _main.trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe2 === void 0 ? void 0 : _trackChangesPluginKe2.isShowDiffAvailable),
+        isToggleChangesDisabled: Boolean((_trackChangesPluginKe3 = _main.trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe3 === void 0 ? void 0 : _trackChangesPluginKe3.isToggleChangesDisabled)
       };
     }
   };

package/dist/cjs/ui/TrackChangesToolbarButton.js CHANGED Viewed

@@ -18,14 +18,20 @@ var TrackChangesToolbarButton = exports.TrackChangesToolbarButton = function Tra
     Wrapper = _ref.wrapper;
   var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['trackChanges'], function (states) {
-      var _states$trackChangesS, _states$trackChangesS2;
+      var _states$trackChangesS, _states$trackChangesS2, _states$trackChangesS3;
       return {
         isDisplayingChanges: (_states$trackChangesS = states.trackChangesState) === null || _states$trackChangesS === void 0 ? void 0 : _states$trackChangesS.isDisplayingChanges,
-        isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable
+        isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable,
+        isToggleChangesDisabled: (_states$trackChangesS3 = states.trackChangesState) === null || _states$trackChangesS3 === void 0 ? void 0 : _states$trackChangesS3.isToggleChangesDisabled
       };
     }),
     isDisplayingChanges = _useSharedPluginState.isDisplayingChanges,
-    isShowDiffAvailable = _useSharedPluginState.isShowDiffAvailable;
+    isShowDiffAvailable = _useSharedPluginState.isShowDiffAvailable,
+    isToggleChangesDisabled = _useSharedPluginState.isToggleChangesDisabled;
+  // Disabled either because there's nothing to diff, or because another plugin currently
+  // owns the diff decorations (e.g. the AI Review moment is visible).
+  var isDisabled = !isShowDiffAvailable || Boolean(isToggleChangesDisabled);
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var handleClick = _react.default.useCallback(function () {
@@ -51,7 +57,7 @@ var TrackChangesToolbarButton = exports.TrackChangesToolbarButton = function Tra
       icon: _editorToolbar.HistoryIcon,
       label: formatMessage(_messages.trackChangesMessages.toolbarIconLabel),
       appearance: "subtle",
-      isDisabled: !isShowDiffAvailable,
+      isDisabled: isDisabled,
       isSelected: isDisplayingChanges,
       onClick: handleClick
     }));
@@ -64,7 +70,7 @@ var TrackChangesToolbarButton = exports.TrackChangesToolbarButton = function Tra
       size: "small"
     }),
     onClick: handleClick,
-    isDisabled: !isShowDiffAvailable,
+    isDisabled: isDisabled,
     isSelected: isDisplayingChanges
   }));
   return Wrapper ? /*#__PURE__*/_react.default.createElement(Wrapper, null, button) : button;

package/dist/es2019/pm-plugins/keymaps.js CHANGED Viewed

@@ -11,9 +11,11 @@ export function keymapPlugin(api) {
     bindKeymapWithCommand(
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     toggleViewChanges.common, () => {
-      var _api$trackChanges, _api$trackChanges$sha, _api$trackChanges2;
-      const isShowDiffAvailable = api === null || api === void 0 ? void 0 : (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 ? void 0 : (_api$trackChanges$sha = _api$trackChanges.sharedState.currentState()) === null || _api$trackChanges$sha === void 0 ? void 0 : _api$trackChanges$sha.isShowDiffAvailable;
-      if (!isShowDiffAvailable) {
+      var _api$trackChanges, _api$trackChanges2;
+      const trackChangesState = api === null || api === void 0 ? void 0 : (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.sharedState.currentState();
+      // Mirror the toolbar button: no changes to show, or another plugin currently owns
+      // the diff decorations (e.g. the AI Review moment is visible).
+      if (!(trackChangesState !== null && trackChangesState !== void 0 && trackChangesState.isShowDiffAvailable) || trackChangesState !== null && trackChangesState !== void 0 && trackChangesState.isToggleChangesDisabled) {
         return false;
       }
       const result = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$trackChanges2 = api.trackChanges) === null || _api$trackChanges2 === void 0 ? void 0 : _api$trackChanges2.commands.toggleChanges);

package/dist/es2019/pm-plugins/main.js CHANGED Viewed

@@ -34,12 +34,19 @@ export const createTrackChangesPlugin = api => {
           steps: [],
           shouldChangesBeDisplayed: false,
           isShowDiffAvailable: false,
+          isToggleChangesDisabled: false,
           allocations: new Set()
         };
       },
       apply(tr, state) {
         var _api$history, _state$steps$at$alloc, _state$steps$at;
         const metadata = tr.getMeta(trackChangesPluginKey);
+        if (metadata && metadata.action === ACTION.SET_TOGGLE_CHANGES_DISABLED) {
+          return {
+            ...state,
+            isToggleChangesDisabled: Boolean(metadata.isDisabled)
+          };
+        }
         if (metadata && metadata.action === ACTION.RESET_BASELINE) {
           return {
             ...state,

package/dist/es2019/pm-plugins/types.js CHANGED Viewed

@@ -1,5 +1,6 @@
 export let TOGGLE_TRACK_CHANGES_ACTION = /*#__PURE__*/function (TOGGLE_TRACK_CHANGES_ACTION) {
   TOGGLE_TRACK_CHANGES_ACTION["TOGGLE_TRACK_CHANGES"] = "TOGGLE_TRACK_CHANGES";
   TOGGLE_TRACK_CHANGES_ACTION["RESET_BASELINE"] = "RESET_BASELINE";
+  TOGGLE_TRACK_CHANGES_ACTION["SET_TOGGLE_CHANGES_DISABLED"] = "SET_TOGGLE_CHANGES_DISABLED";
   return TOGGLE_TRACK_CHANGES_ACTION;
 }({});

package/dist/es2019/trackChangesPlugin.js CHANGED Viewed

@@ -41,15 +41,33 @@ export const trackChangesPlugin = ({
       toggleChanges: ({
         tr
       }) => {
+        var _api$trackChanges, _api$trackChanges$sha;
+        // Another plugin currently owns the diff decorations (e.g. the AI Review moment),
+        // so toggling would fight over the same diff — bail out.
+        if (api !== null && api !== void 0 && (_api$trackChanges = api.trackChanges) !== null && _api$trackChanges !== void 0 && (_api$trackChanges$sha = _api$trackChanges.sharedState.currentState()) !== null && _api$trackChanges$sha !== void 0 && _api$trackChanges$sha.isToggleChangesDisabled) {
+          return null;
+        }
         return tr.setMeta(trackChangesPluginKey, {
           action: ACTION.TOGGLE_TRACK_CHANGES
         });
       },
+      setToggleChangesDisabled: isDisabled => ({
+        tr
+      }) => {
+        var _api$trackChanges2, _api$trackChanges2$sh;
+        if ((api === null || api === void 0 ? void 0 : (_api$trackChanges2 = api.trackChanges) === null || _api$trackChanges2 === void 0 ? void 0 : (_api$trackChanges2$sh = _api$trackChanges2.sharedState.currentState()) === null || _api$trackChanges2$sh === void 0 ? void 0 : _api$trackChanges2$sh.isToggleChangesDisabled) === isDisabled) {
+          return null;
+        }
+        return tr.setMeta(trackChangesPluginKey, {
+          action: ACTION.SET_TOGGLE_CHANGES_DISABLED,
+          isDisabled
+        });
+      },
       resetBaseline: ({
         tr
       }) => {
-        var _api$trackChanges, _api$trackChanges$sha;
-        if (!(api !== null && api !== void 0 && (_api$trackChanges = api.trackChanges) !== null && _api$trackChanges !== void 0 && (_api$trackChanges$sha = _api$trackChanges.sharedState.currentState()) !== null && _api$trackChanges$sha !== void 0 && _api$trackChanges$sha.isShowDiffAvailable)) {
+        var _api$trackChanges3, _api$trackChanges3$sh;
+        if (!(api !== null && api !== void 0 && (_api$trackChanges3 = api.trackChanges) !== null && _api$trackChanges3 !== void 0 && (_api$trackChanges3$sh = _api$trackChanges3.sharedState.currentState()) !== null && _api$trackChanges3$sh !== void 0 && _api$trackChanges3$sh.isShowDiffAvailable)) {
           return null;
         }
         return tr.setMeta(trackChangesPluginKey, {
@@ -58,16 +76,18 @@ export const trackChangesPlugin = ({
       }
     },
     getSharedState: editorState => {
-      var _trackChangesPluginKe, _trackChangesPluginKe2;
+      var _trackChangesPluginKe, _trackChangesPluginKe2, _trackChangesPluginKe3;
       if (!editorState) {
         return {
           isDisplayingChanges: false,
-          isShowDiffAvailable: false
+          isShowDiffAvailable: false,
+          isToggleChangesDisabled: false
         };
       }
       return {
         isDisplayingChanges: Boolean((_trackChangesPluginKe = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe === void 0 ? void 0 : _trackChangesPluginKe.shouldChangesBeDisplayed),
-        isShowDiffAvailable: Boolean((_trackChangesPluginKe2 = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe2 === void 0 ? void 0 : _trackChangesPluginKe2.isShowDiffAvailable)
+        isShowDiffAvailable: Boolean((_trackChangesPluginKe2 = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe2 === void 0 ? void 0 : _trackChangesPluginKe2.isShowDiffAvailable),
+        isToggleChangesDisabled: Boolean((_trackChangesPluginKe3 = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe3 === void 0 ? void 0 : _trackChangesPluginKe3.isToggleChangesDisabled)
       };
     }
   };

package/dist/es2019/ui/TrackChangesToolbarButton.js CHANGED Viewed

@@ -13,14 +13,20 @@ export const TrackChangesToolbarButton = ({
   const isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   const {
     isDisplayingChanges,
-    isShowDiffAvailable
+    isShowDiffAvailable,
+    isToggleChangesDisabled
   } = useSharedPluginStateWithSelector(api, ['trackChanges'], states => {
-    var _states$trackChangesS, _states$trackChangesS2;
+    var _states$trackChangesS, _states$trackChangesS2, _states$trackChangesS3;
     return {
       isDisplayingChanges: (_states$trackChangesS = states.trackChangesState) === null || _states$trackChangesS === void 0 ? void 0 : _states$trackChangesS.isDisplayingChanges,
-      isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable
+      isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable,
+      isToggleChangesDisabled: (_states$trackChangesS3 = states.trackChangesState) === null || _states$trackChangesS3 === void 0 ? void 0 : _states$trackChangesS3.isToggleChangesDisabled
     };
   });
+  // Disabled either because there's nothing to diff, or because another plugin currently
+  // owns the diff decorations (e.g. the AI Review moment is visible).
+  const isDisabled = !isShowDiffAvailable || Boolean(isToggleChangesDisabled);
   const {
     formatMessage
   } = useIntl();
@@ -47,7 +53,7 @@ export const TrackChangesToolbarButton = ({
       icon: HistoryIcon,
       label: formatMessage(trackChangesMessages.toolbarIconLabel),
       appearance: "subtle",
-      isDisabled: !isShowDiffAvailable,
+      isDisabled: isDisabled,
       isSelected: isDisplayingChanges,
       onClick: handleClick
     }));
@@ -60,7 +66,7 @@ export const TrackChangesToolbarButton = ({
       size: "small"
     }),
     onClick: handleClick,
-    isDisabled: !isShowDiffAvailable,
+    isDisabled: isDisabled,
     isSelected: isDisplayingChanges
   }));
   return Wrapper ? /*#__PURE__*/React.createElement(Wrapper, null, button) : button;

package/dist/esm/pm-plugins/keymaps.js CHANGED Viewed

@@ -12,8 +12,10 @@ export function keymapPlugin(api) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     toggleViewChanges.common, function () {
       var _api$trackChanges, _api$trackChanges2;
-      var isShowDiffAvailable = api === null || api === void 0 || (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 || (_api$trackChanges = _api$trackChanges.sharedState.currentState()) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.isShowDiffAvailable;
-      if (!isShowDiffAvailable) {
+      var trackChangesState = api === null || api === void 0 || (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.sharedState.currentState();
+      // Mirror the toolbar button: no changes to show, or another plugin currently owns
+      // the diff decorations (e.g. the AI Review moment is visible).
+      if (!(trackChangesState !== null && trackChangesState !== void 0 && trackChangesState.isShowDiffAvailable) || trackChangesState !== null && trackChangesState !== void 0 && trackChangesState.isToggleChangesDisabled) {
         return false;
       }
       var result = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$trackChanges2 = api.trackChanges) === null || _api$trackChanges2 === void 0 ? void 0 : _api$trackChanges2.commands.toggleChanges);

package/dist/esm/pm-plugins/main.js CHANGED Viewed

@@ -52,12 +52,18 @@ export var createTrackChangesPlugin = function createTrackChangesPlugin(api) {
           steps: [],
           shouldChangesBeDisplayed: false,
           isShowDiffAvailable: false,
+          isToggleChangesDisabled: false,
           allocations: new Set()
         };
       },
       apply: function apply(tr, state) {
         var _api$history, _state$steps$at$alloc, _state$steps$at;
         var metadata = tr.getMeta(trackChangesPluginKey);
+        if (metadata && metadata.action === ACTION.SET_TOGGLE_CHANGES_DISABLED) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            isToggleChangesDisabled: Boolean(metadata.isDisabled)
+          });
+        }
         if (metadata && metadata.action === ACTION.RESET_BASELINE) {
           return _objectSpread(_objectSpread({}, state), {}, {
             steps: [],

package/dist/esm/pm-plugins/types.js CHANGED Viewed

@@ -1,5 +1,6 @@
 export var TOGGLE_TRACK_CHANGES_ACTION = /*#__PURE__*/function (TOGGLE_TRACK_CHANGES_ACTION) {
   TOGGLE_TRACK_CHANGES_ACTION["TOGGLE_TRACK_CHANGES"] = "TOGGLE_TRACK_CHANGES";
   TOGGLE_TRACK_CHANGES_ACTION["RESET_BASELINE"] = "RESET_BASELINE";
+  TOGGLE_TRACK_CHANGES_ACTION["SET_TOGGLE_CHANGES_DISABLED"] = "SET_TOGGLE_CHANGES_DISABLED";
   return TOGGLE_TRACK_CHANGES_ACTION;
 }({});

package/dist/esm/trackChangesPlugin.js CHANGED Viewed

@@ -42,15 +42,34 @@ export var trackChangesPlugin = function trackChangesPlugin(_ref) {
     },
     commands: {
       toggleChanges: function toggleChanges(_ref2) {
+        var _api$trackChanges;
         var tr = _ref2.tr;
+        // Another plugin currently owns the diff decorations (e.g. the AI Review moment),
+        // so toggling would fight over the same diff — bail out.
+        if (api !== null && api !== void 0 && (_api$trackChanges = api.trackChanges) !== null && _api$trackChanges !== void 0 && (_api$trackChanges = _api$trackChanges.sharedState.currentState()) !== null && _api$trackChanges !== void 0 && _api$trackChanges.isToggleChangesDisabled) {
+          return null;
+        }
         return tr.setMeta(trackChangesPluginKey, {
           action: ACTION.TOGGLE_TRACK_CHANGES
         });
       },
-      resetBaseline: function resetBaseline(_ref3) {
-        var _api$trackChanges;
-        var tr = _ref3.tr;
-        if (!(api !== null && api !== void 0 && (_api$trackChanges = api.trackChanges) !== null && _api$trackChanges !== void 0 && (_api$trackChanges = _api$trackChanges.sharedState.currentState()) !== null && _api$trackChanges !== void 0 && _api$trackChanges.isShowDiffAvailable)) {
+      setToggleChangesDisabled: function setToggleChangesDisabled(isDisabled) {
+        return function (_ref3) {
+          var _api$trackChanges2;
+          var tr = _ref3.tr;
+          if ((api === null || api === void 0 || (_api$trackChanges2 = api.trackChanges) === null || _api$trackChanges2 === void 0 || (_api$trackChanges2 = _api$trackChanges2.sharedState.currentState()) === null || _api$trackChanges2 === void 0 ? void 0 : _api$trackChanges2.isToggleChangesDisabled) === isDisabled) {
+            return null;
+          }
+          return tr.setMeta(trackChangesPluginKey, {
+            action: ACTION.SET_TOGGLE_CHANGES_DISABLED,
+            isDisabled: isDisabled
+          });
+        };
+      },
+      resetBaseline: function resetBaseline(_ref4) {
+        var _api$trackChanges3;
+        var tr = _ref4.tr;
+        if (!(api !== null && api !== void 0 && (_api$trackChanges3 = api.trackChanges) !== null && _api$trackChanges3 !== void 0 && (_api$trackChanges3 = _api$trackChanges3.sharedState.currentState()) !== null && _api$trackChanges3 !== void 0 && _api$trackChanges3.isShowDiffAvailable)) {
           return null;
         }
         return tr.setMeta(trackChangesPluginKey, {
@@ -59,16 +78,18 @@ export var trackChangesPlugin = function trackChangesPlugin(_ref) {
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _trackChangesPluginKe, _trackChangesPluginKe2;
+      var _trackChangesPluginKe, _trackChangesPluginKe2, _trackChangesPluginKe3;
       if (!editorState) {
         return {
           isDisplayingChanges: false,
-          isShowDiffAvailable: false
+          isShowDiffAvailable: false,
+          isToggleChangesDisabled: false
         };
       }
       return {
         isDisplayingChanges: Boolean((_trackChangesPluginKe = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe === void 0 ? void 0 : _trackChangesPluginKe.shouldChangesBeDisplayed),
-        isShowDiffAvailable: Boolean((_trackChangesPluginKe2 = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe2 === void 0 ? void 0 : _trackChangesPluginKe2.isShowDiffAvailable)
+        isShowDiffAvailable: Boolean((_trackChangesPluginKe2 = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe2 === void 0 ? void 0 : _trackChangesPluginKe2.isShowDiffAvailable),
+        isToggleChangesDisabled: Boolean((_trackChangesPluginKe3 = trackChangesPluginKey.getState(editorState)) === null || _trackChangesPluginKe3 === void 0 ? void 0 : _trackChangesPluginKe3.isToggleChangesDisabled)
       };
     }
   };

package/dist/esm/ui/TrackChangesToolbarButton.js CHANGED Viewed

@@ -11,14 +11,20 @@ export var TrackChangesToolbarButton = function TrackChangesToolbarButton(_ref)
     Wrapper = _ref.wrapper;
   var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['trackChanges'], function (states) {
-      var _states$trackChangesS, _states$trackChangesS2;
+      var _states$trackChangesS, _states$trackChangesS2, _states$trackChangesS3;
       return {
         isDisplayingChanges: (_states$trackChangesS = states.trackChangesState) === null || _states$trackChangesS === void 0 ? void 0 : _states$trackChangesS.isDisplayingChanges,
-        isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable
+        isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable,
+        isToggleChangesDisabled: (_states$trackChangesS3 = states.trackChangesState) === null || _states$trackChangesS3 === void 0 ? void 0 : _states$trackChangesS3.isToggleChangesDisabled
       };
     }),
     isDisplayingChanges = _useSharedPluginState.isDisplayingChanges,
-    isShowDiffAvailable = _useSharedPluginState.isShowDiffAvailable;
+    isShowDiffAvailable = _useSharedPluginState.isShowDiffAvailable,
+    isToggleChangesDisabled = _useSharedPluginState.isToggleChangesDisabled;
+  // Disabled either because there's nothing to diff, or because another plugin currently
+  // owns the diff decorations (e.g. the AI Review moment is visible).
+  var isDisabled = !isShowDiffAvailable || Boolean(isToggleChangesDisabled);
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var handleClick = React.useCallback(function () {
@@ -44,7 +50,7 @@ export var TrackChangesToolbarButton = function TrackChangesToolbarButton(_ref)
       icon: HistoryIcon,
       label: formatMessage(trackChangesMessages.toolbarIconLabel),
       appearance: "subtle",
-      isDisabled: !isShowDiffAvailable,
+      isDisabled: isDisabled,
       isSelected: isDisplayingChanges,
       onClick: handleClick
     }));
@@ -57,7 +63,7 @@ export var TrackChangesToolbarButton = function TrackChangesToolbarButton(_ref)
       size: "small"
     }),
     onClick: handleClick,
-    isDisabled: !isShowDiffAvailable,
+    isDisabled: isDisabled,
     isSelected: isDisplayingChanges
   }));
   return Wrapper ? /*#__PURE__*/React.createElement(Wrapper, null, button) : button;

package/dist/types/pm-plugins/main.d.ts CHANGED Viewed

@@ -8,6 +8,12 @@ export declare const trackChangesPluginKey: PluginKey<TrackChangesPluginState>;
 type TrackChangesPluginState = {
     allocations: Set<number>;
     isShowDiffAvailable: boolean;
+    /**
+     * Set by other plugins (via the `setToggleChangesDisabled` command) while they own the
+     * diff decorations — e.g. the AI Review moment. While true the toolbar button and the
+     * keyboard shortcut must not toggle track changes.
+     */
+    isToggleChangesDisabled: boolean;
     shouldChangesBeDisplayed: boolean;
     steps: InvertableStep[];
 };

package/dist/types/pm-plugins/types.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export declare enum TOGGLE_TRACK_CHANGES_ACTION {
     TOGGLE_TRACK_CHANGES = "TOGGLE_TRACK_CHANGES",
-    RESET_BASELINE = "RESET_BASELINE"
+    RESET_BASELINE = "RESET_BASELINE",
+    SET_TOGGLE_CHANGES_DISABLED = "SET_TOGGLE_CHANGES_DISABLED"
 }

package/dist/types/trackChangesPluginType.d.ts CHANGED Viewed

@@ -22,6 +22,17 @@ export type TrackChangesPlugin = NextEditorPlugin<'trackChanges', {
          * Resets the baseline used for tracking changes in the editor.
          */
         resetBaseline: EditorCommand;
+        /**
+         * Disables (or re-enables) the ability to toggle track changes.
+         *
+         * Intended for other plugins that temporarily own the diff decorations — for example
+         * the AI Review moment — so the toolbar button and keyboard shortcut don't fight over
+         * the same diff. While disabled the toolbar button renders in a disabled state and
+         * `toggleChanges` becomes a no-op.
+         *
+         * Callers are responsible for re-enabling (passing `false`) once they are done.
+         */
+        setToggleChangesDisabled: (isDisabled: boolean) => EditorCommand;
         /**
          * Toggles the displaying of changes in the editor.
          */
@@ -55,5 +66,11 @@ export type TrackChangesPlugin = NextEditorPlugin<'trackChanges', {
          * This will only be false initially before any changes in the session.
          */
         isShowDiffAvailable: boolean;
+        /**
+         * Whether toggling track changes has been disabled by another plugin that currently
+         * owns the diff decorations (see the `setToggleChangesDisabled` command).
+         * Defaults to false.
+         */
+        isToggleChangesDisabled: boolean;
     };
 }>;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-track-changes",
-	"version": "12.0.3",
+	"version": "12.1.1",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -23,8 +23,8 @@
 		"@atlaskit/button": "^25.0.0",
 		"@atlaskit/editor-plugin-history": "13.0.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^14.0.0",
-		"@atlaskit/editor-plugin-show-diff": "11.0.3",
-		"@atlaskit/editor-plugin-toolbar": "^10.0.0",
+		"@atlaskit/editor-plugin-show-diff": "11.0.4",
+		"@atlaskit/editor-plugin-toolbar": "^10.1.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-toolbar": "^2.4.0",
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
@@ -32,7 +32,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^117.2.0",
+		"@atlaskit/editor-common": "^117.4.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -79,10 +79,10 @@
 	},
 	"devDependencies": {
 		"@af/editor-examples-helpers": "workspace:^",
-		"@atlaskit/editor-core": "^222.0.0",
+		"@atlaskit/editor-core": "^222.1.0",
 		"@atlaskit/primitives": "^22.2.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
-		"@atlaskit/tokens": "^16.3.0",
+		"@atlaskit/tokens": "^16.4.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"@compiled/react": "^1.0.0",
 		"prosemirror-dev-tools": "^4.2.0",

package/tsconfig.json CHANGED Viewed

@@ -1,17 +1,7 @@
 {
-  "extends": "../../../tsconfig.json",
-  "include": [
-    "examples/**/*.ts",
-    "examples/**/*.tsx",
-    "example-helpers/**/*.ts",
-    "example-helpers/**/*.tsx",
-    "src/**/*.ts",
-    "src/**/*.tsx",
-    "**/stories.ts",
-    "**/stories.tsx",
-    "**/stories/*.ts",
-    "**/stories/*.tsx",
-    "**/stories/**/*.ts",
-    "**/stories/**/*.tsx"
-  ]
+	"extends": "./tsconfig.dev.json",
+	"compilerOptions": {
+		"disableReferencedProjectLoad": true,
+		"disableSolutionSearching": true
+	}
 }