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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-undo-redo
 
+## 2.0.7
+
+### Patch Changes
+
+- [#130044](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130044)
+  [`cad348d512cdf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cad348d512cdf) -
+  [ux] ED-26802 contextual formatting configuration
+- Updated dependencies
+
+## 2.0.6
+
+### Patch Changes
+
+- [#127269](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/127269)
+  [`a8235a7de7cd0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a8235a7de7cd0) -
+  Added undo & redo actions to undoRedoPlugin
+- Updated dependencies
+
 ## 2.0.5
 
 ### Patch Changes

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

@@ -8,5 +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";
   return InputSource;
 }({});

package/dist/cjs/undoRedoPlugin.js

@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.undoRedoPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
+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 _keymaps = require("./pm-plugins/keymaps");
 var _main = require("./pm-plugins/main");
 var _ToolbarUndoRedo = _interopRequireDefault(require("./ui/ToolbarUndoRedo"));
@@ -15,7 +18,11 @@ var _ToolbarUndoRedo = _interopRequireDefault(require("./ui/ToolbarUndoRedo"));
 // eslint-disable-next-line import/no-named-as-default
 
 var undoRedoPlugin = exports.undoRedoPlugin = function undoRedoPlugin(_ref) {
+  var _api$primaryToolbar;
   var api = _ref.api;
+  var editorViewRef = {
+    current: null
+  };
   var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
     var editorView = _ref2.editorView,
       disabled = _ref2.disabled,
@@ -27,19 +34,40 @@ var undoRedoPlugin = exports.undoRedoPlugin = function undoRedoPlugin(_ref) {
       api: api
     });
   };
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control', {
-    exposure: true
-  })) {
-    var _api$primaryToolbar;
-    api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 || _api$primaryToolbar.actions.registerComponent({
-      name: 'undoRedoPlugin',
-      component: primaryToolbarComponent
-    });
-  }
+  api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 || _api$primaryToolbar.actions.registerComponent({
+    name: 'undoRedoPlugin',
+    component: primaryToolbarComponent
+  });
   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);
+      }
+    },
     pmPlugins: function pmPlugins() {
-      return [{
+      var plugins = [{
         name: 'undoRedoKeyMap',
         plugin: function plugin() {
           return (0, _keymaps.keymapPlugin)();
@@ -50,9 +78,27 @@ var undoRedoPlugin = exports.undoRedoPlugin = function undoRedoPlugin(_ref) {
           return (0, _main.createPlugin)(options);
         }
       }];
+      if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
+        exposure: false
+      })) {
+        plugins.push({
+          name: 'undoRedoGetEditorViewReferencePlugin',
+          plugin: function plugin() {
+            return new _safePlugin.SafePlugin({
+              view: function view(editorView) {
+                editorViewRef.current = editorView;
+                return {
+                  destroy: function destroy() {
+                    editorViewRef.current = null;
+                  }
+                };
+              }
+            });
+          }
+        });
+      }
+      return plugins;
     },
-    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && (0, _experiments.editorExperiment)('platform_editor_controls', 'control', {
-      exposure: true
-    }) ? primaryToolbarComponent : undefined
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
 };

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

@@ -2,5 +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";
   return InputSource;
 }({});

package/dist/es2019/undoRedoPlugin.js

@@ -1,5 +1,8 @@
 import React from 'react';
