@atlaskit/editor-plugin-block-type 3.13.1 → 3.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js +6 -12
  3. package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js +8 -14
  4. package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js +8 -14
  5. package/package.json +2 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/editor-plugin-block-type
2
2
 
3
+ ## 3.14.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#133191](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133191)
8
+ [`78a1927084934`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/78a1927084934) -
9
+ [ux] Remove icon migration feature gate and migrate new icons on primary toolbar
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
3
15
  ## 3.13.1
4
16
 
5
17
  ### Patch Changes
package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -12,10 +12,7 @@ var _messages = require("@atlaskit/editor-common/messages");
12
12
  var _styles = require("@atlaskit/editor-common/styles");
13
13
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
14
14
  var _textStyleEditorTextStyle = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-style--editor-text-style"));
15
- var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
16
- var _textStyle = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/text-style"));
17
- var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
18
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
+ var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
19
16
  var _blockTypes = require("../../block-types");
20
17
  var _styled = require("./styled");
21
18
  /**
@@ -48,20 +45,17 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
48
45
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
49
46
  css: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
50
47
  "data-testid": "toolbar-block-type-text-styles-icon"
51
- }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (0, _react2.jsx)(_textStyleEditorTextStyle.default, {
48
+ }, (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (0, _react2.jsx)(_textStyleEditorTextStyle.default, {
52
49
  label: labelTextStyles,
53
50
  spacing: "spacious",
54
51
  color: "currentColor"
55
- }), (0, _react2.jsx)(_chevronDown2.default, {
56
- label: "",
57
- color: "currentColor"
58
- })) : (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (0, _react2.jsx)(_textStyle.default, {
59
- label: labelTextStyles
60
52
  }), (0, _react2.jsx)("span", {
61
53
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
62
- css: _styled.expandIconWrapperStyle
54
+ css: _styles.expandIconContainerStyle
63
55
  }, (0, _react2.jsx)(_chevronDown.default, {
64
- label: ""
56
+ label: "",
57
+ color: "currentColor",
58
+ LEGACY_margin: "0 0 0 -8px"
65
59
  }))))
66
60
  }, !props.isSmall && (0, _react2.jsx)("span", {
67
61
  css: [
package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -8,15 +8,12 @@ import React from 'react';
8
8
  import { jsx } from '@emotion/react';
9
9
  import { FormattedMessage } from 'react-intl-next';
10
10
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
11
- import { wrapperStyle } from '@atlaskit/editor-common/styles';
11
+ import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
12
12
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
13
13
  import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
14
- import { default as ExpandIcon } from '@atlaskit/icon/glyph/chevron-down';
15
- import { default as TextStyleIconLegacy } from '@atlaskit/icon/glyph/editor/text-style';
16
14
  import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
17
- import { fg } from '@atlaskit/platform-feature-flags';
18
15
  import { NORMAL_TEXT } from '../../block-types';
19
- import { buttonContentReducedSpacingStyle, buttonContentStyle, expandIconWrapperStyle, wrapperSmallStyle } from './styled';
16
+ import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
20
17
  export const BlockTypeButton = props => {
21
18
  const blockTypeName = props.blockTypeName || '';
22
19
  const labelTextStyles = props.formatMessage(toolbarMessages.textStyles, {
@@ -40,20 +37,17 @@ export const BlockTypeButton = props => {
40
37
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
41
38
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
42
39
  "data-testid": "toolbar-block-type-text-styles-icon"
43
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
40
+ }, jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
44
41
  label: labelTextStyles,
45
42
  spacing: "spacious",
46
43
  color: "currentColor"
47
- }), jsx(ChevronDownIcon, {
48
- label: "",
49
- color: "currentColor"
50
- })) : jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIconLegacy, {
51
- label: labelTextStyles
52
44
  }), jsx("span", {
53
45
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
54
- css: expandIconWrapperStyle
55
- }, jsx(ExpandIcon, {
56
- label: ""
46
+ css: expandIconContainerStyle
47
+ }, jsx(ChevronDownIcon, {
48
+ label: "",
49
+ color: "currentColor",
50
+ LEGACY_margin: "0 0 0 -8px"
57
51
  }))))
58
52
  }, !props.isSmall && jsx("span", {
59
53
  css: [
package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -8,15 +8,12 @@ import React from 'react';
8
8
  import { jsx } from '@emotion/react';
9
9
  import { FormattedMessage } from 'react-intl-next';
10
10
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
11
- import { wrapperStyle } from '@atlaskit/editor-common/styles';
11
+ import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
12
12
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
13
13
  import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
14
- import { default as ExpandIcon } from '@atlaskit/icon/glyph/chevron-down';
15
- import { default as TextStyleIconLegacy } from '@atlaskit/icon/glyph/editor/text-style';
16
14
  import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
17
- import { fg } from '@atlaskit/platform-feature-flags';
18
15
  import { NORMAL_TEXT } from '../../block-types';
19
- import { buttonContentReducedSpacingStyle, buttonContentStyle, expandIconWrapperStyle, wrapperSmallStyle } from './styled';
16
+ import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
20
17
  export var BlockTypeButton = function BlockTypeButton(props) {
21
18
  var blockTypeName = props.blockTypeName || '';
22
19
  var labelTextStyles = props.formatMessage(toolbarMessages.textStyles, {
@@ -40,20 +37,17 @@ export var BlockTypeButton = function BlockTypeButton(props) {
40
37
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
41
38
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
42
39
  "data-testid": "toolbar-block-type-text-styles-icon"
43
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
40
+ }, jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
44
41
  label: labelTextStyles,
45
42
  spacing: "spacious",
46
43
  color: "currentColor"
47
- }), jsx(ChevronDownIcon, {
48
- label: "",
49
- color: "currentColor"
50
- })) : jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIconLegacy, {
51
- label: labelTextStyles
52
44
  }), jsx("span", {
53
45
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
54
- css: expandIconWrapperStyle
55
- }, jsx(ExpandIcon, {
56
- label: ""
46
+ css: expandIconContainerStyle
47
+ }, jsx(ChevronDownIcon, {
48
+ label: "",
49
+ color: "currentColor",
50
+ LEGACY_margin: "0 0 0 -8px"
57
51
  }))))
58
52
  }, !props.isSmall && jsx("span", {
59
53
  css: [
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-type",
3
- "version": "3.13.1",
3
+ "version": "3.14.0",
4
4
  "description": "BlockType plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -36,7 +36,7 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@atlaskit/adf-schema": "^40.8.1",
39
- "@atlaskit/editor-common": "^88.0.0",
39
+ "@atlaskit/editor-common": "^88.1.0",
40
40
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
41
41
  "@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
42
42
  "@atlaskit/editor-prosemirror": "5.0.1",
@@ -102,9 +102,6 @@
102
102
  }
103
103
  },
104
104
  "platform-feature-flags": {
105
- "platform_editor_migration_icon_and_typography": {
106
- "type": "boolean"
107
- },
108
105
  "platform_editor_element_padding_changes_gate": {
109
106
  "type": "boolean"
110
107
  }