@atlaskit/editor-plugin-undo-redo 2.0.7 → 2.0.9

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-undo-redo
 
+## 2.0.9
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.0.8
+
+### Patch Changes
+
+- [#130818](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130818)
+  [`0e42cb4df2b7f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0e42cb4df2b7f) -
+  Changed undo/redo commands to use EXTRENAL input type when no inputSource is provided. Ensure type
+  ahead is closed before undo/redo and that editor is re-focused after undo/redo.
+
 ## 2.0.7
 
 ### Patch Changes

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

@@ -8,6 +8,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var InputSource = exports.InputSource = function (InputSource) {
   InputSource[InputSource["TOOLBAR"] = _analytics.INPUT_METHOD.TOOLBAR] = "TOOLBAR";
   InputSource[InputSource["KEYBOARD"] = _analytics.INPUT_METHOD.KEYBOARD] = "KEYBOARD";
-  InputSource[InputSource["PAGE_OVERFLOW_MENU"] = _analytics.INPUT_METHOD.PAGE_OVERFLOW_MENU] = "PAGE_OVERFLOW_MENU";
+  InputSource[InputSource["EXTERNAL"] = _analytics.INPUT_METHOD.EXTERNAL] = "EXTERNAL";
   return InputSource;
 }({});

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/pm-plugins/utils.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.forceFocus = exports.closeTypeAheadAndRunCommand = void 0;
+var closeTypeAheadAndRunCommand = exports.closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorView, api) {
+  return function (command) {
+    var _api$typeAhead;
+    if (!editorView) {
+      return false;
+    }
+    if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead = _api$typeAhead.actions) !== null && _api$typeAhead !== void 0 && _api$typeAhead.isOpen(editorView.state)) {
+      var _api$typeAhead2;
+      api === null || api === void 0 || (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 || (_api$typeAhead2 = _api$typeAhead2.actions) === null || _api$typeAhead2 === void 0 || _api$typeAhead2.close({
+        attachCommand: command,
+        insertCurrentQueryAsRawText: false
+      });
+    } else {
+      command(editorView.state, editorView.dispatch);
+    }
+    return true;
+  };
+};
+var forceFocus = exports.forceFocus = function forceFocus(editorView, api) {
+  return function (command) {
+    var result = closeTypeAheadAndRunCommand(editorView, api)(command);
+    if (result && !editorView.hasFocus()) {
+      editorView.focus();
+    }
+    return result;
+  };
+};

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

@@ -16,37 +16,13 @@ var _redo = _interopRequireDefault(require("@atlaskit/icon/core/migration/redo")
 var _undo = _interopRequireDefault(require("@atlaskit/icon/core/migration/undo"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../../pm-plugins/commands");
+var _utils = require("../../pm-plugins/utils");
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
-var closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorView, api) {
-  return function (command) {
-    var _api$typeAhead;
-    if (!editorView) {
-      return;
-    }
-    if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead = _api$typeAhead.actions) !== null && _api$typeAhead !== void 0 && _api$typeAhead.isOpen(editorView.state)) {
-      var _api$typeAhead2;
-      api === null || api === void 0 || (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 || (_api$typeAhead2 = _api$typeAhead2.actions) === null || _api$typeAhead2 === void 0 || _api$typeAhead2.close({
-        attachCommand: command,
-        insertCurrentQueryAsRawText: false
-      });
-    } else {
-      command(editorView.state, editorView.dispatch);
-    }
-  };
-};
-var forceFocus = function forceFocus(editorView, api) {
-  return function (command) {
-    closeTypeAheadAndRunCommand(editorView, api)(command);
-    if (!editorView.hasFocus()) {
-      editorView.focus();
-    }
-  };
-};
 var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
   var disabled = _ref.disabled,
     isReducedSpacing = _ref.isReducedSpacing,
@@ -56,16 +32,17 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['history']),
     historyState = _useSharedPluginState.historyState;
   var handleUndo = function handleUndo() {
-    forceFocus(editorView, api)(_commands.undoFromToolbar);
+    (0, _utils.forceFocus)(editorView, api)(_commands.undoFromToolbar);
   };
   var handleRedo = function handleRedo() {
-    forceFocus(editorView, api)(_commands.redoFromToolbar);
+    (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", {
@@ -100,7 +77,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: "",
@@ -108,8 +85,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

@@ -10,10 +10,11 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _attachInputMeta = require("./pm-plugins/attach-input-meta");
+var _enums = require("./pm-plugins/enums");
 var _keymaps = require("./pm-plugins/keymaps");
 var _main = require("./pm-plugins/main");
+var _utils = require("./pm-plugins/utils");
 var _ToolbarUndoRedo = _interopRequireDefault(require("./ui/ToolbarUndoRedo"));
-// eslint-disable-next-line @atlassian/tangerine/import/entry-points
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 
@@ -38,33 +39,23 @@ var undoRedoPlugin = exports.undoRedoPlugin = function undoRedoPlugin(_ref) {
     name: 'undoRedoPlugin',
     component: primaryToolbarComponent
   });
+  var handleUndo = function handleUndo(inputSource) {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMeta)(inputSource || _enums.InputSource.EXTERNAL)(_history.undo));
+  };
+  var handleRedo = function handleRedo(inputSource) {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMeta)(inputSource || _enums.InputSource.EXTERNAL)(_history.redo));
+  };
   return {
     name: 'undoRedoPlugin',
     actions: {
-      undo: function undo(inputSource) {
-        if (!editorViewRef.current) {
-          return false;
-        }
-        var _editorViewRef$curren = editorViewRef.current,
-          state = _editorViewRef$curren.state,
-          dispatch = _editorViewRef$curren.dispatch;
-        if (!inputSource) {
-          return (0, _history.undo)(state, dispatch);
-        }
-        return (0, _attachInputMeta.attachInputMeta)(inputSource)(_history.undo)(state, dispatch);
-      },
-      redo: function redo(inputSource) {
-        if (!editorViewRef.current) {
-          return false;
-        }
-        var _editorViewRef$curren2 = editorViewRef.current,
-          state = _editorViewRef$curren2.state,
-          dispatch = _editorViewRef$curren2.dispatch;
-        if (!inputSource) {
-          return (0, _history.redo)(state, dispatch);
-        }
-        return (0, _attachInputMeta.attachInputMeta)(inputSource)(_history.redo)(state, dispatch);
-      }
+      undo: handleUndo,
+      redo: handleRedo
     },
     pmPlugins: function pmPlugins() {
       var plugins = [{

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

@@ -2,6 +2,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 export let InputSource = function (InputSource) {
   InputSource[InputSource["TOOLBAR"] = INPUT_METHOD.TOOLBAR] = "TOOLBAR";
   InputSource[InputSource["KEYBOARD"] = INPUT_METHOD.KEYBOARD] = "KEYBOARD";
-  InputSource[InputSource["PAGE_OVERFLOW_MENU"] = INPUT_METHOD.PAGE_OVERFLOW_MENU] = "PAGE_OVERFLOW_MENU";
+  InputSource[InputSource["EXTERNAL"] = INPUT_METHOD.EXTERNAL] = "EXTERNAL";
   return InputSource;
 }({});

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/pm-plugins/utils.js

@@ -0,0 +1,23 @@
+export const closeTypeAheadAndRunCommand = (editorView, api) => command => {
+  var _api$typeAhead, _api$typeAhead$action;
+  if (!editorView) {
+    return false;
+  }
+  if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead$action = _api$typeAhead.actions) !== null && _api$typeAhead$action !== void 0 && _api$typeAhead$action.isOpen(editorView.state)) {
+    var _api$typeAhead2, _api$typeAhead2$actio;
+    api === null || api === void 0 ? void 0 : (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 ? void 0 : (_api$typeAhead2$actio = _api$typeAhead2.actions) === null || _api$typeAhead2$actio === void 0 ? void 0 : _api$typeAhead2$actio.close({
+      attachCommand: command,
+      insertCurrentQueryAsRawText: false
+    });
+  } else {
+    command(editorView.state, editorView.dispatch);
+  }
+  return true;
+};
+export const forceFocus = (editorView, api) => command => {
+  const result = closeTypeAheadAndRunCommand(editorView, api)(command);
+  if (result && !editorView.hasFocus()) {
+    editorView.focus();
+  }
+  return result;
+};

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

@@ -6,7 +6,7 @@
 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';
@@ -14,27 +14,7 @@ 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';
-const closeTypeAheadAndRunCommand = (editorView, api) => command => {
-  var _api$typeAhead, _api$typeAhead$action;
-  if (!editorView) {
-    return;
-  }
-  if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead$action = _api$typeAhead.actions) !== null && _api$typeAhead$action !== void 0 && _api$typeAhead$action.isOpen(editorView.state)) {
-    var _api$typeAhead2, _api$typeAhead2$actio;
-    api === null || api === void 0 ? void 0 : (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 ? void 0 : (_api$typeAhead2$actio = _api$typeAhead2.actions) === null || _api$typeAhead2$actio === void 0 ? void 0 : _api$typeAhead2$actio.close({
-      attachCommand: command,
-      insertCurrentQueryAsRawText: false
-    });
-  } else {
-    command(editorView.state, editorView.dispatch);
-  }
-};
-const forceFocus = (editorView, api) => command => {
-  closeTypeAheadAndRunCommand(editorView, api)(command);
-  if (!editorView.hasFocus()) {
-    editorView.focus();
-  }
-};
+import { forceFocus } from '../../pm-plugins/utils';
 export const ToolbarUndoRedo = ({
   disabled,
   isReducedSpacing,
@@ -59,6 +39,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

@@ -3,9 +3,10 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { attachInputMeta } from './pm-plugins/attach-input-meta';
+import { InputSource } from './pm-plugins/enums';
 import { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
-// eslint-disable-next-line @atlassian/tangerine/import/entry-points
+import { forceFocus } from './pm-plugins/utils';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ToolbarUndoRedo from './ui/ToolbarUndoRedo';
@@ -32,35 +33,23 @@ export const undoRedoPlugin = ({
     name: 'undoRedoPlugin',
     component: primaryToolbarComponent
   });
+  const handleUndo = inputSource => {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(undo));
+  };
+  const handleRedo = inputSource => {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(redo));
+  };
   return {
     name: 'undoRedoPlugin',
     actions: {
-      undo: inputSource => {
-        if (!editorViewRef.current) {
-          return false;
-        }
-        const {
-          state,
-          dispatch
-        } = editorViewRef.current;
-        if (!inputSource) {
-          return undo(state, dispatch);
-        }
-        return attachInputMeta(inputSource)(undo)(state, dispatch);
-      },
-      redo: inputSource => {
-        if (!editorViewRef.current) {
-          return false;
-        }
-        const {
-          state,
-          dispatch
-        } = editorViewRef.current;
-        if (!inputSource) {
-          return redo(state, dispatch);
-        }
-        return attachInputMeta(inputSource)(redo)(state, dispatch);
-      }
+      undo: handleUndo,
+      redo: handleRedo
     },
     pmPlugins() {
       const plugins = [{

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

@@ -2,6 +2,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 export var InputSource = function (InputSource) {
   InputSource[InputSource["TOOLBAR"] = INPUT_METHOD.TOOLBAR] = "TOOLBAR";
   InputSource[InputSource["KEYBOARD"] = INPUT_METHOD.KEYBOARD] = "KEYBOARD";
-  InputSource[InputSource["PAGE_OVERFLOW_MENU"] = INPUT_METHOD.PAGE_OVERFLOW_MENU] = "PAGE_OVERFLOW_MENU";
+  InputSource[InputSource["EXTERNAL"] = INPUT_METHOD.EXTERNAL] = "EXTERNAL";
   return InputSource;
 }({});

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/pm-plugins/utils.js

@@ -0,0 +1,27 @@
+export var closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorView, api) {
+  return function (command) {
+    var _api$typeAhead;
+    if (!editorView) {
+      return false;
+    }
+    if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead = _api$typeAhead.actions) !== null && _api$typeAhead !== void 0 && _api$typeAhead.isOpen(editorView.state)) {
+      var _api$typeAhead2;
+      api === null || api === void 0 || (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 || (_api$typeAhead2 = _api$typeAhead2.actions) === null || _api$typeAhead2 === void 0 || _api$typeAhead2.close({
+        attachCommand: command,
+        insertCurrentQueryAsRawText: false
+      });
+    } else {
+      command(editorView.state, editorView.dispatch);
+    }
+    return true;
+  };
+};
+export var forceFocus = function forceFocus(editorView, api) {
+  return function (command) {
+    var result = closeTypeAheadAndRunCommand(editorView, api)(command);
+    if (result && !editorView.hasFocus()) {
+      editorView.focus();
+    }
+    return result;
+  };
+};

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

@@ -6,7 +6,7 @@
 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';
@@ -14,31 +14,7 @@ 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';
-var closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorView, api) {
-  return function (command) {
-    var _api$typeAhead;
-    if (!editorView) {
-      return;
-    }
-    if (api !== null && api !== void 0 && (_api$typeAhead = api.typeAhead) !== null && _api$typeAhead !== void 0 && (_api$typeAhead = _api$typeAhead.actions) !== null && _api$typeAhead !== void 0 && _api$typeAhead.isOpen(editorView.state)) {
-      var _api$typeAhead2;
-      api === null || api === void 0 || (_api$typeAhead2 = api.typeAhead) === null || _api$typeAhead2 === void 0 || (_api$typeAhead2 = _api$typeAhead2.actions) === null || _api$typeAhead2 === void 0 || _api$typeAhead2.close({
-        attachCommand: command,
-        insertCurrentQueryAsRawText: false
-      });
-    } else {
-      command(editorView.state, editorView.dispatch);
-    }
-  };
-};
-var forceFocus = function forceFocus(editorView, api) {
-  return function (command) {
-    closeTypeAheadAndRunCommand(editorView, api)(command);
-    if (!editorView.hasFocus()) {
-      editorView.focus();
-    }
-  };
-};
+import { forceFocus } from '../../pm-plugins/utils';
 export var ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
   var disabled = _ref.disabled,
     isReducedSpacing = _ref.isReducedSpacing,
@@ -58,6 +34,7 @@ export var ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
   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,11 +1,12 @@
 import React from 'react';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { redo as _redo, undo as _undo } from '@atlaskit/editor-prosemirror/history';
+import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { attachInputMeta } from './pm-plugins/attach-input-meta';
+import { InputSource } from './pm-plugins/enums';
 import { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
-// eslint-disable-next-line @atlassian/tangerine/import/entry-points
+import { forceFocus } from './pm-plugins/utils';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ToolbarUndoRedo from './ui/ToolbarUndoRedo';
@@ -30,33 +31,23 @@ export var undoRedoPlugin = function undoRedoPlugin(_ref) {
     name: 'undoRedoPlugin',
     component: primaryToolbarComponent
   });
+  var handleUndo = function handleUndo(inputSource) {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(undo));
+  };
+  var handleRedo = function handleRedo(inputSource) {
+    if (!editorViewRef.current) {
+      return false;
+    }
+    return forceFocus(editorViewRef.current, api)(attachInputMeta(inputSource || InputSource.EXTERNAL)(redo));
+  };
   return {
     name: 'undoRedoPlugin',
     actions: {
-      undo: function undo(inputSource) {
-        if (!editorViewRef.current) {
-          return false;
-        }
-        var _editorViewRef$curren = editorViewRef.current,
-          state = _editorViewRef$curren.state,
-          dispatch = _editorViewRef$curren.dispatch;
-        if (!inputSource) {
-          return _undo(state, dispatch);
-        }
-        return attachInputMeta(inputSource)(_undo)(state, dispatch);
-      },
-      redo: function redo(inputSource) {
-        if (!editorViewRef.current) {
-          return false;
-        }
-        var _editorViewRef$curren2 = editorViewRef.current,
-          state = _editorViewRef$curren2.state,
-          dispatch = _editorViewRef$curren2.dispatch;
-        if (!inputSource) {
-          return _redo(state, dispatch);
-        }
-        return attachInputMeta(inputSource)(_redo)(state, dispatch);
-      }
+      undo: handleUndo,
+      redo: handleRedo
     },
     pmPlugins: function pmPlugins() {
       var plugins = [{

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

@@ -1,5 +1,5 @@
 export declare enum InputSource {
     TOOLBAR = "toolbar",
     KEYBOARD = "keyboard",
-    PAGE_OVERFLOW_MENU = "confluencePageOverflowMenu"
+    EXTERNAL = "external"
 }

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

@@ -0,0 +1,5 @@
+import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { UndoRedoPlugin } from '../undoRedoPluginType';
+export declare const closeTypeAheadAndRunCommand: (editorView: EditorView, api: ExtractInjectionAPI<UndoRedoPlugin> | undefined) => (command: Command) => boolean;
+export declare const forceFocus: (editorView: EditorView, api: ExtractInjectionAPI<UndoRedoPlugin> | undefined) => (command: Command) => boolean;

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

@@ -1,5 +1,5 @@
 export declare enum InputSource {
     TOOLBAR = "toolbar",
     KEYBOARD = "keyboard",
-    PAGE_OVERFLOW_MENU = "confluencePageOverflowMenu"
+    EXTERNAL = "external"
 }

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

@@ -0,0 +1,5 @@
+import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { UndoRedoPlugin } from '../undoRedoPluginType';
+export declare const closeTypeAheadAndRunCommand: (editorView: EditorView, api: ExtractInjectionAPI<UndoRedoPlugin> | undefined) => (command: Command) => boolean;
+export declare const forceFocus: (editorView: EditorView, api: ExtractInjectionAPI<UndoRedoPlugin> | undefined) => (command: Command) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-undo-redo",
-	"version": "2.0.7",
+	"version": "2.0.9",
 	"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.12.0",
+		"@atlaskit/editor-common": "^103.0.0",
 		"@atlaskit/editor-plugin-history": "^2.0.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^3.1.0",
-		"@atlaskit/editor-plugin-type-ahead": "^2.1.0",
+		"@atlaskit/editor-plugin-type-ahead": "^2.3.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^25.0.0",
+		"@atlaskit/icon": "^25.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.1.0",
+		"@atlaskit/tmp-editor-statsig": "^4.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -91,5 +91,10 @@
 		"no-unused-dependencies": {
 			"checkDevDependencies": true
 		}
+	},
+	"platform-feature-flags": {
+		"platform_editor_cmd_y_mac_redo_shortcut": {
+			"type": "boolean"
+		}
 	}
 }