@atlaskit/editor-plugin-block-menu 9.2.11 → 9.2.12

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 9.2.12
+
+### Patch Changes
+
+- [`d3af55fada546`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d3af55fada546) -
+  [ux] Adds shouldIgnoreCloseEvent to prevent sub-menus of Block menu from closing when
+  changeboarding spotlights get dismissed.
+
 ## 9.2.11
 
 ### Patch Changes

package/dist/cjs/ui/format-menu-nested.js

@@ -17,6 +17,10 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _consts = require("./consts");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var BLOCK_MENU_TRANSFORM_SPOTLIGHT_PORTAL_SELECTOR = '[data-test-id="block-menu-transform-spotlight-portal-container"]';
+var shouldIgnoreBlockMenuTransformSpotlightCloseEvent = function shouldIgnoreBlockMenuTransformSpotlightCloseEvent(event) {
+  return event.target instanceof Element && event.target.closest(BLOCK_MENU_TRANSFORM_SPOTLIGHT_PORTAL_SELECTOR) !== null;
+};
 var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuComponent(_ref) {
   var api = _ref.api,
     children = _ref.children;
@@ -55,6 +59,7 @@ var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuCompo
     onClick: handleClick,
     dropdownTestId: "editor-turn-into-menu",
     testId: (0, _platformFeatureFlags.fg)('cc_blocks_changeboarding') ? 'turn-into-block-menu-btn' : undefined,
-    shouldFitContainer: true
+    shouldFitContainer: true,
+    shouldIgnoreCloseEvent: (0, _platformFeatureFlags.fg)('cc_blocks_changeboarding') ? shouldIgnoreBlockMenuTransformSpotlightCloseEvent : undefined
   }, children);
 };

package/dist/es2019/ui/format-menu-nested.js

@@ -8,6 +8,8 @@ import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
+const BLOCK_MENU_TRANSFORM_SPOTLIGHT_PORTAL_SELECTOR = '[data-test-id="block-menu-transform-spotlight-portal-container"]';
+const shouldIgnoreBlockMenuTransformSpotlightCloseEvent = event => event.target instanceof Element && event.target.closest(BLOCK_MENU_TRANSFORM_SPOTLIGHT_PORTAL_SELECTOR) !== null;
 export const FormatMenuComponent = ({
   api,
   children
@@ -49,6 +51,7 @@ export const FormatMenuComponent = ({
     onClick: handleClick,
     dropdownTestId: "editor-turn-into-menu",
     testId: fg('cc_blocks_changeboarding') ? 'turn-into-block-menu-btn' : undefined,
-    shouldFitContainer: true
+    shouldFitContainer: true,
+    shouldIgnoreCloseEvent: fg('cc_blocks_changeboarding') ? shouldIgnoreBlockMenuTransformSpotlightCloseEvent : undefined
   }, children);
 };

package/dist/esm/ui/format-menu-nested.js

@@ -8,6 +8,10 @@ import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
+var BLOCK_MENU_TRANSFORM_SPOTLIGHT_PORTAL_SELECTOR = '[data-test-id="block-menu-transform-spotlight-portal-container"]';
+var shouldIgnoreBlockMenuTransformSpotlightCloseEvent = function shouldIgnoreBlockMenuTransformSpotlightCloseEvent(event) {
+  return event.target instanceof Element && event.target.closest(BLOCK_MENU_TRANSFORM_SPOTLIGHT_PORTAL_SELECTOR) !== null;
+};
 export var FormatMenuComponent = function FormatMenuComponent(_ref) {
   var api = _ref.api,
     children = _ref.children;
@@ -46,6 +50,7 @@ export var FormatMenuComponent = function FormatMenuComponent(_ref) {
     onClick: handleClick,
     dropdownTestId: "editor-turn-into-menu",
     testId: fg('cc_blocks_changeboarding') ? 'turn-into-block-menu-btn' : undefined,
-    shouldFitContainer: true
+    shouldFitContainer: true,
+    shouldIgnoreCloseEvent: fg('cc_blocks_changeboarding') ? shouldIgnoreBlockMenuTransformSpotlightCloseEvent : undefined
   }, children);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "9.2.11",
+	"version": "9.2.12",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,7 +38,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-shared-styles": "^3.11.0",
 		"@atlaskit/editor-tables": "^2.10.0",
-		"@atlaskit/editor-toolbar": "^1.8.0",
+		"@atlaskit/editor-toolbar": "^1.9.0",
 		"@atlaskit/flag": "^17.12.0",
 		"@atlaskit/icon": "^35.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
@@ -50,7 +50,7 @@
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.50.0",
+		"@atlaskit/editor-common": "^114.51.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},