@atlaskit/editor-plugin-table 7.28.9 → 7.28.10
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 +8 -0
- package/dist/cjs/ui/FloatingContextualButton/index.js +2 -1
- package/dist/cjs/ui/FloatingContextualButton/styles.js +9 -4
- package/dist/cjs/ui/FloatingContextualMenu/ContextualMenu.js +76 -45
- package/dist/cjs/ui/FloatingContextualMenu/styles.js +1 -10
- package/dist/cjs/ui/FloatingDragMenu/DragMenu.js +19 -12
- package/dist/cjs/ui/FloatingDragMenu/styles.js +1 -7
- package/dist/cjs/utils/drag-menu.js +47 -14
- package/dist/es2019/ui/FloatingContextualButton/index.js +2 -1
- package/dist/es2019/ui/FloatingContextualButton/styles.js +6 -1
- package/dist/es2019/ui/FloatingContextualMenu/ContextualMenu.js +77 -46
- package/dist/es2019/ui/FloatingContextualMenu/styles.js +0 -9
- package/dist/es2019/ui/FloatingDragMenu/DragMenu.js +20 -13
- package/dist/es2019/ui/FloatingDragMenu/styles.js +0 -6
- package/dist/es2019/utils/drag-menu.js +50 -17
- package/dist/esm/ui/FloatingContextualButton/index.js +2 -1
- package/dist/esm/ui/FloatingContextualButton/styles.js +8 -2
- package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js +77 -46
- package/dist/esm/ui/FloatingContextualMenu/styles.js +0 -9
- package/dist/esm/ui/FloatingDragMenu/DragMenu.js +20 -13
- package/dist/esm/ui/FloatingDragMenu/styles.js +0 -6
- package/dist/esm/utils/drag-menu.js +47 -14
- package/dist/types/ui/FloatingContextualMenu/styles.d.ts +0 -1
- package/dist/types/ui/FloatingDragMenu/styles.d.ts +0 -1
- package/dist/types/utils/drag-menu.d.ts +4 -2
- package/dist/types-ts4.5/ui/FloatingContextualMenu/styles.d.ts +0 -1
- package/dist/types-ts4.5/ui/FloatingDragMenu/styles.d.ts +0 -1
- package/dist/types-ts4.5/utils/drag-menu.d.ts +4 -2
- package/package.json +5 -2
- package/src/ui/FloatingContextualButton/index.tsx +2 -2
- package/src/ui/FloatingContextualButton/styles.ts +5 -0
- package/src/ui/FloatingContextualMenu/ContextualMenu.tsx +75 -36
- package/src/ui/FloatingContextualMenu/styles.ts +0 -8
- package/src/ui/FloatingDragMenu/DragMenu.tsx +20 -15
- package/src/ui/FloatingDragMenu/styles.ts +0 -6
- package/src/utils/drag-menu.ts +73 -43
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-table
|
|
2
2
|
|
|
3
|
+
## 7.28.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#150710](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/150710)
|
|
8
|
+
[`199790376ed8a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/199790376ed8a) -
|
|
9
|
+
[ux] ED-25094: Migrate icons for table drag menu and cell menu
|
|
10
|
+
|
|
3
11
|
## 7.28.9
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -17,7 +17,7 @@ var _ui = require("@atlaskit/editor-common/ui");
|
|
|
17
17
|
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
18
18
|
var _utils = require("@atlaskit/editor-prosemirror/utils");
|
|
19
19
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
20
|
-
var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/
|
|
20
|
+
var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
|
|
21
21
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
22
22
|
var _commands = require("../../commands");
|
|
23
23
|
var _types = require("../../types");
|
|
@@ -89,6 +89,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
|
|
|
89
89
|
onClick: handleClick,
|
|
90
90
|
iconBefore: (0, _react2.jsx)(_chevronDown.default, {
|
|
91
91
|
label: "",
|
|
92
|
+
color: "currentColor",
|
|
92
93
|
isFacadeDisabled: true
|
|
93
94
|
}),
|
|
94
95
|
"aria-label": labelCellOptions,
|
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.tableFloatingCellButtonStyles = exports.tableFloatingCellButtonSelectedStyles = void 0;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
9
|
var _react = require("@emotion/react");
|
|
10
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
8
11
|
var _colors = require("@atlaskit/theme/colors");
|
|
9
12
|
var _consts = require("../consts");
|
|
10
|
-
|
|
11
|
-
|
|
13
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
14
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
12
15
|
var tableFloatingCellButtonStyles = exports.tableFloatingCellButtonStyles = function tableFloatingCellButtonStyles() {
|
|
13
16
|
return (0, _react.css)({
|
|
14
17
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
15
|
-
'> div': {
|
|
18
|
+
'> div': _objectSpread({
|
|
16
19
|
// Sits behind button to provide surface-color background
|
|
17
20
|
background: "var(--ds-surface, ".concat(_colors.N20, ")"),
|
|
18
21
|
borderRadius: "var(--ds-border-radius, 3px)",
|
|
@@ -20,7 +23,9 @@ var tableFloatingCellButtonStyles = exports.tableFloatingCellButtonStyles = func
|
|
|
20
23
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
21
24
|
height: "".concat(_consts.contextualMenuTriggerSize + 2, "px"),
|
|
22
25
|
flexDirection: 'column'
|
|
23
|
-
},
|
|
26
|
+
}, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && {
|
|
27
|
+
width: "var(--ds-space-250, 20px)"
|
|
28
|
+
}),
|
|
24
29
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
25
30
|
'&& button': {
|
|
26
31
|
background: "var(--ds-background-neutral, none)",
|
|
@@ -28,10 +28,19 @@ var _utils = require("@atlaskit/editor-common/utils");
|
|
|
28
28
|
var _editorPalette = require("@atlaskit/editor-palette");
|
|
29
29
|
var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
|
|
30
30
|
var _utils2 = require("@atlaskit/editor-tables/utils");
|
|
31
|
-
var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/
|
|
32
|
-
var
|
|
33
|
-
var
|
|
31
|
+
var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/core/migration/cross-circle"));
|
|
32
|
+
var _deleteEditorRemove = _interopRequireDefault(require("@atlaskit/icon/core/migration/delete--editor-remove"));
|
|
33
|
+
var _paintBucketEditorBackgroundColor = _interopRequireDefault(require("@atlaskit/icon/core/migration/paint-bucket--editor-background-color"));
|
|
34
|
+
var _paintBucket = _interopRequireDefault(require("@atlaskit/icon/core/paint-bucket"));
|
|
35
|
+
var _tableCellClear = _interopRequireDefault(require("@atlaskit/icon/core/table-cell-clear"));
|
|
36
|
+
var _tableCellMerge = _interopRequireDefault(require("@atlaskit/icon/core/table-cell-merge"));
|
|
37
|
+
var _tableCellSplit = _interopRequireDefault(require("@atlaskit/icon/core/table-cell-split"));
|
|
38
|
+
var _tableColumnAddRight = _interopRequireDefault(require("@atlaskit/icon/core/table-column-add-right"));
|
|
39
|
+
var _tableColumnDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-column-delete"));
|
|
40
|
+
var _tableRowAddBelow = _interopRequireDefault(require("@atlaskit/icon/core/table-row-add-below"));
|
|
41
|
+
var _tableRowDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-row-delete"));
|
|
34
42
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
43
|
+
var _primitives = require("@atlaskit/primitives");
|
|
35
44
|
var _commands = require("../../commands");
|
|
36
45
|
var _commandsWithAnalytics = require("../../commands-with-analytics");
|
|
37
46
|
var _pluginFactory = require("../../pm-plugins/plugin-factory");
|
|
@@ -53,6 +62,11 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
53
62
|
* @jsx jsx
|
|
54
63
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
55
64
|
var arrowsList = new Set(['ArrowRight', 'ArrowLeft']);
|
|
65
|
+
var elementBeforeIconStyles = (0, _primitives.xcss)({
|
|
66
|
+
marginRight: 'space.negative.075',
|
|
67
|
+
display: 'flex'
|
|
68
|
+
});
|
|
69
|
+
// eslint-disable-next-line @repo/internal/react/no-class-components
|
|
56
70
|
var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component) {
|
|
57
71
|
(0, _inherits2.default)(ContextualMenu, _Component);
|
|
58
72
|
var _super = _createSuper(ContextualMenu);
|
|
@@ -107,13 +121,13 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
107
121
|
value: {
|
|
108
122
|
name: 'background'
|
|
109
123
|
},
|
|
110
|
-
elemBefore: isDragAndDropEnabled ?
|
|
111
|
-
|
|
112
|
-
(0, _react2.jsx)(
|
|
113
|
-
|
|
114
|
-
|
|
124
|
+
elemBefore: isDragAndDropEnabled ? (0, _react2.jsx)(_primitives.Box, {
|
|
125
|
+
xcss: elementBeforeIconStyles
|
|
126
|
+
}, (0, _react2.jsx)(_paintBucket.default, {
|
|
127
|
+
color: "currentColor",
|
|
128
|
+
spacing: "spacious",
|
|
115
129
|
label: formatMessage(_messages.tableMessages.backgroundColor),
|
|
116
|
-
|
|
130
|
+
LEGACY_fallbackIcon: _paintBucketEditorBackgroundColor.default
|
|
117
131
|
})) : undefined,
|
|
118
132
|
elemAfter:
|
|
119
133
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -189,22 +203,28 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
189
203
|
name: 'merge'
|
|
190
204
|
},
|
|
191
205
|
isDisabled: !(0, _transforms.canMergeCells)(state.tr),
|
|
192
|
-
elemBefore: isDragAndDropEnabled ?
|
|
193
|
-
|
|
194
|
-
(0, _react2.jsx)(
|
|
195
|
-
|
|
196
|
-
|
|
206
|
+
elemBefore: isDragAndDropEnabled ? (0, _react2.jsx)(_primitives.Box, {
|
|
207
|
+
xcss: elementBeforeIconStyles
|
|
208
|
+
}, (0, _react2.jsx)(_tableCellMerge.default, {
|
|
209
|
+
color: "currentColor",
|
|
210
|
+
spacing: "spacious",
|
|
211
|
+
label: formatMessage(_messages.tableMessages.mergeCells),
|
|
212
|
+
LEGACY_fallbackIcon: _icons.MergeCellsIcon
|
|
213
|
+
})) : undefined
|
|
197
214
|
}, {
|
|
198
215
|
content: formatMessage(_messages.tableMessages.splitCell),
|
|
199
216
|
value: {
|
|
200
217
|
name: 'split'
|
|
201
218
|
},
|
|
202
219
|
isDisabled: !(0, _utils2.splitCell)(state),
|
|
203
|
-
elemBefore: isDragAndDropEnabled ?
|
|
204
|
-
|
|
205
|
-
(0, _react2.jsx)(
|
|
206
|
-
|
|
207
|
-
|
|
220
|
+
elemBefore: isDragAndDropEnabled ? (0, _react2.jsx)(_primitives.Box, {
|
|
221
|
+
xcss: elementBeforeIconStyles
|
|
222
|
+
}, (0, _react2.jsx)(_tableCellSplit.default, {
|
|
223
|
+
color: "currentColor",
|
|
224
|
+
spacing: "spacious",
|
|
225
|
+
label: formatMessage(_messages.tableMessages.splitCell),
|
|
226
|
+
LEGACY_fallbackIcon: _icons.SplitCellIcon
|
|
227
|
+
})) : undefined
|
|
208
228
|
}];
|
|
209
229
|
}
|
|
210
230
|
return [];
|
|
@@ -227,9 +247,14 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
227
247
|
}, (0, _keymaps.tooltip)(_keymaps.addColumnAfter)),
|
|
228
248
|
elemBefore: isDragAndDropEnabled ?
|
|
229
249
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
230
|
-
(0, _react2.jsx)(
|
|
231
|
-
|
|
232
|
-
}, (0, _react2.jsx)(
|
|
250
|
+
(0, _react2.jsx)(_primitives.Box, {
|
|
251
|
+
xcss: elementBeforeIconStyles
|
|
252
|
+
}, (0, _react2.jsx)(_tableColumnAddRight.default, {
|
|
253
|
+
color: "currentColor",
|
|
254
|
+
spacing: "spacious",
|
|
255
|
+
label: formatMessage(_messages.tableMessages.addColumnRight),
|
|
256
|
+
LEGACY_fallbackIcon: _icons.AddColRightIcon
|
|
257
|
+
})) : undefined,
|
|
233
258
|
'aria-label': (0, _platformFeatureFlags.fg)('platform_editor_announce_cell_options_hotkeys') ? (0, _keymaps.tooltip)(_keymaps.addColumnAfter, String(content)) : undefined
|
|
234
259
|
};
|
|
235
260
|
});
|
|
@@ -249,11 +274,14 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
249
274
|
elemAfter: (0, _react2.jsx)("div", {
|
|
250
275
|
css: _shortcut.shortcutStyle
|
|
251
276
|
}, (0, _keymaps.tooltip)(_keymaps.addRowAfter)),
|
|
252
|
-
elemBefore: isDragAndDropEnabled ?
|
|
253
|
-
|
|
254
|
-
(0, _react2.jsx)(
|
|
255
|
-
|
|
256
|
-
|
|
277
|
+
elemBefore: isDragAndDropEnabled ? (0, _react2.jsx)(_primitives.Box, {
|
|
278
|
+
xcss: elementBeforeIconStyles
|
|
279
|
+
}, (0, _react2.jsx)(_tableRowAddBelow.default, {
|
|
280
|
+
color: "currentColor",
|
|
281
|
+
spacing: "spacious",
|
|
282
|
+
label: formatMessage(_messages.tableMessages.addRowBelow),
|
|
283
|
+
LEGACY_fallbackIcon: _icons.AddRowBelowIcon
|
|
284
|
+
})) : undefined,
|
|
257
285
|
'aria-label': (0, _platformFeatureFlags.fg)('platform_editor_announce_cell_options_hotkeys') ? (0, _keymaps.tooltip)(_keymaps.addRowAfter, String(content)) : undefined
|
|
258
286
|
};
|
|
259
287
|
});
|
|
@@ -282,14 +310,15 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
282
310
|
elemAfter: (0, _react2.jsx)("div", {
|
|
283
311
|
css: _shortcut.shortcutStyle
|
|
284
312
|
}, (0, _keymaps.tooltip)(_keymaps.backspace)),
|
|
285
|
-
elemBefore: isDragAndDropEnabled ?
|
|
286
|
-
|
|
287
|
-
(0, _react2.jsx)(
|
|
288
|
-
|
|
289
|
-
|
|
313
|
+
elemBefore: isDragAndDropEnabled ? (0, _react2.jsx)(_primitives.Box, {
|
|
314
|
+
xcss: elementBeforeIconStyles
|
|
315
|
+
}, (0, _react2.jsx)(_tableCellClear.default, {
|
|
316
|
+
color: "currentColor",
|
|
317
|
+
spacing: "spacious",
|
|
290
318
|
label: formatMessage(_messages.tableMessages.clearCells, {
|
|
291
319
|
0: Math.max(noOfColumns, noOfRows)
|
|
292
|
-
})
|
|
320
|
+
}),
|
|
321
|
+
LEGACY_fallbackIcon: _crossCircle.default
|
|
293
322
|
})) : undefined,
|
|
294
323
|
'aria-label': (0, _platformFeatureFlags.fg)('platform_editor_announce_cell_options_hotkeys') ? (0, _keymaps.tooltip)(_keymaps.backspace, String(content)) : undefined
|
|
295
324
|
};
|
|
@@ -311,14 +340,15 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
311
340
|
value: {
|
|
312
341
|
name: 'delete_column'
|
|
313
342
|
},
|
|
314
|
-
elemBefore: isDragAndDropEnabled ?
|
|
315
|
-
|
|
316
|
-
(0, _react2.jsx)(
|
|
317
|
-
|
|
318
|
-
|
|
343
|
+
elemBefore: isDragAndDropEnabled ? (0, _react2.jsx)(_primitives.Box, {
|
|
344
|
+
xcss: elementBeforeIconStyles
|
|
345
|
+
}, (0, _react2.jsx)(_tableColumnDelete.default, {
|
|
346
|
+
color: "currentColor",
|
|
347
|
+
spacing: "spacious",
|
|
319
348
|
label: formatMessage(_messages.tableMessages.removeColumns, {
|
|
320
349
|
0: noOfColumns
|
|
321
|
-
})
|
|
350
|
+
}),
|
|
351
|
+
LEGACY_fallbackIcon: _deleteEditorRemove.default
|
|
322
352
|
})) : undefined
|
|
323
353
|
};
|
|
324
354
|
});
|
|
@@ -339,14 +369,15 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
339
369
|
value: {
|
|
340
370
|
name: 'delete_row'
|
|
341
371
|
},
|
|
342
|
-
elemBefore: isDragAndDropEnabled ?
|
|
343
|
-
|
|
344
|
-
(0, _react2.jsx)(
|
|
345
|
-
|
|
346
|
-
|
|
372
|
+
elemBefore: isDragAndDropEnabled ? (0, _react2.jsx)(_primitives.Box, {
|
|
373
|
+
xcss: elementBeforeIconStyles
|
|
374
|
+
}, (0, _react2.jsx)(_tableRowDelete.default, {
|
|
375
|
+
color: "currentColor",
|
|
376
|
+
spacing: "spacious",
|
|
347
377
|
label: formatMessage(_messages.tableMessages.removeRows, {
|
|
348
378
|
0: noOfRows
|
|
349
|
-
})
|
|
379
|
+
}),
|
|
380
|
+
LEGACY_fallbackIcon: _deleteEditorRemove.default
|
|
350
381
|
})) : undefined
|
|
351
382
|
};
|
|
352
383
|
});
|
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.tablePopupStyles = exports.
|
|
7
|
+
exports.tablePopupStyles = exports.cellColourPreviewStyles = void 0;
|
|
8
8
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
10
|
var _adfSchema = require("@atlaskit/adf-schema");
|
|
@@ -20,15 +20,6 @@ var cellColourPreviewStyles = exports.cellColourPreviewStyles = function cellCol
|
|
|
20
20
|
}
|
|
21
21
|
});
|
|
22
22
|
};
|
|
23
|
-
|
|
24
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
25
|
-
var elementBeforeIconStyles = exports.elementBeforeIconStyles = (0, _react.css)({
|
|
26
|
-
marginRight: "var(--ds-space-negative-075, -6px)",
|
|
27
|
-
display: 'flex'
|
|
28
|
-
});
|
|
29
|
-
|
|
30
|
-
// TODO Delete this comment after verifying space token -> previous value `padding: 8px`
|
|
31
|
-
// TODO Delete this comment after verifying space token -> previous value `margin-left: 4px`
|
|
32
23
|
var tablePopupStyles = exports.tablePopupStyles = function tablePopupStyles(isDragAndDropEnabled
|
|
33
24
|
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
|
|
34
25
|
) {
|
|
@@ -22,7 +22,9 @@ var _editorPalette = require("@atlaskit/editor-palette");
|
|
|
22
22
|
var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
|
|
23
23
|
var _tableMap = require("@atlaskit/editor-tables/table-map");
|
|
24
24
|
var _utils2 = require("@atlaskit/editor-tables/utils");
|
|
25
|
-
var
|
|
25
|
+
var _paintBucketEditorBackgroundColor = _interopRequireDefault(require("@atlaskit/icon/core/migration/paint-bucket--editor-background-color"));
|
|
26
|
+
var _paintBucket = _interopRequireDefault(require("@atlaskit/icon/core/paint-bucket"));
|
|
27
|
+
var _primitives = require("@atlaskit/primitives");
|
|
26
28
|
var _toggle = _interopRequireDefault(require("@atlaskit/toggle"));
|
|
27
29
|
var _commands = require("../../commands");
|
|
28
30
|
var _commandsWithAnalytics = require("../../commands-with-analytics");
|
|
@@ -110,6 +112,10 @@ var getGroupedDragMenuConfig = function getGroupedDragMenuConfig(tableSortColumn
|
|
|
110
112
|
tableSortColumnReorder ? groupedDragMenuConfig.unshift(sortColumnItems) : groupedDragMenuConfig.push(sortColumnItems);
|
|
111
113
|
return groupedDragMenuConfig;
|
|
112
114
|
};
|
|
115
|
+
var elementBeforeIconStyles = (0, _primitives.xcss)({
|
|
116
|
+
marginRight: 'space.negative.075',
|
|
117
|
+
display: 'flex'
|
|
118
|
+
});
|
|
113
119
|
var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, formatMessage) {
|
|
114
120
|
var tableSortColumnReorder = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
115
121
|
var selectionRect = arguments.length > 3 ? arguments[3] : undefined;
|
|
@@ -161,12 +167,13 @@ var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, for
|
|
|
161
167
|
name: item.id
|
|
162
168
|
},
|
|
163
169
|
isDisabled: item.disabled,
|
|
164
|
-
elemBefore: item.icon ?
|
|
165
|
-
|
|
166
|
-
(0, _react2.jsx)("span", {
|
|
167
|
-
css: _styles2.elementBeforeIconStyles
|
|
170
|
+
elemBefore: item.icon ? (0, _react2.jsx)(_primitives.Box, {
|
|
171
|
+
xcss: elementBeforeIconStyles
|
|
168
172
|
}, (0, _react2.jsx)(item.icon, {
|
|
169
|
-
|
|
173
|
+
color: "currentColor",
|
|
174
|
+
spacing: "spacious",
|
|
175
|
+
label: formatMessage(MapDragMenuOptionIdToMessage[item.id].message, options),
|
|
176
|
+
LEGACY_fallbackIcon: item.iconFallback ? item.iconFallback : undefined
|
|
170
177
|
})) : undefined,
|
|
171
178
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
172
179
|
elemAfter: item.keymap ? (0, _react2.jsx)("div", {
|
|
@@ -264,13 +271,13 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
264
271
|
value: {
|
|
265
272
|
name: 'background'
|
|
266
273
|
},
|
|
267
|
-
elemBefore:
|
|
268
|
-
|
|
269
|
-
(0, _react2.jsx)(
|
|
270
|
-
|
|
271
|
-
|
|
274
|
+
elemBefore: (0, _react2.jsx)(_primitives.Box, {
|
|
275
|
+
xcss: elementBeforeIconStyles
|
|
276
|
+
}, (0, _react2.jsx)(_paintBucket.default, {
|
|
277
|
+
color: "currentColor",
|
|
278
|
+
spacing: "spacious",
|
|
272
279
|
label: formatMessage(_messages.tableMessages.backgroundColor),
|
|
273
|
-
|
|
280
|
+
LEGACY_fallbackIcon: _paintBucketEditorBackgroundColor.default
|
|
274
281
|
})),
|
|
275
282
|
elemAfter: (0, _react2.jsx)("div", {
|
|
276
283
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.toggleStyles = exports.
|
|
7
|
+
exports.toggleStyles = exports.dragMenuBackgroundColorStyles = exports.cellColourPreviewStyles = void 0;
|
|
8
8
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
10
|
var _adfSchema = require("@atlaskit/adf-schema");
|
|
@@ -21,12 +21,6 @@ var cellColourPreviewStyles = exports.cellColourPreviewStyles = function cellCol
|
|
|
21
21
|
});
|
|
22
22
|
};
|
|
23
23
|
|
|
24
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
25
|
-
var elementBeforeIconStyles = exports.elementBeforeIconStyles = (0, _react.css)({
|
|
26
|
-
marginRight: "var(--ds-space-negative-075, -6px)",
|
|
27
|
-
display: 'flex'
|
|
28
|
-
});
|
|
29
|
-
|
|
30
24
|
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
|
|
31
25
|
var dragMenuBackgroundColorStyles = exports.dragMenuBackgroundColorStyles = function dragMenuBackgroundColorStyles() {
|
|
32
26
|
var tableSortColumnReorder = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
|
@@ -9,6 +9,20 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
|
|
|
9
9
|
var _customSteps = require("@atlaskit/custom-steps");
|
|
10
10
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
11
11
|
var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
12
|
+
var _sortAscending = _interopRequireDefault(require("@atlaskit/icon/core/sort-ascending"));
|
|
13
|
+
var _sortDescending = _interopRequireDefault(require("@atlaskit/icon/core/sort-descending"));
|
|
14
|
+
var _tableCellClear = _interopRequireDefault(require("@atlaskit/icon/core/table-cell-clear"));
|
|
15
|
+
var _tableColumnAddLeft = _interopRequireDefault(require("@atlaskit/icon/core/table-column-add-left"));
|
|
16
|
+
var _tableColumnAddRight = _interopRequireDefault(require("@atlaskit/icon/core/table-column-add-right"));
|
|
17
|
+
var _tableColumnDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-column-delete"));
|
|
18
|
+
var _tableColumnMoveLeft = _interopRequireDefault(require("@atlaskit/icon/core/table-column-move-left"));
|
|
19
|
+
var _tableColumnMoveRight = _interopRequireDefault(require("@atlaskit/icon/core/table-column-move-right"));
|
|
20
|
+
var _tableColumnsDistribute = _interopRequireDefault(require("@atlaskit/icon/core/table-columns-distribute"));
|
|
21
|
+
var _tableRowAddAbove = _interopRequireDefault(require("@atlaskit/icon/core/table-row-add-above"));
|
|
22
|
+
var _tableRowAddBelow = _interopRequireDefault(require("@atlaskit/icon/core/table-row-add-below"));
|
|
23
|
+
var _tableRowDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-row-delete"));
|
|
24
|
+
var _tableRowMoveDown = _interopRequireDefault(require("@atlaskit/icon/core/table-row-move-down"));
|
|
25
|
+
var _tableRowMoveUp = _interopRequireDefault(require("@atlaskit/icon/core/table-row-move-up"));
|
|
12
26
|
var _arrowDown = _interopRequireDefault(require("@atlaskit/icon/glyph/arrow-down"));
|
|
13
27
|
var _arrowLeft = _interopRequireDefault(require("@atlaskit/icon/glyph/arrow-left"));
|
|
14
28
|
var _arrowRight = _interopRequireDefault(require("@atlaskit/icon/glyph/arrow-right"));
|
|
@@ -83,27 +97,32 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
83
97
|
var addOptions = direction === 'row' ? [{
|
|
84
98
|
label: 'above',
|
|
85
99
|
offset: 0,
|
|
86
|
-
icon:
|
|
100
|
+
icon: _tableRowAddAbove.default,
|
|
101
|
+
iconFallback: _icons.AddRowAboveIcon,
|
|
87
102
|
keymap: _keymaps.addRowBefore
|
|
88
103
|
}, {
|
|
89
104
|
label: 'below',
|
|
90
105
|
offset: 1,
|
|
91
|
-
icon:
|
|
106
|
+
icon: _tableRowAddBelow.default,
|
|
107
|
+
iconFallback: _icons.AddRowBelowIcon,
|
|
92
108
|
keymap: _keymaps.addRowAfter
|
|
93
109
|
}] : [{
|
|
94
110
|
label: 'left',
|
|
95
111
|
offset: 0,
|
|
96
|
-
icon:
|
|
112
|
+
icon: _tableColumnAddLeft.default,
|
|
113
|
+
iconFallback: _icons.AddColLeftIcon,
|
|
97
114
|
keymap: _keymaps.addColumnBefore
|
|
98
115
|
}, {
|
|
99
116
|
label: 'right',
|
|
100
117
|
offset: 1,
|
|
101
|
-
icon:
|
|
118
|
+
icon: _tableColumnAddRight.default,
|
|
119
|
+
iconFallback: _icons.AddColRightIcon,
|
|
102
120
|
keymap: _keymaps.addColumnAfter
|
|
103
121
|
}];
|
|
104
122
|
var moveOptions = direction === 'row' ? [{
|
|
105
123
|
label: 'up',
|
|
106
|
-
icon:
|
|
124
|
+
icon: _tableRowMoveUp.default,
|
|
125
|
+
iconFallback: _arrowUp.default,
|
|
107
126
|
keymap: _keymaps.moveRowUp,
|
|
108
127
|
canMove: canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
|
|
109
128
|
getOriginIndexes: _selection.getSelectedRowIndexes,
|
|
@@ -112,7 +131,8 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
112
131
|
}
|
|
113
132
|
}, {
|
|
114
133
|
label: 'down',
|
|
115
|
-
icon:
|
|
134
|
+
icon: _tableRowMoveDown.default,
|
|
135
|
+
iconFallback: _arrowDown.default,
|
|
116
136
|
keymap: _keymaps.moveRowDown,
|
|
117
137
|
canMove: canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
|
|
118
138
|
getOriginIndexes: _selection.getSelectedRowIndexes,
|
|
@@ -121,7 +141,8 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
121
141
|
}
|
|
122
142
|
}] : [{
|
|
123
143
|
label: 'left',
|
|
124
|
-
icon:
|
|
144
|
+
icon: _tableColumnMoveLeft.default,
|
|
145
|
+
iconFallback: _arrowLeft.default,
|
|
125
146
|
keymap: _keymaps.moveColumnLeft,
|
|
126
147
|
canMove: canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
|
|
127
148
|
getOriginIndexes: _selection.getSelectedColumnIndexes,
|
|
@@ -130,7 +151,8 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
130
151
|
}
|
|
131
152
|
}, {
|
|
132
153
|
label: 'right',
|
|
133
|
-
icon:
|
|
154
|
+
icon: _tableColumnMoveRight.default,
|
|
155
|
+
iconFallback: _arrowRight.default,
|
|
134
156
|
keymap: _keymaps.moveColumnRight,
|
|
135
157
|
canMove: canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
|
|
136
158
|
getOriginIndexes: _selection.getSelectedColumnIndexes,
|
|
@@ -141,21 +163,25 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
141
163
|
var sortOptions = direction === 'column' ? [{
|
|
142
164
|
label: 'increasing',
|
|
143
165
|
order: _customSteps.TableSortOrder.ASC,
|
|
144
|
-
icon:
|
|
166
|
+
icon: _sortAscending.default,
|
|
167
|
+
iconFallback: _chevronDoubleUp.default
|
|
145
168
|
}, {
|
|
146
169
|
label: 'decreasing',
|
|
147
170
|
order: _customSteps.TableSortOrder.DESC,
|
|
148
|
-
icon:
|
|
171
|
+
icon: _sortDescending.default,
|
|
172
|
+
iconFallback: _chevronDoubleDown.default
|
|
149
173
|
}] : [];
|
|
150
174
|
var sortConfigs = (0, _toConsumableArray2.default)(sortOptions.map(function (_ref) {
|
|
151
175
|
var label = _ref.label,
|
|
152
176
|
order = _ref.order,
|
|
153
|
-
icon = _ref.icon
|
|
177
|
+
icon = _ref.icon,
|
|
178
|
+
iconFallback = _ref.iconFallback;
|
|
154
179
|
return {
|
|
155
180
|
id: "sort_column_".concat(order),
|
|
156
181
|
title: "Sort ".concat(label),
|
|
157
182
|
disabled: hasMergedCellsInTable,
|
|
158
183
|
icon: icon,
|
|
184
|
+
iconFallback: iconFallback,
|
|
159
185
|
onClick: function onClick(state, dispatch) {
|
|
160
186
|
(0, _commandsWithAnalytics.sortColumnWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, index !== null && index !== void 0 ? index : 0, order)(state, dispatch);
|
|
161
187
|
return true;
|
|
@@ -166,11 +192,13 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
166
192
|
var label = _ref2.label,
|
|
167
193
|
offset = _ref2.offset,
|
|
168
194
|
icon = _ref2.icon,
|
|
195
|
+
iconFallback = _ref2.iconFallback,
|
|
169
196
|
keymap = _ref2.keymap;
|
|
170
197
|
return {
|
|
171
198
|
id: "add_".concat(direction, "_").concat(label),
|
|
172
199
|
title: "Add ".concat(direction, " ").concat(label),
|
|
173
200
|
icon: icon,
|
|
201
|
+
iconFallback: iconFallback,
|
|
174
202
|
onClick: function onClick(state, dispatch) {
|
|
175
203
|
if (direction === 'row') {
|
|
176
204
|
(0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI, tableDuplicateCellColouring)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, {
|
|
@@ -200,7 +228,8 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
200
228
|
}
|
|
201
229
|
return false;
|
|
202
230
|
},
|
|
203
|
-
icon:
|
|
231
|
+
icon: _tableColumnsDistribute.default,
|
|
232
|
+
iconFallback: _layoutThreeEqual.default
|
|
204
233
|
} : undefined, {
|
|
205
234
|
id: 'clear_cells',
|
|
206
235
|
title: 'Clear cells',
|
|
@@ -208,7 +237,8 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
208
237
|
(0, _commandsWithAnalytics.emptyMultipleCellsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, targetCellPosition)(state, dispatch);
|
|
209
238
|
return true;
|
|
210
239
|
},
|
|
211
|
-
icon:
|
|
240
|
+
icon: _tableCellClear.default,
|
|
241
|
+
iconFallback: _crossCircle.default,
|
|
212
242
|
keymap: (0, _keymaps.tooltip)(_keymaps.backspace)
|
|
213
243
|
}, {
|
|
214
244
|
id: "delete_".concat(direction),
|
|
@@ -221,12 +251,14 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
221
251
|
}
|
|
222
252
|
return true;
|
|
223
253
|
},
|
|
224
|
-
icon:
|
|
254
|
+
icon: direction === 'row' ? _tableRowDelete.default : _tableColumnDelete.default,
|
|
255
|
+
iconFallback: _remove.default,
|
|
225
256
|
keymap: direction === 'row' ? (0, _keymaps.tooltip)(_keymaps.deleteRow) : (0, _keymaps.tooltip)(_keymaps.deleteColumn)
|
|
226
257
|
}], (0, _toConsumableArray2.default)(moveOptions.map(function (_ref3) {
|
|
227
258
|
var label = _ref3.label,
|
|
228
259
|
canMove = _ref3.canMove,
|
|
229
260
|
icon = _ref3.icon,
|
|
261
|
+
iconFallback = _ref3.iconFallback,
|
|
230
262
|
keymap = _ref3.keymap,
|
|
231
263
|
getOriginIndexes = _ref3.getOriginIndexes,
|
|
232
264
|
getTargetIndex = _ref3.getTargetIndex;
|
|
@@ -235,6 +267,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
235
267
|
title: "Move ".concat(direction, " ").concat(label),
|
|
236
268
|
disabled: !canMove,
|
|
237
269
|
icon: icon,
|
|
270
|
+
iconFallback: iconFallback,
|
|
238
271
|
onClick: function onClick(state, dispatch) {
|
|
239
272
|
if (canMove) {
|
|
240
273
|
requestAnimationFrame(function () {
|
|
@@ -15,7 +15,7 @@ import { Popup } from '@atlaskit/editor-common/ui';
|
|
|
15
15
|
import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
|
|
16
16
|
import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
|
|
17
17
|
import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
|
|
18
|
-
import ExpandIcon from '@atlaskit/icon/
|
|
18
|
+
import ExpandIcon from '@atlaskit/icon/utility/migration/chevron-down';
|
|
19
19
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
20
|
import { toggleContextualMenu } from '../../commands';
|
|
21
21
|
import { TableCssClassName as ClassName } from '../../types';
|
|
@@ -86,6 +86,7 @@ const FloatingContextualButtonInner = /*#__PURE__*/React.memo(props => {
|
|
|
86
86
|
onClick: handleClick,
|
|
87
87
|
iconBefore: jsx(ExpandIcon, {
|
|
88
88
|
label: "",
|
|
89
|
+
color: "currentColor",
|
|
89
90
|
isFacadeDisabled: true
|
|
90
91
|
}),
|
|
91
92
|
"aria-label": labelCellOptions,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
2
2
|
import { css } from '@emotion/react';
|
|
3
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
4
|
import { N0, N20, N30A, N700 } from '@atlaskit/theme/colors';
|
|
4
5
|
import { contextualMenuTriggerSize } from '../consts';
|
|
5
6
|
export const tableFloatingCellButtonStyles = () => css({
|
|
@@ -11,7 +12,11 @@ export const tableFloatingCellButtonStyles = () => css({
|
|
|
11
12
|
display: 'flex',
|
|
12
13
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
13
14
|
height: `${contextualMenuTriggerSize + 2}px`,
|
|
14
|
-
flexDirection: 'column'
|
|
15
|
+
flexDirection: 'column',
|
|
16
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
17
|
+
...(fg('platform-visual-refresh-icons') && {
|
|
18
|
+
width: "var(--ds-space-250, 20px)"
|
|
19
|
+
})
|
|
15
20
|
},
|
|
16
21
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
17
22
|
'&& button': {
|