@atlaskit/editor-plugin-text-formatting 1.16.7 → 1.16.9

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,21 @@
1
1
  # @atlaskit/editor-plugin-text-formatting
2
2
 
3
+ ## 1.16.9
4
+
5
+ ### Patch Changes
6
+
7
+ - [#100162](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100162)
8
+ [`e80e57fc37719`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e80e57fc37719) -
9
+ [ux] ED-26089: Add 4px gap to main nav bar items
10
+
11
+ ## 1.16.8
12
+
13
+ ### Patch Changes
14
+
15
+ - [#99274](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99274)
16
+ [`b4dd134e0caaa`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b4dd134e0caaa) -
17
+ ED-25961 Add analytics for clear formatting and adding blockquote from text styles menu
18
+
3
19
  ## 1.16.7
4
20
 
5
21
  ### Patch Changes
@@ -103,7 +103,8 @@ function clearFormatting(inputMethod, editorAnalyticsAPI) {
103
103
  actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CLEAR,
104
104
  attributes: {
105
105
  inputMethod: inputMethod,
106
- formattingCleared: formattingCleared
106
+ formattingCleared: formattingCleared,
107
+ dropdownMenu: inputMethod === _analytics.INPUT_METHOD.TOOLBAR || inputMethod === _analytics.INPUT_METHOD.FLOATING_TB ? 'textFormatting' : undefined
107
108
  }
108
109
  })(tr);
109
110
  }
@@ -14,6 +14,7 @@ var _hooks = require("@atlaskit/editor-common/hooks");
14
14
  var _messages = require("@atlaskit/editor-common/messages");
15
15
  var _styles = require("@atlaskit/editor-common/styles");
16
16
  var _ui = require("@atlaskit/editor-common/ui");
17
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
18
  var _utils = require("../../editor-commands/utils");
18
19
  var _dropdownMenu = require("./dropdown-menu");
19
20
  var _clearFormattingIcon = require("./hooks/clear-formatting-icon");