+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 { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
@@ -9,6 +12,10 @@ import ToolbarUndoRedo from './ui/ToolbarUndoRedo';
 export const undoRedoPlugin = ({
   api
 }) => {
+  var _api$primaryToolbar;
+  const editorViewRef = {
+    current: null
+  };
   const primaryToolbarComponent = ({
     editorView,
     disabled,
@@ -21,28 +28,69 @@ export const undoRedoPlugin = ({
       api: api
     });
   };
-  if (editorExperiment('platform_editor_controls', 'control', {
-    exposure: true
-  })) {
-    var _api$primaryToolbar;
-    api === null || api === void 0 ? void 0 : (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.actions.registerComponent({
-      name: 'undoRedoPlugin',
-      component: primaryToolbarComponent
-    });
-  }
+  api === null || api === void 0 ? void 0 : (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.actions.registerComponent({
+    name: 'undoRedoPlugin',
+    component: primaryToolbarComponent
+  });
   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);
+      }
+    },
     pmPlugins() {
-      return [{
+      const plugins = [{
         name: 'undoRedoKeyMap',
         plugin: () => keymapPlugin()
       }, {
         name: 'undoRedoPlugin',
         plugin: options => createPlugin(options)
       }];
+      if (editorExperiment('platform_editor_controls', 'variant1', {
+        exposure: false
+      })) {
+        plugins.push({
+          name: 'undoRedoGetEditorViewReferencePlugin',
+          plugin: () => {
+            return new SafePlugin({
+              view: editorView => {
+                editorViewRef.current = editorView;
+                return {
+                  destroy: () => {
+                    editorViewRef.current = null;
+                  }
+                };
+              }
+            });
+          }
+        });
+      }
+      return plugins;
     },
-    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && editorExperiment('platform_editor_controls', 'control', {
-      exposure: true
-    }) ? primaryToolbarComponent : undefined
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
 };

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

@@ -2,5 +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";
   return InputSource;
 }({});

package/dist/esm/undoRedoPlugin.js

@@ -1,5 +1,8 @@
 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { attachInputMeta } from './pm-plugins/attach-input-meta';
 import { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
@@ -7,7 +10,11 @@ import { createPlugin } from './pm-plugins/main';
 // eslint-disable-next-line import/no-named-as-default
 import ToolbarUndoRedo from './ui/ToolbarUndoRedo';
 export var undoRedoPlugin = function undoRedoPlugin(_ref) {
+  var _api$primaryToolbar;
   var api = _ref.api;
+  var editorViewRef = {
+    current: null
+  };
   var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
     var editorView = _ref2.editorView,
       disabled = _ref2.disabled,
@@ -19,19 +26,40 @@ export var undoRedoPlugin = function undoRedoPlugin(_ref) {
       api: api
     });
   };
-  if (editorExperiment('platform_editor_controls', 'control', {
-    exposure: true
-  })) {
-    var _api$primaryToolbar;
-    api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 || _api$primaryToolbar.actions.registerComponent({
-      name: 'undoRedoPlugin',
-      component: primaryToolbarComponent
-    });
-  }
+  api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 || _api$primaryToolbar.actions.registerComponent({
+    name: 'undoRedoPlugin',
+    component: primaryToolbarComponent
+  });
   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);
+      }
+    },
     pmPlugins: function pmPlugins() {
-      return [{
+      var plugins = [{
         name: 'undoRedoKeyMap',
         plugin: function plugin() {
           return keymapPlugin();
@@ -42,9 +70,27 @@ export var undoRedoPlugin = function undoRedoPlugin(_ref) {
           return createPlugin(options);
         }
       }];
+      if (editorExperiment('platform_editor_controls', 'variant1', {
+        exposure: false
+      })) {
+        plugins.push({
+          name: 'undoRedoGetEditorViewReferencePlugin',
+          plugin: function plugin() {
+            return new SafePlugin({
+              view: function view(editorView) {
+                editorViewRef.current = editorView;
+                return {
+                  destroy: function destroy() {
+                    editorViewRef.current = null;
+                  }
+                };
+              }
+            });
+          }
+        });
+      }
+      return plugins;
     },
-    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && editorExperiment('platform_editor_controls', 'control', {
-      exposure: true
-    }) ? primaryToolbarComponent : undefined
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
 };

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

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

package/dist/types/undoRedoPluginType.d.ts

@@ -2,6 +2,12 @@ import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/t
 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>];
+    actions: {
+        undo: UndoRedoAction;
+        redo: UndoRedoAction;
+    };
 }>;

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

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

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

@@ -2,10 +2,16 @@ import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/t
 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>
     ];
+    actions: {
+        undo: UndoRedoAction;
+        redo: UndoRedoAction;
+    };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-undo-redo",
-	"version": "2.0.5",
+	"version": "2.0.7",
 	"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.4.0",
+		"@atlaskit/editor-common": "^102.12.0",
 		"@atlaskit/editor-plugin-history": "^2.0.0",
-		"@atlaskit/editor-plugin-primary-toolbar": "^3.0.0",
+		"@atlaskit/editor-plugin-primary-toolbar": "^3.1.0",
 		"@atlaskit/editor-plugin-type-ahead": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/icon": "^25.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^3.6.0",
+		"@atlaskit/tmp-editor-statsig": "^4.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},