@atlaskit/editor-plugin-block-menu 6.0.18 → 6.0.20

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.20
+
+### Patch Changes
+
+- [`edb1034803ecf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/edb1034803ecf) -
+  Fix undo/redo via keyboard when block menu is open
+- Updated dependencies
+
+## 6.0.19
+
+### Patch Changes
+
+- [`5a2e9d04ff4d5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5a2e9d04ff4d5) -
+  [ux] Shows only available transforms in 'Suggested' section.
+
 ## 6.0.18
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -69,6 +69,9 @@
 		{
 			"path": "../../../design-system/primitives/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../prosemirror-history/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
 		},

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

@@ -35,12 +35,13 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
         }
 
         // Block further handling of key events when block menu is open
-        // Except for backspace/delete/copy/cut/paste which should be handled by the selection preservation plugin
+        // Except for backspace/delete/copy/cut/paste/undo/redo which should be handled by the selection preservation plugin
         var key = event.key.toLowerCase();
         var isMetaCtrl = event.metaKey || event.ctrlKey;
         var isBackspaceDelete = ['backspace', 'delete'].includes(key);
         var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
-        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete;
+        var isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
+        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo;
         return suppressNativeHandling;
       }
     }

package/dist/cjs/ui/block-menu.js

@@ -24,6 +24,7 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _compiled = require("@atlaskit/primitives/compiled");
+var _prosemirrorHistory = require("@atlaskit/prosemirror-history");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockMenuProvider = require("./block-menu-provider");
 var _BlockMenuRenderer = require("./block-menu-renderer/BlockMenuRenderer");
@@ -198,12 +199,22 @@ var BlockMenu = function BlockMenu(_ref4) {
     if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus() || isSelectionWithinCodeBlock(editorView.state)) {
       return;
     }
+    var key = event.key.toLowerCase();
+    var isMetaCtrl = event.metaKey || event.ctrlKey;
+    var isDelete = ['backspace', 'delete'].includes(key);
+    var isUndo = isMetaCtrl && key === 'z' && !event.shiftKey;
+    var isRedo = isMetaCtrl && (key === 'y' || key === 'z' && event.shiftKey);
 
     // Necessary to prevent the editor from handling the delete natively
-    if (['backspace', 'delete'].includes(event.key.toLowerCase())) {
+    if (isDelete || isUndo || isRedo) {
       event.preventDefault();
       event.stopPropagation();
     }
+    if (isUndo) {
+      (0, _prosemirrorHistory.undo)(editorView.state, editorView.dispatch);
+    } else if (isRedo) {
+      (0, _prosemirrorHistory.redo)(editorView.state, editorView.dispatch);
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.handleKeyDownWithPreservedSelection(event));
   };
   var handleClickOutside = function handleClickOutside(e) {

package/dist/cjs/ui/utils/getSuggestedItemsFromSelection.js

@@ -35,6 +35,7 @@ var getSuggestedItemsFromSelection = exports.getSuggestedItemsFromSelection = fu
   return sortedKeys.map(function (key) {
     return menuItemsMap.get(key);
   }).filter(function (item) {
-    return item !== undefined;
+    var _item$isHidden;
+    return item !== undefined && !((_item$isHidden = item.isHidden) !== null && _item$isHidden !== void 0 && _item$isHidden.call(item));
   });
 };

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

@@ -29,12 +29,13 @@ export const createPlugin = api => {
         }
 
         // Block further handling of key events when block menu is open
-        // Except for backspace/delete/copy/cut/paste which should be handled by the selection preservation plugin
+        // Except for backspace/delete/copy/cut/paste/undo/redo which should be handled by the selection preservation plugin
         const key = event.key.toLowerCase();
         const isMetaCtrl = event.metaKey || event.ctrlKey;
         const isBackspaceDelete = ['backspace', 'delete'].includes(key);
         const isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
-        const suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete;
+        const isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
+        const suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo;
         return suppressNativeHandling;
       }
     }

package/dist/es2019/ui/block-menu.js

@@ -15,6 +15,7 @@ import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styl
 import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { Box } from '@atlaskit/primitives/compiled';
