@atlaskit/editor-plugin-block-menu 5.0.8 → 5.0.10

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.0.10
+
+### Patch Changes
+
+- [`c0f06bd1a9b63`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c0f06bd1a9b63) -
+  Feature flag removal platform_editor_block_menu_patch_2
+- Updated dependencies
+
+## 5.0.9
+
+### Patch Changes
+
+- [`d43ebcd35ce11`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d43ebcd35ce11) -
+  [ux] Enable block menu on all top level nodes by default
+
 ## 5.0.8
 
 ### Patch Changes

package/afm-jira/tsconfig.json

@@ -2,7 +2,7 @@
 	"extends": "../../../../tsconfig.entry-points.jira.json",
 	"compilerOptions": {
 		"target": "es5",
-		"outDir": "../../../../../tsDist/@atlaskit__editor-plugin-block-menu/app",
+		"outDir": "../../../../../jira/tsDist/@atlaskit__editor-plugin-block-menu/app",
 		"rootDir": "../",
 		"composite": true
 	},

package/dist/cjs/editor-commands/formatNode.js

@@ -8,7 +8,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _selection = require("./selection");
@@ -124,7 +123,7 @@ var formatNode = exports.formatNode = function formatNode(api) {
         });
         //	get the first list node as when click on drag handle if there are list node
         //  can only select one list at a time, so we just need to find the first one
