@atlaskit/editor-plugin-floating-toolbar 1.13.18 → 1.13.20
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 +18 -0
- package/dist/cjs/ui/Dropdown.js +7 -0
- package/dist/cjs/ui/DropdownMenu.js +2 -0
- package/dist/cjs/ui/Toolbar.js +2 -0
- package/dist/es2019/ui/Dropdown.js +7 -0
- package/dist/es2019/ui/DropdownMenu.js +2 -0
- package/dist/es2019/ui/Toolbar.js +2 -0
- package/dist/esm/ui/Dropdown.js +7 -0
- package/dist/esm/ui/DropdownMenu.js +2 -0
- package/dist/esm/ui/Toolbar.js +2 -0
- package/dist/types/ui/Dropdown.d.ts +2 -0
- package/dist/types/ui/EmojiPickerButton.d.ts +1 -0
- package/dist/types-ts4.5/ui/Dropdown.d.ts +2 -0
- package/dist/types-ts4.5/ui/EmojiPickerButton.d.ts +1 -0
- package/package.json +15 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-floating-toolbar
|
|
2
2
|
|
|
3
|
+
## 1.13.20
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#155293](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/155293)
|
|
8
|
+
[`28161e3c04419`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/28161e3c04419) -
|
|
9
|
+
[ux] Implement toolbar options on layout for setting number of columns
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 1.13.19
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#155735](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/155735)
|
|
17
|
+
[`1beeeda29023a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1beeeda29023a) -
|
|
18
|
+
Upgrades editor packages to react 18
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 1.13.18
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
package/dist/cjs/ui/Dropdown.js
CHANGED
|
@@ -83,6 +83,10 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
83
83
|
});
|
|
84
84
|
});
|
|
85
85
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "toggleOpen", function () {
|
|
86
|
+
var onClick = _this.props.onClick;
|
|
87
|
+
if (onClick) {
|
|
88
|
+
onClick();
|
|
89
|
+
}
|
|
86
90
|
_this.setState({
|
|
87
91
|
isOpen: !_this.state.isOpen,
|
|
88
92
|
isOpenedByKeyboard: false
|
|
@@ -145,6 +149,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
145
149
|
dropdownListId = _this$props2.dropdownListId,
|
|
146
150
|
alignDropdownWithToolbar = _this$props2.alignDropdownWithToolbar,
|
|
147
151
|
footer = _this$props2.footer,
|
|
152
|
+
onMount = _this$props2.onMount,
|
|
148
153
|
pulse = _this$props2.pulse;
|
|
149
154
|
var trigger;
|
|
150
155
|
if (icon) {
|
|
@@ -160,6 +165,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
160
165
|
selected: isOpen,
|
|
161
166
|
disabled: disabled,
|
|
162
167
|
tooltipContent: tooltip,
|
|
168
|
+
onMount: onMount,
|
|
163
169
|
pulse: pulse
|
|
164
170
|
});
|
|
165
171
|
} else {
|
|
@@ -181,6 +187,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
181
187
|
tooltipContent: tooltip,
|
|
182
188
|
ariaHasPopup: true,
|
|
183
189
|
areaControls: dropdownListId,
|
|
190
|
+
onMount: onMount,
|
|
184
191
|
pulse: pulse
|
|
185
192
|
}, title);
|
|
186
193
|
}
|
|
@@ -12,6 +12,7 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
12
12
|
var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
|
|
13
13
|
var _done = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/done"));
|
|
14
14
|
var _menu = require("@atlaskit/menu");
|
|
15
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
16
|
var _colors = require("@atlaskit/theme/colors");
|
|
16
17
|
var _constants = require("@atlaskit/theme/constants");
|
|
17
18
|
var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
|
|
@@ -173,6 +174,7 @@ var DropdownMenuItem = function DropdownMenuItem(props) {
|
|
|
173
174
|
};
|
|
174
175
|
});
|
|
175
176
|
var itemContent = (0, _react2.jsx)(DropdownButtonItem, {
|
|
177
|
+
isSelected: (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_pre_release_2') ? itemSelected : undefined,
|
|
176
178
|
iconBefore: iconBefore,
|
|
177
179
|
iconAfter: item.elemAfter,
|
|
178
180
|
onClick: handleItemClick,
|
package/dist/cjs/ui/Toolbar.js
CHANGED
|
@@ -208,6 +208,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
208
208
|
alignDropdownWithToolbar: items.length === 1,
|
|
209
209
|
onToggle: item.onToggle,
|
|
210
210
|
footer: item.footer,
|
|
211
|
+
onMount: item.onMount,
|
|
212
|
+
onClick: item.onClick,
|
|
211
213
|
pulse: item.pulse
|
|
212
214
|
});
|
|
213
215
|
case 'select':
|
|
@@ -61,6 +61,10 @@ export default class Dropdown extends Component {
|
|
|
61
61
|
});
|
|
62
62
|
});
|
|
63
63
|
_defineProperty(this, "toggleOpen", () => {
|
|
64
|
+
const onClick = this.props.onClick;
|
|
65
|
+
if (onClick) {
|
|
66
|
+
onClick();
|
|
67
|
+
}
|
|
64
68
|
this.setState({
|
|
65
69
|
isOpen: !this.state.isOpen,
|
|
66
70
|
isOpenedByKeyboard: false
|
|
@@ -123,6 +127,7 @@ export default class Dropdown extends Component {
|
|
|
123
127
|
dropdownListId,
|
|
124
128
|
alignDropdownWithToolbar,
|
|
125
129
|
footer,
|
|
130
|
+
onMount,
|
|
126
131
|
pulse
|
|
127
132
|
} = this.props;
|
|
128
133
|
let trigger;
|
|
@@ -139,6 +144,7 @@ export default class Dropdown extends Component {
|
|
|
139
144
|
selected: isOpen,
|
|
140
145
|
disabled: disabled,
|
|
141
146
|
tooltipContent: tooltip,
|
|
147
|
+
onMount: onMount,
|
|
142
148
|
pulse: pulse
|
|
143
149
|
});
|
|
144
150
|
} else {
|
|
@@ -160,6 +166,7 @@ export default class Dropdown extends Component {
|
|
|
160
166
|
tooltipContent: tooltip,
|
|
161
167
|
ariaHasPopup: true,
|
|
162
168
|
areaControls: dropdownListId,
|
|
169
|
+
onMount: onMount,
|
|
163
170
|
pulse: pulse
|
|
164
171
|
}, title);
|
|
165
172
|
}
|
|
@@ -12,6 +12,7 @@ import { injectIntl } from 'react-intl-next';
|
|
|
12
12
|
import { messages } from '@atlaskit/editor-common/floating-toolbar';
|
|
13
13
|
import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
|
|
14
14
|
import { ButtonItem } from '@atlaskit/menu';
|
|
15
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
16
|
import { B400 } from '@atlaskit/theme/colors';
|
|
16
17
|
// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
|
|
17
18
|
import { gridSize } from '@atlaskit/theme/constants';
|
|
@@ -164,6 +165,7 @@ const DropdownMenuItem = props => {
|
|
|
164
165
|
};
|
|
165
166
|
});
|
|
166
167
|
const itemContent = jsx(DropdownButtonItem, {
|
|
168
|
+
isSelected: fg('platform_editor_advanced_layouts_pre_release_2') ? itemSelected : undefined,
|
|
167
169
|
iconBefore: iconBefore,
|
|
168
170
|
iconAfter: item.elemAfter,
|
|
169
171
|
onClick: handleItemClick,
|
|
@@ -180,6 +180,8 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
|
|
|
180
180
|
alignDropdownWithToolbar: items.length === 1,
|
|
181
181
|
onToggle: item.onToggle,
|
|
182
182
|
footer: item.footer,
|
|
183
|
+
onMount: item.onMount,
|
|
184
|
+
onClick: item.onClick,
|
|
183
185
|
pulse: item.pulse
|
|
184
186
|
});
|
|
185
187
|
case 'select':
|
package/dist/esm/ui/Dropdown.js
CHANGED
|
@@ -78,6 +78,10 @@ var Dropdown = /*#__PURE__*/function (_Component) {
|
|
|
78
78
|
});
|
|
79
79
|
});
|
|
80
80
|
_defineProperty(_assertThisInitialized(_this), "toggleOpen", function () {
|
|
81
|
+
var onClick = _this.props.onClick;
|
|
82
|
+
if (onClick) {
|
|
83
|
+
onClick();
|
|
84
|
+
}
|
|
81
85
|
_this.setState({
|
|
82
86
|
isOpen: !_this.state.isOpen,
|
|
83
87
|
isOpenedByKeyboard: false
|
|
@@ -140,6 +144,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
|
|
|
140
144
|
dropdownListId = _this$props2.dropdownListId,
|
|
141
145
|
alignDropdownWithToolbar = _this$props2.alignDropdownWithToolbar,
|
|
142
146
|
footer = _this$props2.footer,
|
|
147
|
+
onMount = _this$props2.onMount,
|
|
143
148
|
pulse = _this$props2.pulse;
|
|
144
149
|
var trigger;
|
|
145
150
|
if (icon) {
|
|
@@ -155,6 +160,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
|
|
|
155
160
|
selected: isOpen,
|
|
156
161
|
disabled: disabled,
|
|
157
162
|
tooltipContent: tooltip,
|
|
163
|
+
onMount: onMount,
|
|
158
164
|
pulse: pulse
|
|
159
165
|
});
|
|
160
166
|
} else {
|
|
@@ -176,6 +182,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
|
|
|
176
182
|
tooltipContent: tooltip,
|
|
177
183
|
ariaHasPopup: true,
|
|
178
184
|
areaControls: dropdownListId,
|
|
185
|
+
onMount: onMount,
|
|
179
186
|
pulse: pulse
|
|
180
187
|
}, title);
|
|
181
188
|
}
|
|
@@ -13,6 +13,7 @@ import { injectIntl } from 'react-intl-next';
|
|
|
13
13
|
import { messages } from '@atlaskit/editor-common/floating-toolbar';
|
|
14
14
|
import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
|
|
15
15
|
import { ButtonItem } from '@atlaskit/menu';
|
|
16
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
16
17
|
import { B400 } from '@atlaskit/theme/colors';
|
|
17
18
|
// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
|
|
18
19
|
import { gridSize } from '@atlaskit/theme/constants';
|
|
@@ -164,6 +165,7 @@ var DropdownMenuItem = function DropdownMenuItem(props) {
|
|
|
164
165
|
};
|
|
165
166
|
});
|
|
166
167
|
var itemContent = jsx(DropdownButtonItem, {
|
|
168
|
+
isSelected: fg('platform_editor_advanced_layouts_pre_release_2') ? itemSelected : undefined,
|
|
167
169
|
iconBefore: iconBefore,
|
|
168
170
|
iconAfter: item.elemAfter,
|
|
169
171
|
onClick: handleItemClick,
|
package/dist/esm/ui/Toolbar.js
CHANGED
|
@@ -201,6 +201,8 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
201
201
|
alignDropdownWithToolbar: items.length === 1,
|
|
202
202
|
onToggle: item.onToggle,
|
|
203
203
|
footer: item.footer,
|
|
204
|
+
onMount: item.onMount,
|
|
205
|
+
onClick: item.onClick,
|
|
204
206
|
pulse: item.pulse
|
|
205
207
|
});
|
|
206
208
|
case 'select':
|
|
@@ -29,6 +29,8 @@ export interface Props {
|
|
|
29
29
|
dropdownListId?: string;
|
|
30
30
|
alignDropdownWithToolbar?: boolean;
|
|
31
31
|
onToggle?: (state: EditorState, dispatch: CommandDispatch | undefined) => boolean;
|
|
32
|
+
onMount?: () => void;
|
|
33
|
+
onClick?: () => void;
|
|
32
34
|
footer?: React.ReactNode;
|
|
33
35
|
/** If true, the component will have pulse onboarding effect around it. */
|
|
34
36
|
pulse?: boolean;
|
|
@@ -193,6 +193,7 @@ export declare const EmojiPickerButton: (props: {
|
|
|
193
193
|
openTypeAhead: (inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod) => boolean;
|
|
194
194
|
insertItem: (item: import("@atlaskit/editor-common/provider-factory").QuickInsertItem, source?: import("@atlaskit/editor-common/analytics").INPUT_METHOD.QUICK_INSERT | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR | undefined) => import("@atlaskit/editor-common/types").Command;
|
|
195
195
|
getSuggestions: (searchOptions: import("@atlaskit/editor-common/types").QuickInsertSearchOptions) => import("@atlaskit/editor-common/provider-factory").QuickInsertItem[];
|
|
196
|
+
onInsert: (item: import("@atlaskit/editor-common/provider-factory").QuickInsertItem) => void;
|
|
196
197
|
};
|
|
197
198
|
commands: {
|
|
198
199
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
|
@@ -29,6 +29,8 @@ export interface Props {
|
|
|
29
29
|
dropdownListId?: string;
|
|
30
30
|
alignDropdownWithToolbar?: boolean;
|
|
31
31
|
onToggle?: (state: EditorState, dispatch: CommandDispatch | undefined) => boolean;
|
|
32
|
+
onMount?: () => void;
|
|
33
|
+
onClick?: () => void;
|
|
32
34
|
footer?: React.ReactNode;
|
|
33
35
|
/** If true, the component will have pulse onboarding effect around it. */
|
|
34
36
|
pulse?: boolean;
|
|
@@ -230,6 +230,7 @@ export declare const EmojiPickerButton: (props: {
|
|
|
230
230
|
openTypeAhead: (inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod) => boolean;
|
|
231
231
|
insertItem: (item: import("@atlaskit/editor-common/provider-factory").QuickInsertItem, source?: import("@atlaskit/editor-common/analytics").INPUT_METHOD.QUICK_INSERT | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR | undefined) => import("@atlaskit/editor-common/types").Command;
|
|
232
232
|
getSuggestions: (searchOptions: import("@atlaskit/editor-common/types").QuickInsertSearchOptions) => import("@atlaskit/editor-common/provider-factory").QuickInsertItem[];
|
|
233
|
+
onInsert: (item: import("@atlaskit/editor-common/provider-factory").QuickInsertItem) => void;
|
|
233
234
|
};
|
|
234
235
|
commands: {
|
|
235
236
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-floating-toolbar",
|
|
3
|
-
"version": "1.13.
|
|
3
|
+
"version": "1.13.20",
|
|
4
4
|
"description": "Floating toolbar plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"atlassian": {
|
|
11
11
|
"team": "Editor: Lego",
|
|
12
12
|
"singleton": true,
|
|
13
|
-
"runReact18":
|
|
13
|
+
"runReact18": true
|
|
14
14
|
},
|
|
15
15
|
"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
|
|
16
16
|
"main": "dist/cjs/index.js",
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
".": "./src/index.ts"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@atlaskit/adf-utils": "^19.
|
|
27
|
-
"@atlaskit/button": "^20.
|
|
28
|
-
"@atlaskit/checkbox": "^15.
|
|
29
|
-
"@atlaskit/editor-common": "^94.
|
|
30
|
-
"@atlaskit/editor-palette": "1.6.
|
|
31
|
-
"@atlaskit/editor-plugin-block-controls": "^2.
|
|
26
|
+
"@atlaskit/adf-utils": "^19.10.0",
|
|
27
|
+
"@atlaskit/button": "^20.3.0",
|
|
28
|
+
"@atlaskit/checkbox": "^15.1.0",
|
|
29
|
+
"@atlaskit/editor-common": "^94.3.0",
|
|
30
|
+
"@atlaskit/editor-palette": "1.6.2",
|
|
31
|
+
"@atlaskit/editor-plugin-block-controls": "^2.10.0",
|
|
32
32
|
"@atlaskit/editor-plugin-context-panel": "^1.3.0",
|
|
33
33
|
"@atlaskit/editor-plugin-copy-button": "^1.3.0",
|
|
34
34
|
"@atlaskit/editor-plugin-decorations": "^1.3.0",
|
|
@@ -39,12 +39,12 @@
|
|
|
39
39
|
"@atlaskit/editor-plugin-table": "^7.29.0",
|
|
40
40
|
"@atlaskit/editor-prosemirror": "6.0.0",
|
|
41
41
|
"@atlaskit/emoji": "^67.8.0",
|
|
42
|
-
"@atlaskit/icon": "^22.
|
|
42
|
+
"@atlaskit/icon": "^22.24.0",
|
|
43
43
|
"@atlaskit/menu": "^2.13.0",
|
|
44
44
|
"@atlaskit/modal-dialog": "^12.17.0",
|
|
45
45
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
46
46
|
"@atlaskit/primitives": "^12.2.0",
|
|
47
|
-
"@atlaskit/select": "^18.
|
|
47
|
+
"@atlaskit/select": "^18.3.0",
|
|
48
48
|
"@atlaskit/theme": "^14.0.0",
|
|
49
49
|
"@atlaskit/tokens": "^2.0.0",
|
|
50
50
|
"@atlaskit/tooltip": "^18.8.0",
|
|
@@ -56,7 +56,8 @@
|
|
|
56
56
|
"react-loadable": "^5.1.0"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"react": "^16.8.0 || ^17.0.0 || ~18.2.0"
|
|
59
|
+
"react": "^16.8.0 || ^17.0.0 || ~18.2.0",
|
|
60
|
+
"react-dom": "^16.8.0 || ^17.0.0 || ^18.2.0"
|
|
60
61
|
},
|
|
61
62
|
"devDependencies": {
|
|
62
63
|
"@atlaskit/visual-regression": "*",
|
|
@@ -64,7 +65,6 @@
|
|
|
64
65
|
"@testing-library/react": "^12.1.5",
|
|
65
66
|
"@testing-library/user-event": "^14.4.3",
|
|
66
67
|
"enzyme": "^3.10.0",
|
|
67
|
-
"react-dom": "^16.8.0",
|
|
68
68
|
"typescript": "~5.4.2",
|
|
69
69
|
"wait-for-expect": "^1.2.0"
|
|
70
70
|
},
|
|
@@ -109,6 +109,9 @@
|
|
|
109
109
|
"platform-feature-flags": {
|
|
110
110
|
"platform_editor_react18_phase2": {
|
|
111
111
|
"type": "boolean"
|
|
112
|
+
},
|
|
113
|
+
"platform_editor_advanced_layouts_pre_release_2": {
|
|
114
|
+
"type": "boolean"
|
|
112
115
|
}
|
|
113
116
|
}
|
|
114
117
|
}
|