@atlaskit/editor-plugin-text-formatting 2.4.0 → 2.4.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.
Files changed (19) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/ui/FloatingToolbarComponent.js +1 -2
  3. package/dist/cjs/ui/Toolbar/hooks/formatting-icons.js +1 -2
  4. package/dist/cjs/ui/Toolbar/hooks/use-icon-list.js +2 -10
  5. package/dist/cjs/ui/Toolbar/index.js +2 -2
  6. package/dist/cjs/ui/Toolbar/single-toolbar-buttons.js +2 -7
  7. package/dist/es2019/ui/FloatingToolbarComponent.js +1 -2
  8. package/dist/es2019/ui/Toolbar/hooks/formatting-icons.js +1 -2
  9. package/dist/es2019/ui/Toolbar/hooks/use-icon-list.js +2 -10
  10. package/dist/es2019/ui/Toolbar/index.js +2 -2
  11. package/dist/es2019/ui/Toolbar/single-toolbar-buttons.js +2 -7
  12. package/dist/esm/ui/FloatingToolbarComponent.js +1 -2
  13. package/dist/esm/ui/Toolbar/hooks/formatting-icons.js +1 -2
  14. package/dist/esm/ui/Toolbar/hooks/use-icon-list.js +2 -10
  15. package/dist/esm/ui/Toolbar/index.js +2 -2
  16. package/dist/esm/ui/Toolbar/single-toolbar-buttons.js +2 -7
  17. package/dist/types/ui/Toolbar/hooks/use-icon-list.d.ts +1 -2
  18. package/dist/types-ts4.5/ui/Toolbar/hooks/use-icon-list.d.ts +1 -2
  19. package/package.json +2 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-text-formatting
2
2
 
