@atlaskit/editor-plugin-block-type 3.10.0 → 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 (8) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/plugin/index.js +1 -2
  3. package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js +12 -2
  4. package/dist/es2019/plugin/index.js +2 -3
  5. package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js +14 -4
  6. package/dist/esm/plugin/index.js +2 -3
  7. package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js +14 -4
  8. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
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
+
12
+ ## 3.10.1
13
+
14
+ ### Patch Changes
15
+
16
+ - [#124134](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/124134)
17
+ [`60d66d9621cca`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/60d66d9621cca) -
18
+ Removed FF platform.editor.allow-list-in-blockquote
19
+ - Updated dependencies
20
+
3
21
  ## 3.10.0
4
22
 
5
23
  ### Minor Changes
package/dist/cjs/plugin/index.js CHANGED
@@ -19,7 +19,6 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
19
19
  var _messages = require("@atlaskit/editor-common/messages");
20
20
  var _quickInsert = require("@atlaskit/editor-common/quick-insert");
21
21
  var _types = require("@atlaskit/editor-common/types");
22
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
23
22
  var _commands = require("./commands");
24
23
  var _blockType = require("./commands/block-type");
25
24
  var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
@@ -126,7 +125,7 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
126
125
  return {
127
126
  name: 'blockType',
128
127
  nodes: function nodes() {
129
- var blockquoteNode = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-list-in-blockquote') ? _adfSchema.blockquoteWithList : _adfSchema.blockquote;
128
+ var blockquoteNode = _adfSchema.blockquoteWithList;
130
129
  var nodes = [{
131
130
  name: 'heading',
132
131
  node: _adfSchema.heading
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/index.js CHANGED
@@ -1,11 +1,10 @@
1
1
  import React from 'react';
2
- import { blockquote, blockquoteWithList, hardBreak, heading } from '@atlaskit/adf-schema';
2
+ import { blockquoteWithList, hardBreak, heading } from '@atlaskit/adf-schema';
3
3
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
4
4
  import { keymap, tooltip } from '@atlaskit/editor-common/keymaps';
5
5
  import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
6
6
  import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
7
7
  import { ToolbarSize } from '@atlaskit/editor-common/types';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
9
8
  import { setBlockTypeWithAnalytics } from './commands';
10
9
  import { insertBlockQuoteWithAnalytics } from './commands/block-type';
11
10
  import inputRulePlugin from './pm-plugins/input-rule';
@@ -112,7 +111,7 @@ const blockTypePlugin = ({
112
111
  return {
113
112
  name: 'blockType',
114
113
  nodes() {
115
- const blockquoteNode = getBooleanFF('platform.editor.allow-list-in-blockquote') ? blockquoteWithList : blockquote;
114
+ const blockquoteNode = blockquoteWithList;
116
115
  const nodes = [{
117
116
  name: 'heading',
118
117
  node: heading
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/index.js CHANGED
@@ -1,12 +1,11 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import React from 'react';
3
- import { blockquote, blockquoteWithList, hardBreak, heading } from '@atlaskit/adf-schema';
3
+ import { blockquoteWithList, hardBreak, heading } from '@atlaskit/adf-schema';
4
4
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
5
5
  import { keymap, tooltip } from '@atlaskit/editor-common/keymaps';
6
6
  import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
7
7
  import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
8
8
  import { ToolbarSize } from '@atlaskit/editor-common/types';
9
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
10
9
  import { setBlockTypeWithAnalytics } from './commands';
11
10
  import { insertBlockQuoteWithAnalytics } from './commands/block-type';
12
11
  import inputRulePlugin from './pm-plugins/input-rule';
@@ -113,7 +112,7 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
113
112
  return {
114
113
  name: 'blockType',
115
114
  nodes: function nodes() {
116
- var blockquoteNode = getBooleanFF('platform.editor.allow-list-in-blockquote') ? blockquoteWithList : blockquote;
115
+ var blockquoteNode = blockquoteWithList;
117
116
  var nodes = [{
118
117
  name: 'heading',
119
118
  node: heading
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.0",
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,13 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@atlaskit/adf-schema": "^40.3.0",
39
- "@atlaskit/editor-common": "^86.8.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
46
  "@atlaskit/platform-feature-flags": "^0.3.0",
47
47
  "@atlaskit/prosemirror-input-rules": "^3.2.0",
48
48
  "@atlaskit/theme": "^12.11.0",
@@ -102,7 +102,7 @@
102
102
  }
103
103
  },
104
104
  "platform-feature-flags": {
105
- "platform.editor.allow-list-in-blockquote": {
105
+ "platform_editor_migration_icon_and_typography": {
106
106
  "type": "boolean"
107
107
  }
108
108
  }