@atlaskit/editor-plugin-undo-redo 2.0.8 → 2.0.10

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-undo-redo
 
+## 2.0.10
+
+### Patch Changes
+
+- [#149192](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149192)
+  [`7dd3315f8b3a2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7dd3315f8b3a2) -
+  Added undo/redo analytics
+- Updated dependencies
+
+## 2.0.9
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.0.8
 
 ### Patch Changes

package/dist/cjs/pm-plugins/attach-input-meta.js

@@ -3,7 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.attachInputMeta = void 0;
+exports.attachInputMetaWithAnalytics = exports.attachInputMeta = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _enums = require("./enums");
 var _pluginKey = require("./plugin-key");
 var attachInputMeta = exports.attachInputMeta = function attachInputMeta(inputSource) {
   return function (command) {
@@ -23,4 +26,30 @@ var attachInputMeta = exports.attachInputMeta = function attachInputMeta(inputSo
       return true;
     };
   };
+};
+var inputSourceToInputMethod = function inputSourceToInputMethod(inputSource) {
+  switch (inputSource) {
+    case _enums.InputSource.EXTERNAL:
+      return _analytics.INPUT_METHOD.EXTERNAL;
+    case _enums.InputSource.KEYBOARD:
+      return _analytics.INPUT_METHOD.KEYBOARD;
+    case _enums.InputSource.TOOLBAR:
+      return _analytics.INPUT_METHOD.TOOLBAR;
+    default:
+      return _analytics.INPUT_METHOD.EXTERNAL;
+  }
+};
+var attachInputMetaWithAnalytics = exports.attachInputMetaWithAnalytics = function attachInputMetaWithAnalytics(editorAnalyticsAPI) {
+  return function (inputSource, action) {
+    return function (command) {
+      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        action: action,
+        actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
+        attributes: {
+          inputMethod: inputSourceToInputMethod(inputSource)
+        }
+      })(attachInputMeta(inputSource)(command));
+    };
+  };
 };

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

@@ -3,11 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.undoFromToolbar = exports.undoFromKeyboard = exports.redoFromToolbar = exports.redoFromKeyboard = void 0;
+exports.undoFromToolbarWithAnalytics = exports.undoFromToolbar = exports.undoFromKeyboard = exports.redoFromToolbarWithAnalytics = exports.redoFromToolbar = exports.redoFromKeyboard = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _attachInputMeta = require("./attach-input-meta");
 var _enums = require("./enums");
 var undoFromKeyboard = exports.undoFromKeyboard = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.KEYBOARD)(_history.undo);
 var redoFromKeyboard = exports.redoFromKeyboard = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.KEYBOARD)(_history.redo);
 var undoFromToolbar = exports.undoFromToolbar = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.TOOLBAR)(_history.undo);
-var redoFromToolbar = exports.redoFromToolbar = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.TOOLBAR)(_history.redo);
+var redoFromToolbar = exports.redoFromToolbar = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.TOOLBAR)(_history.redo);
+var undoFromToolbarWithAnalytics = exports.undoFromToolbarWithAnalytics = function undoFromToolbarWithAnalytics(editorAnalyticsAPI) {
+  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums.InputSource.TOOLBAR, _analytics.ACTION.UNDO_PERFORMED)(_history.undo);
+};
+var redoFromToolbarWithAnalytics = exports.redoFromToolbarWithAnalytics = function redoFromToolbarWithAnalytics(editorAnalyticsAPI) {
+  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums.InputSource.TOOLBAR, _analytics.ACTION.REDO_PERFORMED)(_history.redo);
+};

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

@@ -7,6 +7,7 @@ exports.keymapPlugin = keymapPlugin;
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("./commands");
 function keymapPlugin() {
   var list = {};
@@ -14,6 +15,10 @@ function keymapPlugin() {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findKeyMapForBrowser)(_keymaps.redo), _commands.redoFromKeyboard, list);
+  if ((0, _platformFeatureFlags.fg)('platform_editor_cmd_y_mac_redo_shortcut')) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findKeyMapForBrowser)(_keymaps.redoAlt), _commands.redoFromKeyboard, list);
+  }
 
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/cjs/ui/ToolbarUndoRedo/index.js

@@ -32,16 +32,27 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['history']),
     historyState = _useSharedPluginState.historyState;
   var handleUndo = function handleUndo() {
-    (0, _utils.forceFocus)(editorView, api)(_commands.undoFromToolbar);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics')) {
+      var _api$analytics;
+      (0, _utils.forceFocus)(editorView, api)((0, _commands.undoFromToolbarWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions));
+    } else {
+      (0, _utils.forceFocus)(editorView, api)(_commands.undoFromToolbar);
+    }
   };
   var handleRedo = function handleRedo() {
-    (0, _utils.forceFocus)(editorView, api)(_commands.redoFromToolbar);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics')) {
+      var _api$analytics2;
+      (0, _utils.forceFocus)(editorView, api)((0, _commands.redoFromToolbarWithAnalytics)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions));
+    } else {
+      (0, _utils.forceFocus)(editorView, api)(_commands.redoFromToolbar);
+    }
   };
   var labelUndo = formatMessage(_messages.undoRedoMessages.undo);
   var labelRedo = formatMessage(_messages.undoRedoMessages.redo);
   var _ref2 = historyState !== null && historyState !== void 0 ? historyState : {},
     canUndo = _ref2.canUndo,
     canRedo = _ref2.canRedo;
+  var redoKeymap = (0, _platformFeatureFlags.fg)('platform_editor_cmd_y_mac_redo_shortcut') ? _keymaps.redoAlt : _keymaps.redo;
   return (
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     (0, _react.jsx)("span", {
@@ -76,7 +87,7 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
       disabled: !canRedo || disabled,
       title: (0, _react.jsx)(_keymaps.ToolTipContent, {
         description: labelRedo,
-        keymap: _keymaps.redo
+        keymap: redoKeymap
       }),
       iconBefore: (0, _react.jsx)(_redo.default, {
         label: "",
@@ -84,8 +95,8 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
         spacing: "spacious"
       }),
       testId: "ak-editor-toolbar-button-redo",
-      "aria-label": (0, _keymaps.tooltip)(_keymaps.redo, labelRedo),
-      "aria-keyshortcuts": (0, _keymaps.getAriaKeyshortcuts)(_keymaps.redo)
+      "aria-label": (0, _keymaps.tooltip)(redoKeymap, labelRedo),
+      "aria-keyshortcuts": (0, _keymaps.getAriaKeyshortcuts)(redoKeymap)
     }), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     (0, _react.jsx)("span", {

package/dist/cjs/undoRedoPlugin.js

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.undoRedoPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _history = require("@atlaskit/editor-prosemirror/history");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _attachInputMeta = require("./pm-plugins/attach-input-meta");
 var _enums = require("./pm-plugins/enums");
@@ -40,16 +42,18 @@ var undoRedoPlugin = exports.undoRedoPlugin = function undoRedoPlugin(_ref) {
     component: primaryToolbarComponent
   });
   var handleUndo = function handleUndo(inputSource) {
+    var _api$analytics;
     if (!editorViewRef.current) {
       return false;
     }
-    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMeta)(inputSource || _enums.InputSource.EXTERNAL)(_history.undo));
+    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics') ? (0, _attachInputMeta.attachInputMetaWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(inputSource || _enums.InputSource.EXTERNAL, _analytics.ACTION.UNDO_PERFORMED)(_history.undo) : (0, _attachInputMeta.attachInputMeta)(inputSource || _enums.InputSource.EXTERNAL)(_history.undo));
   };
   var handleRedo = function handleRedo(inputSource) {
+    var _api$analytics2;
     if (!editorViewRef.current) {
       return false;
     }
-    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMeta)(inputSource || _enums.InputSource.EXTERNAL)(_history.redo));
+    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics') ? (0, _attachInputMeta.attachInputMetaWithAnalytics)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(inputSource || _enums.InputSource.EXTERNAL, _analytics.ACTION.REDO_PERFORMED)(_history.redo) : (0, _attachInputMeta.attachInputMeta)(inputSource || _enums.InputSource.EXTERNAL)(_history.redo));
   };
   return {
     name: 'undoRedoPlugin',

package/dist/es2019/pm-plugins/attach-input-meta.js

@@ -1,3 +1,6 @@
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { InputSource } from './enums';
 import { pluginKey as undoPluginKey } from './plugin-key';
 export const attachInputMeta = inputSource => command => (state, dispatch) => {
   let customTr = state.tr;
@@ -13,4 +16,24 @@ export const attachInputMeta = inputSource => command => (state, dispatch) => {
     dispatch(customTr);
   }
   return true;
-};
+};
+const inputSourceToInputMethod = inputSource => {
+  switch (inputSource) {
+    case InputSource.EXTERNAL:
+      return INPUT_METHOD.EXTERNAL;
+    case InputSource.KEYBOARD:
+      return INPUT_METHOD.KEYBOARD;
+    case InputSource.TOOLBAR:
+      return INPUT_METHOD.TOOLBAR;
+    default:
+      return INPUT_METHOD.EXTERNAL;
+  }
+};
+export const attachInputMetaWithAnalytics = editorAnalyticsAPI => (inputSource, action) => command => withAnalytics(editorAnalyticsAPI, {
+  eventType: EVENT_TYPE.TRACK,
+  action,
+  actionSubject: ACTION_SUBJECT.EDITOR,
+  attributes: {
+    inputMethod: inputSourceToInputMethod(inputSource)
+  }
+})(attachInputMeta(inputSource)(command));

package/dist/es2019/pm-plugins/commands.js

@@ -1,7 +1,10 @@
+import { ACTION } from '@atlaskit/editor-common/analytics';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
-import { attachInputMeta } from './attach-input-meta';
+import { attachInputMeta, attachInputMetaWithAnalytics } from './attach-input-meta';
 import { InputSource } from './enums';
 export const undoFromKeyboard = attachInputMeta(InputSource.KEYBOARD)(undo);
 export const redoFromKeyboard = attachInputMeta(InputSource.KEYBOARD)(redo);
 export const undoFromToolbar = attachInputMeta(InputSource.TOOLBAR)(undo);
-export const redoFromToolbar = attachInputMeta(InputSource.TOOLBAR)(redo);
+export const redoFromToolbar = attachInputMeta(InputSource.TOOLBAR)(redo);
+export const undoFromToolbarWithAnalytics = editorAnalyticsAPI => attachInputMetaWithAnalytics(editorAnalyticsAPI)(InputSource.TOOLBAR, ACTION.UNDO_PERFORMED)(undo);
+export const redoFromToolbarWithAnalytics = editorAnalyticsAPI => attachInputMetaWithAnalytics(editorAnalyticsAPI)(InputSource.TOOLBAR, ACTION.REDO_PERFORMED)(redo);

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

@@ -1,6 +1,7 @@
-import { bindKeymapWithCommand, findKeyMapForBrowser, isCapsLockOnAndModifyKeyboardEvent, redo, undo } from '@atlaskit/editor-common/keymaps';
+import { bindKeymapWithCommand, findKeyMapForBrowser, isCapsLockOnAndModifyKeyboardEvent, redo, redoAlt, undo } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { redoFromKeyboard, undoFromKeyboard } from './commands';
 export function keymapPlugin() {
   const list = {};
@@ -8,6 +9,10 @@ export function keymapPlugin() {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(findKeyMapForBrowser(redo), redoFromKeyboard, list);
+  if (fg('platform_editor_cmd_y_mac_redo_shortcut')) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    bindKeymapWithCommand(findKeyMapForBrowser(redoAlt), redoFromKeyboard, list);
+  }
 
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/es2019/ui/ToolbarUndoRedo/index.js

@@ -6,14 +6,14 @@
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { getAriaKeyshortcuts, redo as redoKeymap, tooltip, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
+import { getAriaKeyshortcuts, redo, redoAlt, tooltip, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
 import { undoRedoMessages } from '@atlaskit/editor-common/messages';
 import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, separatorStyles } from '@atlaskit/editor-common/styles';
 import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import RedoIcon from '@atlaskit/icon/core/migration/redo';
 import UndoIcon from '@atlaskit/icon/core/migration/undo';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { redoFromToolbar, undoFromToolbar } from '../../pm-plugins/commands';
+import { redoFromToolbar, redoFromToolbarWithAnalytics, undoFromToolbar, undoFromToolbarWithAnalytics } from '../../pm-plugins/commands';
 import { forceFocus } from '../../pm-plugins/utils';
 export const ToolbarUndoRedo = ({
   disabled,
@@ -28,10 +28,20 @@ export const ToolbarUndoRedo = ({
     historyState
   } = useSharedPluginState(api, ['history']);
   const handleUndo = () => {
-    forceFocus(editorView, api)(undoFromToolbar);
+    if (fg('platform_editor_controls_patch_analytics')) {
+      var _api$analytics;
+      forceFocus(editorView, api)(undoFromToolbarWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions));
+    } else {
+      forceFocus(editorView, api)(undoFromToolbar);
+    }
   };
   const handleRedo = () => {
-    forceFocus(editorView, api)(redoFromToolbar);
+    if (fg('platform_editor_controls_patch_analytics')) {
+      var _api$analytics2;
+      forceFocus(editorView, api)(redoFromToolbarWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions));
+    } else {
+      forceFocus(editorView, api)(redoFromToolbar);
+    }
   };
   const labelUndo = formatMessage(undoRedoMessages.undo);
   const labelRedo = formatMessage(undoRedoMessages.redo);
@@ -39,6 +49,7 @@ export const ToolbarUndoRedo = ({
     canUndo,
     canRedo
   } = historyState !== null && historyState !== void 0 ? historyState : {};
+  const redoKeymap = fg('platform_editor_cmd_y_mac_redo_shortcut') ? redoAlt : redo;
   return (
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     jsx("span", {

package/dist/es2019/undoRedoPlugin.js

@@ -1,8 +1,10 @@
 import React from 'react';
+import { ACTION } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { attachInputMeta } from './pm-plugins/attach-input-meta';
+import { attachInputMeta, attachInputMetaWithAnalytics } from './pm-plugins/attach-input-meta';
 import { InputSource } from './pm-plugins/enums';
 import { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
@@ -34,16 +36,18 @@ export const undoRedoPlugin = ({
     component: primaryToolbarComponent
   });
   const handleUndo = inputSource => {
+    var _api$analytics;
     if (!editorViewRef.current) {
       return false;
     }
-    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(undo));
+    return forceFocus(editorViewRef.current, api)(fg('platform_editor_controls_patch_analytics') ? attachInputMetaWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(inputSource || InputSource.EXTERNAL, ACTION.UNDO_PERFORMED)(undo) : attachInputMeta(inputSource || InputSource.EXTERNAL)(undo));
   };
   const handleRedo = inputSource => {
+    var _api$analytics2;
     if (!editorViewRef.current) {
       return false;
     }
-    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(redo));
+    return forceFocus(editorViewRef.current, api)(fg('platform_editor_controls_patch_analytics') ? attachInputMetaWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(inputSource || InputSource.EXTERNAL, ACTION.REDO_PERFORMED)(redo) : attachInputMeta(inputSource || InputSource.EXTERNAL)(redo));
   };
   return {
     name: 'undoRedoPlugin',

package/dist/esm/pm-plugins/attach-input-meta.js

@@ -1,3 +1,6 @@
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { InputSource } from './enums';
 import { pluginKey as undoPluginKey } from './plugin-key';
 export var attachInputMeta = function attachInputMeta(inputSource) {
   return function (command) {
@@ -17,4 +20,30 @@ export var attachInputMeta = function attachInputMeta(inputSource) {
       return true;
     };
   };
+};
+var inputSourceToInputMethod = function inputSourceToInputMethod(inputSource) {
+  switch (inputSource) {
+    case InputSource.EXTERNAL:
+      return INPUT_METHOD.EXTERNAL;
+    case InputSource.KEYBOARD:
+      return INPUT_METHOD.KEYBOARD;
+    case InputSource.TOOLBAR:
+      return INPUT_METHOD.TOOLBAR;
+    default:
+      return INPUT_METHOD.EXTERNAL;
+  }
+};
+export var attachInputMetaWithAnalytics = function attachInputMetaWithAnalytics(editorAnalyticsAPI) {
+  return function (inputSource, action) {
+    return function (command) {
+      return withAnalytics(editorAnalyticsAPI, {
+        eventType: EVENT_TYPE.TRACK,
+        action: action,
+        actionSubject: ACTION_SUBJECT.EDITOR,
+        attributes: {
+          inputMethod: inputSourceToInputMethod(inputSource)
+        }
+      })(attachInputMeta(inputSource)(command));
+    };
+  };
 };

package/dist/esm/pm-plugins/commands.js

@@ -1,7 +1,14 @@
+import { ACTION } from '@atlaskit/editor-common/analytics';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
-import { attachInputMeta } from './attach-input-meta';
+import { attachInputMeta, attachInputMetaWithAnalytics } from './attach-input-meta';
 import { InputSource } from './enums';
 export var undoFromKeyboard = attachInputMeta(InputSource.KEYBOARD)(undo);
 export var redoFromKeyboard = attachInputMeta(InputSource.KEYBOARD)(redo);
 export var undoFromToolbar = attachInputMeta(InputSource.TOOLBAR)(undo);
-export var redoFromToolbar = attachInputMeta(InputSource.TOOLBAR)(redo);
+export var redoFromToolbar = attachInputMeta(InputSource.TOOLBAR)(redo);
+export var undoFromToolbarWithAnalytics = function undoFromToolbarWithAnalytics(editorAnalyticsAPI) {
+  return attachInputMetaWithAnalytics(editorAnalyticsAPI)(InputSource.TOOLBAR, ACTION.UNDO_PERFORMED)(undo);
+};
+export var redoFromToolbarWithAnalytics = function redoFromToolbarWithAnalytics(editorAnalyticsAPI) {
+  return attachInputMetaWithAnalytics(editorAnalyticsAPI)(InputSource.TOOLBAR, ACTION.REDO_PERFORMED)(redo);
+};

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

@@ -1,6 +1,7 @@
-import { bindKeymapWithCommand, findKeyMapForBrowser, isCapsLockOnAndModifyKeyboardEvent, redo, undo } from '@atlaskit/editor-common/keymaps';
+import { bindKeymapWithCommand, findKeyMapForBrowser, isCapsLockOnAndModifyKeyboardEvent, redo, redoAlt, undo } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { redoFromKeyboard, undoFromKeyboard } from './commands';
 export function keymapPlugin() {
   var list = {};
@@ -8,6 +9,10 @@ export function keymapPlugin() {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(findKeyMapForBrowser(redo), redoFromKeyboard, list);
+  if (fg('platform_editor_cmd_y_mac_redo_shortcut')) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    bindKeymapWithCommand(findKeyMapForBrowser(redoAlt), redoFromKeyboard, list);
+  }
 
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/esm/ui/ToolbarUndoRedo/index.js

@@ -6,14 +6,14 @@
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { getAriaKeyshortcuts, redo as redoKeymap, tooltip, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
+import { getAriaKeyshortcuts, redo, redoAlt, tooltip, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
 import { undoRedoMessages } from '@atlaskit/editor-common/messages';
 import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, separatorStyles } from '@atlaskit/editor-common/styles';
 import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import RedoIcon from '@atlaskit/icon/core/migration/redo';
 import UndoIcon from '@atlaskit/icon/core/migration/undo';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { redoFromToolbar, undoFromToolbar } from '../../pm-plugins/commands';
+import { redoFromToolbar, redoFromToolbarWithAnalytics, undoFromToolbar, undoFromToolbarWithAnalytics } from '../../pm-plugins/commands';
 import { forceFocus } from '../../pm-plugins/utils';
 export var ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
   var disabled = _ref.disabled,
@@ -24,16 +24,27 @@ export var ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
   var _useSharedPluginState = useSharedPluginState(api, ['history']),
     historyState = _useSharedPluginState.historyState;
   var handleUndo = function handleUndo() {
-    forceFocus(editorView, api)(undoFromToolbar);
+    if (fg('platform_editor_controls_patch_analytics')) {
+      var _api$analytics;
+      forceFocus(editorView, api)(undoFromToolbarWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions));
+    } else {
+      forceFocus(editorView, api)(undoFromToolbar);
+    }
   };
   var handleRedo = function handleRedo() {
-    forceFocus(editorView, api)(redoFromToolbar);
+    if (fg('platform_editor_controls_patch_analytics')) {
+      var _api$analytics2;
+      forceFocus(editorView, api)(redoFromToolbarWithAnalytics(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions));
+    } else {
+      forceFocus(editorView, api)(redoFromToolbar);
+    }
   };
   var labelUndo = formatMessage(undoRedoMessages.undo);
   var labelRedo = formatMessage(undoRedoMessages.redo);
   var _ref2 = historyState !== null && historyState !== void 0 ? historyState : {},
     canUndo = _ref2.canUndo,
     canRedo = _ref2.canRedo;
+  var redoKeymap = fg('platform_editor_cmd_y_mac_redo_shortcut') ? redoAlt : redo;
   return (
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     jsx("span", {

package/dist/esm/undoRedoPlugin.js

@@ -1,8 +1,10 @@
 import React from 'react';
+import { ACTION } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { attachInputMeta } from './pm-plugins/attach-input-meta';
+import { attachInputMeta, attachInputMetaWithAnalytics } from './pm-plugins/attach-input-meta';
 import { InputSource } from './pm-plugins/enums';
 import { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
@@ -32,16 +34,18 @@ export var undoRedoPlugin = function undoRedoPlugin(_ref) {
     component: primaryToolbarComponent
   });
   var handleUndo = function handleUndo(inputSource) {
+    var _api$analytics;
     if (!editorViewRef.current) {
       return false;
     }
-    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(undo));
+    return forceFocus(editorViewRef.current, api)(fg('platform_editor_controls_patch_analytics') ? attachInputMetaWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(inputSource || InputSource.EXTERNAL, ACTION.UNDO_PERFORMED)(undo) : attachInputMeta(inputSource || InputSource.EXTERNAL)(undo));
   };
   var handleRedo = function handleRedo(inputSource) {
+    var _api$analytics2;
     if (!editorViewRef.current) {
       return false;
     }
-    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(redo));
+    return forceFocus(editorViewRef.current, api)(fg('platform_editor_controls_patch_analytics') ? attachInputMetaWithAnalytics(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(inputSource || InputSource.EXTERNAL, ACTION.REDO_PERFORMED)(redo) : attachInputMeta(inputSource || InputSource.EXTERNAL)(redo));
   };
   return {
     name: 'undoRedoPlugin',

package/dist/types/pm-plugins/attach-input-meta.d.ts

@@ -1,5 +1,8 @@
-import type { HigherOrderCommand } from '@atlaskit/editor-common/types';
-import type { InputSource } from './enums';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics';
+import type { HigherOrderCommand, Command } from '@atlaskit/editor-common/types';
+import { InputSource } from './enums';
 type AttachInputMeta = (inputSource: InputSource) => HigherOrderCommand;
 export declare const attachInputMeta: AttachInputMeta;
+export declare const attachInputMetaWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputSource: InputSource, action: ACTION.UNDO_PERFORMED | ACTION.REDO_PERFORMED) => (command: Command) => Command;
 export {};

package/dist/types/pm-plugins/commands.d.ts

@@ -1,4 +1,7 @@
+import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 export declare const undoFromKeyboard: import("@atlaskit/editor-common/types").Command;
 export declare const redoFromKeyboard: import("@atlaskit/editor-common/types").Command;
 export declare const undoFromToolbar: import("@atlaskit/editor-common/types").Command;
 export declare const redoFromToolbar: import("@atlaskit/editor-common/types").Command;
+export declare const undoFromToolbarWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/types").Command;
+export declare const redoFromToolbarWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/types").Command;

package/dist/types/undoRedoPluginType.d.ts

@@ -1,11 +1,17 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { HistoryPlugin } from '@atlaskit/editor-plugin-history';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import { InputSource } from './pm-plugins/enums';
 export type UndoRedoAction = (inputSource?: InputSource) => boolean;
 export type UndoRedoPlugin = NextEditorPlugin<'undoRedoPlugin', {
-    dependencies: [TypeAheadPlugin, HistoryPlugin, OptionalPlugin<PrimaryToolbarPlugin>];
+    dependencies: [
+        TypeAheadPlugin,
+        HistoryPlugin,
+        OptionalPlugin<PrimaryToolbarPlugin>,
+        OptionalPlugin<AnalyticsPlugin>
+    ];
     actions: {
         undo: UndoRedoAction;
         redo: UndoRedoAction;

package/dist/types-ts4.5/pm-plugins/attach-input-meta.d.ts

@@ -1,5 +1,8 @@
-import type { HigherOrderCommand } from '@atlaskit/editor-common/types';
-import type { InputSource } from './enums';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics';
+import type { HigherOrderCommand, Command } from '@atlaskit/editor-common/types';
+import { InputSource } from './enums';
 type AttachInputMeta = (inputSource: InputSource) => HigherOrderCommand;
 export declare const attachInputMeta: AttachInputMeta;
+export declare const attachInputMetaWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputSource: InputSource, action: ACTION.UNDO_PERFORMED | ACTION.REDO_PERFORMED) => (command: Command) => Command;
 export {};

package/dist/types-ts4.5/pm-plugins/commands.d.ts

@@ -1,4 +1,7 @@
+import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 export declare const undoFromKeyboard: import("@atlaskit/editor-common/types").Command;
 export declare const redoFromKeyboard: import("@atlaskit/editor-common/types").Command;
 export declare const undoFromToolbar: import("@atlaskit/editor-common/types").Command;
 export declare const redoFromToolbar: import("@atlaskit/editor-common/types").Command;
+export declare const undoFromToolbarWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/types").Command;
+export declare const redoFromToolbarWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/types").Command;

package/dist/types-ts4.5/undoRedoPluginType.d.ts

@@ -1,4 +1,5 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { HistoryPlugin } from '@atlaskit/editor-plugin-history';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
@@ -8,7 +9,8 @@ export type UndoRedoPlugin = NextEditorPlugin<'undoRedoPlugin', {
     dependencies: [
         TypeAheadPlugin,
         HistoryPlugin,
-        OptionalPlugin<PrimaryToolbarPlugin>
+        OptionalPlugin<PrimaryToolbarPlugin>,
+        OptionalPlugin<AnalyticsPlugin>
     ];
     actions: {
         undo: UndoRedoAction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-undo-redo",
-	"version": "2.0.8",
+	"version": "2.0.10",
 	"description": "Undo redo plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,14 +33,14 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^102.13.0",
+		"@atlaskit/editor-common": "^103.21.0",
 		"@atlaskit/editor-plugin-history": "^2.0.0",
-		"@atlaskit/editor-plugin-primary-toolbar": "^3.1.0",
-		"@atlaskit/editor-plugin-type-ahead": "^2.2.0",
+		"@atlaskit/editor-plugin-primary-toolbar": "^3.2.0",
+		"@atlaskit/editor-plugin-type-ahead": "^2.5.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^25.0.0",
+		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.2.0",
+		"@atlaskit/tmp-editor-statsig": "^4.15.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -91,5 +91,13 @@
 		"no-unused-dependencies": {
 			"checkDevDependencies": true
 		}
+	},
+	"platform-feature-flags": {
+		"platform_editor_cmd_y_mac_redo_shortcut": {
+			"type": "boolean"
+		},
+		"platform_editor_controls_patch_analytics": {
+			"type": "boolean"
+		}
 	}
 }