3
+ ## 2.4.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#173846](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173846)
8
+ [`852a3c0aec64b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/852a3c0aec64b) -
9
+ Clean up platform_editor_controls_patch_10
10
+
3
11
  ## 2.4.0
4
12
 
5
13
  ### Minor Changes
package/dist/cjs/ui/FloatingToolbarComponent.js CHANGED
@@ -154,8 +154,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
154
154
  });
155
155
  var _useIconList = (0, _useIconList2.useIconList)({
156
156
  icons: defaultIcons,
157
- iconTypeList: _constants.ToolbarButtonsStrong,
158
- shouldUnselect: hasMultiplePartsWithFormattingSelected
157
+ iconTypeList: _constants.ToolbarButtonsStrong
159
158
  }),
160
159
  dropdownItems = _useIconList.dropdownItems,
161
160
  singleItems = _useIconList.singleItems;
package/dist/cjs/ui/Toolbar/hooks/formatting-icons.js CHANGED
@@ -18,7 +18,6 @@ var _textBoldEditorBold = _interopRequireDefault(require("@atlaskit/icon/core/mi
18
18
  var _textItalicEditorItalic = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-italic--editor-italic"));
19
19
  var _textStrikethrough = _interopRequireDefault(require("@atlaskit/icon/core/text-strikethrough"));
20
20
  var _textUnderline = _interopRequireDefault(require("@atlaskit/icon/core/text-underline"));
21
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
22
21
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
23
22
  var _commands = require("../../../pm-plugins/commands");
24
23
  var _icons = require("../icons");
@@ -191,7 +190,7 @@ var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsW
191
190
  hasSchemaMark: hasSchemaMark
192
191
  };
193
192
  }
194
- var isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
193
+ var isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
195
194
  var isDisabled = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Disabled")];
196
195
  var isHidden = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Hidden")];
197
196
  return {
package/dist/cjs/ui/Toolbar/hooks/use-icon-list.js CHANGED
@@ -7,22 +7,14 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.useIconList = void 0;
8
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
9
  var _react = require("react");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
11
- var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
12
10
  var useIconList = exports.useIconList = function useIconList(_ref) {
13
11
  var icons = _ref.icons,
14
- iconTypeList = _ref.iconTypeList,
15
- shouldUnselect = _ref.shouldUnselect;
12
+ iconTypeList = _ref.iconTypeList;
16
13
  return (0, _react.useMemo)(function () {
17
14
  return icons.reduce(function (acc, icon) {
18
15
  if (!icon || !icon.iconMark) {
19
16
  return acc;
20
17
  }
21
- if (
22
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
23
- shouldUnselect && icon.isActive && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10')) {
24
- icon.isActive = false;
25
- }
26
18
  var isIconSingleButton = iconTypeList.includes(icon.iconMark);
27
19
  if (isIconSingleButton) {
28
20
  return {
@@ -38,5 +30,5 @@ var useIconList = exports.useIconList = function useIconList(_ref) {
38
30
  dropdownItems: [],
39
31
  singleItems: []
40
32
  });
41
- }, [icons, shouldUnselect, iconTypeList]);
33
+ }, [icons, iconTypeList]);
42
34
  };
package/dist/cjs/ui/Toolbar/index.js CHANGED
@@ -169,7 +169,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
169
169
  }), (0, _react2.jsx)("span", {
170
170
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
171
171
  css: _styles.wrapperStyle
172
- }, isToolbarDisabled && !((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10')) ? (0, _react2.jsx)("div", null, (0, _react2.jsx)(_moreButton.MoreButton, {
172
+ }, isToolbarDisabled && !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _react2.jsx)("div", null, (0, _react2.jsx)(_moreButton.MoreButton, {
173
173
  label: moreFormattingButtonLabel,
174
174
  isReducedSpacing: isReducedSpacing,
175
175
  isDisabled: true,
@@ -188,7 +188,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
188
188
  items: items,
189
189
  intl: intl,
190
190
  toolbarType: toolbarType,
191
- isDisabled: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? isToolbarDisabled : false
191
+ isDisabled: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? isToolbarDisabled : false
192
192
  }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
193
193
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
194
194
  (0, _react2.jsx)("span", {
package/dist/cjs/ui/Toolbar/single-toolbar-buttons.js CHANGED
@@ -10,7 +10,6 @@ var _react2 = require("@emotion/react");
10
10
  var _styles = require("@atlaskit/editor-common/styles");
11
11
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
12
12
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
13
- var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
14
13
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
15
14
  /**
16
15
  * @jsxRuntime classic
@@ -48,15 +47,11 @@ var SingleToolbarButtons = exports.SingleToolbarButtons = /*#__PURE__*/_react.de
48
47
  buttonId: item.buttonId,
49
48
  spacing: isReducedSpacing ? 'none' : 'default',
50
49
  onClick: onClick(item.command),
51
- selected:
52
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
53
- hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
50
+ selected: item.isActive,
54
51
  disabled: item.isDisabled,
55
52
  title: item.tooltipElement,
56
53
  iconBefore: item.iconElement,
57
- "aria-pressed":
58
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
59
- hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
54
+ "aria-pressed": item.isActive,
60
55
  "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
61
56
  "aria-keyshortcuts": item['aria-keyshortcuts']
62
57
  });
package/dist/es2019/ui/FloatingToolbarComponent.js CHANGED
@@ -155,8 +155,7 @@ const FloatingToolbarTextFormat = ({
155
155
  singleItems
156
156
  } = useIconList({
157
157
  icons: defaultIcons,
158
- iconTypeList: ToolbarButtonsStrong,
159
- shouldUnselect: hasMultiplePartsWithFormattingSelected
158
+ iconTypeList: ToolbarButtonsStrong
160
159
  });
161
160
  const clearIcon = useClearIcon({
162
161
  formattingPluginInitialised: textFormattingState.isInitialised,
package/dist/es2019/ui/Toolbar/hooks/formatting-icons.js CHANGED
@@ -16,7 +16,6 @@ import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
16
16
  import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
17
17
  import TextStrikethroughIcon from '@atlaskit/icon/core/text-strikethrough';
18
18
  import UnderlineIcon from '@atlaskit/icon/core/text-underline';
19
- import { fg } from '@atlaskit/platform-feature-flags';
20
19
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
21
20
  import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../pm-plugins/commands';
22
21
  import { Subscript, Superscript } from '../icons';
@@ -183,7 +182,7 @@ const buildMenuIconState = (iconMark, hasMultiplePartsWithFormattingSelected, co
183
182
  hasSchemaMark
184
183
  };
185
184
  }
186
- const isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Active`];
185
+ const isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && editorExperiment('platform_editor_controls', 'variant1') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Active`];
187
186
  const isDisabled = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Disabled`];