+import { redo, undo } from '@atlaskit/prosemirror-history';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
@@ -188,12 +189,22 @@ const BlockMenu = ({
     if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus() || isSelectionWithinCodeBlock(editorView.state)) {
       return;
     }
+    const key = event.key.toLowerCase();
+    const isMetaCtrl = event.metaKey || event.ctrlKey;
+    const isDelete = ['backspace', 'delete'].includes(key);
+    const isUndo = isMetaCtrl && key === 'z' && !event.shiftKey;
+    const isRedo = isMetaCtrl && (key === 'y' || key === 'z' && event.shiftKey);
 
     // Necessary to prevent the editor from handling the delete natively
-    if (['backspace', 'delete'].includes(event.key.toLowerCase())) {
+    if (isDelete || isUndo || isRedo) {
       event.preventDefault();
       event.stopPropagation();
     }
+    if (isUndo) {
+      undo(editorView.state, editorView.dispatch);
+    } else if (isRedo) {
+      redo(editorView.state, editorView.dispatch);
+    }
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.handleKeyDownWithPreservedSelection(event));
   };
   const handleClickOutside = e => {

package/dist/es2019/ui/utils/getSuggestedItemsFromSelection.js

@@ -26,5 +26,8 @@ export const getSuggestedItemsFromSelection = (menuItemsMap, currentSelection) =
   }
   const nodeTypeName = firstNodeType;
   const sortedKeys = getSortedSuggestedItems(nodeTypeName);
-  return sortedKeys.map(key => menuItemsMap.get(key)).filter(item => item !== undefined);
+  return sortedKeys.map(key => menuItemsMap.get(key)).filter(item => {
+    var _item$isHidden;
+    return item !== undefined && !((_item$isHidden = item.isHidden) !== null && _item$isHidden !== void 0 && _item$isHidden.call(item));
+  });
 };

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

@@ -29,12 +29,13 @@ export var createPlugin = function createPlugin(api) {
         }
 
         // Block further handling of key events when block menu is open
-        // Except for backspace/delete/copy/cut/paste which should be handled by the selection preservation plugin
+        // Except for backspace/delete/copy/cut/paste/undo/redo which should be handled by the selection preservation plugin
         var key = event.key.toLowerCase();
         var isMetaCtrl = event.metaKey || event.ctrlKey;
         var isBackspaceDelete = ['backspace', 'delete'].includes(key);
         var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
-        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete;
+        var isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
+        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo;
         return suppressNativeHandling;
       }
     }

package/dist/esm/ui/block-menu.js

@@ -16,6 +16,7 @@ import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styl
 import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { Box } from '@atlaskit/primitives/compiled';
+import { redo, undo } from '@atlaskit/prosemirror-history';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
@@ -189,12 +190,22 @@ var BlockMenu = function BlockMenu(_ref4) {
     if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus() || isSelectionWithinCodeBlock(editorView.state)) {
       return;
     }
+    var key = event.key.toLowerCase();
+    var isMetaCtrl = event.metaKey || event.ctrlKey;
+    var isDelete = ['backspace', 'delete'].includes(key);
+    var isUndo = isMetaCtrl && key === 'z' && !event.shiftKey;
+    var isRedo = isMetaCtrl && (key === 'y' || key === 'z' && event.shiftKey);
 
     // Necessary to prevent the editor from handling the delete natively
-    if (['backspace', 'delete'].includes(event.key.toLowerCase())) {
+    if (isDelete || isUndo || isRedo) {
       event.preventDefault();
       event.stopPropagation();
     }
+    if (isUndo) {
+      undo(editorView.state, editorView.dispatch);
+    } else if (isRedo) {
+      redo(editorView.state, editorView.dispatch);
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.handleKeyDownWithPreservedSelection(event));
   };
   var handleClickOutside = function handleClickOutside(e) {

package/dist/esm/ui/utils/getSuggestedItemsFromSelection.js

@@ -30,6 +30,7 @@ export var getSuggestedItemsFromSelection = function getSuggestedItemsFromSelect
   return sortedKeys.map(function (key) {
     return menuItemsMap.get(key);
   }).filter(function (item) {
-    return item !== undefined;
+    var _item$isHidden;
+    return item !== undefined && !((_item$isHidden = item.isHidden) !== null && _item$isHidden !== void 0 && _item$isHidden.call(item));
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.18",
+	"version": "6.0.20",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -45,7 +45,8 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.1.0",
-		"@atlaskit/tmp-editor-statsig": "^16.23.0",
+		"@atlaskit/prosemirror-history": "^0.2.0",
+		"@atlaskit/tmp-editor-statsig": "^16.24.0",
 		"@atlaskit/tokens": "^10.0.0",
 		"@babel/runtime": "^7.0.0"
 	},