-        if (listNodes.length > 0 && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_2')) {
+        if (listNodes.length > 0) {
           var firstChild = listNodes[0];
           var newTr = formatNodeSelectEmptyList(tr, targetType, firstChild, schema);
           if (newTr) {

package/dist/cjs/editor-commands/transforms/container-transforms.js

@@ -8,7 +8,6 @@ exports.unwrapAndConvertToList = exports.unwrapAndConvertToBlockType = exports.t
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _inlineNodeTransforms = require("./inline-node-transforms");
 var _utils2 = require("./utils");
 var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeType(sourceContent, sourceNodeType, validNodeType, withMarks) {
@@ -204,7 +203,7 @@ var unwrapAndConvertToList = exports.unwrapAndConvertToList = function unwrapAnd
     heading = _schema$nodes2.heading;
   var isTargetTaskList = targetNodeType === taskList;
   var createListItemFromInline = function createListItemFromInline(content) {
-    if (!content && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_2')) {
+    if (!content) {
       return isTargetTaskList ? taskItem.create() : listItem.create(null, paragraph.create());
     } else {
       return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
@@ -243,7 +242,7 @@ var unwrapAndConvertToList = exports.unwrapAndConvertToList = function unwrapAnd
     var isOnlyNewLines = function isOnlyNewLines(codeText) {
       return codeText.replace(/\n/g, '').trim() === '';
     };
-    if ((!codeText || isOnlyNewLines(codeText)) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_2')) {
+    if (!codeText || isOnlyNewLines(codeText)) {
       // Empty code block - create an empty list item
       currentListItems.push(createListItemFromInline());
     }

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

@@ -76,7 +76,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
         // if text is inside of an expand or extension, the selection contains an expand or extension for some reason
         // the expandNode or extensionNode always and only have one child, no matter how much contents are inside the expand or extension,
         // and the one child is the line that is being selected, so we can use the .firstChild again
-        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && (fragment.firstChild.type.name === 'expand' || fragment.firstChild.type.name === 'bodiedExtension' && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_2'))) {
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && (fragment.firstChild.type.name === 'expand' || fragment.firstChild.type.name === 'bodiedExtension')) {
           var expandOrExtensionNode = fragment.firstChild;
           var actualNodeToCopy = expandOrExtensionNode.firstChild;
           fragment = _model.Fragment.from(actualNodeToCopy) || _model.Fragment.empty;

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

@@ -9,11 +9,18 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _isNestedNode = require("./isNestedNode");
+var TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES = true;
 var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, menuTriggerBy) {
   var nodes = schema.nodes;
   if (!nodes) {
     return false;
   }
+  var isNested = (0, _isNestedNode.isNestedNode)(selection, menuTriggerBy);
+  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
+    var disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+    var disabledNode = (0, _utils.findSelectedNodeOfType)(disabledOnNodes)(selection);
+    return !!disabledNode || isNested && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_transform_nested_node');
+  }
   var content;
   var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
   if ((0, _expValEquals.expValEquals)('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
@@ -31,7 +38,6 @@ var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, me
       content = listTypeOrBlockQuoteNode.node;
     }
   }
-  var isNested = (0, _isNestedNode.isNestedNode)(selection, menuTriggerBy);
   return !content || isNested && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_transform_nested_node');
 };
 var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(selection, schema, menuTriggerBy) {
@@ -40,6 +46,11 @@ var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(sel
     return false;
   }
   var isNested = (0, _isNestedNode.isNestedNode)(selection, menuTriggerBy);
+  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
+    var disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+    var disabledNode = (0, _utils.findSelectedNodeOfType)(disabledOnNodes)(selection);
+    return !!disabledNode || isNested && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_transform_nested_node');
+  }
   if (selection.empty || selection.content().size === 0) {
     // if empty selection, show format menu
     return false;

package/dist/es2019/editor-commands/formatNode.js

@@ -2,7 +2,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType, safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { setSelectionAfterTransform } from './selection';
@@ -129,7 +128,7 @@ export const formatNode = api => (targetType, analyticsAttrs) => {
       });
       //	get the first list node as when click on drag handle if there are list node
       //  can only select one list at a time, so we just need to find the first one
-      if (listNodes.length > 0 && fg('platform_editor_block_menu_patch_2')) {
+      if (listNodes.length > 0) {
         const firstChild = listNodes[0];
         const newTr = formatNodeSelectEmptyList(tr, targetType, firstChild, schema);
         if (newTr) {

package/dist/es2019/editor-commands/transforms/container-transforms.js

@@ -1,6 +1,5 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getInlineNodeTextContent } from './inline-node-transforms';
 import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker, convertCodeBlockContentToParagraphs, filterMarksForTargetNodeType, getMarksWithBreakout } from './utils';
 const convertInvalidNodeToValidNodeType = (sourceContent, sourceNodeType, validNodeType, withMarks) => {
@@ -205,7 +204,7 @@ export const unwrapAndConvertToList = ({
   } = schema.nodes;
   const isTargetTaskList = targetNodeType === taskList;
   const createListItemFromInline = content => {
-    if (!content && fg('platform_editor_block_menu_patch_2')) {
+    if (!content) {
       return isTargetTaskList ? taskItem.create() : listItem.create(null, paragraph.create());
     } else {
       return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
@@ -242,7 +241,7 @@ export const unwrapAndConvertToList = ({
     // check if code block only contains newline characters
     // eslint-disable-next-line require-unicode-regexp
     const isOnlyNewLines = codeText => codeText.replace(/\n/g, '').trim() === '';
-    if ((!codeText || isOnlyNewLines(codeText)) && fg('platform_editor_block_menu_patch_2')) {
+    if (!codeText || isOnlyNewLines(codeText)) {
       // Empty code block - create an empty list item
       currentListItems.push(createListItemFromInline());
     }

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

@@ -70,7 +70,7 @@ const CopyBlockMenuItem = ({
         // if text is inside of an expand or extension, the selection contains an expand or extension for some reason
         // the expandNode or extensionNode always and only have one child, no matter how much contents are inside the expand or extension,
         // and the one child is the line that is being selected, so we can use the .firstChild again
-        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && (fragment.firstChild.type.name === 'expand' || fragment.firstChild.type.name === 'bodiedExtension' && fg('platform_editor_block_menu_patch_2'))) {
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && (fragment.firstChild.type.name === 'expand' || fragment.firstChild.type.name === 'bodiedExtension')) {
           const expandOrExtensionNode = fragment.firstChild;
           const actualNodeToCopy = expandOrExtensionNode.firstChild;
           fragment = Fragment.from(actualNodeToCopy) || Fragment.empty;

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

@@ -3,11 +3,18 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isNestedNode } from './isNestedNode';
+const TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES = true;
 const getIsFormatMenuHidden = (selection, schema, menuTriggerBy) => {
   const nodes = schema.nodes;
   if (!nodes) {
     return false;
   }
+  const isNested = isNestedNode(selection, menuTriggerBy);
+  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
+    const disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+    const disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
+    return !!disabledNode || isNested && !fg('platform_editor_block_menu_transform_nested_node');
+  }
   let content;
   const allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
   if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
@@ -25,7 +32,6 @@ const getIsFormatMenuHidden = (selection, schema, menuTriggerBy) => {
       content = listTypeOrBlockQuoteNode.node;
     }
   }
-  const isNested = isNestedNode(selection, menuTriggerBy);
   return !content || isNested && !fg('platform_editor_block_menu_transform_nested_node');
 };
 const getIsFormatMenuHiddenEmptyLine = (selection, schema, menuTriggerBy) => {
@@ -34,6 +40,11 @@ const getIsFormatMenuHiddenEmptyLine = (selection, schema, menuTriggerBy) => {
     return false;
   }
   const isNested = isNestedNode(selection, menuTriggerBy);
+  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
+    const disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+    const disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
+    return !!disabledNode || isNested && !fg('platform_editor_block_menu_transform_nested_node');
+  }
   if (selection.empty || selection.content().size === 0) {
     // if empty selection, show format menu
     return false;

package/dist/esm/editor-commands/formatNode.js

@@ -2,7 +2,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType, safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { setSelectionAfterTransform } from './selection';
@@ -119,7 +118,7 @@ export var formatNode = function formatNode(api) {
         });
         //	get the first list node as when click on drag handle if there are list node
         //  can only select one list at a time, so we just need to find the first one
-        if (listNodes.length > 0 && fg('platform_editor_block_menu_patch_2')) {
+        if (listNodes.length > 0) {
           var firstChild = listNodes[0];
           var newTr = formatNodeSelectEmptyList(tr, targetType, firstChild, schema);
           if (newTr) {

package/dist/esm/editor-commands/transforms/container-transforms.js

@@ -1,7 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getInlineNodeTextContent } from './inline-node-transforms';
 import { isBlockNodeType, isListNodeType, isContainerNodeType, isBlockNodeForExtraction, convertNodeToInlineContent, getContentSupportChecker, convertCodeBlockContentToParagraphs, filterMarksForTargetNodeType, getMarksWithBreakout } from './utils';
 var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeType(sourceContent, sourceNodeType, validNodeType, withMarks) {
@@ -197,7 +196,7 @@ export var unwrapAndConvertToList = function unwrapAndConvertToList(_ref3) {
     heading = _schema$nodes2.heading;
   var isTargetTaskList = targetNodeType === taskList;
   var createListItemFromInline = function createListItemFromInline(content) {
-    if (!content && fg('platform_editor_block_menu_patch_2')) {
+    if (!content) {
       return isTargetTaskList ? taskItem.create() : listItem.create(null, paragraph.create());
     } else {
       return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
@@ -236,7 +235,7 @@ export var unwrapAndConvertToList = function unwrapAndConvertToList(_ref3) {
     var isOnlyNewLines = function isOnlyNewLines(codeText) {
       return codeText.replace(/\n/g, '').trim() === '';
     };
-    if ((!codeText || isOnlyNewLines(codeText)) && fg('platform_editor_block_menu_patch_2')) {
+    if (!codeText || isOnlyNewLines(codeText)) {
       // Empty code block - create an empty list item
       currentListItems.push(createListItemFromInline());
     }

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

@@ -69,7 +69,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
         // if text is inside of an expand or extension, the selection contains an expand or extension for some reason
         // the expandNode or extensionNode always and only have one child, no matter how much contents are inside the expand or extension,
         // and the one child is the line that is being selected, so we can use the .firstChild again
-        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && (fragment.firstChild.type.name === 'expand' || fragment.firstChild.type.name === 'bodiedExtension' && fg('platform_editor_block_menu_patch_2'))) {
+        if ((_fragment2 = fragment) !== null && _fragment2 !== void 0 && _fragment2.firstChild && (fragment.firstChild.type.name === 'expand' || fragment.firstChild.type.name === 'bodiedExtension')) {
           var expandOrExtensionNode = fragment.firstChild;
           var actualNodeToCopy = expandOrExtensionNode.firstChild;
           fragment = Fragment.from(actualNodeToCopy) || Fragment.empty;

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

@@ -3,11 +3,18 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isNestedNode } from './isNestedNode';
+var TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES = true;
 var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, menuTriggerBy) {
   var nodes = schema.nodes;
   if (!nodes) {
     return false;
   }
+  var isNested = isNestedNode(selection, menuTriggerBy);
+  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
+    var disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+    var disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
+    return !!disabledNode || isNested && !fg('platform_editor_block_menu_transform_nested_node');
+  }
   var content;
   var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
   if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
@@ -25,7 +32,6 @@ var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, me
       content = listTypeOrBlockQuoteNode.node;
     }
   }
-  var isNested = isNestedNode(selection, menuTriggerBy);
   return !content || isNested && !fg('platform_editor_block_menu_transform_nested_node');
 };
 var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(selection, schema, menuTriggerBy) {
@@ -34,6 +40,11 @@ var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(sel
     return false;
   }
   var isNested = isNestedNode(selection, menuTriggerBy);
+  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
+    var disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+    var disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
+    return !!disabledNode || isNested && !fg('platform_editor_block_menu_transform_nested_node');
+  }
   if (selection.empty || selection.content().size === 0) {
     // if empty selection, show format menu
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.0.8",
+	"version": "5.0.10",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.15.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.5.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.7.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -44,12 +44,12 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.1.0",
-		"@atlaskit/tmp-editor-statsig": "^13.36.0",
+		"@atlaskit/tmp-editor-statsig": "^13.38.0",
 		"@atlaskit/tokens": "^8.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.27.0",
+		"@atlaskit/editor-common": "^110.31.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -102,9 +102,6 @@
 		"platform_editor_block_menu_for_disabled_nodes": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_patch_2": {
-			"type": "boolean"
-		},
 		"platform_editor_block_menu_shouldfitcontainer": {
 			"type": "boolean"
 		},