@atlaskit/editor-plugin-text-formatting 1.18.1 → 1.20.0

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 (7) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/cjs/textFormattingPlugin.js +36 -20
  3. package/dist/es2019/textFormattingPlugin.js +36 -20
  4. package/dist/esm/textFormattingPlugin.js +36 -20
  5. package/dist/types/textFormattingPluginType.d.ts +3 -1
  6. package/dist/types-ts4.5/textFormattingPluginType.d.ts +3 -1
  7. package/package.json +8 -7
package/CHANGELOG.md CHANGED
@@ -1,5 +1,29 @@
1
1
  # @atlaskit/editor-plugin-text-formatting
2
2
 
3
+ ## 1.20.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#116949](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116949)
8
+ [`9154f7b89e3d2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9154f7b89e3d2) -
9
+ [ux] ED-26674 Hiding contextual toolbar menu items when the menu is docked to top
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
15
+ ## 1.19.0
16
+
17
+ ### Minor Changes
18
+
19
+ - [#116013](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116013)
20
+ [`18e022766bfd3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/18e022766bfd3) -
21
+ [ux] ED-26464 Hiding primary toolbar and docking contextual toolbar items to top
22
+
23
+ ### Patch Changes
24
+
25
+ - Updated dependencies
26
+
3
27
  ## 1.18.1
4
28
 
5
29
  ### Patch Changes
package/dist/cjs/textFormattingPlugin.js CHANGED
@@ -27,7 +27,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
27
27
  * from `@atlaskit/editor-core`.
28
28
  */
