@atlaskit/editor-plugin-block-type 3.14.2 → 3.14.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-type
 
+## 3.14.4
+
+### Patch Changes
+
+- [#136367](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136367)
+  [`4d9450a7e1283`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4d9450a7e1283) -
+  [ux] Update new icons (text color, highlight, text style) with design change
+- [#136348](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136348)
+  [`fb4fb56f1da7c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb4fb56f1da7c) -
+  Use optimised entry-points on editor-common for browser.
+- Updated dependencies
+
+## 3.14.3
+
+### Patch Changes
+
+- [#136078](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136078)
+  [`09414d7233497`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/09414d7233497) -
+  ED-24507 Switch nested dnd FG to experiment and include padding changes"
+
 ## 3.14.2
 
 ### Patch Changes

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

@@ -7,13 +7,13 @@ 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 _browser = require("@atlaskit/editor-common/browser");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _blockTypes = require("../block-types");
 var _commands = require("../commands");
 var _consts = require("../consts");
-var _utils2 = require("../utils");
+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; }
 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) { (0, _defineProperty2.default)(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; }
 var blockTypeForNode = function blockTypeForNode(node, schema) {
@@ -102,7 +102,7 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         });
         return {
           currentBlockType: detectBlockType(availableBlockTypes, state),
-          blockTypesDisabled: (0, _utils2.areBlockTypesDisabled)(state),
+          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(state),
           availableBlockTypes: availableBlockTypes,
           availableWrapperBlockTypes: availableWrapperBlockTypes
         };
@@ -110,7 +110,7 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypes, newState),
-          blockTypesDisabled: (0, _utils2.areBlockTypesDisabled)(newState)
+          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(newState)
         });
         if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled) {
           dispatch(pluginKey, newPluginState);
@@ -129,10 +129,10 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
       handleKeyDown: function handleKeyDown(view, event) {
         var headingLevel = _consts.HEADING_KEYS.indexOf(event.keyCode);
         if (headingLevel > -1 && event.altKey) {
-          if (_utils.browser.mac && event.metaKey) {
+          if (_browser.browser.mac && event.metaKey) {
             var _editorAPI$core$actio, _editorAPI$core;
             return (_editorAPI$core$actio = editorAPI === null || editorAPI === void 0 || (_editorAPI$core = editorAPI.core) === null || _editorAPI$core === void 0 ? void 0 : _editorAPI$core.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio !== void 0 ? _editorAPI$core$actio : false;
-          } else if (!_utils.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
+          } else if (!_browser.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
             var _editorAPI$core$actio2, _editorAPI$core2;
             return (_editorAPI$core$actio2 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core2 = editorAPI.core) === null || _editorAPI$core2 === void 0 ? void 0 : _editorAPI$core2.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio2 !== void 0 ? _editorAPI$core$actio2 : false;
           }

package/dist/cjs/plugin/styles.js

@@ -8,9 +8,9 @@ exports.blocktypeStyles = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _templateObject; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Imports are not safe in an object syntax
 var blocktypeStyles = exports.blocktypeStyles = function blocktypeStyles() {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n"])), (0, _platformFeatureFlags.fg)('platform_editor_element_padding_changes_gate') ? _styles.blockquoteSharedStylesNew : _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)());
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n"])), (0, _experiments.editorExperiment)('nested-dnd', true) ? _styles.blockquoteSharedStylesNew : _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)());
 };

package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js

@@ -12,7 +12,9 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _textStyleEditorTextStyle = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-style--editor-text-style"));
+var _text = _interopRequireDefault(require("@atlaskit/icon/core/text"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _blockTypes = require("../../block-types");
 var _styled = require("./styled");
 /**
@@ -45,11 +47,17 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
-    }, (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (0, _react2.jsx)(_textStyleEditorTextStyle.default, {
+    }, (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (
+    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
+    (0, _platformFeatureFlags.fg)('platform.design-system-team.enable-new-icons') ? (0, _react2.jsx)(_text.default, {
       label: labelTextStyles,
       spacing: "spacious",
       color: "currentColor"
-    }), (0, _react2.jsx)("span", {
+    }) : (0, _react2.jsx)(_textStyleEditorTextStyle.default, {
+      color: "currentColor",
+      spacing: "spacious",
+      label: labelTextStyles
+    })), (0, _react2.jsx)("span", {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: _styles.expandIconContainerStyle
     }, (0, _react2.jsx)(_chevronDown.default, {

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

@@ -1,6 +1,6 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { browser } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { browser } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 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 } from '../block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';

package/dist/es2019/plugin/styles.js

@@ -1,12 +1,12 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { blockquoteSharedStyles, blockquoteSharedStylesNew, headingsSharedStyles } from '@atlaskit/editor-common/styles';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Imports are not safe in an object syntax
 export const blocktypeStyles = () => css`
 	.ProseMirror {
-		${fg('platform_editor_element_padding_changes_gate') ? blockquoteSharedStylesNew : blockquoteSharedStyles};
+		${editorExperiment('nested-dnd', true) ? blockquoteSharedStylesNew : blockquoteSharedStyles};
 		${headingsSharedStyles()};
 	}
 `;

package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js

@@ -11,7 +11,9 @@ import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
+import TextIcon from '@atlaskit/icon/core/text';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { NORMAL_TEXT } from '../../block-types';
 import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
 export const BlockTypeButton = props => {
@@ -37,11 +39,17 @@ export const BlockTypeButton = props => {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
-    }, jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
+    }, jsx(React.Fragment, null, props.isSmall && (
+    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
+    fg('platform.design-system-team.enable-new-icons') ? jsx(TextIcon, {
       label: labelTextStyles,
       spacing: "spacious",
       color: "currentColor"
-    }), jsx("span", {
+    }) : jsx(TextStyleIcon, {
+      color: "currentColor",
+      spacing: "spacious",
+      label: labelTextStyles
+    })), jsx("span", {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: expandIconContainerStyle
     }, jsx(ChevronDownIcon, {

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

@@ -2,8 +2,8 @@ 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 { browser } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { browser } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 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 } from '../block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';

package/dist/esm/plugin/styles.js

@@ -3,9 +3,9 @@ var _templateObject;
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { blockquoteSharedStyles, blockquoteSharedStylesNew, headingsSharedStyles } from '@atlaskit/editor-common/styles';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Imports are not safe in an object syntax
 export var blocktypeStyles = function blocktypeStyles() {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n"])), fg('platform_editor_element_padding_changes_gate') ? blockquoteSharedStylesNew : blockquoteSharedStyles, headingsSharedStyles());
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n"])), editorExperiment('nested-dnd', true) ? blockquoteSharedStylesNew : blockquoteSharedStyles, headingsSharedStyles());
 };

package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js

@@ -11,7 +11,9 @@ import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
+import TextIcon from '@atlaskit/icon/core/text';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { NORMAL_TEXT } from '../../block-types';
 import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
 export var BlockTypeButton = function BlockTypeButton(props) {
@@ -37,11 +39,17 @@ export var BlockTypeButton = function BlockTypeButton(props) {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
-    }, jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
+    }, jsx(React.Fragment, null, props.isSmall && (
+    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
+    fg('platform.design-system-team.enable-new-icons') ? jsx(TextIcon, {
       label: labelTextStyles,
       spacing: "spacious",
       color: "currentColor"
-    }), jsx("span", {
+    }) : jsx(TextStyleIcon, {
+      color: "currentColor",
+      spacing: "spacious",
+      label: labelTextStyles
+    })), jsx("span", {
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: expandIconContainerStyle
     }, jsx(ChevronDownIcon, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "3.14.2",
+	"version": "3.14.4",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -10,8 +10,6 @@
 	"atlassian": {
 		"team": "Editor: Lego",
 		"singleton": true,
-		"inPublicMirror": false,
-		"releaseModel": "continuous",
 		"runReact18": false
 	},
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
@@ -36,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^88.2.0",
+		"@atlaskit/editor-common": "^88.8.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
@@ -46,6 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@atlaskit/theme": "^13.0.0",
+		"@atlaskit/tmp-editor-statsig": "*",
 		"@atlaskit/tokens": "^1.59.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
@@ -102,9 +101,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_element_padding_changes_gate": {
-			"type": "boolean"
-		},
 		"editor_nest_media_and_codeblock_in_quotes_jira": {
 			"type": "boolean"
 		}