@@ -139,7 +140,13 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
139
140
  return (
140
141
  // 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
142
  (0, _react2.jsx)("span", {
142
- css: _styles.buttonGroupStyle
143
+ css:
144
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/platform/ensure-feature-flag-prefix
145
+ (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ?
146
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
147
+ _styles.buttonGroupStyle :
148
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
149
+ _styles.buttonGroupStyleBeforeVisualRefresh
143
150
  }, (0, _react2.jsx)("div", {
144
151
  role: "group"
145
152
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -156,6 +163,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
156
163
  editorView: editorView,
157
164
  isReducedSpacing: isReducedSpacing
158
165
  }), (0, _react2.jsx)("span", {
166
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
159
167
  css: _styles.wrapperStyle
160
168
  }, isToolbarDisabled ? (0, _react2.jsx)("div", null, (0, _react2.jsx)(_moreButton.MoreButton, {
161
169
  label: moreFormattingButtonLabel,
@@ -39,7 +39,7 @@ var MoreButton = exports.MoreButton = /*#__PURE__*/_react.default.memo(function
39
39
  spacing: isReducedSpacing ? 'none' : 'default',
40
40
  title: label,
41
41
  iconBefore:
42
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
42
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/platform/ensure-feature-flag-prefix -- Ignored via go/DSP-18766
43
43
  (0, _react2.jsx)("div", {
44
44
  css: (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ? MoreIconStyle : _styles.triggerWrapperStyles
45
45
  }, (0, _react2.jsx)(_showMoreHorizontalEditorMore.default, {
@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
9
9
  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
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
12
13
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
13
14
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
15
  /**
@@ -31,7 +32,13 @@ var SingleToolbarButtons = exports.SingleToolbarButtons = /*#__PURE__*/_react.de
31
32
  return (
32
33
  // 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
34
  (0, _react2.jsx)("span", {
34
- css: _styles.buttonGroupStyle
35
+ css:
36
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/platform/ensure-feature-flag-prefix
37
+ (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ?
38
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
39
+ _styles.buttonGroupStyle :
40
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
41
+ _styles.buttonGroupStyleBeforeVisualRefresh
35
42
  }, items.map(function (item) {
36
43
  var _item$ariaLabel;
37
44
  return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
@@ -1,4 +1,4 @@
1
- import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
1
+ import { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
2
2
  import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
3
3
  import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
4
4
  import { cellSelectionNodesBetween } from './utils/cell-selection';
@@ -99,7 +99,8 @@ export function clearFormatting(inputMethod, editorAnalyticsAPI) {
99
99
  actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CLEAR,
100
100
  attributes: {
101
101
  inputMethod,
102
- formattingCleared
102
+ formattingCleared,
103
+ dropdownMenu: inputMethod === INPUT_METHOD.TOOLBAR || inputMethod === INPUT_METHOD.FLOATING_TB ? 'textFormatting' : undefined
103
104
  }
104
105
  })(tr);
105
106
  }
@@ -9,8 +9,9 @@ import { jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { usePreviousState } from '@atlaskit/editor-common/hooks';
11
11
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
12
- import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
12
+ import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
13
13
  import { Announcer } from '@atlaskit/editor-common/ui';
14
+ import { fg } from '@atlaskit/platform-feature-flags';
14
15
  import { compareItemsArrays, isArrayContainsContent } from '../../editor-commands/utils';
15
16
  import { FormattingTextDropdownMenu } from './dropdown-menu';
16
17
  import { useClearIcon } from './hooks/clear-formatting-icon';
@@ -126,7 +127,13 @@ const ToolbarFormatting = ({
126
127
  return (
127
128
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
128
129
  jsx("span", {
129
- css: buttonGroupStyle
130
+ css:
131
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/platform/ensure-feature-flag-prefix
132
+ fg('platform-visual-refresh-icons') ?
133
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
134
+ buttonGroupStyle :
135
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
136
+ buttonGroupStyleBeforeVisualRefresh
130
137
  }, jsx("div", {
131
138
  role: "group"
132
139
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -143,6 +150,7 @@ const ToolbarFormatting = ({
143
150
  editorView: editorView,
144
151
  isReducedSpacing: isReducedSpacing
145
152
  }), jsx("span", {
153
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
146
154
  css: wrapperStyle
147
155
  }, isToolbarDisabled ? jsx("div", null, jsx(MoreButton, {
148
156
  label: moreFormattingButtonLabel,
@@ -32,7 +32,7 @@ export const MoreButton = /*#__PURE__*/React.memo(({
32
32
  spacing: isReducedSpacing ? 'none' : 'default',
33
33
  title: label,
34
34
  iconBefore:
35
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
35
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/platform/ensure-feature-flag-prefix -- Ignored via go/DSP-18766
36
36
  jsx("div", {
37
37
  css: fg('platform-visual-refresh-icons') ? MoreIconStyle : triggerWrapperStyles
38
38
  }, jsx(ShowMoreHorizontalIcon, {
@@ -6,8 +6,9 @@ import React, { useCallback } from 'react';
6
6
 
7
7
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
8
8
  import { jsx } from '@emotion/react';
9
- import { buttonGroupStyle } from '@atlaskit/editor-common/styles';
9
+ import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh } from '@atlaskit/editor-common/styles';
10
10
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
11
+ import { fg } from '@atlaskit/platform-feature-flags';
11
12
  export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
12
13
  items,
13
14
  isReducedSpacing,
@@ -22,7 +23,13 @@ export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
22
23
  return (
23
24
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
24
25
  jsx("span", {
25
- css: buttonGroupStyle
26
+ css:
27
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/platform/ensure-feature-flag-prefix
28
+ fg('platform-visual-refresh-icons') ?
29
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
30
+ buttonGroupStyle :
31
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
32
+ buttonGroupStyleBeforeVisualRefresh
26
33
  }, items.map(item => {
27
34
  var _item$ariaLabel;
28
35
  return jsx(ToolbarButton, {
@@ -1,4 +1,4 @@
1
- import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
1
+ import { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
2
2
  import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
3
3
  import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
4
4
  import { cellSelectionNodesBetween } from './utils/cell-selection';
@@ -95,7 +95,8 @@ export function clearFormatting(inputMethod, editorAnalyticsAPI) {
95
95
  actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CLEAR,
96
96
  attributes: {
97
97
  inputMethod: inputMethod,
98
- formattingCleared: formattingCleared
98
+ formattingCleared: formattingCleared,
99
+ dropdownMenu: inputMethod === INPUT_METHOD.TOOLBAR || inputMethod === INPUT_METHOD.FLOATING_TB ? 'textFormatting' : undefined
99
100
  }
100
101
  })(tr);
101
102
  }
@@ -11,8 +11,9 @@ import { jsx } from '@emotion/react';
11
11
  import { injectIntl } from 'react-intl-next';
12
12
  import { usePreviousState } from '@atlaskit/editor-common/hooks';
13
13
  import { toolbarMessages } from '@atlaskit/editor-common/messages';
14
- import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
14
+ import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
15
15
  import { Announcer } from '@atlaskit/editor-common/ui';
16
+ import { fg } from '@atlaskit/platform-feature-flags';
16
17
  import { compareItemsArrays, isArrayContainsContent } from '../../editor-commands/utils';
17
18
  import { FormattingTextDropdownMenu } from './dropdown-menu';
18
19
  import { useClearIcon } from './hooks/clear-formatting-icon';
@@ -131,7 +132,13 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
131
132
  return (
132
133
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
133
134
  jsx("span", {
134
- css: buttonGroupStyle
135
+ css:
136
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/platform/ensure-feature-flag-prefix
137
+ fg('platform-visual-refresh-icons') ?
138
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
139
+ buttonGroupStyle :
140
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
141
+ buttonGroupStyleBeforeVisualRefresh
135
142
  }, jsx("div", {
136
143
  role: "group"
137
144
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -148,6 +155,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
148
155
  editorView: editorView,
149
156
  isReducedSpacing: isReducedSpacing
150
157
  }), jsx("span", {
158
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
151
159
  css: wrapperStyle
152
160
  }, isToolbarDisabled ? jsx("div", null, jsx(MoreButton, {
153
161
  label: moreFormattingButtonLabel,
@@ -31,7 +31,7 @@ export var MoreButton = /*#__PURE__*/React.memo(function (_ref) {
31
31
  spacing: isReducedSpacing ? 'none' : 'default',
32
32
  title: label,
33
33
  iconBefore:
34
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
34
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/platform/ensure-feature-flag-prefix -- Ignored via go/DSP-18766
35
35
  jsx("div", {
36
36
  css: fg('platform-visual-refresh-icons') ? MoreIconStyle : triggerWrapperStyles
37
37
  }, jsx(ShowMoreHorizontalIcon, {
@@ -6,8 +6,9 @@ import React, { useCallback } from 'react';
6
6
 
7
7
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
8
8
  import { jsx } from '@emotion/react';
9
- import { buttonGroupStyle } from '@atlaskit/editor-common/styles';
9
+ import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh } from '@atlaskit/editor-common/styles';
10
10
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
11
+ import { fg } from '@atlaskit/platform-feature-flags';
11
12
  export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
12
13
  var items = _ref.items,
13
14
  isReducedSpacing = _ref.isReducedSpacing,
@@ -21,7 +22,13 @@ export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
21
22
  return (
22
23
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
23
24
  jsx("span", {
24
- css: buttonGroupStyle
25
+ css:
26
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/platform/ensure-feature-flag-prefix
27
+ fg('platform-visual-refresh-icons') ?
28
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
29
+ buttonGroupStyle :
30
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
31
+ buttonGroupStyleBeforeVisualRefresh
25
32
  }, items.map(function (item) {
26
33
  var _item$ariaLabel;
27
34
  return jsx(ToolbarButton, {
@@ -1,4 +1,5 @@
1
- import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
1
+ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
+ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
2
3
  import type { Command } from '@atlaskit/editor-common/types';
3
4
  export declare const FORMATTING_NODE_TYPES: string[];
4
5
  export declare const FORMATTING_MARK_TYPES: string[];
@@ -1,4 +1,5 @@
1
- import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
1
+ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
+ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
2
3
  import type { Command } from '@atlaskit/editor-common/types';
3
4
  export declare const FORMATTING_NODE_TYPES: string[];
4
5
  export declare const FORMATTING_MARK_TYPES: string[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-text-formatting",
3
- "version": "1.16.7",
3
+ "version": "1.16.9",
4
4
  "description": "Text-formatting plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -32,16 +32,16 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@atlaskit/adf-schema": "^46.1.0",
35
- "@atlaskit/editor-common": "^98.0.0",
35
+ "@atlaskit/editor-common": "^98.2.0",
36
36
  "@atlaskit/editor-plugin-analytics": "^1.10.0",
37
37
  "@atlaskit/editor-plugin-primary-toolbar": "^2.1.0",
38
38
  "@atlaskit/editor-prosemirror": "6.2.1",
39
39
  "@atlaskit/editor-shared-styles": "^3.2.0",
40
40
  "@atlaskit/editor-tables": "^2.8.0",
41
- "@atlaskit/icon": "^23.1.0",
41
+ "@atlaskit/icon": "^23.2.0",
42
42
  "@atlaskit/platform-feature-flags": "^0.3.0",
43
43
  "@atlaskit/prosemirror-input-rules": "^3.2.0",
44
- "@atlaskit/tmp-editor-statsig": "^2.31.0",
44
+ "@atlaskit/tmp-editor-statsig": "^2.33.0",
45
45
  "@atlaskit/tokens": "^2.5.0",
46
46
  "@babel/runtime": "^7.0.0",
47
47
  "@emotion/react": "^11.7.1",