29
29
  var textFormattingPlugin = exports.textFormattingPlugin = function textFormattingPlugin(_ref) {
30
- var _api$primaryToolbar, _api$analytics7, _api$analytics8, _api$analytics9, _api$analytics10, _api$analytics11, _api$analytics12, _api$analytics13;
30
+ var _api$primaryToolbar, _api$analytics8, _api$analytics9, _api$analytics10, _api$analytics11, _api$analytics12, _api$analytics13, _api$analytics14;
31
31
  var options = _ref.config,
32
32
  api = _ref.api;
33
33
  var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
@@ -37,6 +37,16 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
37
37
  isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
38
38
  toolbarSize = _ref2.toolbarSize,
39
39
  disabled = _ref2.disabled;
40
+ if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
41
+ exposure: true
42
+ })) {
43
+ var _api$analytics;
44
+ return /*#__PURE__*/_react.default.createElement(_FloatingToolbarComponent.FloatingToolbarTextFormalWithIntl, {
45
+ api: api,
46
+ editorView: editorView,
47
+ editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
48
+ });
49
+ }
40
50
  return /*#__PURE__*/_react.default.createElement(_PrimaryToolbarComponent.PrimaryToolbarComponent, {
41
51
  api: api,
42
52
  popupsMountPoint: popupsMountPoint,
@@ -79,9 +89,9 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
79
89
  return [{
80
90
  name: 'textFormatting',
81
91
  plugin: function plugin(_ref3) {
82
- var _api$analytics;
92
+ var _api$analytics2;
83
93
  var dispatch = _ref3.dispatch;
84
- return (0, _main.plugin)(dispatch, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
94
+ return (0, _main.plugin)(dispatch, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
85
95
  }
86
96
  }, {
87
97
  name: 'textFormattingCursor',
@@ -91,15 +101,15 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
91
101
  }, {
92
102
  name: 'textFormattingInputRule',
93
103
  plugin: function plugin(_ref4) {
94
- var _api$analytics2;
104
+ var _api$analytics3;
95
105
  var schema = _ref4.schema;
96
- return (0, _inputRule.default)(schema, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api);
106
+ return (0, _inputRule.default)(schema, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, api);
97
107
  }
98
108
  }, {
99
109
  name: 'textFormattingSmartRule',
100
110
  plugin: function plugin() {
101
- var _api$analytics3;
102
- return !(options !== null && options !== void 0 && options.disableSmartTextCompletion) ? (0, _smartInputRule.default)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions) : undefined;
111
+ var _api$analytics4;
112
+ return !(options !== null && options !== void 0 && options.disableSmartTextCompletion) ? (0, _smartInputRule.default)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions) : undefined;
103
113
  }
104
114
  }, {
105
115
  name: 'textFormattingClear',
@@ -110,15 +120,15 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
110
120
  }, {
111
121
  name: 'textFormattingClearKeymap',
112
122
  plugin: function plugin() {
113
- var _api$analytics4;
114
- return (0, _clearFormattingKeymap.default)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
123
+ var _api$analytics5;
124
+ return (0, _clearFormattingKeymap.default)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
115
125
  }
116
126
  }, {
117
127
  name: 'textFormattingKeymap',
118
128
  plugin: function plugin(_ref6) {
119
- var _api$analytics5;
129
+ var _api$analytics6;
120
130
  var schema = _ref6.schema;
121
- return (0, _keymap.default)(schema, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
131
+ return (0, _keymap.default)(schema, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
122
132
  }
123
133
  }];
124
134
  },
@@ -133,6 +143,12 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
133
143
  },
134
144
  pluginsOptions: {
135
145
  selectionToolbar: function selectionToolbar() {
146
+ var _api$selectionToolbar;
147
+ if ((api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking) === 'top' && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
148
+ exposure: true
149
+ })) {
150
+ return undefined;
151
+ }
136
152
  if ((0, _experiments.editorExperiment)('contextual_formatting_toolbar', true, {
137
153
  exposure: true
138
154
  }) || (0, _experiments.editorExperiment)('platform_editor_contextual_formatting_toolbar_v2', 'variant1', {
@@ -143,14 +159,14 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
143
159
  var toolbarCustom = {
144
160
  type: 'custom',
145
161
  render: function render(view) {
146
- var _api$analytics6;
162
+ var _api$analytics7;
147
163
  if (!view) {
148
164
  return;
149
165
  }
150
166
  return /*#__PURE__*/_react.default.createElement(_FloatingToolbarComponent.FloatingToolbarTextFormalWithIntl, {
151
167
  api: api,
152
168
  editorView: view,
153
- editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions
169
+ editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions
154
170
  });
155
171
  },
156
172
  fallback: []
@@ -167,13 +183,13 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
167
183
  },
168
184
  primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
169
185
  commands: {
170
- toggleSuperscript: (0, _commands.toggleSuperscriptWithAnalytics)(api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions),
171
- toggleSubscript: (0, _commands.toggleSubscriptWithAnalytics)(api === null || api === void 0 || (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions),
172
- toggleStrike: (0, _commands.toggleStrikeWithAnalytics)(api === null || api === void 0 || (_api$analytics9 = api.analytics) === null || _api$analytics9 === void 0 ? void 0 : _api$analytics9.actions),
173
- toggleCode: (0, _commands.toggleCodeWithAnalytics)(api === null || api === void 0 || (_api$analytics10 = api.analytics) === null || _api$analytics10 === void 0 ? void 0 : _api$analytics10.actions),
174
- toggleUnderline: (0, _commands.toggleUnderlineWithAnalytics)(api === null || api === void 0 || (_api$analytics11 = api.analytics) === null || _api$analytics11 === void 0 ? void 0 : _api$analytics11.actions),
175
- toggleEm: (0, _commands.toggleEmWithAnalytics)(api === null || api === void 0 || (_api$analytics12 = api.analytics) === null || _api$analytics12 === void 0 ? void 0 : _api$analytics12.actions),
176
- toggleStrong: (0, _commands.toggleStrongWithAnalytics)(api === null || api === void 0 || (_api$analytics13 = api.analytics) === null || _api$analytics13 === void 0 ? void 0 : _api$analytics13.actions)
186
+ toggleSuperscript: (0, _commands.toggleSuperscriptWithAnalytics)(api === null || api === void 0 || (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions),
187
+ toggleSubscript: (0, _commands.toggleSubscriptWithAnalytics)(api === null || api === void 0 || (_api$analytics9 = api.analytics) === null || _api$analytics9 === void 0 ? void 0 : _api$analytics9.actions),
188
+ toggleStrike: (0, _commands.toggleStrikeWithAnalytics)(api === null || api === void 0 || (_api$analytics10 = api.analytics) === null || _api$analytics10 === void 0 ? void 0 : _api$analytics10.actions),
189
+ toggleCode: (0, _commands.toggleCodeWithAnalytics)(api === null || api === void 0 || (_api$analytics11 = api.analytics) === null || _api$analytics11 === void 0 ? void 0 : _api$analytics11.actions),
190
+ toggleUnderline: (0, _commands.toggleUnderlineWithAnalytics)(api === null || api === void 0 || (_api$analytics12 = api.analytics) === null || _api$analytics12 === void 0 ? void 0 : _api$analytics12.actions),
191
+ toggleEm: (0, _commands.toggleEmWithAnalytics)(api === null || api === void 0 || (_api$analytics13 = api.analytics) === null || _api$analytics13 === void 0 ? void 0 : _api$analytics13.actions),
192
+ toggleStrong: (0, _commands.toggleStrongWithAnalytics)(api === null || api === void 0 || (_api$analytics14 = api.analytics) === null || _api$analytics14 === void 0 ? void 0 : _api$analytics14.actions)
177
193
  }
178
194
  };
179
195
  };
package/dist/es2019/textFormattingPlugin.js CHANGED
@@ -21,7 +21,7 @@ export const textFormattingPlugin = ({
21
21
  config: options,
22
22
  api
23
23
  }) => {
24
- var _api$primaryToolbar, _api$analytics7, _api$analytics8, _api$analytics9, _api$analytics10, _api$analytics11, _api$analytics12, _api$analytics13;
24
+ var _api$primaryToolbar, _api$analytics8, _api$analytics9, _api$analytics10, _api$analytics11, _api$analytics12, _api$analytics13, _api$analytics14;
25
25
  const primaryToolbarComponent = ({
26
26
  editorView,
27
27
  popupsMountPoint,
@@ -30,6 +30,16 @@ export const textFormattingPlugin = ({
30
30
  toolbarSize,
31
31
  disabled
32
32
  }) => {
33
+ if (editorExperiment('platform_editor_controls', 'variant1', {
34
+ exposure: true
35
+ })) {
36
+ var _api$analytics;
37
+ return /*#__PURE__*/React.createElement(FloatingToolbarComponent, {
38
+ api: api,
39
+ editorView: editorView,
40
+ editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
41
+ });
42
+ }
33
43
  return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
34
44
  api: api,
35
45
  popupsMountPoint: popupsMountPoint,
@@ -74,8 +84,8 @@ export const textFormattingPlugin = ({
74
84
  plugin: ({
75
85
  dispatch
76
86
  }) => {
77
- var _api$analytics;
78
- return pmPlugin(dispatch, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
87
+ var _api$analytics2;
88
+ return pmPlugin(dispatch, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
79
89
  }
80
90
  }, {
81
91
  name: 'textFormattingCursor',
@@ -85,14 +95,14 @@ export const textFormattingPlugin = ({
85
95
  plugin: ({
86
96
  schema
87
97
  }) => {
88
- var _api$analytics2;
89
- return textFormattingInputRulePlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api);
98
+ var _api$analytics3;
99
+ return textFormattingInputRulePlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, api);
90
100
  }
91
101
  }, {
92
102
  name: 'textFormattingSmartRule',
93
103
  plugin: () => {
94
- var _api$analytics3;
95
- return !(options !== null && options !== void 0 && options.disableSmartTextCompletion) ? textFormattingSmartInputRulePlugin(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions) : undefined;
104
+ var _api$analytics4;
105
+ return !(options !== null && options !== void 0 && options.disableSmartTextCompletion) ? textFormattingSmartInputRulePlugin(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions) : undefined;
96
106
  }
97
107
  }, {
98
108
  name: 'textFormattingClear',
@@ -102,16 +112,16 @@ export const textFormattingPlugin = ({
102
112
  }, {
103
113
  name: 'textFormattingClearKeymap',
104
114
  plugin: () => {
105
- var _api$analytics4;
106
- return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
115
+ var _api$analytics5;
116
+ return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
107
117
  }
108
118
  }, {
109
119
  name: 'textFormattingKeymap',
110
120
  plugin: ({
111
121
  schema
112
122
  }) => {
113
- var _api$analytics5;
114
- return keymapPlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
123
+ var _api$analytics6;
124
+ return keymapPlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
115
125
  }
116
126
  }];
117
127
  },
@@ -127,6 +137,12 @@ export const textFormattingPlugin = ({
127
137
  },
128
138
  pluginsOptions: {
129
139
  selectionToolbar: () => {
140
+ var _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3;
141
+ if ((api === null || api === void 0 ? void 0 : (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 ? void 0 : (_api$selectionToolbar2 = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar2 === void 0 ? void 0 : (_api$selectionToolbar3 = _api$selectionToolbar2.currentState()) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.toolbarDocking) === 'top' && editorExperiment('platform_editor_controls', 'variant1', {
142
+ exposure: true
143
+ })) {
144
+ return undefined;
145
+ }
130
146
  if (editorExperiment('contextual_formatting_toolbar', true, {
131
147
  exposure: true
132
148
  }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant1', {
@@ -137,14 +153,14 @@ export const textFormattingPlugin = ({
137
153
  const toolbarCustom = {
138
154
  type: 'custom',
139
155
  render: view => {
140
- var _api$analytics6;
156
+ var _api$analytics7;
141
157
  if (!view) {
142
158
  return;
143
159
  }
144
160
  return /*#__PURE__*/React.createElement(FloatingToolbarComponent, {
145
161
  api: api,
146
162
  editorView: view,
147
- editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions
163
+ editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions
148
164
  });
149
165
  },
150
166
  fallback: []
@@ -161,13 +177,13 @@ export const textFormattingPlugin = ({
161
177
  },
162
178
  primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
163
179
  commands: {
164
- toggleSuperscript: toggleSuperscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions),
165
- toggleSubscript: toggleSubscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions),
166
- toggleStrike: toggleStrikeWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics9 = api.analytics) === null || _api$analytics9 === void 0 ? void 0 : _api$analytics9.actions),
167
- toggleCode: toggleCodeWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics10 = api.analytics) === null || _api$analytics10 === void 0 ? void 0 : _api$analytics10.actions),
168
- toggleUnderline: toggleUnderlineWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics11 = api.analytics) === null || _api$analytics11 === void 0 ? void 0 : _api$analytics11.actions),
169
- toggleEm: toggleEmWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics12 = api.analytics) === null || _api$analytics12 === void 0 ? void 0 : _api$analytics12.actions),
170
- toggleStrong: toggleStrongWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics13 = api.analytics) === null || _api$analytics13 === void 0 ? void 0 : _api$analytics13.actions)
180
+ toggleSuperscript: toggleSuperscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions),
181
+ toggleSubscript: toggleSubscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics9 = api.analytics) === null || _api$analytics9 === void 0 ? void 0 : _api$analytics9.actions),
182
+ toggleStrike: toggleStrikeWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics10 = api.analytics) === null || _api$analytics10 === void 0 ? void 0 : _api$analytics10.actions),
183
+ toggleCode: toggleCodeWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics11 = api.analytics) === null || _api$analytics11 === void 0 ? void 0 : _api$analytics11.actions),
184
+ toggleUnderline: toggleUnderlineWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics12 = api.analytics) === null || _api$analytics12 === void 0 ? void 0 : _api$analytics12.actions),
185
+ toggleEm: toggleEmWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics13 = api.analytics) === null || _api$analytics13 === void 0 ? void 0 : _api$analytics13.actions),
186
+ toggleStrong: toggleStrongWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics14 = api.analytics) === null || _api$analytics14 === void 0 ? void 0 : _api$analytics14.actions)
171
187
  }