188
187
  const isHidden = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Hidden`];
189
188
  return {
package/dist/es2019/ui/Toolbar/hooks/use-icon-list.js CHANGED
@@ -1,21 +1,13 @@
1
1
  import { useMemo } from 'react';
2
- import { fg } from '@atlaskit/platform-feature-flags';
3
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
4
2
  export const useIconList = ({
5
3
  icons,
6
- iconTypeList,
7
- shouldUnselect
4
+ iconTypeList
8
5
  }) => {
9
6
  return useMemo(() => {
10
7
  return icons.reduce((acc, icon) => {
11
8
  if (!icon || !icon.iconMark) {
12
9
  return acc;
13
10
  }
14
- if (
15
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
16
- shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10')) {
17
- icon.isActive = false;
18
- }
19
11
  const isIconSingleButton = iconTypeList.includes(icon.iconMark);
20
12
  if (isIconSingleButton) {
21
13
  return {
@@ -31,5 +23,5 @@ export const useIconList = ({
31
23
  dropdownItems: [],
32
24
  singleItems: []
33
25
  });
34
- }, [icons, shouldUnselect, iconTypeList]);
26
+ }, [icons, iconTypeList]);
35
27
  };
package/dist/es2019/ui/Toolbar/index.js CHANGED
@@ -158,7 +158,7 @@ const ToolbarFormatting = ({
158
158
  }), jsx("span", {
159
159
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
160
160
  css: wrapperStyle
161
- }, isToolbarDisabled && !(editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10')) ? jsx("div", null, jsx(MoreButton, {
161
+ }, isToolbarDisabled && !editorExperiment('platform_editor_controls', 'variant1') ? jsx("div", null, jsx(MoreButton, {
162
162
  label: moreFormattingButtonLabel,
163
163
  isReducedSpacing: isReducedSpacing,
164
164
  isDisabled: true,
@@ -177,7 +177,7 @@ const ToolbarFormatting = ({
177
177
  items: items,
178
178
  intl: intl,
179
179
  toolbarType: toolbarType,
180
- isDisabled: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? isToolbarDisabled : false
180
+ isDisabled: editorExperiment('platform_editor_controls', 'variant1') ? isToolbarDisabled : false
181
181
  }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
182
182
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
183
183
  jsx("span", {
package/dist/es2019/ui/Toolbar/single-toolbar-buttons.js CHANGED
@@ -9,7 +9,6 @@ import { jsx } from '@emotion/react';
9
9
  import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh } from '@atlaskit/editor-common/styles';
10
10
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
11
11
  import { fg } from '@atlaskit/platform-feature-flags';
12
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
13
12
  export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
14
13
  items,
15
14
  isReducedSpacing,
@@ -40,15 +39,11 @@ export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
40
39
  buttonId: item.buttonId,
41
40
  spacing: isReducedSpacing ? 'none' : 'default',
42
41
  onClick: onClick(item.command),
43
- selected:
44
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
45
- hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
42
+ selected: item.isActive,
46
43
  disabled: item.isDisabled,
47
44
  title: item.tooltipElement,
48
45
  iconBefore: item.iconElement,
49
- "aria-pressed":
50
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
51
- hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
46
+ "aria-pressed": item.isActive,
52
47
  "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
53
48
  "aria-keyshortcuts": item['aria-keyshortcuts']
54
49
  });
package/dist/esm/ui/FloatingToolbarComponent.js CHANGED
@@ -146,8 +146,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
146
146
  });
147
147
  var _useIconList = useIconList({
148
148
  icons: defaultIcons,
149
- iconTypeList: ToolbarButtonsStrong,
150
- shouldUnselect: hasMultiplePartsWithFormattingSelected
149
+ iconTypeList: ToolbarButtonsStrong
151
150
  }),
152
151
  dropdownItems = _useIconList.dropdownItems,
153
152
  singleItems = _useIconList.singleItems;
package/dist/esm/ui/Toolbar/hooks/formatting-icons.js CHANGED
@@ -17,7 +17,6 @@ import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
17
17
  import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
18
18
  import TextStrikethroughIcon from '@atlaskit/icon/core/text-strikethrough';
19
19
  import UnderlineIcon from '@atlaskit/icon/core/text-underline';
20
- import { fg } from '@atlaskit/platform-feature-flags';
21
20
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
22
21
  import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../pm-plugins/commands';
23
22
  import { Subscript, Superscript } from '../icons';
@@ -183,7 +182,7 @@ var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsW
183
182
  hasSchemaMark: hasSchemaMark
184
183
  };
185
184
  }
186
- var isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
185
+ var isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && editorExperiment('platform_editor_controls', 'variant1') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
187
186
  var isDisabled = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Disabled")];
188
187
  var isHidden = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Hidden")];
189
188
  return {
package/dist/esm/ui/Toolbar/hooks/use-icon-list.js CHANGED
@@ -1,21 +1,13 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import { useMemo } from 'react';
3
- import { fg } from '@atlaskit/platform-feature-flags';
4
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
5
3
  export var useIconList = function useIconList(_ref) {
6
4
  var icons = _ref.icons,
7
- iconTypeList = _ref.iconTypeList,
8
- shouldUnselect = _ref.shouldUnselect;
5
+ iconTypeList = _ref.iconTypeList;
9
6
  return useMemo(function () {
10
7
  return icons.reduce(function (acc, icon) {
11
8
  if (!icon || !icon.iconMark) {
12
9
  return acc;
13
10
  }
14
- if (
15
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
16
- shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10')) {
17
- icon.isActive = false;
18
- }
19
11
  var isIconSingleButton = iconTypeList.includes(icon.iconMark);
20
12
  if (isIconSingleButton) {
21
13
  return {
@@ -31,5 +23,5 @@ export var useIconList = function useIconList(_ref) {
31
23
  dropdownItems: [],
32
24
  singleItems: []
33
25
  });
34
- }, [icons, shouldUnselect, iconTypeList]);
26
+ }, [icons, iconTypeList]);
35
27
  };
package/dist/esm/ui/Toolbar/index.js CHANGED
@@ -163,7 +163,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
163
163
  }), jsx("span", {
164
164
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
165
165
  css: wrapperStyle
166
- }, isToolbarDisabled && !(editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10')) ? jsx("div", null, jsx(MoreButton, {
166
+ }, isToolbarDisabled && !editorExperiment('platform_editor_controls', 'variant1') ? jsx("div", null, jsx(MoreButton, {
167
167
  label: moreFormattingButtonLabel,
168
168
  isReducedSpacing: isReducedSpacing,
169
169
  isDisabled: true,
@@ -182,7 +182,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
182
182
  items: items,
183
183
  intl: intl,
184
184
  toolbarType: toolbarType,
185
- isDisabled: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? isToolbarDisabled : false
185
+ isDisabled: editorExperiment('platform_editor_controls', 'variant1') ? isToolbarDisabled : false
186
186
  }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
187
187
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
188
188
  jsx("span", {
package/dist/esm/ui/Toolbar/single-toolbar-buttons.js CHANGED
@@ -9,7 +9,6 @@ import { jsx } from '@emotion/react';
9
9
  import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh } from '@atlaskit/editor-common/styles';
10
10
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
11
11
  import { fg } from '@atlaskit/platform-feature-flags';
12
- import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
13
12
  export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
14
13
  var items = _ref.items,
15
14
  isReducedSpacing = _ref.isReducedSpacing,
@@ -39,15 +38,11 @@ export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
39
38
  buttonId: item.buttonId,
40
39
  spacing: isReducedSpacing ? 'none' : 'default',
41
40
  onClick: onClick(item.command),
42
- selected:
43
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
44
- hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
41
+ selected: item.isActive,
45
42
  disabled: item.isDisabled,
46
43
  title: item.tooltipElement,
47
44
  iconBefore: item.iconElement,
48
- "aria-pressed":
49
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
50
- hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
45
+ "aria-pressed": item.isActive,
51
46
  "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
52
47
  "aria-keyshortcuts": item['aria-keyshortcuts']
53
48
  });
package/dist/types/ui/Toolbar/hooks/use-icon-list.d.ts CHANGED
@@ -2,11 +2,10 @@ import type { IconTypes, MenuIconItem } from '../types';
2
2
  interface UseIconsParams {
3
3
  icons: Array<MenuIconItem | null>;
4
4
  iconTypeList: IconTypes[];
5
- shouldUnselect?: boolean;
6
5
  }
7
6
  export type IconsPositions = {
8
7
  dropdownItems: Array<MenuIconItem>;
9
8
  singleItems: Array<MenuIconItem>;
10
9
  };
11
- export declare const useIconList: ({ icons, iconTypeList, shouldUnselect }: UseIconsParams) => IconsPositions;
10
+ export declare const useIconList: ({ icons, iconTypeList }: UseIconsParams) => IconsPositions;
12
11
  export {};
package/dist/types-ts4.5/ui/Toolbar/hooks/use-icon-list.d.ts CHANGED
@@ -2,11 +2,10 @@ import type { IconTypes, MenuIconItem } from '../types';
2
2
  interface UseIconsParams {
3
3
  icons: Array<MenuIconItem | null>;
4
4
  iconTypeList: IconTypes[];
5
- shouldUnselect?: boolean;
6
5
  }
7
6
  export type IconsPositions = {
8
7
  dropdownItems: Array<MenuIconItem>;
9
8
  singleItems: Array<MenuIconItem>;
10
9
  };
11
- export declare const useIconList: ({ icons, iconTypeList, shouldUnselect }: UseIconsParams) => IconsPositions;
10
+ export declare const useIconList: ({ icons, iconTypeList }: UseIconsParams) => IconsPositions;
12
11
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-text-formatting",
3
- "version": "2.4.0",
3
+ "version": "2.4.1",
4
4
  "description": "Text-formatting plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -42,7 +42,7 @@
42
42
  "@atlaskit/editor-prosemirror": "7.0.0",
43
43
  "@atlaskit/editor-shared-styles": "^3.4.0",
44
44
  "@atlaskit/editor-tables": "^2.9.0",
45
- "@atlaskit/icon": "^27.0.0",
45
+ "@atlaskit/icon": "^27.1.0",
46
46
  "@atlaskit/platform-feature-flags": "^1.1.0",
47
47
  "@atlaskit/prosemirror-input-rules": "^3.3.0",
48
48
  "@atlaskit/tmp-editor-statsig": "^8.0.0",
@@ -110,9 +110,6 @@
110
110
  "platform_editor_controls_patch_9": {
111
111
  "type": "boolean"
112
112
  },
113
- "platform_editor_controls_patch_10": {
114
- "type": "boolean"
115
- },
116
113
  "platform_editor_controls_patch_13": {
117
114
  "type": "boolean"
118
115
  },