@atlaskit/editor-plugin-block-type 14.1.3 → 14.1.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-type
 
+## 14.1.5
+
+### Patch Changes
+
+- [`41962dd9dccb2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/41962dd9dccb2) -
+  NO-ISSUE: adds a default toolbar state so we can render the toolbar on initial load without
+  relying on editor state
+- Updated dependencies
+
+## 14.1.4
+
+### Patch Changes
+
+- [`32dce97f78584`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/32dce97f78584) -
+  Fix preserved selection mapping when comment editors append a trailing paragraph after block menu
+  transforms.
+- Updated dependencies
+
 ## 14.1.3
 
 ### Patch Changes

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

@@ -7,12 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.pluginKey = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _blockType = require("@atlaskit/editor-common/block-type");
 var _browser = require("@atlaskit/editor-common/browser");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _blockTypes = require("./block-types");
-var _blockType = require("./commands/block-type");
+var _blockType2 = require("./commands/block-type");
 var _consts = require("./consts");
 var _utils = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -82,9 +84,9 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
 };
 var autoformatHeading = function autoformatHeading(headingLevel, editorAnalyticsApi) {
   if (headingLevel === 0) {
-    return (0, _blockType.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
+    return (0, _blockType2.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
   }
-  return (0, _blockType.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
+  return (0, _blockType2.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 var pluginKey = exports.pluginKey = new _state.PluginKey('blockTypePlugin');
 var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption, allowFontSize) {
@@ -98,7 +100,8 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         var lastNode = pos.node(1);
         var paragraph = newState.schema.nodes.paragraph;
         if (lastNode && lastNode.isBlock && lastNode.type !== paragraph) {
-          return newState.tr.insert(newState.doc.content.size, newState.schema.nodes.paragraph.create());
+          var tr = newState.tr.insert(newState.doc.content.size, newState.schema.nodes.paragraph.create());
+          return (0, _platformFeatureFlags.fg)('platform_editor_block_menu_jira_patch_2') ? tr.setMeta(_blockType.INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META, true) : tr;
         }
       }
     },
@@ -162,10 +165,10 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         } else if (event.keyCode === _consts.KEY_7 && event.altKey && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
           if (browser.mac && event.metaKey) {
             var _editorAPI$core$actio3, _editorAPI$core3;
-            return (_editorAPI$core$actio3 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core3 = editorAPI.core) === null || _editorAPI$core3 === void 0 ? void 0 : _editorAPI$core3.actions.execute((0, _blockType.setSmallTextWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio3 !== void 0 ? _editorAPI$core$actio3 : false;
+            return (_editorAPI$core$actio3 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core3 = editorAPI.core) === null || _editorAPI$core3 === void 0 ? void 0 : _editorAPI$core3.actions.execute((0, _blockType2.setSmallTextWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio3 !== void 0 ? _editorAPI$core$actio3 : false;
           } else if (!browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
             var _editorAPI$core$actio4, _editorAPI$core4;
-            return (_editorAPI$core$actio4 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core4 = editorAPI.core) === null || _editorAPI$core4 === void 0 ? void 0 : _editorAPI$core4.actions.execute((0, _blockType.setSmallTextWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio4 !== void 0 ? _editorAPI$core$actio4 : false;
+            return (_editorAPI$core$actio4 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core4 = editorAPI.core) === null || _editorAPI$core4 === void 0 ? void 0 : _editorAPI$core4.actions.execute((0, _blockType2.setSmallTextWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio4 !== void 0 ? _editorAPI$core$actio4 : false;
           }
         } else if (event.key === 'Alt') {
           // event.location is for the current key only; when a user hits Ctrl-Alt-1 the

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

@@ -11,14 +11,15 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _blockTypes = require("../../block-types");
 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 usePluginState = function usePluginState(api) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockType'], function (state) {
-    var _state$blockTypeState, _state$blockTypeState2;
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockType', 'interaction'], function (state) {
+    var _state$blockTypeState, _state$interactionSta, _state$blockTypeState2;
     return {
       blockTypesDisabled: (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.blockTypesDisabled,
-      currentBlockType: (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
+      currentBlockType: ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && (0, _expValEquals.expValEquals)('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
     };
   });
 };

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

@@ -1,7 +1,9 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, getBlockTypesInDropdown, SMALL_TEXT } from './block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics, setSmallTextWithAnalytics } from './commands/block-type';
@@ -87,7 +89,8 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, inclu
           paragraph
         } = newState.schema.nodes;
         if (lastNode && lastNode.isBlock && lastNode.type !== paragraph) {
-          return newState.tr.insert(newState.doc.content.size, newState.schema.nodes.paragraph.create());
+          const tr = newState.tr.insert(newState.doc.content.size, newState.schema.nodes.paragraph.create());
+          return fg('platform_editor_block_menu_jira_patch_2') ? tr.setMeta(INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META, true) : tr;
         }
       }
     },

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

@@ -4,13 +4,14 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { toolbarBlockTypesWithRank } from '../../block-types';
 const usePluginState = api => {
-  return useSharedPluginStateWithSelector(api, ['blockType'], state => {
-    var _state$blockTypeState, _state$blockTypeState2;
+  return useSharedPluginStateWithSelector(api, ['blockType', 'interaction'], state => {
+    var _state$blockTypeState, _state$interactionSta, _state$blockTypeState2;
     return {
       blockTypesDisabled: (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.blockTypesDisabled,
-      currentBlockType: (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
+      currentBlockType: ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && expValEquals('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
     };
   });
 };

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

@@ -2,9 +2,11 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, getBlockTypesInDropdown, SMALL_TEXT } from './block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics, setSmallTextWithAnalytics } from './commands/block-type';
@@ -91,7 +93,8 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
         var lastNode = pos.node(1);
         var paragraph = newState.schema.nodes.paragraph;
         if (lastNode && lastNode.isBlock && lastNode.type !== paragraph) {
-          return newState.tr.insert(newState.doc.content.size, newState.schema.nodes.paragraph.create());
+          var tr = newState.tr.insert(newState.doc.content.size, newState.schema.nodes.paragraph.create());
+          return fg('platform_editor_block_menu_jira_patch_2') ? tr.setMeta(INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META, true) : tr;
         }
       }
     },

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

@@ -4,13 +4,14 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { toolbarBlockTypesWithRank } from '../../block-types';
 var usePluginState = function usePluginState(api) {
-  return useSharedPluginStateWithSelector(api, ['blockType'], function (state) {
-    var _state$blockTypeState, _state$blockTypeState2;
+  return useSharedPluginStateWithSelector(api, ['blockType', 'interaction'], function (state) {
+    var _state$blockTypeState, _state$interactionSta, _state$blockTypeState2;
     return {
       blockTypesDisabled: (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.blockTypesDisabled,
-      currentBlockType: (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
+      currentBlockType: ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && expValEquals('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
     };
   });
 };

package/dist/types/blockTypePluginType.d.ts

@@ -1,6 +1,7 @@
 import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { ListPlugin } from '@atlaskit/editor-plugin-list';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -28,7 +29,8 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
         OptionalPlugin<ToolbarPlugin>,
         OptionalPlugin<BlockMenuPlugin>,
         OptionalPlugin<ListPlugin>,
-        OptionalPlugin<SelectionPlugin>
+        OptionalPlugin<SelectionPlugin>,
+        OptionalPlugin<InteractionPlugin>
     ];
     pluginConfiguration: BlockTypePluginOptions | undefined;
     sharedState: BlockTypeState | undefined;

package/dist/types-ts4.5/blockTypePluginType.d.ts

@@ -1,6 +1,7 @@
 import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { ListPlugin } from '@atlaskit/editor-plugin-list';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -28,7 +29,8 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
         OptionalPlugin<ToolbarPlugin>,
         OptionalPlugin<BlockMenuPlugin>,
         OptionalPlugin<ListPlugin>,
-        OptionalPlugin<SelectionPlugin>
+        OptionalPlugin<SelectionPlugin>,
+        OptionalPlugin<InteractionPlugin>
     ];
     pluginConfiguration: BlockTypePluginOptions | undefined;
     sharedState: BlockTypeState | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "14.1.3",
+	"version": "14.1.5",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,6 +33,7 @@
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-plugin-analytics": "^10.1.0",
 		"@atlaskit/editor-plugin-block-menu": "^9.2.0",
+		"@atlaskit/editor-plugin-interaction": "^19.1.0",
 		"@atlaskit/editor-plugin-list": "^12.1.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^11.1.0",
 		"@atlaskit/editor-plugin-selection": "^10.1.0",
@@ -41,7 +42,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-shared-styles": "^3.11.0",
 		"@atlaskit/editor-tables": "^2.10.0",
-		"@atlaskit/editor-toolbar": "^1.6.0",
+		"@atlaskit/editor-toolbar": "^1.7.0",
 		"@atlaskit/editor-toolbar-model": "^0.5.0",
 		"@atlaskit/icon": "^35.0.0",
 		"@atlaskit/icon-lab": "^6.9.0",
@@ -49,14 +50,14 @@
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.7.0",
-		"@atlaskit/tmp-editor-statsig": "^82.0.0",
+		"@atlaskit/tmp-editor-statsig": "^82.4.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.36.0",
+		"@atlaskit/editor-common": "^114.41.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -64,6 +65,8 @@
 	"devDependencies": {
 		"@testing-library/react": "^16.3.0",
 		"@testing-library/user-event": "^14.4.3",
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
 		"react-intl": "^6.6.2",
 		"wait-for-expect": "^1.2.0"
 	},
@@ -104,6 +107,9 @@
 		}
 	},
 	"platform-feature-flags": {
+		"platform_editor_block_menu_jira_patch_2": {
+			"type": "boolean"
+		},
 		"platform_editor_change_normal_text_icon": {
 			"type": "boolean"
 		},