@atlaskit/editor-plugin-block-type 3.14.7 → 3.14.8

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 (10) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/plugin/index.js +0 -1
  3. package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js +4 -10
  4. package/dist/es2019/plugin/index.js +0 -1
  5. package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js +4 -10
  6. package/dist/esm/plugin/index.js +0 -1
  7. package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js +4 -10
  8. package/dist/types/plugin/index.d.ts +1 -6
  9. package/dist/types-ts4.5/plugin/index.d.ts +1 -3
  10. package/package.json +4 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/editor-plugin-block-type
2
2
 
3
+ ## 3.14.8
4
+
5
+ ### Patch Changes
6
+
7
+ - [#140915](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140915)
8
+ [`eaccad51157d6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eaccad51157d6) -
9
+ [ux] Migrate new icons including color, highlight and task on Editor primary toolbar
10
+ - [#141594](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141594)
11
+ [`3f6b2eb7bd493`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f6b2eb7bd493) -
12
+ [ux] [ED-24867] This change moves nesting codeblocks and media in blockquotes via insertion
13
+ methods behind an experiment gate.
14
+
3
15
  ## 3.14.7
4
16
 
5
17
  ### Patch Changes
package/dist/cjs/plugin/index.js CHANGED
@@ -105,7 +105,6 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
105
105
  var _api$primaryToolbar;
106
106
  var options = _ref3.config,
107
107
  api = _ref3.api;
108
- // Confluence and Jira is pulling it in through platform feature flags, from a feature gate
109
108
  var isNestingInQuoteSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nest_in_quotes_adf_change') || (0, _platformFeatureFlags.fg)('editor_nest_media_and_codeblock_in_quotes_jira');
110
109
  var primaryToolbarComponent = function primaryToolbarComponent(_ref4) {
111
110
  var popupsMountPoint = _ref4.popupsMountPoint,
package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -11,10 +11,9 @@ 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"));
15
14
  var _text = _interopRequireDefault(require("@atlaskit/icon/core/text"));
15
+ var _textStyle = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/text-style"));
16
16
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
17
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
18
17
  var _blockTypes = require("../../block-types");
19
18
  var _styled = require("./styled");
20
19
  /**
@@ -47,17 +46,12 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
47
46
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
48
47
  css: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
49
48
  "data-testid": "toolbar-block-type-text-styles-icon"
50
- }, (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (
51
- // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
52
- (0, _platformFeatureFlags.fg)('platform.design-system-team.enable-new-icons') ? (0, _react2.jsx)(_text.default, {
49
+ }, (0, _react2.jsx)(_react.default.Fragment, null, props.isSmall && (0, _react2.jsx)(_text.default, {
53
50
  label: labelTextStyles,
54
51
  spacing: "spacious",
55
- color: "currentColor"
56
- }) : (0, _react2.jsx)(_textStyleEditorTextStyle.default, {
57
52
  color: "currentColor",
58
- spacing: "spacious",
59
- label: labelTextStyles
60
- })), (0, _react2.jsx)("span", {
53
+ LEGACY_fallbackIcon: _textStyle.default
54
+ }), (0, _react2.jsx)("span", {
61
55
  // 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
56
  css: _styles.expandIconContainerStyle
63
57
  }, (0, _react2.jsx)(_chevronDown.default, {
package/dist/es2019/plugin/index.js CHANGED
@@ -90,7 +90,6 @@ const blockTypePlugin = ({
90
90
  api
91
91
  }) => {
92
92
  var _api$primaryToolbar;
93
- // Confluence and Jira is pulling it in through platform feature flags, from a feature gate
94
93
  const isNestingInQuoteSchemaChanged = fg('platform_editor_nest_in_quotes_adf_change') || fg('editor_nest_media_and_codeblock_in_quotes_jira');
95
94
  const primaryToolbarComponent = ({
96
95
  popupsMountPoint,
package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -10,10 +10,9 @@ import { FormattedMessage } from 'react-intl-next';
10
10
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
11
11
  import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
12
12
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
13
- import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
14
13
  import TextIcon from '@atlaskit/icon/core/text';
14
+ import { default as TextStyleIconLegacy } from '@atlaskit/icon/glyph/editor/text-style';
15
15
  import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
16
- import { fg } from '@atlaskit/platform-feature-flags';
17
16
  import { NORMAL_TEXT } from '../../block-types';
18
17
  import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
19
18
  export const BlockTypeButton = props => {
@@ -39,17 +38,12 @@ export const BlockTypeButton = props => {
39
38
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
40
39
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
41
40
  "data-testid": "toolbar-block-type-text-styles-icon"
42
- }, jsx(React.Fragment, null, props.isSmall && (
43
- // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
44
- fg('platform.design-system-team.enable-new-icons') ? jsx(TextIcon, {
41
+ }, jsx(React.Fragment, null, props.isSmall && jsx(TextIcon, {
45
42
  label: labelTextStyles,
46
43
  spacing: "spacious",
47
- color: "currentColor"
48
- }) : jsx(TextStyleIcon, {
49
44
  color: "currentColor",
50
- spacing: "spacious",
51
- label: labelTextStyles
52
- })), jsx("span", {
45
+ LEGACY_fallbackIcon: TextStyleIconLegacy
46
+ }), jsx("span", {
53
47
  // 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
48
  css: expandIconContainerStyle
55
49
  }, jsx(ChevronDownIcon, {
package/dist/esm/plugin/index.js CHANGED
@@ -92,7 +92,6 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
92
92
  var _api$primaryToolbar;
93
93
  var options = _ref3.config,
94
94
  api = _ref3.api;
95
- // Confluence and Jira is pulling it in through platform feature flags, from a feature gate
96
95
  var isNestingInQuoteSchemaChanged = fg('platform_editor_nest_in_quotes_adf_change') || fg('editor_nest_media_and_codeblock_in_quotes_jira');
97
96
  var primaryToolbarComponent = function primaryToolbarComponent(_ref4) {
98
97
  var popupsMountPoint = _ref4.popupsMountPoint,
package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js CHANGED
@@ -10,10 +10,9 @@ import { FormattedMessage } from 'react-intl-next';
10
10
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
11
11
  import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
12
12
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
13
- import TextStyleIcon from '@atlaskit/icon/core/migration/text-style--editor-text-style';
14
13
  import TextIcon from '@atlaskit/icon/core/text';
14
+ import { default as TextStyleIconLegacy } from '@atlaskit/icon/glyph/editor/text-style';
15
15
  import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
16
- import { fg } from '@atlaskit/platform-feature-flags';
17
16
  import { NORMAL_TEXT } from '../../block-types';
18
17
  import { buttonContentReducedSpacingStyle, buttonContentStyle, wrapperSmallStyle } from './styled';
19
18
  export var BlockTypeButton = function BlockTypeButton(props) {
@@ -39,17 +38,12 @@ export var BlockTypeButton = function BlockTypeButton(props) {
39
38
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
40
39
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
41
40
  "data-testid": "toolbar-block-type-text-styles-icon"
42
- }, jsx(React.Fragment, null, props.isSmall && (
43
- // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
44
- fg('platform.design-system-team.enable-new-icons') ? jsx(TextIcon, {
41
+ }, jsx(React.Fragment, null, props.isSmall && jsx(TextIcon, {
45
42
  label: labelTextStyles,
46
43
  spacing: "spacious",
47
- color: "currentColor"
48
- }) : jsx(TextStyleIcon, {
49
44
  color: "currentColor",
50
- spacing: "spacious",
51
- label: labelTextStyles
52
- })), jsx("span", {
45
+ LEGACY_fallbackIcon: TextStyleIconLegacy
46
+ }), jsx("span", {
53
47
  // 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
48
  css: expandIconContainerStyle
55
49
  }, jsx(ChevronDownIcon, {
package/dist/types/plugin/index.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
2
2
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
3
- import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
4
3
  import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
5
4
  import type { TextBlockTypes } from './block-types';
6
5
  import type { InputMethod } from './commands/block-type';
@@ -8,11 +7,7 @@ import type { BlockTypeState } from './pm-plugins/main';
8
7
  import type { BlockTypePluginOptions } from './types';
9
8
  export type BlockTypePlugin = NextEditorPlugin<'blockType', {
10
9
  pluginConfiguration: BlockTypePluginOptions | undefined;
11
- dependencies: [
12
- OptionalPlugin<AnalyticsPlugin>,
13
- OptionalPlugin<PrimaryToolbarPlugin>,
14
- OptionalPlugin<FeatureFlagsPlugin>
15
- ];
10
+ dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<PrimaryToolbarPlugin>];
16
11
  sharedState: BlockTypeState | undefined;
17
12
  actions: {
18
13
  insertBlockQuote: (inputMethod: InputMethod) => Command;
package/dist/types-ts4.5/plugin/index.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
2
2
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
3
- import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
4
3
  import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
5
4
  import type { TextBlockTypes } from './block-types';
6
5
  import type { InputMethod } from './commands/block-type';
@@ -10,8 +9,7 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
10
9
  pluginConfiguration: BlockTypePluginOptions | undefined;
11
10
  dependencies: [
12
11
  OptionalPlugin<AnalyticsPlugin>,
13
- OptionalPlugin<PrimaryToolbarPlugin>,
14
- OptionalPlugin<FeatureFlagsPlugin>
12
+ OptionalPlugin<PrimaryToolbarPlugin>
15
13
  ];
16
14
  sharedState: BlockTypeState | undefined;
17
15
  actions: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-type",
3
- "version": "3.14.7",
3
+ "version": "3.14.8",
4
4
  "description": "BlockType plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -34,18 +34,18 @@
34
34
  },
35
35
  "dependencies": {
36
36
  "@atlaskit/adf-schema": "^40.9.0",
37
- "@atlaskit/editor-common": "^89.0.0",
37
+ "@atlaskit/editor-common": "^89.2.0",
38
38
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
39
39
  "@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
40
40
  "@atlaskit/editor-prosemirror": "6.0.0",
41
41
  "@atlaskit/editor-shared-styles": "^2.13.0",
42
42
  "@atlaskit/editor-tables": "^2.8.0",
43
- "@atlaskit/icon": "^22.16.0",
43
+ "@atlaskit/icon": "^22.18.0",
44
44
  "@atlaskit/platform-feature-flags": "^0.3.0",
45
45
  "@atlaskit/prosemirror-input-rules": "^3.2.0",
46
46
  "@atlaskit/theme": "^13.0.0",
47
47
  "@atlaskit/tmp-editor-statsig": "*",
48
- "@atlaskit/tokens": "^1.59.0",
48
+ "@atlaskit/tokens": "^1.60.0",
49
49
  "@babel/runtime": "^7.0.0",
50
50
  "@emotion/react": "^11.7.1"
51
51
  },
@@ -56,7 +56,6 @@
56
56
  "devDependencies": {
57
57
  "@af/visual-regression": "*",
58
58
  "@atlaskit/analytics-next": "^10.1.0",
59
- "@atlaskit/editor-plugin-feature-flags": "^1.2.0",
60
59
  "@atlaskit/editor-plugin-quick-insert": "^1.3.0",
61
60
  "@atlaskit/editor-plugin-type-ahead": "^1.8.0",
62
61
  "@atlaskit/ssr": "*",