@atlaskit/editor-plugin-block-type 3.10.1 → 3.10.2

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 +9 -0
  2. package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js +12 -2
  3. package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js +14 -4
  4. package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js +14 -4
  5. package/package.json +9 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaskit/editor-plugin-block-type
2
2
 
3
+ ## 3.10.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#125353](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/125353)
8
+ [`77847728bf617`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/77847728bf617) -
9
+ Migrate icons in Editor primary toolbar
10
+ - Updated dependencies
11
+
3
12
  ## 3.10.1
4
13
 
5
14
  ### Patch Changes
package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -11,8 +11,11 @@ var _reactIntlNext = require("react-intl-next");
11
11
  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
+ var _textStyleEditorTextStyle = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-style--editor-text-style"));
14
15
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
15
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");
16
19
  var _blockTypes = require("../../block-types");
17
20
  var _styled = require("./styled");
18
21
  /**
@@ -45,14 +48,21 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
45
48
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
46
49
  css: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
47
50
  "data-testid": "toolbar-block-type-text-styles-icon"
48
- }, props.isSmall && (0, _react2.jsx)(_textStyle.default, {
51
+ }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (0, _react2.jsx)(_textStyleEditorTextStyle.default, {
52
+ label: labelTextStyles,
53
+ spacing: "spacious",
54
+ 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, {
49
59
  label: labelTextStyles
50
60
  }), (0, _react2.jsx)("span", {
51
61
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
52
62
  css: _styled.expandIconWrapperStyle
53
63
  }, (0, _react2.jsx)(_chevronDown.default, {
54
64
  label: ""
55
- })))
65
+ }))))
56
66
  }, !props.isSmall && (0, _react2.jsx)("span", {
57
67
  css: [
58
68
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -10,8 +10,11 @@ import { FormattedMessage } from 'react-intl-next';
10
10
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
11
11
  import { wrapperStyle } from '@atlaskit/editor-common/styles';
12
12
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
13
- import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
14
- import TextStyleIcon from '@atlaskit/icon/glyph/editor/text-style';
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
+ import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
17
+ import { fg } from '@atlaskit/platform-feature-flags';
15
18
  import { NORMAL_TEXT } from '../../block-types';
16
19
  import { buttonContentReducedSpacingStyle, buttonContentStyle, expandIconWrapperStyle, wrapperSmallStyle } from './styled';
17
20
  export const BlockTypeButton = props => {
@@ -37,14 +40,21 @@ export const BlockTypeButton = props => {
37
40
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
38
41
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
39
42
  "data-testid": "toolbar-block-type-text-styles-icon"
40
- }, props.isSmall && jsx(TextStyleIcon, {
43
+ }, fg('platform_editor_migration_icon_and_typography') ? jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
44
+ label: labelTextStyles,
45
+ spacing: "spacious",
46
+ color: "currentColor"
47
+ }), jsx(ChevronDownIcon, {
48
+ label: "",
49
+ color: "currentColor"
50
+ })) : jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIconLegacy, {
41
51
  label: labelTextStyles
42
52
  }), jsx("span", {
43
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
44
54
  css: expandIconWrapperStyle
45
55
  }, jsx(ExpandIcon, {
46
56
  label: ""
47
- })))
57
+ }))))
48
58
  }, !props.isSmall && jsx("span", {
49
59
  css: [
50
60
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -10,8 +10,11 @@ import { FormattedMessage } from 'react-intl-next';
10
10
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
11
11
  import { wrapperStyle } from '@atlaskit/editor-common/styles';
12
12
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
13
- import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
14
- import TextStyleIcon from '@atlaskit/icon/glyph/editor/text-style';
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
+ import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
17
+ import { fg } from '@atlaskit/platform-feature-flags';
15
18
  import { NORMAL_TEXT } from '../../block-types';
16
19
  import { buttonContentReducedSpacingStyle, buttonContentStyle, expandIconWrapperStyle, wrapperSmallStyle } from './styled';
17
20
  export var BlockTypeButton = function BlockTypeButton(props) {
@@ -37,14 +40,21 @@ export var BlockTypeButton = function BlockTypeButton(props) {
37
40
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
38
41
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
39
42
  "data-testid": "toolbar-block-type-text-styles-icon"
40
- }, props.isSmall && jsx(TextStyleIcon, {
43
+ }, fg('platform_editor_migration_icon_and_typography') ? jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIcon, {
44
+ label: labelTextStyles,
45
+ spacing: "spacious",
46
+ color: "currentColor"
47
+ }), jsx(ChevronDownIcon, {
48
+ label: "",
49
+ color: "currentColor"
50
+ })) : jsx(React.Fragment, null, props.isSmall && jsx(TextStyleIconLegacy, {
41
51
  label: labelTextStyles
42
52
  }), jsx("span", {
43
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
44
54
  css: expandIconWrapperStyle
45
55
  }, jsx(ExpandIcon, {
46
56
  label: ""
47
- })))
57
+ }))))
48
58
  }, !props.isSmall && jsx("span", {
49
59
  css: [
50
60
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-type",
3
- "version": "3.10.1",
3
+ "version": "3.10.2",
4
4
  "description": "BlockType plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -36,13 +36,14 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@atlaskit/adf-schema": "^40.3.0",
39
- "@atlaskit/editor-common": "^87.0.0",
39
+ "@atlaskit/editor-common": "^87.1.0",
40
40
  "@atlaskit/editor-plugin-analytics": "^1.6.0",
41
41
  "@atlaskit/editor-plugin-primary-toolbar": "^1.3.0",
42
42
  "@atlaskit/editor-prosemirror": "5.0.1",
43
43
  "@atlaskit/editor-shared-styles": "^2.13.0",
44
44
  "@atlaskit/editor-tables": "^2.8.0",
45
- "@atlaskit/icon": "^22.7.0",
45
+ "@atlaskit/icon": "^22.8.0",
46
+ "@atlaskit/platform-feature-flags": "^0.3.0",
46
47
  "@atlaskit/prosemirror-input-rules": "^3.2.0",
47
48
  "@atlaskit/theme": "^12.11.0",
48
49
  "@atlaskit/tokens": "^1.56.0",
@@ -99,5 +100,10 @@
99
100
  "import-no-extraneous-disable-for-examples-and-docs"
100
101
  ]
101
102
  }
103
+ },
104
+ "platform-feature-flags": {
105
+ "platform_editor_migration_icon_and_typography": {
106
+ "type": "boolean"
107
+ }
102
108
  }
103
109
  }