@atlaskit/editor-plugin-block-type 19.0.6 → 19.0.8

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-block-type
 
+## 19.0.8
+
+### Patch Changes
+
+- [`85c7571a0f48b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/85c7571a0f48b) -
+  Return focus to the editor after selecting a text style (e.g. a heading) from the toolbar Text
+  styles dropdown, so typing continues immediately instead of focus staying on the trigger button.
+  The Text styles dropdown now renders inline via `shouldRenderToParent`, which stops the popup
+  focus-trap from returning focus to the trigger on close. `ToolbarDropdownMenu` gains an opt-in
+  `shouldRenderToParent` prop so only the Text styles menu is affected. Gated behind the
+  `platform_editor_return_focus_after_text_styles` feature flag.
+- Updated dependencies
+
+## 19.0.7
+
+### Patch Changes
+
+- [`70c05b380d08c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/70c05b380d08c) -
+  Clean up experiment `platform_editor_blockquote_in_text_formatting_menu` as globally enabled.
+- Updated dependencies
+
 ## 19.0.6
 
 ### Patch Changes

package/dist/cjs/pm-plugins/commands/clear-formatting.js

@@ -9,7 +9,7 @@ exports.formatTypes = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 // Functions duplicated from platform/packages/editor/editor-plugin-text-formatting/src/editor-commands/clear-formatting.ts
-// TODO: ED-26959 - Refactor to avoid duplication if platform_editor_blockquote_in_text_formatting_menu experiment is productionalised
+// TODO: ED-26959 - Refactor to avoid duplication.
 var FORMATTING_NODE_TYPES = exports.FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 var FORMATTING_MARK_TYPES = exports.FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 var formatTypes = exports.formatTypes = {

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -106,6 +106,7 @@ var TextStylesMenuButton = exports.TextStylesMenuButton = function TextStylesMen
     }),
     label: formatMessage(_messages.toolbarMessages.textStyles, {
       blockTypeName: currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name
-    })
+    }),
+    shouldRenderToParent: (0, _platformFeatureFlags.fg)('platform_editor_return_focus_after_text_styles')
   }, children);
 };

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/index.js

