@atlaskit/editor-plugin-floating-toolbar 10.0.10 → 10.0.12
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 +14 -0
- package/dist/cjs/floatingToolbarPlugin.js +18 -5
- package/dist/cjs/pm-plugins/commands.js +2 -2
- package/dist/cjs/ui/CheckboxModal.js +6 -2
- package/dist/cjs/ui/Dropdown.js +3 -1
- package/dist/cjs/ui/EmojiPickerButton.js +6 -2
- package/dist/cjs/ui/ScrollButton.js +11 -5
- package/dist/cjs/ui/SimpleModal.js +3 -1
- package/dist/cjs/ui/Toolbar.js +30 -10
- package/dist/es2019/floatingToolbarPlugin.js +18 -5
- package/dist/es2019/pm-plugins/commands.js +2 -2
- package/dist/es2019/ui/CheckboxModal.js +6 -2
- package/dist/es2019/ui/Dropdown.js +3 -1
- package/dist/es2019/ui/EmojiPickerButton.js +6 -2
- package/dist/es2019/ui/ScrollButton.js +10 -4
- package/dist/es2019/ui/SimpleModal.js +3 -1
- package/dist/es2019/ui/Toolbar.js +30 -10
- package/dist/esm/floatingToolbarPlugin.js +18 -5
- package/dist/esm/pm-plugins/commands.js +2 -2
- package/dist/esm/ui/CheckboxModal.js +6 -2
- package/dist/esm/ui/Dropdown.js +3 -1
- package/dist/esm/ui/EmojiPickerButton.js +6 -2
- package/dist/esm/ui/ScrollButton.js +10 -4
- package/dist/esm/ui/SimpleModal.js +3 -1
- package/dist/esm/ui/Toolbar.js +30 -10
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-floating-toolbar
|
|
2
2
|
|
|
3
|
+
## 10.0.12
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 10.0.11
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`9ed32aea2c1d3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9ed32aea2c1d3) -
|
|
14
|
+
Replace feature experiment util with cross platform alternative for platform_editor_block_menu
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 10.0.10
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
|
@@ -312,6 +312,7 @@ function ContentComponent(_ref5) {
|
|
|
312
312
|
if (isInViewMode) {
|
|
313
313
|
// Typescript note: Not all toolbar item types have the `supportsViewMode` prop.
|
|
314
314
|
var toolbarItemViewModeProp = 'supportsViewMode';
|
|
315
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
315
316
|
items = iterableItems.filter(function (item) {
|
|
316
317
|
return toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp];
|
|
317
318
|
});
|
|
@@ -320,11 +321,13 @@ function ContentComponent(_ref5) {
|
|
|
320
321
|
var _items2;
|
|
321
322
|
// Consolidate floating toolbar items
|
|
322
323
|
var toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);
|
|
324
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
323
325
|
var overflowDropdownItems = toolbarItemsArray.filter(function (item) {
|
|
324
326
|
return item.type === 'overflow-dropdown';
|
|
325
327
|
});
|
|
326
328
|
if (overflowDropdownItems.length > 1) {
|
|
327
329
|
var consolidatedOverflowDropdown = (0, _utils3.consolidateOverflowDropdownItems)(overflowDropdownItems);
|
|
330
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
328
331
|
var otherItems = toolbarItemsArray.filter(function (item) {
|
|
329
332
|
return item.type !== 'overflow-dropdown';
|
|
330
333
|
});
|
|
@@ -432,8 +435,12 @@ function ContentComponent(_ref5) {
|
|
|
432
435
|
focusTrap: focusTrap,
|
|
433
436
|
preventOverflow: preventPopupOverflow
|
|
434
437
|
}, /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
|
|
435
|
-
providerFactory: providerFactory
|
|
436
|
-
|
|
438
|
+
providerFactory: providerFactory
|
|
439
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
440
|
+
,
|
|
441
|
+
providers: ['extensionProvider']
|
|
442
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
443
|
+
,
|
|
437
444
|
renderNode: function renderNode(providers) {
|
|
438
445
|
return /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
|
|
439
446
|
target: targetRef
|
|
@@ -447,7 +454,9 @@ function ContentComponent(_ref5) {
|
|
|
447
454
|
editorView: editorView
|
|
448
455
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
449
456
|
,
|
|
450
|
-
className: className
|
|
457
|
+
className: className
|
|
458
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
459
|
+
,
|
|
451
460
|
focusEditor: function focusEditor() {
|
|
452
461
|
return editorView.focus();
|
|
453
462
|
},
|
|
@@ -464,7 +473,9 @@ function ContentComponent(_ref5) {
|
|
|
464
473
|
}
|
|
465
474
|
})), /*#__PURE__*/_react.default.createElement(_ConfirmationModal.ConfirmationModal, {
|
|
466
475
|
testId: "ak-floating-toolbar-confirmation-modal",
|
|
467
|
-
options: confirmDialogOptions
|
|
476
|
+
options: confirmDialogOptions
|
|
477
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
478
|
+
,
|
|
468
479
|
onConfirm: function onConfirm() {
|
|
469
480
|
var isChecked = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
|
470
481
|
// Ignored via go/ees005
|
|
@@ -478,7 +489,9 @@ function ContentComponent(_ref5) {
|
|
|
478
489
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
479
490
|
dispatchCommand(confirmButtonItem.onClick);
|
|
480
491
|
}
|
|
481
|
-
}
|
|
492
|
+
}
|
|
493
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
494
|
+
,
|
|
482
495
|
onClose: function onClose() {
|
|
483
496
|
dispatchCommand((0, _commands2.hideConfirmDialog)());
|
|
484
497
|
// Need to set focus to Editor here,
|
|
@@ -9,7 +9,7 @@ var _clipboard = require("@atlaskit/editor-common/clipboard");
|
|
|
9
9
|
var _copyButton = require("@atlaskit/editor-common/copy-button");
|
|
10
10
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
11
11
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
12
|
-
var
|
|
12
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
13
13
|
var copyNode = exports.copyNode = function copyNode(nodeType, editorAnalyticsApi, inputMethod) {
|
|
14
14
|
return function (_ref) {
|
|
15
15
|
var tr = _ref.tr;
|
|
@@ -27,7 +27,7 @@ var copyNode = exports.copyNode = function copyNode(nodeType, editorAnalyticsApi
|
|
|
27
27
|
var schema = tr.doc.type.schema;
|
|
28
28
|
var copyToClipboardTr = tr;
|
|
29
29
|
var domNode = (0, _copyButton.toDOM)(contentNodeWithPos.node, schema);
|
|
30
|
-
if ((0,
|
|
30
|
+
if ((0, _experiments.editorExperiment)('platform_editor_block_menu', true)) {
|
|
31
31
|
(0, _copyButton.copyDomNode)(domNode, contentNodeWithPos.node.type, tr.selection);
|
|
32
32
|
} else {
|
|
33
33
|
if (domNode) {
|
|
@@ -72,7 +72,9 @@ var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
|
|
|
72
72
|
}), /*#__PURE__*/_react.default.createElement(_compiled.Text, {
|
|
73
73
|
as: "p"
|
|
74
74
|
}, /*#__PURE__*/_react.default.createElement(_checkbox.Checkbox, {
|
|
75
|
-
isChecked: isChecked
|
|
75
|
+
isChecked: isChecked
|
|
76
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
77
|
+
,
|
|
76
78
|
onChange: function onChange() {
|
|
77
79
|
return setCheckbox(!isChecked);
|
|
78
80
|
},
|
|
@@ -83,7 +85,9 @@ var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
|
|
|
83
85
|
onClick: onClose,
|
|
84
86
|
testId: testId ? "".concat(testId, "-cancel-button") : undefined
|
|
85
87
|
}, cancelButtonLabel), /*#__PURE__*/_react.default.createElement(_new.default, {
|
|
86
|
-
appearance: "warning"
|
|
88
|
+
appearance: "warning"
|
|
89
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
90
|
+
,
|
|
87
91
|
onClick: function onClick() {
|
|
88
92
|
onConfirm(isChecked);
|
|
89
93
|
onClose();
|
package/dist/cjs/ui/Dropdown.js
CHANGED
|
@@ -232,7 +232,9 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
232
232
|
fitHeight: fitHeight + fitTolerance,
|
|
233
233
|
trigger: trigger,
|
|
234
234
|
dropdownListId: dropdownListId,
|
|
235
|
-
alignDropdownWithParentElement: alignDropdownWithToolbar
|
|
235
|
+
alignDropdownWithParentElement: alignDropdownWithToolbar
|
|
236
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
237
|
+
,
|
|
236
238
|
arrowKeyNavigationProviderOptions: {
|
|
237
239
|
type: _uiMenu.ArrowKeyNavigationType.MENU
|
|
238
240
|
},
|
|
@@ -111,7 +111,9 @@ var EmojiPickerButton = exports.EmojiPickerButton = function EmojiPickerButton(p
|
|
|
111
111
|
,
|
|
112
112
|
mountTo: props.setDisableParentScroll ? props.mountPoint : buttonRef.current.parentElement,
|
|
113
113
|
fitHeight: EMOJI_PICKER_MAX_HEIGHT,
|
|
114
|
-
fitWidth: EMOJI_PICKER_MAX_WIDTH
|
|
114
|
+
fitWidth: EMOJI_PICKER_MAX_WIDTH
|
|
115
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
116
|
+
,
|
|
115
117
|
offset: [0, 10]
|
|
116
118
|
// Confluence inline comment editor has z-index: 500
|
|
117
119
|
// if the toolbar is scrollable, this will be mounted in the root editor
|
|
@@ -141,7 +143,9 @@ var EmojiPickerButton = exports.EmojiPickerButton = function EmojiPickerButton(p
|
|
|
141
143
|
ref: buttonRef,
|
|
142
144
|
isSelected: props.isSelected,
|
|
143
145
|
label: title,
|
|
144
|
-
spacing: "compact"
|
|
146
|
+
spacing: "compact"
|
|
147
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
148
|
+
,
|
|
145
149
|
icon: function icon() {
|
|
146
150
|
return (0, _react2.jsx)(_emojiAdd.default, {
|
|
147
151
|
color: "currentColor",
|
|
@@ -15,7 +15,7 @@ var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
|
|
|
15
15
|
var _chevronLeft = _interopRequireDefault(require("@atlaskit/icon/core/chevron-left"));
|
|
16
16
|
var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
|
|
17
17
|
var _primitives = require("@atlaskit/primitives");
|
|
18
|
-
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
|
|
18
|
+
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 _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
|
|
19
19
|
// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
|
|
20
20
|
|
|
21
21
|
var rightSideStyles = (0, _primitives.xcss)({
|
|
@@ -78,7 +78,7 @@ var ScrollButton = exports.ScrollButton = function ScrollButton(_ref) {
|
|
|
78
78
|
behavior: 'smooth'
|
|
79
79
|
});
|
|
80
80
|
};
|
|
81
|
-
var resizeObserver = new ResizeObserver(function (
|
|
81
|
+
var resizeObserver = new ResizeObserver(function (_t) {
|
|
82
82
|
var _scrollContainerRef$c5, _scrollContainerRef$c6;
|
|
83
83
|
var widthNeededToShowAllItems = ((_scrollContainerRef$c5 = scrollContainerRef.current) === null || _scrollContainerRef$c5 === void 0 ? void 0 : _scrollContainerRef$c5.scrollWidth) || 0;
|
|
84
84
|
var parentNode = (_scrollContainerRef$c6 = scrollContainerRef.current) === null || _scrollContainerRef$c6 === void 0 ? void 0 : _scrollContainerRef$c6.parentNode;
|
|
@@ -133,20 +133,26 @@ var ScrollButton = exports.ScrollButton = function ScrollButton(_ref) {
|
|
|
133
133
|
}, [node.type, scrollContainerRef]);
|
|
134
134
|
var Icon = side === 'left' ? _chevronLeft.default : _chevronRight.default;
|
|
135
135
|
return needScroll && (side === 'left' && canScrollToSide || side === 'right' && canScrollToSide) && /*#__PURE__*/_react.default.createElement(_primitives.Box, {
|
|
136
|
-
padding: "space.050"
|
|
136
|
+
padding: "space.050"
|
|
137
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
138
|
+
,
|
|
137
139
|
xcss: [side === 'left' ? leftSideStyles : rightSideStyles, buttonCommonStyles]
|
|
138
140
|
}, /*#__PURE__*/_react.default.createElement(_new.IconButton, {
|
|
139
141
|
appearance: "subtle",
|
|
140
142
|
label: intl.formatMessage(side === 'left' ? _floatingToolbar.messages.floatingToolbarScrollLeft : _floatingToolbar.messages.floatingToolbarScrollRight),
|
|
141
143
|
onClick: onClick,
|
|
142
|
-
isDisabled: disabled
|
|
144
|
+
isDisabled: disabled
|
|
145
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
146
|
+
,
|
|
143
147
|
icon: function icon(iconProps) {
|
|
144
148
|
return /*#__PURE__*/_react.default.createElement(Icon, {
|
|
145
149
|
label: iconProps.label,
|
|
146
150
|
size: "small"
|
|
147
151
|
});
|
|
148
152
|
},
|
|
149
|
-
isTooltipDisabled: false
|
|
153
|
+
isTooltipDisabled: false
|
|
154
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
155
|
+
,
|
|
150
156
|
tooltip: {
|
|
151
157
|
position: 'top'
|
|
152
158
|
}
|
|
@@ -35,7 +35,9 @@ var SimpleModal = exports.SimpleModal = function SimpleModal(props) {
|
|
|
35
35
|
onClick: onClose,
|
|
36
36
|
testId: testId ? "".concat(testId, "-cancel-button") : undefined
|
|
37
37
|
}, cancelButtonLabel), /*#__PURE__*/_react.default.createElement(_new.default, {
|
|
38
|
-
appearance: "warning"
|
|
38
|
+
appearance: "warning"
|
|
39
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
40
|
+
,
|
|
39
41
|
onClick: function onClick() {
|
|
40
42
|
onConfirm();
|
|
41
43
|
onClose();
|
package/dist/cjs/ui/Toolbar.js
CHANGED
|
@@ -146,16 +146,24 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
146
146
|
}) : undefined,
|
|
147
147
|
appearance: item.appearance,
|
|
148
148
|
target: item.target,
|
|
149
|
-
onClick: onClickHandler
|
|
149
|
+
onClick: onClickHandler
|
|
150
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
151
|
+
,
|
|
150
152
|
onMouseEnter: function onMouseEnter() {
|
|
151
153
|
return dispatchCommand(item.onMouseEnter);
|
|
152
|
-
}
|
|
154
|
+
}
|
|
155
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
156
|
+
,
|
|
153
157
|
onMouseLeave: function onMouseLeave() {
|
|
154
158
|
return dispatchCommand(item.onMouseLeave);
|
|
155
|
-
}
|
|
159
|
+
}
|
|
160
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
161
|
+
,
|
|
156
162
|
onFocus: function onFocus() {
|
|
157
163
|
return dispatchCommand(item.onFocus);
|
|
158
|
-
}
|
|
164
|
+
}
|
|
165
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
166
|
+
,
|
|
159
167
|
onBlur: function onBlur() {
|
|
160
168
|
return dispatchCommand(item.onBlur);
|
|
161
169
|
},
|
|
@@ -181,10 +189,14 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
181
189
|
mountPoint: popupsMountPoint,
|
|
182
190
|
boundariesElement: popupsBoundariesElement,
|
|
183
191
|
defaultValue: item.defaultValue,
|
|
184
|
-
placeholder: item.placeholder
|
|
192
|
+
placeholder: item.placeholder
|
|
193
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
194
|
+
,
|
|
185
195
|
onSubmit: function onSubmit(value) {
|
|
186
196
|
return dispatchCommand(item.onSubmit(value));
|
|
187
|
-
}
|
|
197
|
+
}
|
|
198
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
199
|
+
,
|
|
188
200
|
onBlur: function onBlur(value) {
|
|
189
201
|
return dispatchCommand(item.onBlur(value));
|
|
190
202
|
}
|
|
@@ -284,7 +296,9 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
284
296
|
boundariesElement: popupsBoundariesElement,
|
|
285
297
|
scrollableElement: popupsScrollableElement,
|
|
286
298
|
defaultValue: item.defaultValue,
|
|
287
|
-
placeholder: item.placeholder
|
|
299
|
+
placeholder: item.placeholder
|
|
300
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
301
|
+
,
|
|
288
302
|
onChange: function onChange(selected) {
|
|
289
303
|
return dispatchCommand(item.onChange(selected));
|
|
290
304
|
},
|
|
@@ -299,7 +313,9 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
299
313
|
skipFocusButtonAfterPick: true,
|
|
300
314
|
key: idx,
|
|
301
315
|
isAriaExpanded: item.isAriaExpanded,
|
|
302
|
-
title: item.title
|
|
316
|
+
title: item.title
|
|
317
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
318
|
+
,
|
|
303
319
|
onChange: function onChange(selected) {
|
|
304
320
|
dispatchCommand(item.onChange(selected));
|
|
305
321
|
},
|
|
@@ -328,7 +344,9 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
328
344
|
editorView: editorView,
|
|
329
345
|
title: item.title,
|
|
330
346
|
providerFactory: providerFactory,
|
|
331
|
-
isSelected: item.selected
|
|
347
|
+
isSelected: item.selected
|
|
348
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
349
|
+
,
|
|
332
350
|
onChange: function onChange(selected) {
|
|
333
351
|
return dispatchCommand(item.onChange(selected));
|
|
334
352
|
},
|
|
@@ -374,7 +392,9 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
374
392
|
});
|
|
375
393
|
}
|
|
376
394
|
};
|
|
377
|
-
var groupedItems = groupItems(
|
|
395
|
+
var groupedItems = groupItems(
|
|
396
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
397
|
+
items.filter(function (item) {
|
|
378
398
|
return !item.hidden;
|
|
379
399
|
}), areAnyNewToolbarFlagsEnabled);
|
|
380
400
|
return (0, _react2.jsx)(_buttonGroup.default, {
|
|
@@ -301,15 +301,18 @@ export function ContentComponent({
|
|
|
301
301
|
if (isInViewMode) {
|
|
302
302
|
// Typescript note: Not all toolbar item types have the `supportsViewMode` prop.
|
|
303
303
|
const toolbarItemViewModeProp = 'supportsViewMode';
|
|
304
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
304
305
|
items = iterableItems.filter(item => toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp]);
|
|
305
306
|
}
|
|
306
307
|
if (areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar))) {
|
|
307
308
|
var _items2;
|
|
308
309
|
// Consolidate floating toolbar items
|
|
309
310
|
const toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);
|
|
311
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
310
312
|
const overflowDropdownItems = toolbarItemsArray.filter(item => item.type === 'overflow-dropdown');
|
|
311
313
|
if (overflowDropdownItems.length > 1) {
|
|
312
314
|
const consolidatedOverflowDropdown = consolidateOverflowDropdownItems(overflowDropdownItems);
|
|
315
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
313
316
|
const otherItems = toolbarItemsArray.filter(item => item.type !== 'overflow-dropdown');
|
|
314
317
|
if (otherItems.length > 0) {
|
|
315
318
|
// remove the last separators
|
|
@@ -415,8 +418,12 @@ export function ContentComponent({
|
|
|
415
418
|
focusTrap: focusTrap,
|
|
416
419
|
preventOverflow: preventPopupOverflow
|
|
417
420
|
}, /*#__PURE__*/React.createElement(WithProviders, {
|
|
418
|
-
providerFactory: providerFactory
|
|
419
|
-
|
|
421
|
+
providerFactory: providerFactory
|
|
422
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
423
|
+
,
|
|
424
|
+
providers: ['extensionProvider']
|
|
425
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
426
|
+
,
|
|
420
427
|
renderNode: providers => {
|
|
421
428
|
return /*#__PURE__*/React.createElement(Toolbar, {
|
|
422
429
|
target: targetRef
|
|
@@ -430,7 +437,9 @@ export function ContentComponent({
|
|
|
430
437
|
editorView: editorView
|
|
431
438
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
432
439
|
,
|
|
433
|
-
className: className
|
|
440
|
+
className: className
|
|
441
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
442
|
+
,
|
|
434
443
|
focusEditor: () => editorView.focus(),
|
|
435
444
|
providerFactory: providerFactory,
|
|
436
445
|
popupsMountPoint: popupsMountPoint,
|
|
@@ -445,7 +454,9 @@ export function ContentComponent({
|
|
|
445
454
|
}
|
|
446
455
|
})), /*#__PURE__*/React.createElement(ConfirmationModal, {
|
|
447
456
|
testId: "ak-floating-toolbar-confirmation-modal",
|
|
448
|
-
options: confirmDialogOptions
|
|
457
|
+
options: confirmDialogOptions
|
|
458
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
459
|
+
,
|
|
449
460
|
onConfirm: (isChecked = false) => {
|
|
450
461
|
// Ignored via go/ees005
|
|
451
462
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
@@ -458,7 +469,9 @@ export function ContentComponent({
|
|
|
458
469
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
459
470
|
dispatchCommand(confirmButtonItem.onClick);
|
|
460
471
|
}
|
|
461
|
-
}
|
|
472
|
+
}
|
|
473
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
474
|
+
,
|
|
462
475
|
onClose: () => {
|
|
463
476
|
dispatchCommand(hideConfirmDialog());
|
|
464
477
|
// Need to set focus to Editor here,
|
|
@@ -3,7 +3,7 @@ import { copyHTMLToClipboard, copyHTMLToClipboardPolyfill, getNodeCopiedAnalytic
|
|
|
3
3
|
import { copyDomNode, getSelectedNodeOrNodeParentByNodeType, toDOM } from '@atlaskit/editor-common/copy-button';
|
|
4
4
|
import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
|
|
5
5
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
6
|
-
import {
|
|
6
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
7
7
|
export const copyNode = (nodeType, editorAnalyticsApi, inputMethod) => ({
|
|
8
8
|
tr
|
|
9
9
|
}) => {
|
|
@@ -21,7 +21,7 @@ export const copyNode = (nodeType, editorAnalyticsApi, inputMethod) => ({
|
|
|
21
21
|
const schema = tr.doc.type.schema;
|
|
22
22
|
const copyToClipboardTr = tr;
|
|
23
23
|
const domNode = toDOM(contentNodeWithPos.node, schema);
|
|
24
|
-
if (
|
|
24
|
+
if (editorExperiment('platform_editor_block_menu', true)) {
|
|
25
25
|
copyDomNode(domNode, contentNodeWithPos.node.type, tr.selection);
|
|
26
26
|
} else {
|
|
27
27
|
if (domNode) {
|
|
@@ -63,7 +63,9 @@ export const CheckboxModal = props => {
|
|
|
63
63
|
}), /*#__PURE__*/React.createElement(Text, {
|
|
64
64
|
as: "p"
|
|
65
65
|
}, /*#__PURE__*/React.createElement(Checkbox, {
|
|
66
|
-
isChecked: isChecked
|
|
66
|
+
isChecked: isChecked
|
|
67
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
68
|
+
,
|
|
67
69
|
onChange: () => setCheckbox(!isChecked),
|
|
68
70
|
label: checkboxlabel,
|
|
69
71
|
testId: testId ? `${testId}-checkbox` : undefined
|
|
@@ -72,7 +74,9 @@ export const CheckboxModal = props => {
|
|
|
72
74
|
onClick: onClose,
|
|
73
75
|
testId: testId ? `${testId}-cancel-button` : undefined
|
|
74
76
|
}, cancelButtonLabel), /*#__PURE__*/React.createElement(Button, {
|
|
75
|
-
appearance: "warning"
|
|
77
|
+
appearance: "warning"
|
|
78
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
79
|
+
,
|
|
76
80
|
onClick: () => {
|
|
77
81
|
onConfirm(isChecked);
|
|
78
82
|
onClose();
|
|
@@ -214,7 +214,9 @@ export default class Dropdown extends Component {
|
|
|
214
214
|
fitHeight: fitHeight + fitTolerance,
|
|
215
215
|
trigger: trigger,
|
|
216
216
|
dropdownListId: dropdownListId,
|
|
217
|
-
alignDropdownWithParentElement: alignDropdownWithToolbar
|
|
217
|
+
alignDropdownWithParentElement: alignDropdownWithToolbar
|
|
218
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
219
|
+
,
|
|
218
220
|
arrowKeyNavigationProviderOptions: {
|
|
219
221
|
type: ArrowKeyNavigationType.MENU
|
|
220
222
|
},
|
|
@@ -95,7 +95,9 @@ export const EmojiPickerButton = props => {
|
|
|
95
95
|
,
|
|
96
96
|
mountTo: props.setDisableParentScroll ? props.mountPoint : buttonRef.current.parentElement,
|
|
97
97
|
fitHeight: EMOJI_PICKER_MAX_HEIGHT,
|
|
98
|
-
fitWidth: EMOJI_PICKER_MAX_WIDTH
|
|
98
|
+
fitWidth: EMOJI_PICKER_MAX_WIDTH
|
|
99
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
100
|
+
,
|
|
99
101
|
offset: [0, 10]
|
|
100
102
|
// Confluence inline comment editor has z-index: 500
|
|
101
103
|
// if the toolbar is scrollable, this will be mounted in the root editor
|
|
@@ -125,7 +127,9 @@ export const EmojiPickerButton = props => {
|
|
|
125
127
|
ref: buttonRef,
|
|
126
128
|
isSelected: props.isSelected,
|
|
127
129
|
label: title,
|
|
128
|
-
spacing: "compact"
|
|
130
|
+
spacing: "compact"
|
|
131
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
132
|
+
,
|
|
129
133
|
icon: () => jsx(EmojiAddIcon, {
|
|
130
134
|
color: "currentColor",
|
|
131
135
|
label: "emoji-picker-button",
|
|
@@ -63,7 +63,7 @@ export const ScrollButton = ({
|
|
|
63
63
|
behavior: 'smooth'
|
|
64
64
|
});
|
|
65
65
|
};
|
|
66
|
-
const resizeObserver = new ResizeObserver(
|
|
66
|
+
const resizeObserver = new ResizeObserver(_t => {
|
|
67
67
|
var _scrollContainerRef$c4, _scrollContainerRef$c5;
|
|
68
68
|
const widthNeededToShowAllItems = ((_scrollContainerRef$c4 = scrollContainerRef.current) === null || _scrollContainerRef$c4 === void 0 ? void 0 : _scrollContainerRef$c4.scrollWidth) || 0;
|
|
69
69
|
const parentNode = (_scrollContainerRef$c5 = scrollContainerRef.current) === null || _scrollContainerRef$c5 === void 0 ? void 0 : _scrollContainerRef$c5.parentNode;
|
|
@@ -118,18 +118,24 @@ export const ScrollButton = ({
|
|
|
118
118
|
}, [node.type, scrollContainerRef]);
|
|
119
119
|
const Icon = side === 'left' ? ChevronLeftLargeIcon : ChevronRightLargeIcon;
|
|
120
120
|
return needScroll && (side === 'left' && canScrollToSide || side === 'right' && canScrollToSide) && /*#__PURE__*/React.createElement(Box, {
|
|
121
|
-
padding: "space.050"
|
|
121
|
+
padding: "space.050"
|
|
122
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
123
|
+
,
|
|
122
124
|
xcss: [side === 'left' ? leftSideStyles : rightSideStyles, buttonCommonStyles]
|
|
123
125
|
}, /*#__PURE__*/React.createElement(IconButton, {
|
|
124
126
|
appearance: "subtle",
|
|
125
127
|
label: intl.formatMessage(side === 'left' ? messages.floatingToolbarScrollLeft : messages.floatingToolbarScrollRight),
|
|
126
128
|
onClick: onClick,
|
|
127
|
-
isDisabled: disabled
|
|
129
|
+
isDisabled: disabled
|
|
130
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
131
|
+
,
|
|
128
132
|
icon: iconProps => /*#__PURE__*/React.createElement(Icon, {
|
|
129
133
|
label: iconProps.label,
|
|
130
134
|
size: "small"
|
|
131
135
|
}),
|
|
132
|
-
isTooltipDisabled: false
|
|
136
|
+
isTooltipDisabled: false
|
|
137
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
138
|
+
,
|
|
133
139
|
tooltip: {
|
|
134
140
|
position: 'top'
|
|
135
141
|
}
|
|
@@ -30,7 +30,9 @@ export const SimpleModal = props => {
|
|
|
30
30
|
onClick: onClose,
|
|
31
31
|
testId: testId ? `${testId}-cancel-button` : undefined
|
|
32
32
|
}, cancelButtonLabel), /*#__PURE__*/React.createElement(Button, {
|
|
33
|
-
appearance: "warning"
|
|
33
|
+
appearance: "warning"
|
|
34
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
35
|
+
,
|
|
34
36
|
onClick: () => {
|
|
35
37
|
onConfirm();
|
|
36
38
|
onClose();
|
|
@@ -134,10 +134,18 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
|
|
|
134
134
|
}) : undefined,
|
|
135
135
|
appearance: item.appearance,
|
|
136
136
|
target: item.target,
|
|
137
|
-
onClick: onClickHandler
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
137
|
+
onClick: onClickHandler
|
|
138
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
139
|
+
,
|
|
140
|
+
onMouseEnter: () => dispatchCommand(item.onMouseEnter)
|
|
141
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
142
|
+
,
|
|
143
|
+
onMouseLeave: () => dispatchCommand(item.onMouseLeave)
|
|
144
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
145
|
+
,
|
|
146
|
+
onFocus: () => dispatchCommand(item.onFocus)
|
|
147
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
148
|
+
,
|
|
141
149
|
onBlur: () => dispatchCommand(item.onBlur),
|
|
142
150
|
onMount: item.onMount,
|
|
143
151
|
onUnmount: item.onUnmount,
|
|
@@ -161,8 +169,12 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
|
|
|
161
169
|
mountPoint: popupsMountPoint,
|
|
162
170
|
boundariesElement: popupsBoundariesElement,
|
|
163
171
|
defaultValue: item.defaultValue,
|
|
164
|
-
placeholder: item.placeholder
|
|
165
|
-
|
|
172
|
+
placeholder: item.placeholder
|
|
173
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
174
|
+
,
|
|
175
|
+
onSubmit: value => dispatchCommand(item.onSubmit(value))
|
|
176
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
177
|
+
,
|
|
166
178
|
onBlur: value => dispatchCommand(item.onBlur(value))
|
|
167
179
|
});
|
|
168
180
|
case 'custom':
|
|
@@ -261,7 +273,9 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
|
|
|
261
273
|
boundariesElement: popupsBoundariesElement,
|
|
262
274
|
scrollableElement: popupsScrollableElement,
|
|
263
275
|
defaultValue: item.defaultValue,
|
|
264
|
-
placeholder: item.placeholder
|
|
276
|
+
placeholder: item.placeholder
|
|
277
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
278
|
+
,
|
|
265
279
|
onChange: selected => dispatchCommand(item.onChange(selected)),
|
|
266
280
|
ariaLabel: ariaLabel,
|
|
267
281
|
filterOption: item.filterOption,
|
|
@@ -274,7 +288,9 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
|
|
|
274
288
|
skipFocusButtonAfterPick: true,
|
|
275
289
|
key: idx,
|
|
276
290
|
isAriaExpanded: item.isAriaExpanded,
|
|
277
|
-
title: item.title
|
|
291
|
+
title: item.title
|
|
292
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
293
|
+
,
|
|
278
294
|
onChange: selected => {
|
|
279
295
|
dispatchCommand(item.onChange(selected));
|
|
280
296
|
},
|
|
@@ -303,7 +319,9 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
|
|
|
303
319
|
editorView: editorView,
|
|
304
320
|
title: item.title,
|
|
305
321
|
providerFactory: providerFactory,
|
|
306
|
-
isSelected: item.selected
|
|
322
|
+
isSelected: item.selected
|
|
323
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
324
|
+
,
|
|
307
325
|
onChange: selected => dispatchCommand(item.onChange(selected)),
|
|
308
326
|
mountPoint: emojiAndColourPickerMountPoint,
|
|
309
327
|
popupsBoundariesElement: popupsBoundariesElement,
|
|
@@ -347,7 +365,9 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
|
|
|
347
365
|
});
|
|
348
366
|
}
|
|
349
367
|
};
|
|
350
|
-
const groupedItems = groupItems(
|
|
368
|
+
const groupedItems = groupItems(
|
|
369
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
370
|
+
items.filter(item => !item.hidden), areAnyNewToolbarFlagsEnabled);
|
|
351
371
|
return jsx(ButtonGroup, {
|
|
352
372
|
testId: "editor-floating-toolbar-items"
|
|
353
373
|
}, groupedItems.map((element, index) => {
|
|
@@ -302,6 +302,7 @@ export function ContentComponent(_ref5) {
|
|
|
302
302
|
if (isInViewMode) {
|
|
303
303
|
// Typescript note: Not all toolbar item types have the `supportsViewMode` prop.
|
|
304
304
|
var toolbarItemViewModeProp = 'supportsViewMode';
|
|
305
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
305
306
|
items = iterableItems.filter(function (item) {
|
|
306
307
|
return toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp];
|
|
307
308
|
});
|
|
@@ -310,11 +311,13 @@ export function ContentComponent(_ref5) {
|
|
|
310
311
|
var _items2;
|
|
311
312
|
// Consolidate floating toolbar items
|
|
312
313
|
var toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);
|
|
314
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
313
315
|
var overflowDropdownItems = toolbarItemsArray.filter(function (item) {
|
|
314
316
|
return item.type === 'overflow-dropdown';
|
|
315
317
|
});
|
|
316
318
|
if (overflowDropdownItems.length > 1) {
|
|
317
319
|
var consolidatedOverflowDropdown = consolidateOverflowDropdownItems(overflowDropdownItems);
|
|
320
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
318
321
|
var otherItems = toolbarItemsArray.filter(function (item) {
|
|
319
322
|
return item.type !== 'overflow-dropdown';
|
|
320
323
|
});
|
|
@@ -422,8 +425,12 @@ export function ContentComponent(_ref5) {
|
|
|
422
425
|
focusTrap: focusTrap,
|
|
423
426
|
preventOverflow: preventPopupOverflow
|
|
424
427
|
}, /*#__PURE__*/React.createElement(WithProviders, {
|
|
425
|
-
providerFactory: providerFactory
|
|
426
|
-
|
|
428
|
+
providerFactory: providerFactory
|
|
429
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
430
|
+
,
|
|
431
|
+
providers: ['extensionProvider']
|
|
432
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
433
|
+
,
|
|
427
434
|
renderNode: function renderNode(providers) {
|
|
428
435
|
return /*#__PURE__*/React.createElement(Toolbar, {
|
|
429
436
|
target: targetRef
|
|
@@ -437,7 +444,9 @@ export function ContentComponent(_ref5) {
|
|
|
437
444
|
editorView: editorView
|
|
438
445
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
439
446
|
,
|
|
440
|
-
className: className
|
|
447
|
+
className: className
|
|
448
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
449
|
+
,
|
|
441
450
|
focusEditor: function focusEditor() {
|
|
442
451
|
return editorView.focus();
|
|
443
452
|
},
|
|
@@ -454,7 +463,9 @@ export function ContentComponent(_ref5) {
|
|
|
454
463
|
}
|
|
455
464
|
})), /*#__PURE__*/React.createElement(ConfirmationModal, {
|
|
456
465
|
testId: "ak-floating-toolbar-confirmation-modal",
|
|
457
|
-
options: confirmDialogOptions
|
|
466
|
+
options: confirmDialogOptions
|
|
467
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
468
|
+
,
|
|
458
469
|
onConfirm: function onConfirm() {
|
|
459
470
|
var isChecked = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
|
460
471
|
// Ignored via go/ees005
|
|
@@ -468,7 +479,9 @@ export function ContentComponent(_ref5) {
|
|
|
468
479
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
469
480
|
dispatchCommand(confirmButtonItem.onClick);
|
|
470
481
|
}
|
|
471
|
-
}
|
|
482
|
+
}
|
|
483
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
484
|
+
,
|
|
472
485
|
onClose: function onClose() {
|
|
473
486
|
dispatchCommand(hideConfirmDialog());
|
|
474
487
|
// Need to set focus to Editor here,
|
|
@@ -3,7 +3,7 @@ import { copyHTMLToClipboard, copyHTMLToClipboardPolyfill, getNodeCopiedAnalytic
|
|
|
3
3
|
import { copyDomNode, getSelectedNodeOrNodeParentByNodeType, toDOM } from '@atlaskit/editor-common/copy-button';
|
|
4
4
|
import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
|
|
5
5
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
6
|
-
import {
|
|
6
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
7
7
|
export var copyNode = function copyNode(nodeType, editorAnalyticsApi, inputMethod) {
|
|
8
8
|
return function (_ref) {
|
|
9
9
|
var tr = _ref.tr;
|
|
@@ -21,7 +21,7 @@ export var copyNode = function copyNode(nodeType, editorAnalyticsApi, inputMetho
|
|
|
21
21
|
var schema = tr.doc.type.schema;
|
|
22
22
|
var copyToClipboardTr = tr;
|
|
23
23
|
var domNode = toDOM(contentNodeWithPos.node, schema);
|
|
24
|
-
if (
|
|
24
|
+
if (editorExperiment('platform_editor_block_menu', true)) {
|
|
25
25
|
copyDomNode(domNode, contentNodeWithPos.node.type, tr.selection);
|
|
26
26
|
} else {
|
|
27
27
|
if (domNode) {
|
|
@@ -63,7 +63,9 @@ export var CheckboxModal = function CheckboxModal(props) {
|
|
|
63
63
|
}), /*#__PURE__*/React.createElement(Text, {
|
|
64
64
|
as: "p"
|
|
65
65
|
}, /*#__PURE__*/React.createElement(Checkbox, {
|
|
66
|
-
isChecked: isChecked
|
|
66
|
+
isChecked: isChecked
|
|
67
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
68
|
+
,
|
|
67
69
|
onChange: function onChange() {
|
|
68
70
|
return setCheckbox(!isChecked);
|
|
69
71
|
},
|
|
@@ -74,7 +76,9 @@ export var CheckboxModal = function CheckboxModal(props) {
|
|
|
74
76
|
onClick: onClose,
|
|
75
77
|
testId: testId ? "".concat(testId, "-cancel-button") : undefined
|
|
76
78
|
}, cancelButtonLabel), /*#__PURE__*/React.createElement(Button, {
|
|
77
|
-
appearance: "warning"
|
|
79
|
+
appearance: "warning"
|
|
80
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
81
|
+
,
|
|
78
82
|
onClick: function onClick() {
|
|
79
83
|
onConfirm(isChecked);
|
|
80
84
|
onClose();
|
package/dist/esm/ui/Dropdown.js
CHANGED
|
@@ -228,7 +228,9 @@ var Dropdown = /*#__PURE__*/function (_Component) {
|
|
|
228
228
|
fitHeight: fitHeight + fitTolerance,
|
|
229
229
|
trigger: trigger,
|
|
230
230
|
dropdownListId: dropdownListId,
|
|
231
|
-
alignDropdownWithParentElement: alignDropdownWithToolbar
|
|
231
|
+
alignDropdownWithParentElement: alignDropdownWithToolbar
|
|
232
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
233
|
+
,
|
|
232
234
|
arrowKeyNavigationProviderOptions: {
|
|
233
235
|
type: ArrowKeyNavigationType.MENU
|
|
234
236
|
},
|
|
@@ -101,7 +101,9 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
|
|
|
101
101
|
,
|
|
102
102
|
mountTo: props.setDisableParentScroll ? props.mountPoint : buttonRef.current.parentElement,
|
|
103
103
|
fitHeight: EMOJI_PICKER_MAX_HEIGHT,
|
|
104
|
-
fitWidth: EMOJI_PICKER_MAX_WIDTH
|
|
104
|
+
fitWidth: EMOJI_PICKER_MAX_WIDTH
|
|
105
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
106
|
+
,
|
|
105
107
|
offset: [0, 10]
|
|
106
108
|
// Confluence inline comment editor has z-index: 500
|
|
107
109
|
// if the toolbar is scrollable, this will be mounted in the root editor
|
|
@@ -131,7 +133,9 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
|
|
|
131
133
|
ref: buttonRef,
|
|
132
134
|
isSelected: props.isSelected,
|
|
133
135
|
label: title,
|
|
134
|
-
spacing: "compact"
|
|
136
|
+
spacing: "compact"
|
|
137
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
138
|
+
,
|
|
135
139
|
icon: function icon() {
|
|
136
140
|
return jsx(EmojiAddIcon, {
|
|
137
141
|
color: "currentColor",
|
|
@@ -68,7 +68,7 @@ export var ScrollButton = function ScrollButton(_ref) {
|
|
|
68
68
|
behavior: 'smooth'
|
|
69
69
|
});
|
|
70
70
|
};
|
|
71
|
-
var resizeObserver = new ResizeObserver(function (
|
|
71
|
+
var resizeObserver = new ResizeObserver(function (_t) {
|
|
72
72
|
var _scrollContainerRef$c5, _scrollContainerRef$c6;
|
|
73
73
|
var widthNeededToShowAllItems = ((_scrollContainerRef$c5 = scrollContainerRef.current) === null || _scrollContainerRef$c5 === void 0 ? void 0 : _scrollContainerRef$c5.scrollWidth) || 0;
|
|
74
74
|
var parentNode = (_scrollContainerRef$c6 = scrollContainerRef.current) === null || _scrollContainerRef$c6 === void 0 ? void 0 : _scrollContainerRef$c6.parentNode;
|
|
@@ -123,20 +123,26 @@ export var ScrollButton = function ScrollButton(_ref) {
|
|
|
123
123
|
}, [node.type, scrollContainerRef]);
|
|
124
124
|
var Icon = side === 'left' ? ChevronLeftLargeIcon : ChevronRightLargeIcon;
|
|
125
125
|
return needScroll && (side === 'left' && canScrollToSide || side === 'right' && canScrollToSide) && /*#__PURE__*/React.createElement(Box, {
|
|
126
|
-
padding: "space.050"
|
|
126
|
+
padding: "space.050"
|
|
127
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
128
|
+
,
|
|
127
129
|
xcss: [side === 'left' ? leftSideStyles : rightSideStyles, buttonCommonStyles]
|
|
128
130
|
}, /*#__PURE__*/React.createElement(IconButton, {
|
|
129
131
|
appearance: "subtle",
|
|
130
132
|
label: intl.formatMessage(side === 'left' ? messages.floatingToolbarScrollLeft : messages.floatingToolbarScrollRight),
|
|
131
133
|
onClick: onClick,
|
|
132
|
-
isDisabled: disabled
|
|
134
|
+
isDisabled: disabled
|
|
135
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
136
|
+
,
|
|
133
137
|
icon: function icon(iconProps) {
|
|
134
138
|
return /*#__PURE__*/React.createElement(Icon, {
|
|
135
139
|
label: iconProps.label,
|
|
136
140
|
size: "small"
|
|
137
141
|
});
|
|
138
142
|
},
|
|
139
|
-
isTooltipDisabled: false
|
|
143
|
+
isTooltipDisabled: false
|
|
144
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
145
|
+
,
|
|
140
146
|
tooltip: {
|
|
141
147
|
position: 'top'
|
|
142
148
|
}
|
|
@@ -26,7 +26,9 @@ export var SimpleModal = function SimpleModal(props) {
|
|
|
26
26
|
onClick: onClose,
|
|
27
27
|
testId: testId ? "".concat(testId, "-cancel-button") : undefined
|
|
28
28
|
}, cancelButtonLabel), /*#__PURE__*/React.createElement(Button, {
|
|
29
|
-
appearance: "warning"
|
|
29
|
+
appearance: "warning"
|
|
30
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
31
|
+
,
|
|
30
32
|
onClick: function onClick() {
|
|
31
33
|
onConfirm();
|
|
32
34
|
onClose();
|
package/dist/esm/ui/Toolbar.js
CHANGED
|
@@ -140,16 +140,24 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
140
140
|
}) : undefined,
|
|
141
141
|
appearance: item.appearance,
|
|
142
142
|
target: item.target,
|
|
143
|
-
onClick: onClickHandler
|
|
143
|
+
onClick: onClickHandler
|
|
144
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
145
|
+
,
|
|
144
146
|
onMouseEnter: function onMouseEnter() {
|
|
145
147
|
return dispatchCommand(item.onMouseEnter);
|
|
146
|
-
}
|
|
148
|
+
}
|
|
149
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
150
|
+
,
|
|
147
151
|
onMouseLeave: function onMouseLeave() {
|
|
148
152
|
return dispatchCommand(item.onMouseLeave);
|
|
149
|
-
}
|
|
153
|
+
}
|
|
154
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
155
|
+
,
|
|
150
156
|
onFocus: function onFocus() {
|
|
151
157
|
return dispatchCommand(item.onFocus);
|
|
152
|
-
}
|
|
158
|
+
}
|
|
159
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
160
|
+
,
|
|
153
161
|
onBlur: function onBlur() {
|
|
154
162
|
return dispatchCommand(item.onBlur);
|
|
155
163
|
},
|
|
@@ -175,10 +183,14 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
175
183
|
mountPoint: popupsMountPoint,
|
|
176
184
|
boundariesElement: popupsBoundariesElement,
|
|
177
185
|
defaultValue: item.defaultValue,
|
|
178
|
-
placeholder: item.placeholder
|
|
186
|
+
placeholder: item.placeholder
|
|
187
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
188
|
+
,
|
|
179
189
|
onSubmit: function onSubmit(value) {
|
|
180
190
|
return dispatchCommand(item.onSubmit(value));
|
|
181
|
-
}
|
|
191
|
+
}
|
|
192
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
193
|
+
,
|
|
182
194
|
onBlur: function onBlur(value) {
|
|
183
195
|
return dispatchCommand(item.onBlur(value));
|
|
184
196
|
}
|
|
@@ -278,7 +290,9 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
278
290
|
boundariesElement: popupsBoundariesElement,
|
|
279
291
|
scrollableElement: popupsScrollableElement,
|
|
280
292
|
defaultValue: item.defaultValue,
|
|
281
|
-
placeholder: item.placeholder
|
|
293
|
+
placeholder: item.placeholder
|
|
294
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
295
|
+
,
|
|
282
296
|
onChange: function onChange(selected) {
|
|
283
297
|
return dispatchCommand(item.onChange(selected));
|
|
284
298
|
},
|
|
@@ -293,7 +307,9 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
293
307
|
skipFocusButtonAfterPick: true,
|
|
294
308
|
key: idx,
|
|
295
309
|
isAriaExpanded: item.isAriaExpanded,
|
|
296
|
-
title: item.title
|
|
310
|
+
title: item.title
|
|
311
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
312
|
+
,
|
|
297
313
|
onChange: function onChange(selected) {
|
|
298
314
|
dispatchCommand(item.onChange(selected));
|
|
299
315
|
},
|
|
@@ -322,7 +338,9 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
322
338
|
editorView: editorView,
|
|
323
339
|
title: item.title,
|
|
324
340
|
providerFactory: providerFactory,
|
|
325
|
-
isSelected: item.selected
|
|
341
|
+
isSelected: item.selected
|
|
342
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
343
|
+
,
|
|
326
344
|
onChange: function onChange(selected) {
|
|
327
345
|
return dispatchCommand(item.onChange(selected));
|
|
328
346
|
},
|
|
@@ -368,7 +386,9 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
368
386
|
});
|
|
369
387
|
}
|
|
370
388
|
};
|
|
371
|
-
var groupedItems = groupItems(
|
|
389
|
+
var groupedItems = groupItems(
|
|
390
|
+
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
391
|
+
items.filter(function (item) {
|
|
372
392
|
return !item.hidden;
|
|
373
393
|
}), areAnyNewToolbarFlagsEnabled);
|
|
374
394
|
return jsx(ButtonGroup, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-floating-toolbar",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.0.12",
|
|
4
4
|
"description": "Floating toolbar plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@atlaskit/primitives": "^18.0.0",
|
|
45
45
|
"@atlaskit/select": "^21.8.0",
|
|
46
46
|
"@atlaskit/theme": "^22.0.0",
|
|
47
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
47
|
+
"@atlaskit/tmp-editor-statsig": "^44.0.0",
|
|
48
48
|
"@atlaskit/tokens": "^11.1.0",
|
|
49
49
|
"@atlaskit/tooltip": "^21.0.0",
|
|
50
50
|
"@babel/runtime": "^7.0.0",
|