@atlaskit/editor-plugin-block-menu 6.0.12 → 6.0.14

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.14
+
+### Patch Changes
+
+- [`3a117b2d76d59`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3a117b2d76d59) -
+  [ux] Transform decision -> codeBlock and quote -> headings are disabled.
+- Updated dependencies
+
+## 6.0.13
+
+### Patch Changes
+
+- [`799170edab4f8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/799170edab4f8) -
+  Fix the delete wrong content via keyboard when block menu open
+
 ## 6.0.12
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -1,5 +1,5 @@
 {
-	"extends": "../../../../tsconfig.entry-points.confluence.json",
+	"extends": "../../../../tsconfig.local-consumption.json",
 	"compilerOptions": {
 		"target": "es5",
 		"outDir": "../../../../../confluence/tsDist/@atlaskit__editor-plugin-block-menu",

package/dist/cjs/editor-commands/transform-node-utils/TRANSFORMATION_MATRIX.js

@@ -77,7 +77,6 @@ var TRANSFORMATION_MATRIX = exports.TRANSFORMATION_MATRIX = {
     layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],
     panel: [_unwrapStep.unwrapStep, _wrapStep.wrapStep],
     paragraph: [_unwrapStep.unwrapStep],
-    heading: [_unwrapStep.unwrapStep, _applyTargetTextTypeStep.applyTargetTextTypeStep],
     decisionList: [_unwrapStep.unwrapStep, _wrapBlockquoteToDecisionListStep.wrapBlockquoteToDecisionListStep]
   },
   layoutSection: {
@@ -165,7 +164,6 @@ var TRANSFORMATION_MATRIX = exports.TRANSFORMATION_MATRIX = {
     orderedList: [_decisionListToListStep.decisionListToListStep],
     taskList: [_decisionListToListStep.decisionListToListStep],
     blockquote: [_unwrapListStep.unwrapListStep, _wrapStep.wrapStep],
-    codeBlock: [_unwrapListStep.unwrapListStep, _wrapMixedContentStep.wrapMixedContentStep],
     expand: [_wrapStep.wrapStep],
     nestedExpand: [_wrapStep.wrapStep],
     layoutSection: [_wrapMixedContentStep.wrapMixedContentStep],

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

@@ -105,6 +105,12 @@ var useConditionalBlockMenuEffect = (0, _platformFeatureFlagsReact.conditionalHo
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent('blockMenuOpen'));
   }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
 });
+var isSelectionWithinCodeBlock = function isSelectionWithinCodeBlock(state) {
+  var _state$selection = state.selection,
+    $from = _state$selection.$from,
+    $to = _state$selection.$to;
+  return $from.sameParent($to) && $from.parent.type === state.schema.nodes.codeBlock;
+};
 var BlockMenuContent = function BlockMenuContent(_ref3) {
   var _api$blockMenu;
   var api = _ref3.api,
@@ -188,7 +194,8 @@ var BlockMenu = function BlockMenu(_ref4) {
     var _api$core, _api$blockControls;
     // When the editor view has focus, the keydown will be handled by the
     // selection preservation plugin – exit early to avoid double handling
-    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus()) {
+    // Also exit if selection is within a code block to avoid double handling when code block got focus when the node after it is deleted
+    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus() || isSelectionWithinCodeBlock(editorView.state)) {
       return;
     }
 

package/dist/es2019/editor-commands/transform-node-utils/TRANSFORMATION_MATRIX.js

@@ -72,7 +72,6 @@ export const TRANSFORMATION_MATRIX = {
     layoutSection: [wrapMixedContentStep],
     panel: [unwrapStep, wrapStep],
     paragraph: [unwrapStep],
-    heading: [unwrapStep, applyTargetTextTypeStep],
     decisionList: [unwrapStep, wrapBlockquoteToDecisionListStep]
   },
   layoutSection: {
@@ -160,7 +159,6 @@ export const TRANSFORMATION_MATRIX = {
     orderedList: [decisionListToListStep],
     taskList: [decisionListToListStep],
     blockquote: [unwrapListStep, wrapStep],
-    codeBlock: [unwrapListStep, wrapMixedContentStep],
     expand: [wrapStep],
     nestedExpand: [wrapStep],
     layoutSection: [wrapMixedContentStep],

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

@@ -95,6 +95,13 @@ const useConditionalBlockMenuEffect = conditionalHooksFactory(() => fg('platform
     api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent('blockMenuOpen'));
   }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
 });
+const isSelectionWithinCodeBlock = state => {
+  const {
+    $from,
+    $to
+  } = state.selection;
+  return $from.sameParent($to) && $from.parent.type === state.schema.nodes.codeBlock;
+};
 const BlockMenuContent = ({
   api,
   setRef
@@ -177,7 +184,8 @@ const BlockMenu = ({
     var _api$core, _api$blockControls, _api$blockControls$co;
     // When the editor view has focus, the keydown will be handled by the
     // selection preservation plugin – exit early to avoid double handling
-    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus()) {
+    // Also exit if selection is within a code block to avoid double handling when code block got focus when the node after it is deleted
+    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus() || isSelectionWithinCodeBlock(editorView.state)) {
       return;
     }
 

package/dist/esm/editor-commands/transform-node-utils/TRANSFORMATION_MATRIX.js

@@ -72,7 +72,6 @@ export var TRANSFORMATION_MATRIX = {
     layoutSection: [wrapMixedContentStep],
     panel: [unwrapStep, wrapStep],
     paragraph: [unwrapStep],
-    heading: [unwrapStep, applyTargetTextTypeStep],
     decisionList: [unwrapStep, wrapBlockquoteToDecisionListStep]
   },
   layoutSection: {
@@ -160,7 +159,6 @@ export var TRANSFORMATION_MATRIX = {
     orderedList: [decisionListToListStep],
     taskList: [decisionListToListStep],
     blockquote: [unwrapListStep, wrapStep],
-    codeBlock: [unwrapListStep, wrapMixedContentStep],
     expand: [wrapStep],
     nestedExpand: [wrapStep],
     layoutSection: [wrapMixedContentStep],

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

@@ -96,6 +96,12 @@ var useConditionalBlockMenuEffect = conditionalHooksFactory(function () {
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent('blockMenuOpen'));
   }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
 });
+var isSelectionWithinCodeBlock = function isSelectionWithinCodeBlock(state) {
+  var _state$selection = state.selection,
+    $from = _state$selection.$from,
+    $to = _state$selection.$to;
+  return $from.sameParent($to) && $from.parent.type === state.schema.nodes.codeBlock;
+};
 var BlockMenuContent = function BlockMenuContent(_ref3) {
   var _api$blockMenu;
   var api = _ref3.api,
@@ -179,7 +185,8 @@ var BlockMenu = function BlockMenu(_ref4) {
     var _api$core, _api$blockControls;
     // When the editor view has focus, the keydown will be handled by the
     // selection preservation plugin – exit early to avoid double handling
-    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus()) {
+    // Also exit if selection is within a code block to avoid double handling when code block got focus when the node after it is deleted
+    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus() || isSelectionWithinCodeBlock(editorView.state)) {
       return;
     }
 

package/dist/types/ui/block-menu.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockMenuPlugin } from '../blockMenuPluginType';
 export type BlockMenuProps = {
     api: ExtractInjectionAPI<BlockMenuPlugin> | undefined;

package/dist/types-ts4.5/ui/block-menu.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockMenuPlugin } from '../blockMenuPluginType';
 export type BlockMenuProps = {
     api: ExtractInjectionAPI<BlockMenuPlugin> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.12",
+	"version": "6.0.14",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.11.0",
+		"@atlaskit/tmp-editor-statsig": "^16.13.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@babel/runtime": "^7.0.0"
 	},