172
188
  };
173
189
  };
package/dist/esm/textFormattingPlugin.js CHANGED
@@ -21,7 +21,7 @@ import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
21
21
  * from `@atlaskit/editor-core`.
22
22
  */
23
23
  export var textFormattingPlugin = function textFormattingPlugin(_ref) {
24
- var _api$primaryToolbar, _api$analytics7, _api$analytics8, _api$analytics9, _api$analytics10, _api$analytics11, _api$analytics12, _api$analytics13;
24
+ var _api$primaryToolbar, _api$analytics8, _api$analytics9, _api$analytics10, _api$analytics11, _api$analytics12, _api$analytics13, _api$analytics14;
25
25
  var options = _ref.config,
26
26
  api = _ref.api;
27
27
  var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
@@ -31,6 +31,16 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
31
31
  isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
32
32
  toolbarSize = _ref2.toolbarSize,
33
33
  disabled = _ref2.disabled;
34
+ if (editorExperiment('platform_editor_controls', 'variant1', {
35
+ exposure: true
36
+ })) {
37
+ var _api$analytics;
38
+ return /*#__PURE__*/React.createElement(FloatingToolbarComponent, {
39
+ api: api,
40
+ editorView: editorView,
41
+ editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
42
+ });
43
+ }
34
44
  return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
35
45
  api: api,
36
46
  popupsMountPoint: popupsMountPoint,
@@ -73,9 +83,9 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
73
83
  return [{
74
84
  name: 'textFormatting',
75
85
  plugin: function plugin(_ref3) {
76
- var _api$analytics;
86
+ var _api$analytics2;
77
87
  var dispatch = _ref3.dispatch;
78
- return pmPlugin(dispatch, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
88
+ return pmPlugin(dispatch, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
79
89
  }
80
90
  }, {
81
91
  name: 'textFormattingCursor',
@@ -85,15 +95,15 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
85
95
  }, {
86
96
  name: 'textFormattingInputRule',
87
97
  plugin: function plugin(_ref4) {
88
- var _api$analytics2;
98
+ var _api$analytics3;
89
99
  var schema = _ref4.schema;
90
- return textFormattingInputRulePlugin(schema, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api);
100
+ return textFormattingInputRulePlugin(schema, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, api);
91
101
  }
92
102
  }, {
93
103
  name: 'textFormattingSmartRule',
94
104
  plugin: function plugin() {
95
- var _api$analytics3;
96
- return !(options !== null && options !== void 0 && options.disableSmartTextCompletion) ? textFormattingSmartInputRulePlugin(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions) : undefined;
105
+ var _api$analytics4;
106
+ return !(options !== null && options !== void 0 && options.disableSmartTextCompletion) ? textFormattingSmartInputRulePlugin(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions) : undefined;
97
107
  }
98
108
  }, {
99
109
  name: 'textFormattingClear',
@@ -104,15 +114,15 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
104
114
  }, {
105
115
  name: 'textFormattingClearKeymap',
106
116
  plugin: function plugin() {
107
- var _api$analytics4;
108
- return clearFormattingKeymapPlugin(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
117
+ var _api$analytics5;
118
+ return clearFormattingKeymapPlugin(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
109
119
  }
110
120
  }, {
111
121
  name: 'textFormattingKeymap',
112
122
  plugin: function plugin(_ref6) {
113
- var _api$analytics5;
123
+ var _api$analytics6;
114
124
  var schema = _ref6.schema;
115
- return keymapPlugin(schema, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
125
+ return keymapPlugin(schema, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
116
126
  }
117
127
  }];
118
128
  },
@@ -127,6 +137,12 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
127
137
  },
128
138
  pluginsOptions: {
129
139
  selectionToolbar: function selectionToolbar() {
140
+ var _api$selectionToolbar;
141
+ if ((api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking) === 'top' && editorExperiment('platform_editor_controls', 'variant1', {
142
+ exposure: true
143
+ })) {
144
+ return undefined;
145
+ }
130
146
  if (editorExperiment('contextual_formatting_toolbar', true, {
131
147
  exposure: true
132
148
  }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant1', {
@@ -137,14 +153,14 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
137
153
  var toolbarCustom = {
138
154
  type: 'custom',
139
155
  render: function render(view) {
140
- var _api$analytics6;
156
+ var _api$analytics7;
141
157
  if (!view) {
142
158
  return;
143
159
  }
144
160
  return /*#__PURE__*/React.createElement(FloatingToolbarComponent, {
145
161
  api: api,
146
162
  editorView: view,
147
- editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions
163
+ editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions
148
164
  });
149
165
  },
150
166
  fallback: []
@@ -161,13 +177,13 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
161
177
  },
162
178
  primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
163
179
  commands: {
164
- toggleSuperscript: toggleSuperscriptWithAnalytics(api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions),
165
- toggleSubscript: toggleSubscriptWithAnalytics(api === null || api === void 0 || (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions),
166
- toggleStrike: toggleStrikeWithAnalytics(api === null || api === void 0 || (_api$analytics9 = api.analytics) === null || _api$analytics9 === void 0 ? void 0 : _api$analytics9.actions),
167
- toggleCode: toggleCodeWithAnalytics(api === null || api === void 0 || (_api$analytics10 = api.analytics) === null || _api$analytics10 === void 0 ? void 0 : _api$analytics10.actions),
168
- toggleUnderline: toggleUnderlineWithAnalytics(api === null || api === void 0 || (_api$analytics11 = api.analytics) === null || _api$analytics11 === void 0 ? void 0 : _api$analytics11.actions),
169
- toggleEm: toggleEmWithAnalytics(api === null || api === void 0 || (_api$analytics12 = api.analytics) === null || _api$analytics12 === void 0 ? void 0 : _api$analytics12.actions),
170
- toggleStrong: toggleStrongWithAnalytics(api === null || api === void 0 || (_api$analytics13 = api.analytics) === null || _api$analytics13 === void 0 ? void 0 : _api$analytics13.actions)
180
+ toggleSuperscript: toggleSuperscriptWithAnalytics(api === null || api === void 0 || (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions),
181
+ toggleSubscript: toggleSubscriptWithAnalytics(api === null || api === void 0 || (_api$analytics9 = api.analytics) === null || _api$analytics9 === void 0 ? void 0 : _api$analytics9.actions),
182
+ toggleStrike: toggleStrikeWithAnalytics(api === null || api === void 0 || (_api$analytics10 = api.analytics) === null || _api$analytics10 === void 0 ? void 0 : _api$analytics10.actions),
183
+ toggleCode: toggleCodeWithAnalytics(api === null || api === void 0 || (_api$analytics11 = api.analytics) === null || _api$analytics11 === void 0 ? void 0 : _api$analytics11.actions),
184
+ toggleUnderline: toggleUnderlineWithAnalytics(api === null || api === void 0 || (_api$analytics12 = api.analytics) === null || _api$analytics12 === void 0 ? void 0 : _api$analytics12.actions),
185
+ toggleEm: toggleEmWithAnalytics(api === null || api === void 0 || (_api$analytics13 = api.analytics) === null || _api$analytics13 === void 0 ? void 0 : _api$analytics13.actions),
186
+ toggleStrong: toggleStrongWithAnalytics(api === null || api === void 0 || (_api$analytics14 = api.analytics) === null || _api$analytics14 === void 0 ? void 0 : _api$analytics14.actions)
171
187
  }
172
188
  };
173
189
  };
package/dist/types/textFormattingPluginType.d.ts CHANGED
@@ -2,13 +2,15 @@ import type { NextEditorPlugin, OptionalPlugin, TextFormattingOptions, TextForma
2
2
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
3
3
  import type { BasePlugin } from '@atlaskit/editor-plugin-base';
4
4
  import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
5
+ import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
5
6
  import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
6
7
  export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
7
8
  pluginConfiguration: TextFormattingOptions | undefined;
8
9
  dependencies: [
9
10
  OptionalPlugin<AnalyticsPlugin>,
10
11
  OptionalPlugin<PrimaryToolbarPlugin>,
11
- OptionalPlugin<BasePlugin>
12
+ OptionalPlugin<BasePlugin>,
13
+ OptionalPlugin<SelectionToolbarPlugin>
12
14
  ];
13
15
  commands: {
14
16
  toggleSuperscript: ToggleMarkEditorCommand;
package/dist/types-ts4.5/textFormattingPluginType.d.ts CHANGED
@@ -2,13 +2,15 @@ import type { NextEditorPlugin, OptionalPlugin, TextFormattingOptions, TextForma
2
2
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
3
3
  import type { BasePlugin } from '@atlaskit/editor-plugin-base';
4
4
  import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
5
+ import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
5
6
  import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
6
7
  export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
7
8
  pluginConfiguration: TextFormattingOptions | undefined;
8
9
  dependencies: [
9
10
  OptionalPlugin<AnalyticsPlugin>,
10
11
  OptionalPlugin<PrimaryToolbarPlugin>,
11
- OptionalPlugin<BasePlugin>
12
+ OptionalPlugin<BasePlugin>,
13
+ OptionalPlugin<SelectionToolbarPlugin>
12
14
  ];
13
15
  commands: {
14
16
  toggleSuperscript: ToggleMarkEditorCommand;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-text-formatting",
3
- "version": "1.18.1",
3
+ "version": "1.20.0",
4
4
  "description": "Text-formatting plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -32,17 +32,18 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@atlaskit/adf-schema": "^47.2.1",
35
- "@atlaskit/editor-common": "^99.14.0",
35
+ "@atlaskit/editor-common": "^99.18.0",
36
36
  "@atlaskit/editor-plugin-analytics": "^1.12.0",
37
37
  "@atlaskit/editor-plugin-base": "^2.2.0",
38
- "@atlaskit/editor-plugin-primary-toolbar": "^2.2.0",
38
+ "@atlaskit/editor-plugin-primary-toolbar": "^2.3.0",
39
+ "@atlaskit/editor-plugin-selection-toolbar": "^1.9.0",
39
40
  "@atlaskit/editor-prosemirror": "7.0.0",
40
- "@atlaskit/editor-shared-styles": "^3.2.0",
41
+ "@atlaskit/editor-shared-styles": "^3.3.0",
41
42
  "@atlaskit/editor-tables": "^2.9.0",
42
- "@atlaskit/icon": "^23.9.0",
43
- "@atlaskit/platform-feature-flags": "^1.0.0",
43
+ "@atlaskit/icon": "^23.11.0",
44
+ "@atlaskit/platform-feature-flags": "^1.1.0",
44
45
  "@atlaskit/prosemirror-input-rules": "^3.3.0",
45
- "@atlaskit/tmp-editor-statsig": "^2.46.0",
46
+ "@atlaskit/tmp-editor-statsig": "^2.47.0",
46
47
  "@atlaskit/tokens": "^3.3.0",
47
48
  "@babel/runtime": "^7.0.0",
48
49
  "@emotion/react": "^11.7.1",