@atlaskit/editor-plugin-block-type 3.5.0 → 3.6.1

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @atlaskit/editor-plugin-block-type
2
2
 
3
+ ## 3.6.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#111357](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/111357)
8
+ [`cf6122614ec5f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cf6122614ec5f) -
9
+ [ux] Adjusted the shortcut displayed for block quote on quick insert dropdown.
10
+
11
+ ## 3.6.0
12
+
13
+ ### Minor Changes
14
+
15
+ - [#110262](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/110262)
16
+ [`5a9ede4b76193`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5a9ede4b76193) -
17
+ Added paragraph and heading NodeSpecs flag back
18
+
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies
22
+
3
23
  ## 3.5.0
4
24
 
5
25
  ### Minor Changes
@@ -82,7 +82,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
82
82
  title: formatMessage(_messages.blockTypeMessages.blockquote),
83
83
  description: formatMessage(_messages.blockTypeMessages.blockquoteDescription),
84
84
  priority: 1300,
85
- keyshortcut: (0, _keymaps.tooltip)(_keymaps.toggleBlockQuote),
85
+ keyshortcut: '>',
86
86
  icon: function icon() {
87
87
  return /*#__PURE__*/_react.default.createElement(_quickInsert.IconQuote, null);
88
88
  },
@@ -127,9 +127,10 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
127
127
  name: 'blockType',
128
128
  nodes: function nodes() {
129
129
  var blockquoteNode = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-list-in-blockquote') ? _adfSchema.blockquoteWithList : _adfSchema.blockquote;
130
+ var headingNode = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.enable-localid-for-paragraph-in-stage-0_cby7g') ? _adfSchema.headingStage0 : _adfSchema.heading;
130
131
  var nodes = [{
131
132
  name: 'heading',
132
- node: _adfSchema.heading
133
+ node: headingNode
133
134
  }, {
134
135
  name: 'blockquote',
135
136
  node: blockquoteNode
@@ -37,22 +37,22 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
37
37
  "aria-haspopup": true,
38
38
  "aria-expanded": props['aria-expanded'],
39
39
  iconAfter: (0, _react2.jsx)("span", {
40
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
41
41
  css: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
42
42
  "data-testid": "toolbar-block-type-text-styles-icon"
43
43
  }, props.isSmall && (0, _react2.jsx)(_textStyle.default, {
44
44
  label: labelTextStyles
45
45
  }), (0, _react2.jsx)("span", {
46
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
47
47
  css: _styled.expandIconWrapperStyle
48
48
  }, (0, _react2.jsx)(_chevronDown.default, {
49
49
  label: ""
50
50
  })))
51
51
  }, !props.isSmall && (0, _react2.jsx)("span", {
52
52
  css: [
53
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
54
54
  _styled.buttonContentStyle,
55
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
56
56
  props.isReducedSpacing && _styled.buttonContentReducedSpacingStyle]
57
57
  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, props.title || _blockTypes.NORMAL_TEXT.title)));
58
58
  };
@@ -74,7 +74,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
74
74
  var keyMap = (0, _keymaps.findKeymapByDescription)(blockType.title.defaultMessage);
75
75
  return {
76
76
  content:
77
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
77
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
78
78
  (0, _react2.jsx)("div", {
79
79
  css: (0, _styled.blockTypeMenuItemStyle)(tagName, isActive)
80
80
  }, (0, _react2.jsx)(Tag, null, formatMessage(blockType.title))),
@@ -84,7 +84,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
84
84
  keyShortcuts: (0, _keymaps.getAriaKeyshortcuts)(keyMap),
85
85
  key: "".concat(blockType.name, "-").concat(index),
86
86
  elemAfter:
87
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
87
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
88
88
  (0, _react2.jsx)("div", {
89
89
  css: [_styled.keyboardShortcut, isActive && _styled.keyboardShortcutSelect]
90
90
  }, (0, _keymaps.tooltip)(keyMap)),
@@ -143,7 +143,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
143
143
  if (!this.props.isDisabled && !blockTypesDisabled) {
144
144
  var items = this.createItems();
145
145
  return (
146
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
146
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
147
147
  (0, _react2.jsx)("span", {
148
148
  css: _styles.wrapperStyle
149
149
  }, (0, _react2.jsx)(_uiMenu.DropdownMenuWithKeyboardNavigation, {
@@ -179,13 +179,13 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
179
179
  "aria-expanded": active,
180
180
  blockTypeName: currentBlockType.name
181
181
  })), !(api !== null && api !== void 0 && api.primaryToolbar) && (0, _react2.jsx)("span", {
182
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
182
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
183
183
  css: _styles.separatorStyles
184
184
  }))
185
185
  );
186
186
  }
187
187
  return (
188
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
188
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
189
189
  (0, _react2.jsx)("span", {
190
190
  css: _styles.wrapperStyle
191
191
  }, (0, _react2.jsx)(_blocktypeButton.BlockTypeButton, {
@@ -200,7 +200,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
200
200
  "aria-expanded": active,
201
201
  blockTypeName: currentBlockType.name
202
202
  }), !(api !== null && api !== void 0 && api.primaryToolbar) && (0, _react2.jsx)("span", {
203
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
203
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
204
204
  css: _styles.separatorStyles
205
205
  }))
206
206
  );
@@ -14,22 +14,34 @@ var blockTypeMenuItemStyle = exports.blockTypeMenuItemStyle = function blockType
14
14
  // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
15
15
  var selectedStyle = selected ? "".concat(tagName, " { color: ", "var(--ds-text, white)", " !important; }") : '';
16
16
  return function () {
17
- return (0, _react.css)((0, _styles.headingsSharedStyles)(), {
17
+ return (0, _react.css)(
18
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
19
+ (0, _styles.headingsSharedStyles)(), {
20
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
18
21
  '>': {
22
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
19
23
  'h1, h2, h3, h4, h5, h6': {
20
24
  marginTop: 0
21
25
  }
22
26
  }
23
- }, selectedStyle);
27
+ },
28
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
29
+ selectedStyle);
24
30
  };
25
31
  };
32
+
33
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
26
34
  var keyboardShortcut = exports.keyboardShortcut = (0, _react.css)(_shortcut.shortcutStyle, {
27
35
  marginLeft: "var(--ds-space-200, 16px)",
28
36
  color: "var(--ds-icon, ".concat(_colors.N400, ")")
29
37
  });
38
+
39
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
30
40
  var keyboardShortcutSelect = exports.keyboardShortcutSelect = (0, _react.css)({
31
41
  color: "var(--ds-icon, ".concat(_colors.N400, ")")
32
42
  });
43
+
44
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
33
45
  var buttonContentStyle = exports.buttonContentStyle = (0, _react.css)({
34
46
  display: 'flex',
35
47
  minWidth: '80px',
@@ -39,13 +51,19 @@ var buttonContentStyle = exports.buttonContentStyle = (0, _react.css)({
39
51
  flexDirection: 'column',
40
52
  padding: "var(--ds-space-075, 6px)"
41
53
  });
54
+
55
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
42
56
  var buttonContentReducedSpacingStyle = exports.buttonContentReducedSpacingStyle = (0, _react.css)({
43
57
  padding: "var(--ds-space-100, 8px)"
44
58
  });
59
+
60
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
45
61
  var wrapperSmallStyle = exports.wrapperSmallStyle = (0, _react.css)({
46
62
  marginLeft: "var(--ds-space-050, 4px)",
47
63
  minWidth: '40px'
48
64
  });
65
+
66
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
49
67
  var expandIconWrapperStyle = exports.expandIconWrapperStyle = (0, _react.css)({
50
68
  marginLeft: "var(--ds-space-negative-100, -8px)"
51
69
  });
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
- import { blockquote, blockquoteWithList, hardBreak, heading } from '@atlaskit/adf-schema';
2
+ import { blockquote, blockquoteWithList, hardBreak, heading, headingStage0 } from '@atlaskit/adf-schema';
3
3
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
4
- import { keymap, toggleBlockQuote, tooltip } from '@atlaskit/editor-common/keymaps';
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';
@@ -68,7 +68,7 @@ const blockquotePluginOptions = ({
68
68
  title: formatMessage(messages.blockquote),
69
69
  description: formatMessage(messages.blockquoteDescription),
70
70
  priority: 1300,
71
- keyshortcut: tooltip(toggleBlockQuote),
71
+ keyshortcut: '>',
72
72
  icon: () => /*#__PURE__*/React.createElement(IconQuote, null),
73
73
  action(insert, state) {
74
74
  const tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));
@@ -113,9 +113,10 @@ const blockTypePlugin = ({
113
113
  name: 'blockType',
114
114
  nodes() {
115
115
  const blockquoteNode = getBooleanFF('platform.editor.allow-list-in-blockquote') ? blockquoteWithList : blockquote;
116
+ const headingNode = getBooleanFF('platform.editor.enable-localid-for-paragraph-in-stage-0_cby7g') ? headingStage0 : heading;
116
117
  const nodes = [{
117
118
  name: 'heading',
118
- node: heading
119
+ node: headingNode
119
120
  }, {
120
121
  name: 'blockquote',
121
122
  node: blockquoteNode
@@ -29,22 +29,22 @@ export const BlockTypeButton = props => {
29
29
  "aria-haspopup": true,
30
30
  "aria-expanded": props['aria-expanded'],
31
31
  iconAfter: jsx("span", {
32
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
32
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
33
33
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
34
34
  "data-testid": "toolbar-block-type-text-styles-icon"
35
35
  }, props.isSmall && jsx(TextStyleIcon, {
36
36
  label: labelTextStyles
37
37
  }), jsx("span", {
38
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
39
39
  css: expandIconWrapperStyle
40
40
  }, jsx(ExpandIcon, {
41
41
  label: ""
42
42
  })))
43
43
  }, !props.isSmall && jsx("span", {
44
44
  css: [
45
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
46
46
  buttonContentStyle,
47
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
48
48
  props.isReducedSpacing && buttonContentReducedSpacingStyle]
49
49
  }, jsx(FormattedMessage, props.title || NORMAL_TEXT.title)));
50
50
  };
@@ -57,7 +57,7 @@ class ToolbarBlockType extends React.PureComponent {
57
57
  const keyMap = findKeymapByDescription(blockType.title.defaultMessage);
58
58
  return {
59
59
  content:
60
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
61
61
  jsx("div", {
62
62
  css: blockTypeMenuItemStyle(tagName, isActive)
63
63
  }, jsx(Tag, null, formatMessage(blockType.title))),
@@ -67,7 +67,7 @@ class ToolbarBlockType extends React.PureComponent {
67
67
  keyShortcuts: getAriaKeyshortcuts(keyMap),
68
68
  key: `${blockType.name}-${index}`,
69
69
  elemAfter:
70
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
70
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
71
71
  jsx("div", {
72
72
  css: [keyboardShortcut, isActive && keyboardShortcutSelect]
73
73
  }, tooltip(keyMap)),
@@ -122,7 +122,7 @@ class ToolbarBlockType extends React.PureComponent {
122
122
  if (!this.props.isDisabled && !blockTypesDisabled) {
123
123
  const items = this.createItems();
124
124
  return (
125
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
125
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
126
126
  jsx("span", {
127
127
  css: wrapperStyle
128
128
  }, jsx(DropdownMenu, {
@@ -159,13 +159,13 @@ class ToolbarBlockType extends React.PureComponent {
159
159
  "aria-expanded": active,
160
160
  blockTypeName: currentBlockType.name
161
161
  })), !(api !== null && api !== void 0 && api.primaryToolbar) && jsx("span", {
162
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
162
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
163
163
  css: separatorStyles
164
164
  }))
165
165
  );
166
166
  }
167
167
  return (
168
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
168
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
169
169
  jsx("span", {
170
170
  css: wrapperStyle
171
171
  }, jsx(BlockTypeButton, {
@@ -180,7 +180,7 @@ class ToolbarBlockType extends React.PureComponent {
180
180
  "aria-expanded": active,
181
181
  blockTypeName: currentBlockType.name
182
182
  }), !(api !== null && api !== void 0 && api.primaryToolbar) && jsx("span", {
183
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
183
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
184
184
  css: separatorStyles
185
185
  }))
186
186
  );
@@ -6,21 +6,33 @@ import { N400 } from '@atlaskit/theme/colors';
6
6
  export const blockTypeMenuItemStyle = (tagName, selected) => {
7
7
  // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
8
8
  const selectedStyle = selected ? `${tagName} { color: ${"var(--ds-text, white)"} !important; }` : '';
9
- return () => css(headingsSharedStyles(), {
9
+ return () => css(
10
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
11
+ headingsSharedStyles(), {
12
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
10
13
  '>': {
14
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
11
15
  'h1, h2, h3, h4, h5, h6': {
12
16
  marginTop: 0
13
17
  }
14
18
  }
15
- }, selectedStyle);
19
+ },
20
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
21
+ selectedStyle);
16
22
  };
23
+
24
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
17
25
  export const keyboardShortcut = css(shortcutStyle, {
18
26
  marginLeft: "var(--ds-space-200, 16px)",
19
27
  color: `var(--ds-icon, ${N400})`
20
28
  });
29
+
30
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
21
31
  export const keyboardShortcutSelect = css({
22
32
  color: `var(--ds-icon, ${N400})`
23
33
  });
34
+
35
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
24
36
  export const buttonContentStyle = css({
25
37
  display: 'flex',
26
38
  minWidth: '80px',
@@ -30,13 +42,19 @@ export const buttonContentStyle = css({
30
42
  flexDirection: 'column',
31
43
  padding: "var(--ds-space-075, 6px)"
32
44
  });
45
+
46
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
33
47
  export const buttonContentReducedSpacingStyle = css({
34
48
  padding: "var(--ds-space-100, 8px)"
35
49
  });
50
+
51
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
36
52
  export const wrapperSmallStyle = css({
37
53
  marginLeft: "var(--ds-space-050, 4px)",
38
54
  minWidth: '40px'
39
55
  });
56
+
57
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
40
58
  export const expandIconWrapperStyle = css({
41
59
  marginLeft: "var(--ds-space-negative-100, -8px)"
42
60
  });
@@ -1,8 +1,8 @@
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 { blockquote, blockquoteWithList, hardBreak, heading, headingStage0 } from '@atlaskit/adf-schema';
4
4
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
5
- import { keymap, toggleBlockQuote, tooltip } from '@atlaskit/editor-common/keymaps';
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';
@@ -69,7 +69,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
69
69
  title: formatMessage(messages.blockquote),
70
70
  description: formatMessage(messages.blockquoteDescription),
71
71
  priority: 1300,
72
- keyshortcut: tooltip(toggleBlockQuote),
72
+ keyshortcut: '>',
73
73
  icon: function icon() {
74
74
  return /*#__PURE__*/React.createElement(IconQuote, null);
75
75
  },
@@ -114,9 +114,10 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
114
114
  name: 'blockType',
115
115
  nodes: function nodes() {
116
116
  var blockquoteNode = getBooleanFF('platform.editor.allow-list-in-blockquote') ? blockquoteWithList : blockquote;
117
+ var headingNode = getBooleanFF('platform.editor.enable-localid-for-paragraph-in-stage-0_cby7g') ? headingStage0 : heading;
117
118
  var nodes = [{
118
119
  name: 'heading',
119
- node: heading
120
+ node: headingNode
120
121
  }, {
121
122
  name: 'blockquote',
122
123
  node: blockquoteNode
@@ -29,22 +29,22 @@ export var BlockTypeButton = function BlockTypeButton(props) {
29
29
  "aria-haspopup": true,
30
30
  "aria-expanded": props['aria-expanded'],
31
31
  iconAfter: jsx("span", {
32
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
32
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
33
33
  css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
34
34
  "data-testid": "toolbar-block-type-text-styles-icon"
35
35
  }, props.isSmall && jsx(TextStyleIcon, {
36
36
  label: labelTextStyles
37
37
  }), jsx("span", {
38
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
39
39
  css: expandIconWrapperStyle
40
40
  }, jsx(ExpandIcon, {
41
41
  label: ""
42
42
  })))
43
43
  }, !props.isSmall && jsx("span", {
44
44
  css: [
45
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
46
46
  buttonContentStyle,
47
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
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
48
48
  props.isReducedSpacing && buttonContentReducedSpacingStyle]
49
49
  }, jsx(FormattedMessage, props.title || NORMAL_TEXT.title)));
50
50
  };
@@ -68,7 +68,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
68
68
  var keyMap = findKeymapByDescription(blockType.title.defaultMessage);
69
69
  return {
70
70
  content:
71
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
71
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
72
72
  jsx("div", {
73
73
  css: blockTypeMenuItemStyle(tagName, isActive)
74
74
  }, jsx(Tag, null, formatMessage(blockType.title))),
@@ -78,7 +78,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
78
78
  keyShortcuts: getAriaKeyshortcuts(keyMap),
79
79
  key: "".concat(blockType.name, "-").concat(index),
80
80
  elemAfter:
81
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
81
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
82
82
  jsx("div", {
83
83
  css: [keyboardShortcut, isActive && keyboardShortcutSelect]
84
84
  }, tooltip(keyMap)),
@@ -137,7 +137,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
137
137
  if (!this.props.isDisabled && !blockTypesDisabled) {
138
138
  var items = this.createItems();
139
139
  return (
140
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
140
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
141
141
  jsx("span", {
142
142
  css: wrapperStyle
143
143
  }, jsx(DropdownMenu, {
@@ -173,13 +173,13 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
173
173
  "aria-expanded": active,
174
174
  blockTypeName: currentBlockType.name
175
175
  })), !(api !== null && api !== void 0 && api.primaryToolbar) && jsx("span", {
176
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
176
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
177
177
  css: separatorStyles
178
178
  }))
179
179
  );
180
180
  }
181
181
  return (
182
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
182
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
183
183
  jsx("span", {
184
184
  css: wrapperStyle
185
185
  }, jsx(BlockTypeButton, {
@@ -194,7 +194,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
194
194
  "aria-expanded": active,
195
195
  blockTypeName: currentBlockType.name
196
196
  }), !(api !== null && api !== void 0 && api.primaryToolbar) && jsx("span", {
197
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
197
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
198
198
  css: separatorStyles
199
199
  }))
200
200
  );
@@ -7,22 +7,34 @@ export var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, sel
7
7
  // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
8
8
  var selectedStyle = selected ? "".concat(tagName, " { color: ", "var(--ds-text, white)", " !important; }") : '';
9
9
  return function () {
10
- return css(headingsSharedStyles(), {
10
+ return css(
11
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
12
+ headingsSharedStyles(), {
13
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
11
14
  '>': {
15
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
12
16
  'h1, h2, h3, h4, h5, h6': {
13
17
  marginTop: 0
14
18
  }
15
19
  }
16
- }, selectedStyle);
20
+ },
21
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
22
+ selectedStyle);
17
23
  };
18
24
  };
25
+
26
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
19
27
  export var keyboardShortcut = css(shortcutStyle, {
20
28
  marginLeft: "var(--ds-space-200, 16px)",
21
29
  color: "var(--ds-icon, ".concat(N400, ")")
22
30
  });
31
+
32
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
23
33
  export var keyboardShortcutSelect = css({
24
34
  color: "var(--ds-icon, ".concat(N400, ")")
25
35
  });
36
+
37
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
26
38
  export var buttonContentStyle = css({
27
39
  display: 'flex',
28
40
  minWidth: '80px',
@@ -32,13 +44,19 @@ export var buttonContentStyle = css({
32
44
  flexDirection: 'column',
33
45
  padding: "var(--ds-space-075, 6px)"
34
46
  });
47
+
48
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
35
49
  export var buttonContentReducedSpacingStyle = css({
36
50
  padding: "var(--ds-space-100, 8px)"
37
51
  });
52
+
53
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
38
54
  export var wrapperSmallStyle = css({
39
55
  marginLeft: "var(--ds-space-050, 4px)",
40
56
  minWidth: '40px'
41
57
  });
58
+
59
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
42
60
  export var expandIconWrapperStyle = css({
43
61
  marginLeft: "var(--ds-space-negative-100, -8px)"
44
62
  });
package/package.json CHANGED
@@ -1,109 +1,112 @@
1
1
  {
2
- "name": "@atlaskit/editor-plugin-block-type",
3
- "version": "3.5.0",
4
- "description": "BlockType plugin for @atlaskit/editor-core",
5
- "author": "Atlassian Pty Ltd",
6
- "license": "Apache-2.0",
7
- "publishConfig": {
8
- "registry": "https://registry.npmjs.org/"
9
- },
10
- "atlassian": {
11
- "team": "Editor: Lego",
12
- "singleton": true,
13
- "inPublicMirror": false,
14
- "releaseModel": "continuous",
15
- "runReact18": false
16
- },
17
- "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
18
- "main": "dist/cjs/index.js",
19
- "module": "dist/esm/index.js",
20
- "module:es2019": "dist/es2019/index.js",
21
- "types": "dist/types/index.d.ts",
22
- "typesVersions": {
23
- ">=4.5 <4.9": {
24
- "*": [
25
- "dist/types-ts4.5/*",
26
- "dist/types-ts4.5/index.d.ts"
27
- ]
28
- }
29
- },
30
- "sideEffects": false,
31
- "atlaskit:src": "src/index.ts",
32
- "af:exports": {
33
- ".": "./src/index.ts",
34
- "./consts": "./src/consts.ts",
35
- "./styles": "./src/styles.ts"
36
- },
37
- "dependencies": {
38
- "@atlaskit/adf-schema": "^36.10.7",
39
- "@atlaskit/editor-common": "^82.0.0",
40
- "@atlaskit/editor-plugin-analytics": "^1.2.0",
41
- "@atlaskit/editor-plugin-primary-toolbar": "^1.1.0",
42
- "@atlaskit/editor-prosemirror": "4.0.1",
43
- "@atlaskit/editor-shared-styles": "^2.12.0",
44
- "@atlaskit/editor-tables": "^2.7.0",
45
- "@atlaskit/icon": "^22.3.0",
46
- "@atlaskit/platform-feature-flags": "^0.2.5",
47
- "@atlaskit/prosemirror-input-rules": "^3.1.0",
48
- "@atlaskit/theme": "^12.8.0",
49
- "@atlaskit/tokens": "^1.49.0",
50
- "@babel/runtime": "^7.0.0",
51
- "@emotion/react": "^11.7.1"
52
- },
53
- "peerDependencies": {
54
- "react": "^16.8.0",
55
- "react-intl-next": "npm:react-intl@^5.18.1"
56
- },
57
- "devDependencies": {
58
- "@af/visual-regression": "*",
59
- "@atlaskit/analytics-next": "^9.3.0",
60
- "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
61
- "@atlaskit/editor-plugin-quick-insert": "^1.1.0",
62
- "@atlaskit/editor-plugin-type-ahead": "^1.2.0",
63
- "@atlaskit/ssr": "*",
64
- "@atlaskit/visual-regression": "*",
65
- "@testing-library/react": "^12.1.5",
66
- "@testing-library/user-event": "^14.4.3",
67
- "react-dom": "^16.8.0",
68
- "typescript": "~5.4.2",
69
- "wait-for-expect": "^1.2.0"
70
- },
71
- "techstack": {
72
- "@atlassian/frontend": {
73
- "import-structure": [
74
- "atlassian-conventions"
75
- ],
76
- "circular-dependencies": [
77
- "file-and-folder-level"
78
- ]
79
- },
80
- "@repo/internal": {
81
- "dom-events": "use-bind-event-listener",
82
- "analytics": [
83
- "analytics-next"
84
- ],
85
- "design-tokens": [
86
- "color"
87
- ],
88
- "theming": [
89
- "react-context"
90
- ],
91
- "ui-components": [
92
- "lite-mode"
93
- ],
94
- "deprecation": "no-deprecated-imports",
95
- "styling": [
96
- "emotion",
97
- "emotion"
98
- ],
99
- "imports": [
100
- "import-no-extraneous-disable-for-examples-and-docs"
101
- ]
102
- }
103
- },
104
- "platform-feature-flags": {
105
- "platform.editor.allow-list-in-blockquote": {
106
- "type": "boolean"
107
- }
108
- }
109
- }
2
+ "name": "@atlaskit/editor-plugin-block-type",
3
+ "version": "3.6.1",
4
+ "description": "BlockType plugin for @atlaskit/editor-core",
5
+ "author": "Atlassian Pty Ltd",
6
+ "license": "Apache-2.0",
7
+ "publishConfig": {
8
+ "registry": "https://registry.npmjs.org/"
9
+ },
10
+ "atlassian": {
11
+ "team": "Editor: Lego",
12
+ "singleton": true,
13
+ "inPublicMirror": false,
14
+ "releaseModel": "continuous",
15
+ "runReact18": false
16
+ },
17
+ "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
18
+ "main": "dist/cjs/index.js",
19
+ "module": "dist/esm/index.js",
20
+ "module:es2019": "dist/es2019/index.js",
21
+ "types": "dist/types/index.d.ts",
22
+ "typesVersions": {
23
+ ">=4.5 <4.9": {
24
+ "*": [
25
+ "dist/types-ts4.5/*",
26
+ "dist/types-ts4.5/index.d.ts"
27
+ ]
28
+ }
29
+ },
30
+ "sideEffects": false,
31
+ "atlaskit:src": "src/index.ts",
32
+ "af:exports": {
33
+ ".": "./src/index.ts",
34
+ "./consts": "./src/consts.ts",
35
+ "./styles": "./src/styles.ts"
36
+ },
37
+ "dependencies": {
38
+ "@atlaskit/adf-schema": "^36.10.7",
39
+ "@atlaskit/editor-common": "^82.8.0",
40
+ "@atlaskit/editor-plugin-analytics": "^1.2.0",
41
+ "@atlaskit/editor-plugin-primary-toolbar": "^1.1.0",
42
+ "@atlaskit/editor-prosemirror": "4.0.1",
43
+ "@atlaskit/editor-shared-styles": "^2.12.0",
44
+ "@atlaskit/editor-tables": "^2.7.0",
45
+ "@atlaskit/icon": "^22.3.0",
46
+ "@atlaskit/platform-feature-flags": "^0.2.5",
47
+ "@atlaskit/prosemirror-input-rules": "^3.1.0",
48
+ "@atlaskit/theme": "^12.9.0",
49
+ "@atlaskit/tokens": "^1.50.0",
50
+ "@babel/runtime": "^7.0.0",
51
+ "@emotion/react": "^11.7.1"
52
+ },
53
+ "peerDependencies": {
54
+ "react": "^16.8.0",
55
+ "react-intl-next": "npm:react-intl@^5.18.1"
56
+ },
57
+ "devDependencies": {
58
+ "@af/visual-regression": "*",
59
+ "@atlaskit/analytics-next": "^9.3.0",
60
+ "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
61
+ "@atlaskit/editor-plugin-quick-insert": "^1.1.0",
62
+ "@atlaskit/editor-plugin-type-ahead": "^1.2.0",
63
+ "@atlaskit/ssr": "*",
64
+ "@atlaskit/visual-regression": "*",
65
+ "@testing-library/react": "^12.1.5",
66
+ "@testing-library/user-event": "^14.4.3",
67
+ "react-dom": "^16.8.0",
68
+ "typescript": "~5.4.2",
69
+ "wait-for-expect": "^1.2.0"
70
+ },
71
+ "techstack": {
72
+ "@atlassian/frontend": {
73
+ "import-structure": [
74
+ "atlassian-conventions"
75
+ ],
76
+ "circular-dependencies": [
77
+ "file-and-folder-level"
78
+ ]
79
+ },
80
+ "@repo/internal": {
81
+ "dom-events": "use-bind-event-listener",
82
+ "analytics": [
83
+ "analytics-next"
84
+ ],
85
+ "design-tokens": [
86
+ "color"
87
+ ],
88
+ "theming": [
89
+ "react-context"
90
+ ],
91
+ "ui-components": [
92
+ "lite-mode"
93
+ ],
94
+ "deprecation": "no-deprecated-imports",
95
+ "styling": [
96
+ "emotion",
97
+ "emotion"
98
+ ],
99
+ "imports": [
100
+ "import-no-extraneous-disable-for-examples-and-docs"
101
+ ]
102
+ }
103
+ },
104
+ "platform-feature-flags": {
105
+ "platform.editor.allow-list-in-blockquote": {
106
+ "type": "boolean"
107
+ },
108
+ "platform.editor.enable-localid-for-paragraph-in-stage-0_cby7g": {
109
+ "type": "boolean"
110
+ }
111
+ }
112
+ }