@atlaskit/editor-plugin-block-menu 4.0.16 → 4.0.18

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 4.0.18
+
+### Patch Changes
+
+- [`64b94b53839de`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/64b94b53839de) -
+  Fix the outdated Turn into disabled state in block menu
+- Updated dependencies
+
+## 4.0.17
+
+### Patch Changes
+
+- [`dc211dc1927b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dc211dc1927b5) -
+  [ux] ED-29232: Fixed issues with block menu for file
+- Updated dependencies
+
 ## 4.0.16
 
 ### Patch Changes

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

@@ -24,9 +24,7 @@ var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuCompo
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.turnInto) : formatMessage(_blockMenu.messages.turnInto);
-  var isDisabled = (0, _react.useMemo)(function () {
-    return (0, _platformFeatureFlags.fg)('platform_editor_block_menu_for_disabled_nodes') ? (0, _checkIsFormatMenuHidden.checkIsFormatMenuHidden)(api) : false;
-  }, [api]);
+  var isDisabled = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_for_disabled_nodes') ? (0, _checkIsFormatMenuHidden.checkIsFormatMenuHidden)(api) : false;
   var handleClick = (0, _react.useCallback)(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
       var _api$analytics;

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

@@ -24,6 +24,11 @@ var isNestedNode = exports.isNestedNode = function isNestedNode(selection, menuT
   }
   var $from = selection.$from;
   var depth = $from.depth;
+
+  // When a file is in card view, selection.$from has a depth of 1, but it is not a nested node, should return false
+  if ($from.depth === 1 && selection instanceof _state.NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file') {
+    return false;
+  }
   if ($from.depth > 0 && selection instanceof _state.NodeSelection) {
     return true;
   }

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

@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/editor-common/block-menu';
@@ -17,9 +17,7 @@ export const FormatMenuComponent = ({
     formatMessage
   } = useIntl();
   const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
-  const isDisabled = useMemo(() => {
-    return fg('platform_editor_block_menu_for_disabled_nodes') ? checkIsFormatMenuHidden(api) : false;
-  }, [api]);
+  const isDisabled = fg('platform_editor_block_menu_for_disabled_nodes') ? checkIsFormatMenuHidden(api) : false;
   const handleClick = useCallback(() => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr

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

@@ -21,6 +21,11 @@ export const isNestedNode = (selection, menuTriggerBy) => {
     $from
   } = selection;
   const depth = $from.depth;
+
+  // When a file is in card view, selection.$from has a depth of 1, but it is not a nested node, should return false
+  if ($from.depth === 1 && selection instanceof NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file') {
+    return false;
+  }
   if ($from.depth > 0 && selection instanceof NodeSelection) {
     return true;
   }

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

@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/editor-common/block-menu';
@@ -15,9 +15,7 @@ export var FormatMenuComponent = function FormatMenuComponent(_ref) {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
-  var isDisabled = useMemo(function () {
-    return fg('platform_editor_block_menu_for_disabled_nodes') ? checkIsFormatMenuHidden(api) : false;
-  }, [api]);
+  var isDisabled = fg('platform_editor_block_menu_for_disabled_nodes') ? checkIsFormatMenuHidden(api) : false;
   var handleClick = useCallback(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
       var _api$analytics;

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

@@ -19,6 +19,11 @@ export var isNestedNode = function isNestedNode(selection, menuTriggerBy) {
   }
   var $from = selection.$from;
   var depth = $from.depth;
+
+  // When a file is in card view, selection.$from has a depth of 1, but it is not a nested node, should return false
+  if ($from.depth === 1 && selection instanceof NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file') {
+    return false;
+  }
   if ($from.depth > 0 && selection instanceof NodeSelection) {
     return true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "4.0.16",
+	"version": "4.0.18",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,8 +39,8 @@
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.14.0",
-		"@atlaskit/icon": "^28.4.0",
-		"@atlaskit/icon-lab": "^5.9.0",
+		"@atlaskit/icon": "^28.5.0",
+		"@atlaskit/icon-lab": "^5.10.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/tmp-editor-statsig": "^13.4.0",