@@ -238,11 +238,9 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           blockTypeIcon: currentIcon || defaultIcon
         });
         return (0, _react2.jsx)("span", {
-          css: (0, _experiments.editorExperiment)('platform_editor_blockquote_in_text_formatting_menu', true) ?
+          css:
           // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          [_styles.wrapperStyle, _styled.floatingToolbarWrapperStyle] :
-          // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          _styles.wrapperStyle
+          [_styles.wrapperStyle, _styled.floatingToolbarWrapperStyle]
         }, (0, _react2.jsx)(_uiMenu.DropdownMenuWithKeyboardNavigation, {
           items: items,
           onOpenChange: this.onOpenChange,

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

@@ -16,7 +16,6 @@ var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockTypes = require("./block-types");
 var isNodeAWrappingBlockNode = exports.isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -127,28 +126,25 @@ function areBlockTypesDisabled(state) {
     }
     return disallowedWrapperTypes.length > 0;
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_blockquote_in_text_formatting_menu', true)) {
-    var hasQuote = false;
-    var hasNestedListInQuote = false;
-    var _state$selection2 = state.selection,
-      $from = _state$selection2.$from,
-      $to = _state$selection2.$to;
-    state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (node.type === blockquote) {
-        hasQuote = true;
-        node.descendants(function (child) {
-          if (child.type === bulletList || child.type === orderedList) {
-            hasNestedListInQuote = true;
-            return false;
-          }
-          return true;
-        });
-      }
-      return !hasNestedListInQuote;
-    });
-    return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
-  }
-  return disallowedWrapperTypes.length > 0;
+  var hasQuote = false;
+  var hasNestedListInQuote = false;
+  var _state$selection2 = state.selection,
+    $from = _state$selection2.$from,
+    $to = _state$selection2.$to;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (node.type === blockquote) {
+      hasQuote = true;
+      node.descendants(function (child) {
+        if (child.type === bulletList || child.type === orderedList) {
+          hasNestedListInQuote = true;
+          return false;
+        }
+        return true;
+      });
+    }
+    return !hasNestedListInQuote;
+  });
+  return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
 }
 
 /**

package/dist/es2019/pm-plugins/commands/clear-formatting.js

@@ -1,7 +1,7 @@
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 // Functions duplicated from platform/packages/editor/editor-plugin-text-formatting/src/editor-commands/clear-formatting.ts
-// TODO: ED-26959 - Refactor to avoid duplication if platform_editor_blockquote_in_text_formatting_menu experiment is productionalised
+// TODO: ED-26959 - Refactor to avoid duplication.
 export const FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 export const FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 export const formatTypes = {

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -92,6 +92,7 @@ export const TextStylesMenuButton = ({
     }),
     label: formatMessage(toolbarMessages.textStyles, {
       blockTypeName: currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name
-    })
+    }),
+    shouldRenderToParent: fg('platform_editor_return_focus_after_text_styles')
   }, children);
 };

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/index.js

@@ -208,11 +208,9 @@ class ToolbarBlockType extends React.PureComponent {
         blockTypeIcon: currentIcon || defaultIcon
       });
       return jsx("span", {
-        css: editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true) ?
+        css:
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        [wrapperStyle, floatingToolbarWrapperStyle] :
-        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        wrapperStyle
+        [wrapperStyle, floatingToolbarWrapperStyle]
       }, jsx(DropdownMenu, {
         items: items,
         onOpenChange: this.onOpenChange,

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

@@ -3,7 +3,6 @@ import { createBlockTaskItem } from '@atlaskit/editor-common/transforms';
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export const isNodeAWrappingBlockNode = node => {
   if (!node) {
@@ -109,29 +108,26 @@ export function areBlockTypesDisabled(state, allowFontSize = false) {
     }
     return disallowedWrapperTypes.length > 0;
   }
-  if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
-    let hasQuote = false;
-    let hasNestedListInQuote = false;
-    const {
-      $from,
-      $to
-    } = state.selection;
-    state.doc.nodesBetween($from.pos, $to.pos, node => {
-      if (node.type === blockquote) {
-        hasQuote = true;
-        node.descendants(child => {
-          if (child.type === bulletList || child.type === orderedList) {
-            hasNestedListInQuote = true;
-            return false;
-          }
-          return true;
-        });
-      }
-      return !hasNestedListInQuote;
-    });
-    return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
-  }
-  return disallowedWrapperTypes.length > 0;
+  let hasQuote = false;
+  let hasNestedListInQuote = false;
+  const {
+    $from,
+    $to
+  } = state.selection;
+  state.doc.nodesBetween($from.pos, $to.pos, node => {
+    if (node.type === blockquote) {
+      hasQuote = true;
+      node.descendants(child => {
+        if (child.type === bulletList || child.type === orderedList) {
+          hasNestedListInQuote = true;
+          return false;
+        }
+        return true;
+      });
+    }
+    return !hasNestedListInQuote;
+  });
+  return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
 }
 
 /**

package/dist/esm/pm-plugins/commands/clear-formatting.js

@@ -1,7 +1,7 @@
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 // Functions duplicated from platform/packages/editor/editor-plugin-text-formatting/src/editor-commands/clear-formatting.ts
-// TODO: ED-26959 - Refactor to avoid duplication if platform_editor_blockquote_in_text_formatting_menu experiment is productionalised
+// TODO: ED-26959 - Refactor to avoid duplication.
 export var FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 export var FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 export var formatTypes = {

package/dist/esm/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -98,6 +98,7 @@ export var TextStylesMenuButton = function TextStylesMenuButton(_ref) {
     }),
     label: formatMessage(toolbarMessages.textStyles, {
       blockTypeName: currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name
-    })
+    }),
+    shouldRenderToParent: fg('platform_editor_return_focus_after_text_styles')
   }, children);
 };

package/dist/esm/pm-plugins/ui/ToolbarBlockType/index.js

@@ -234,11 +234,9 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           blockTypeIcon: currentIcon || defaultIcon
         });
         return jsx("span", {
-          css: editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true) ?
+          css:
           // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          [wrapperStyle, floatingToolbarWrapperStyle] :
-          // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          wrapperStyle
+          [wrapperStyle, floatingToolbarWrapperStyle]
         }, jsx(DropdownMenu, {
           items: items,
           onOpenChange: this.onOpenChange,

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

@@ -3,7 +3,6 @@ import { createBlockTaskItem } from '@atlaskit/editor-common/transforms';
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -114,28 +113,25 @@ export function areBlockTypesDisabled(state) {
     }
     return disallowedWrapperTypes.length > 0;
   }
-  if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
-    var hasQuote = false;
-    var hasNestedListInQuote = false;
-    var _state$selection2 = state.selection,
-      $from = _state$selection2.$from,
-      $to = _state$selection2.$to;
-    state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (node.type === blockquote) {
-        hasQuote = true;
-        node.descendants(function (child) {
-          if (child.type === bulletList || child.type === orderedList) {
-            hasNestedListInQuote = true;
-            return false;
-          }
-          return true;
-        });
-      }
-      return !hasNestedListInQuote;
-    });
-    return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
-  }
-  return disallowedWrapperTypes.length > 0;
+  var hasQuote = false;
+  var hasNestedListInQuote = false;
+  var _state$selection2 = state.selection,
+    $from = _state$selection2.$from,
+    $to = _state$selection2.$to;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (node.type === blockquote) {
+      hasQuote = true;
+      node.descendants(function (child) {
+        if (child.type === bulletList || child.type === orderedList) {
+          hasNestedListInQuote = true;
+          return false;
+        }
+        return true;
+      });
+    }
+    return !hasNestedListInQuote;
+  });
+  return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "19.0.6",
+	"version": "19.0.8",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
-		"@atlaskit/editor-toolbar": "^2.4.0",
+		"@atlaskit/editor-toolbar": "^2.5.0",
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
 		"@atlaskit/icon": "^37.4.0",
 		"@atlaskit/icon-lab": "^7.6.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/primitives": "^22.2.0",
 		"@atlaskit/prosemirror-history": "^1.2.0",
 		"@atlaskit/prosemirror-input-rules": "^4.0.0",
-		"@atlaskit/tmp-editor-statsig": "^151.0.0",
+		"@atlaskit/tmp-editor-statsig": "^152.0.0",
 		"@atlaskit/tokens": "^16.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -113,6 +113,9 @@
 		},
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
+		},
+		"platform_editor_return_focus_after_text_styles": {
+			"type": "boolean"
 		}
 	}
 }