@atlaskit/editor-toolbar 0.11.0 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/cjs/ui/ColorPalette/index.js +1 -47
- package/dist/cjs/ui/ToolbarDropdownItem.js +5 -5
- package/dist/cjs/ui/ToolbarDropdownMenu.js +10 -21
- package/dist/cjs/ui/ToolbarDropdownMenuContext.js +2 -14
- package/dist/es2019/ui/ColorPalette/index.js +2 -46
- package/dist/es2019/ui/ToolbarDropdownItem.js +4 -4
- package/dist/es2019/ui/ToolbarDropdownMenu.js +11 -22
- package/dist/es2019/ui/ToolbarDropdownMenuContext.js +1 -11
- package/dist/esm/ui/ColorPalette/index.js +2 -47
- package/dist/esm/ui/ToolbarDropdownItem.js +6 -6
- package/dist/esm/ui/ToolbarDropdownMenu.js +11 -22
- package/dist/esm/ui/ToolbarDropdownMenuContext.js +1 -13
- package/dist/types/ui/ToolbarDropdownMenuContext.d.ts +1 -3
- package/dist/types-ts4.5/ui/ToolbarDropdownMenuContext.d.ts +1 -3
- package/package.json +3 -3
- package/dist/cjs/ui/ColorPalette/index.compiled.css +0 -1
- package/dist/es2019/ui/ColorPalette/index.compiled.css +0 -1
- package/dist/esm/ui/ColorPalette/index.compiled.css +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @atlaskit/editor-toolbar
|
|
2
2
|
|
|
3
|
+
## 0.12.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`4ad69354a021d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4ad69354a021d) -
|
|
8
|
+
Remove references to platform_editor_toolbar_aifc_patch_1 experiment, remove
|
|
9
|
+
useToolbarDropdownMenuOld export from @atlaskit/editor-toolbar package
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
3
15
|
## 0.11.0
|
|
4
16
|
|
|
5
17
|
### Minor Changes
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/* index.tsx generated by @compiled/babel-plugin v0.38.1 */
|
|
2
1
|
"use strict";
|
|
3
2
|
|
|
4
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -7,22 +6,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
6
|
value: true
|
|
8
7
|
});
|
|
9
8
|
exports.default = void 0;
|
|
10
|
-
require("./index.compiled.css");
|
|
11
|
-
var _runtime = require("@compiled/react/runtime");
|
|
12
9
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
10
|
var _chromatism = _interopRequireDefault(require("chromatism"));
|
|
14
11
|
var _reactIntlNext = require("react-intl-next");
|
|
15
12
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
16
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
17
13
|
var _tokens = require("@atlaskit/tokens");
|
|
18
14
|
var _Color = require("./Color");
|
|
19
15
|
var _getColorMessage = _interopRequireDefault(require("./getColorMessage"));
|
|
20
16
|
var _utils = require("./utils");
|
|
21
17
|
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 _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
22
|
-
var styles = {
|
|
23
|
-
paletteWrapper: "_1e0c1txw"
|
|
24
|
-
};
|
|
25
|
-
|
|
26
18
|
/**
|
|
27
19
|
* For a given color pick the color from a list of colors with
|
|
28
20
|
* the highest contrast
|
|
@@ -117,9 +109,6 @@ var ColorPalette = function ColorPalette(_ref) {
|
|
|
117
109
|
|
|
118
110
|
// Initialize focus position and handle autofocus
|
|
119
111
|
(0, _react.useEffect)(function () {
|
|
120
|
-
if (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true)) {
|
|
121
|
-
return;
|
|
122
|
-
}
|
|
123
112
|
if (selectedRowIndex >= 0 && selectedColumnIndex >= 0) {
|
|
124
113
|
currentFocusRef.current = {
|
|
125
114
|
row: selectedRowIndex,
|
|
@@ -263,7 +252,7 @@ var ColorPalette = function ColorPalette(_ref) {
|
|
|
263
252
|
}
|
|
264
253
|
}
|
|
265
254
|
}, [colorsPerRow, focusColorAt, onClick, onKeyDown]);
|
|
266
|
-
return
|
|
255
|
+
return /*#__PURE__*/_react.default.createElement(_compiled.Grid, {
|
|
267
256
|
gap: "space.050",
|
|
268
257
|
ref: paletteRef,
|
|
269
258
|
role: "group"
|
|
@@ -311,41 +300,6 @@ var ColorPalette = function ColorPalette(_ref) {
|
|
|
311
300
|
tabIndex: shouldBeFocusable ? 0 : -1
|
|
312
301
|
});
|
|
313
302
|
}));
|
|
314
|
-
})) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, colorsPerRow.map(function (row) {
|
|
315
|
-
return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
316
|
-
xcss: styles.paletteWrapper,
|
|
317
|
-
key: "row-first-color-".concat(row[0].value),
|
|
318
|
-
role: "radiogroup"
|
|
319
|
-
}, row.map(function (_ref3) {
|
|
320
|
-
var value = _ref3.value,
|
|
321
|
-
label = _ref3.label,
|
|
322
|
-
border = _ref3.border,
|
|
323
|
-
message = _ref3.message,
|
|
324
|
-
decorator = _ref3.decorator;
|
|
325
|
-
var tooltipMessage = message;
|
|
326
|
-
|
|
327
|
-
// Override with theme-specific tooltip messages if provided
|
|
328
|
-
if (paletteColorTooltipMessages) {
|
|
329
|
-
if (tokenTheme === 'dark') {
|
|
330
|
-
tooltipMessage = (0, _getColorMessage.default)(paletteColorTooltipMessages.dark, value.toUpperCase());
|
|
331
|
-
}
|
|
332
|
-
if (tokenTheme === 'light') {
|
|
333
|
-
tooltipMessage = (0, _getColorMessage.default)(paletteColorTooltipMessages.light, value.toUpperCase());
|
|
334
|
-
}
|
|
335
|
-
}
|
|
336
|
-
return /*#__PURE__*/_react.default.createElement(_Color.Color, {
|
|
337
|
-
key: value,
|
|
338
|
-
value: value,
|
|
339
|
-
borderColor: border,
|
|
340
|
-
label: tooltipMessage ? formatMessage(tooltipMessage) : label,
|
|
341
|
-
onClick: onClick,
|
|
342
|
-
onKeyDown: onKeyDown,
|
|
343
|
-
isSelected: value === selectedColor,
|
|
344
|
-
checkMarkColor: getCheckMarkColor(value, useIconToken),
|
|
345
|
-
hexToPaletteColor: hexToPaletteColor,
|
|
346
|
-
decorator: decorator
|
|
347
|
-
});
|
|
348
|
-
}));
|
|
349
303
|
}));
|
|
350
304
|
};
|
|
351
305
|
var _default = exports.default = ColorPalette;
|
|
@@ -48,7 +48,7 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/(0, _react.forwardRef)(function
|
|
|
48
48
|
}, children);
|
|
49
49
|
});
|
|
50
50
|
var ToolbarDropdownItem = exports.ToolbarDropdownItem = function ToolbarDropdownItem(_ref2) {
|
|
51
|
-
var
|
|
51
|
+
var _onClick = _ref2.onClick,
|
|
52
52
|
elemBefore = _ref2.elemBefore,
|
|
53
53
|
elemAfter = _ref2.elemAfter,
|
|
54
54
|
isSelected = _ref2.isSelected,
|
|
@@ -63,7 +63,7 @@ var ToolbarDropdownItem = exports.ToolbarDropdownItem = function ToolbarDropdown
|
|
|
63
63
|
href = _ref2.href,
|
|
64
64
|
target = _ref2.target,
|
|
65
65
|
rel = _ref2.rel;
|
|
66
|
-
var parentContext = (0, _ToolbarDropdownMenuContext.
|
|
66
|
+
var parentContext = (0, _ToolbarDropdownMenuContext.useToolbarDropdownMenu)();
|
|
67
67
|
var injectedElemAfter = function () {
|
|
68
68
|
if (! /*#__PURE__*/(0, _react.isValidElement)(elemAfter)) {
|
|
69
69
|
return elemAfter;
|
|
@@ -77,12 +77,12 @@ var ToolbarDropdownItem = exports.ToolbarDropdownItem = function ToolbarDropdown
|
|
|
77
77
|
}));
|
|
78
78
|
}();
|
|
79
79
|
return /*#__PURE__*/_react.default.createElement(_dropdownMenu.DropdownItem, {
|
|
80
|
-
onClick:
|
|
80
|
+
onClick: function onClick(e) {
|
|
81
81
|
if (!hasNestedDropdownMenu) {
|
|
82
82
|
parentContext === null || parentContext === void 0 || parentContext.closeMenu();
|
|
83
83
|
}
|
|
84
|
-
|
|
85
|
-
}
|
|
84
|
+
_onClick === null || _onClick === void 0 || _onClick(e);
|
|
85
|
+
},
|
|
86
86
|
elemBefore: elemBefore,
|
|
87
87
|
elemAfter: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? injectedElemAfter : elemAfter,
|
|
88
88
|
isSelected: isSelected,
|
|
@@ -82,25 +82,14 @@ var ToolbarDropdownMenu = exports.ToolbarDropdownMenu = function ToolbarDropdown
|
|
|
82
82
|
_ref2$enableMaxHeight = _ref2.enableMaxHeight,
|
|
83
83
|
enableMaxHeight = _ref2$enableMaxHeight === void 0 ? false : _ref2$enableMaxHeight,
|
|
84
84
|
onClick = _ref2.onClick;
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
}, children));
|
|
96
|
-
} else {
|
|
97
|
-
return /*#__PURE__*/_react.default.createElement(_ToolbarDropdownMenuContext.ToolbarDropdownMenuProvider, null, /*#__PURE__*/_react.default.createElement(ToolbarDropdownMenuContent, {
|
|
98
|
-
iconBefore: iconBefore,
|
|
99
|
-
isDisabled: isDisabled,
|
|
100
|
-
testId: testId,
|
|
101
|
-
label: label
|
|
102
|
-
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
103
|
-
className: (0, _runtime.ax)([hasSectionMargin && styles.sectionMargin, (0, _expValEquals.expValEquals)('platform_editor_toolbar_migrate_loom', 'isEnabled', true) && styles.firstSectionSeparator])
|
|
104
|
-
}, children)));
|
|
105
|
-
}
|
|
85
|
+
return /*#__PURE__*/_react.default.createElement(ToolbarDropdownMenuContent, {
|
|
86
|
+
iconBefore: iconBefore,
|
|
87
|
+
isDisabled: isDisabled,
|
|
88
|
+
testId: testId,
|
|
89
|
+
label: label,
|
|
90
|
+
onClick: onClick
|
|
91
|
+
}, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
92
|
+
xcss: (0, _react2.cx)(hasSectionMargin && styles.sectionMargin, enableMaxHeight && styles.scrollContainer, (0, _expValEquals.expValEquals)('platform_editor_toolbar_migrate_loom', 'isEnabled', true) && styles.firstSectionSeparator),
|
|
93
|
+
"data-toolbar-component": "menu"
|
|
94
|
+
}, children));
|
|
106
95
|
};
|
|
@@ -5,26 +5,14 @@ var _typeof = require("@babel/runtime/helpers/typeof");
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.
|
|
8
|
+
exports.useToolbarDropdownMenu = exports.ToolbarDropdownMenuProvider = void 0;
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
|
-
var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
|
|
12
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
13
11
|
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 _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
14
12
|
var ToolbarDropdownMenuContext = /*#__PURE__*/(0, _react.createContext)(undefined);
|
|
15
|
-
var
|
|
16
|
-
var context = (0, _react.useContext)(ToolbarDropdownMenuContext);
|
|
17
|
-
if (!context) {
|
|
18
|
-
throw new Error('useToolbarDropdownMenu must be used within ToolbarDropdownMenuProvider');
|
|
19
|
-
}
|
|
20
|
-
return context;
|
|
21
|
-
};
|
|
22
|
-
var useToolbarDropdownMenuNew = exports.useToolbarDropdownMenuNew = function useToolbarDropdownMenuNew() {
|
|
13
|
+
var useToolbarDropdownMenu = exports.useToolbarDropdownMenu = function useToolbarDropdownMenu() {
|
|
23
14
|
return (0, _react.useContext)(ToolbarDropdownMenuContext);
|
|
24
15
|
};
|
|
25
|
-
var useToolbarDropdownMenu = exports.useToolbarDropdownMenu = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
|
|
26
|
-
return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true);
|
|
27
|
-
}, useToolbarDropdownMenuNew, useToolbarDropdownMenuOld);
|
|
28
16
|
var ToolbarDropdownMenuProvider = exports.ToolbarDropdownMenuProvider = function ToolbarDropdownMenuProvider(_ref) {
|
|
29
17
|
var children = _ref.children;
|
|
30
18
|
var _useState = (0, _react.useState)(false),
|
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
/* index.tsx generated by @compiled/babel-plugin v0.38.1 */
|
|
2
|
-
import "./index.compiled.css";
|
|
3
|
-
import { ax, ix } from "@compiled/react/runtime";
|
|
4
1
|
import React, { useMemo, useCallback, useRef, useEffect } from 'react';
|
|
5
2
|
import chromatism from 'chromatism';
|
|
6
3
|
import { useIntl } from 'react-intl-next';
|
|
7
|
-
import {
|
|
8
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
4
|
+
import { Grid, Inline } from '@atlaskit/primitives/compiled';
|
|
9
5
|
import { useThemeObserver } from '@atlaskit/tokens';
|
|
10
6
|
import { Color } from './Color';
|
|
11
7
|
import getColorMessage from './getColorMessage';
|
|
12
8
|
import { DEFAULT_COLOR_PICKER_COLUMNS, getColorsPerRowFromPalette, getSelectedRowAndColumnFromPalette, getTokenCSSVariableValue } from './utils';
|
|
13
|
-
const styles = {
|
|
14
|
-
paletteWrapper: "_1e0c1txw"
|
|
15
|
-
};
|
|
16
9
|
|
|
17
10
|
/**
|
|
18
11
|
* For a given color pick the color from a list of colors with
|
|
@@ -111,9 +104,6 @@ const ColorPalette = ({
|
|
|
111
104
|
|
|
112
105
|
// Initialize focus position and handle autofocus
|
|
113
106
|
useEffect(() => {
|
|
114
|
-
if (!expValEquals('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true)) {
|
|
115
|
-
return;
|
|
116
|
-
}
|
|
117
107
|
if (selectedRowIndex >= 0 && selectedColumnIndex >= 0) {
|
|
118
108
|
currentFocusRef.current = {
|
|
119
109
|
row: selectedRowIndex,
|
|
@@ -258,7 +248,7 @@ const ColorPalette = ({
|
|
|
258
248
|
}
|
|
259
249
|
}
|
|
260
250
|
}, [colorsPerRow, focusColorAt, onClick, onKeyDown]);
|
|
261
|
-
return
|
|
251
|
+
return /*#__PURE__*/React.createElement(Grid, {
|
|
262
252
|
gap: "space.050",
|
|
263
253
|
ref: paletteRef,
|
|
264
254
|
role: "group"
|
|
@@ -305,40 +295,6 @@ const ColorPalette = ({
|
|
|
305
295
|
decorator: decorator,
|
|
306
296
|
tabIndex: shouldBeFocusable ? 0 : -1
|
|
307
297
|
});
|
|
308
|
-
})))) : /*#__PURE__*/React.createElement(React.Fragment, null, colorsPerRow.map(row => /*#__PURE__*/React.createElement(Box, {
|
|
309
|
-
xcss: styles.paletteWrapper,
|
|
310
|
-
key: `row-first-color-${row[0].value}`,
|
|
311
|
-
role: "radiogroup"
|
|
312
|
-
}, row.map(({
|
|
313
|
-
value,
|
|
314
|
-
label,
|
|
315
|
-
border,
|
|
316
|
-
message,
|
|
317
|
-
decorator
|
|
318
|
-
}) => {
|
|
319
|
-
let tooltipMessage = message;
|
|
320
|
-
|
|
321
|
-
// Override with theme-specific tooltip messages if provided
|
|
322
|
-
if (paletteColorTooltipMessages) {
|
|
323
|
-
if (tokenTheme === 'dark') {
|
|
324
|
-
tooltipMessage = getColorMessage(paletteColorTooltipMessages.dark, value.toUpperCase());
|
|
325
|
-
}
|
|
326
|
-
if (tokenTheme === 'light') {
|
|
327
|
-
tooltipMessage = getColorMessage(paletteColorTooltipMessages.light, value.toUpperCase());
|
|
328
|
-
}
|
|
329
|
-
}
|
|
330
|
-
return /*#__PURE__*/React.createElement(Color, {
|
|
331
|
-
key: value,
|
|
332
|
-
value: value,
|
|
333
|
-
borderColor: border,
|
|
334
|
-
label: tooltipMessage ? formatMessage(tooltipMessage) : label,
|
|
335
|
-
onClick: onClick,
|
|
336
|
-
onKeyDown: onKeyDown,
|
|
337
|
-
isSelected: value === selectedColor,
|
|
338
|
-
checkMarkColor: getCheckMarkColor(value, useIconToken),
|
|
339
|
-
hexToPaletteColor: hexToPaletteColor,
|
|
340
|
-
decorator: decorator
|
|
341
|
-
});
|
|
342
298
|
}))));
|
|
343
299
|
};
|
|
344
300
|
export default ColorPalette;
|
|
@@ -6,7 +6,7 @@ import { cx } from '@atlaskit/css';
|
|
|
6
6
|
import { DropdownItem } from '@atlaskit/dropdown-menu';
|
|
7
7
|
import { Pressable } from '@atlaskit/primitives/compiled';
|
|
8
8
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
9
|
-
import {
|
|
9
|
+
import { useToolbarDropdownMenu } from './ToolbarDropdownMenuContext';
|
|
10
10
|
const styles = {
|
|
11
11
|
toolbarDropdownItem: "_11c82smr _18zrutpp _1rjc1b66 _1e0c1txw _kqswh2mm _bfhksm61 _1bsb1osq _1tkezwfg _1ul9eoa3 _syaz1gjq _1bas12b0 _1ah31i6y",
|
|
12
12
|
enabled: "_irr3166n _1di61dty",
|
|
@@ -50,7 +50,7 @@ export const ToolbarDropdownItem = ({
|
|
|
50
50
|
target,
|
|
51
51
|
rel
|
|
52
52
|
}) => {
|
|
53
|
-
const parentContext =
|
|
53
|
+
const parentContext = useToolbarDropdownMenu();
|
|
54
54
|
const injectedElemAfter = (() => {
|
|
55
55
|
if (! /*#__PURE__*/isValidElement(elemAfter)) {
|
|
56
56
|
return elemAfter;
|
|
@@ -65,12 +65,12 @@ export const ToolbarDropdownItem = ({
|
|
|
65
65
|
});
|
|
66
66
|
})();
|
|
67
67
|
return /*#__PURE__*/React.createElement(DropdownItem, {
|
|
68
|
-
onClick:
|
|
68
|
+
onClick: e => {
|
|
69
69
|
if (!hasNestedDropdownMenu) {
|
|
70
70
|
parentContext === null || parentContext === void 0 ? void 0 : parentContext.closeMenu();
|
|
71
71
|
}
|
|
72
72
|
onClick === null || onClick === void 0 ? void 0 : onClick(e);
|
|
73
|
-
}
|
|
73
|
+
},
|
|
74
74
|
elemBefore: elemBefore,
|
|
75
75
|
elemAfter: expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? injectedElemAfter : elemAfter,
|
|
76
76
|
isSelected: isSelected,
|
|
@@ -8,7 +8,7 @@ import { Box } from '@atlaskit/primitives/compiled';
|
|
|
8
8
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
9
9
|
import { useToolbarUI } from '../hooks/ui-context';
|
|
10
10
|
import { ToolbarButton } from './ToolbarButton';
|
|
11
|
-
import {
|
|
11
|
+
import { useToolbarDropdownMenu } from './ToolbarDropdownMenuContext';
|
|
12
12
|
const styles = {
|
|
13
13
|
sectionMargin: "_1mouv77o",
|
|
14
14
|
firstSectionSeparator: "_18l8n7od",
|
|
@@ -72,25 +72,14 @@ export const ToolbarDropdownMenu = ({
|
|
|
72
72
|
enableMaxHeight = false,
|
|
73
73
|
onClick
|
|
74
74
|
}) => {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}, children));
|
|
86
|
-
} else {
|
|
87
|
-
return /*#__PURE__*/React.createElement(ToolbarDropdownMenuProvider, null, /*#__PURE__*/React.createElement(ToolbarDropdownMenuContent, {
|
|
88
|
-
iconBefore: iconBefore,
|
|
89
|
-
isDisabled: isDisabled,
|
|
90
|
-
testId: testId,
|
|
91
|
-
label: label
|
|
92
|
-
}, /*#__PURE__*/React.createElement("div", {
|
|
93
|
-
className: ax([hasSectionMargin && styles.sectionMargin, expValEquals('platform_editor_toolbar_migrate_loom', 'isEnabled', true) && styles.firstSectionSeparator])
|
|
94
|
-
}, children)));
|
|
95
|
-
}
|
|
75
|
+
return /*#__PURE__*/React.createElement(ToolbarDropdownMenuContent, {
|
|
76
|
+
iconBefore: iconBefore,
|
|
77
|
+
isDisabled: isDisabled,
|
|
78
|
+
testId: testId,
|
|
79
|
+
label: label,
|
|
80
|
+
onClick: onClick
|
|
81
|
+
}, /*#__PURE__*/React.createElement(Box, {
|
|
82
|
+
xcss: cx(hasSectionMargin && styles.sectionMargin, enableMaxHeight && styles.scrollContainer, expValEquals('platform_editor_toolbar_migrate_loom', 'isEnabled', true) && styles.firstSectionSeparator),
|
|
83
|
+
"data-toolbar-component": "menu"
|
|
84
|
+
}, children));
|
|
96
85
|
};
|
|
@@ -1,18 +1,8 @@
|
|
|
1
1
|
import React, { createContext, useContext, useState } from 'react';
|
|
2
|
-
import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
|
|
3
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
4
2
|
const ToolbarDropdownMenuContext = /*#__PURE__*/createContext(undefined);
|
|
5
|
-
export const
|
|
6
|
-
const context = useContext(ToolbarDropdownMenuContext);
|
|
7
|
-
if (!context) {
|
|
8
|
-
throw new Error('useToolbarDropdownMenu must be used within ToolbarDropdownMenuProvider');
|
|
9
|
-
}
|
|
10
|
-
return context;
|
|
11
|
-
};
|
|
12
|
-
export const useToolbarDropdownMenuNew = () => {
|
|
3
|
+
export const useToolbarDropdownMenu = () => {
|
|
13
4
|
return useContext(ToolbarDropdownMenuContext);
|
|
14
5
|
};
|
|
15
|
-
export const useToolbarDropdownMenu = conditionalHooksFactory(() => expValEquals('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true), useToolbarDropdownMenuNew, useToolbarDropdownMenuOld);
|
|
16
6
|
export const ToolbarDropdownMenuProvider = ({
|
|
17
7
|
children
|
|
18
8
|
}) => {
|
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
/* index.tsx generated by @compiled/babel-plugin v0.38.1 */
|
|
2
|
-
import "./index.compiled.css";
|
|
3
|
-
import { ax, ix } from "@compiled/react/runtime";
|
|
4
1
|
import React, { useMemo, useCallback, useRef, useEffect } from 'react';
|
|
5
2
|
import chromatism from 'chromatism';
|
|
6
3
|
import { useIntl } from 'react-intl-next';
|
|
7
|
-
import {
|
|
8
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
4
|
+
import { Grid, Inline } from '@atlaskit/primitives/compiled';
|
|
9
5
|
import { useThemeObserver } from '@atlaskit/tokens';
|
|
10
6
|
import { Color } from './Color';
|
|
11
7
|
import getColorMessage from './getColorMessage';
|
|
12
8
|
import { DEFAULT_COLOR_PICKER_COLUMNS, getColorsPerRowFromPalette, getSelectedRowAndColumnFromPalette, getTokenCSSVariableValue } from './utils';
|
|
13
|
-
var styles = {
|
|
14
|
-
paletteWrapper: "_1e0c1txw"
|
|
15
|
-
};
|
|
16
9
|
|
|
17
10
|
/**
|
|
18
11
|
* For a given color pick the color from a list of colors with
|
|
@@ -108,9 +101,6 @@ var ColorPalette = function ColorPalette(_ref) {
|
|
|
108
101
|
|
|
109
102
|
// Initialize focus position and handle autofocus
|
|
110
103
|
useEffect(function () {
|
|
111
|
-
if (!expValEquals('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true)) {
|
|
112
|
-
return;
|
|
113
|
-
}
|
|
114
104
|
if (selectedRowIndex >= 0 && selectedColumnIndex >= 0) {
|
|
115
105
|
currentFocusRef.current = {
|
|
116
106
|
row: selectedRowIndex,
|
|
@@ -254,7 +244,7 @@ var ColorPalette = function ColorPalette(_ref) {
|
|
|
254
244
|
}
|
|
255
245
|
}
|
|
256
246
|
}, [colorsPerRow, focusColorAt, onClick, onKeyDown]);
|
|
257
|
-
return
|
|
247
|
+
return /*#__PURE__*/React.createElement(Grid, {
|
|
258
248
|
gap: "space.050",
|
|
259
249
|
ref: paletteRef,
|
|
260
250
|
role: "group"
|
|
@@ -302,41 +292,6 @@ var ColorPalette = function ColorPalette(_ref) {
|
|
|
302
292
|
tabIndex: shouldBeFocusable ? 0 : -1
|
|
303
293
|
});
|
|
304
294
|
}));
|
|
305
|
-
})) : /*#__PURE__*/React.createElement(React.Fragment, null, colorsPerRow.map(function (row) {
|
|
306
|
-
return /*#__PURE__*/React.createElement(Box, {
|
|
307
|
-
xcss: styles.paletteWrapper,
|
|
308
|
-
key: "row-first-color-".concat(row[0].value),
|
|
309
|
-
role: "radiogroup"
|
|
310
|
-
}, row.map(function (_ref3) {
|
|
311
|
-
var value = _ref3.value,
|
|
312
|
-
label = _ref3.label,
|
|
313
|
-
border = _ref3.border,
|
|
314
|
-
message = _ref3.message,
|
|
315
|
-
decorator = _ref3.decorator;
|
|
316
|
-
var tooltipMessage = message;
|
|
317
|
-
|
|
318
|
-
// Override with theme-specific tooltip messages if provided
|
|
319
|
-
if (paletteColorTooltipMessages) {
|
|
320
|
-
if (tokenTheme === 'dark') {
|
|
321
|
-
tooltipMessage = getColorMessage(paletteColorTooltipMessages.dark, value.toUpperCase());
|
|
322
|
-
}
|
|
323
|
-
if (tokenTheme === 'light') {
|
|
324
|
-
tooltipMessage = getColorMessage(paletteColorTooltipMessages.light, value.toUpperCase());
|
|
325
|
-
}
|
|
326
|
-
}
|
|
327
|
-
return /*#__PURE__*/React.createElement(Color, {
|
|
328
|
-
key: value,
|
|
329
|
-
value: value,
|
|
330
|
-
borderColor: border,
|
|
331
|
-
label: tooltipMessage ? formatMessage(tooltipMessage) : label,
|
|
332
|
-
onClick: onClick,
|
|
333
|
-
onKeyDown: onKeyDown,
|
|
334
|
-
isSelected: value === selectedColor,
|
|
335
|
-
checkMarkColor: getCheckMarkColor(value, useIconToken),
|
|
336
|
-
hexToPaletteColor: hexToPaletteColor,
|
|
337
|
-
decorator: decorator
|
|
338
|
-
});
|
|
339
|
-
}));
|
|
340
295
|
}));
|
|
341
296
|
};
|
|
342
297
|
export default ColorPalette;
|
|
@@ -9,7 +9,7 @@ import { cx } from '@atlaskit/css';
|
|
|
9
9
|
import { DropdownItem } from '@atlaskit/dropdown-menu';
|
|
10
10
|
import { Pressable } from '@atlaskit/primitives/compiled';
|
|
11
11
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
12
|
-
import {
|
|
12
|
+
import { useToolbarDropdownMenu } from './ToolbarDropdownMenuContext';
|
|
13
13
|
var styles = {
|
|
14
14
|
toolbarDropdownItem: "_11c82smr _18zrutpp _1rjc1b66 _1e0c1txw _kqswh2mm _bfhksm61 _1bsb1osq _1tkezwfg _1ul9eoa3 _syaz1gjq _1bas12b0 _1ah31i6y",
|
|
15
15
|
enabled: "_irr3166n _1di61dty",
|
|
@@ -39,7 +39,7 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/forwardRef(function (_ref, ref)
|
|
|
39
39
|
}, children);
|
|
40
40
|
});
|
|
41
41
|
export var ToolbarDropdownItem = function ToolbarDropdownItem(_ref2) {
|
|
42
|
-
var
|
|
42
|
+
var _onClick = _ref2.onClick,
|
|
43
43
|
elemBefore = _ref2.elemBefore,
|
|
44
44
|
elemAfter = _ref2.elemAfter,
|
|
45
45
|
isSelected = _ref2.isSelected,
|
|
@@ -54,7 +54,7 @@ export var ToolbarDropdownItem = function ToolbarDropdownItem(_ref2) {
|
|
|
54
54
|
href = _ref2.href,
|
|
55
55
|
target = _ref2.target,
|
|
56
56
|
rel = _ref2.rel;
|
|
57
|
-
var parentContext =
|
|
57
|
+
var parentContext = useToolbarDropdownMenu();
|
|
58
58
|
var injectedElemAfter = function () {
|
|
59
59
|
if (! /*#__PURE__*/isValidElement(elemAfter)) {
|
|
60
60
|
return elemAfter;
|
|
@@ -68,12 +68,12 @@ export var ToolbarDropdownItem = function ToolbarDropdownItem(_ref2) {
|
|
|
68
68
|
}));
|
|
69
69
|
}();
|
|
70
70
|
return /*#__PURE__*/React.createElement(DropdownItem, {
|
|
71
|
-
onClick:
|
|
71
|
+
onClick: function onClick(e) {
|
|
72
72
|
if (!hasNestedDropdownMenu) {
|
|
73
73
|
parentContext === null || parentContext === void 0 || parentContext.closeMenu();
|
|
74
74
|
}
|
|
75
|
-
|
|
76
|
-
}
|
|
75
|
+
_onClick === null || _onClick === void 0 || _onClick(e);
|
|
76
|
+
},
|
|
77
77
|
elemBefore: elemBefore,
|
|
78
78
|
elemAfter: expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? injectedElemAfter : elemAfter,
|
|
79
79
|
isSelected: isSelected,
|
|
@@ -8,7 +8,7 @@ import { Box } from '@atlaskit/primitives/compiled';
|
|
|
8
8
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
9
9
|
import { useToolbarUI } from '../hooks/ui-context';
|
|
10
10
|
import { ToolbarButton } from './ToolbarButton';
|
|
11
|
-
import {
|
|
11
|
+
import { useToolbarDropdownMenu } from './ToolbarDropdownMenuContext';
|
|
12
12
|
var styles = {
|
|
13
13
|
sectionMargin: "_1mouv77o",
|
|
14
14
|
firstSectionSeparator: "_18l8n7od",
|
|
@@ -73,25 +73,14 @@ export var ToolbarDropdownMenu = function ToolbarDropdownMenu(_ref2) {
|
|
|
73
73
|
_ref2$enableMaxHeight = _ref2.enableMaxHeight,
|
|
74
74
|
enableMaxHeight = _ref2$enableMaxHeight === void 0 ? false : _ref2$enableMaxHeight,
|
|
75
75
|
onClick = _ref2.onClick;
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
}, children));
|
|
87
|
-
} else {
|
|
88
|
-
return /*#__PURE__*/React.createElement(ToolbarDropdownMenuProvider, null, /*#__PURE__*/React.createElement(ToolbarDropdownMenuContent, {
|
|
89
|
-
iconBefore: iconBefore,
|
|
90
|
-
isDisabled: isDisabled,
|
|
91
|
-
testId: testId,
|
|
92
|
-
label: label
|
|
93
|
-
}, /*#__PURE__*/React.createElement("div", {
|
|
94
|
-
className: ax([hasSectionMargin && styles.sectionMargin, expValEquals('platform_editor_toolbar_migrate_loom', 'isEnabled', true) && styles.firstSectionSeparator])
|
|
95
|
-
}, children)));
|
|
96
|
-
}
|
|
76
|
+
return /*#__PURE__*/React.createElement(ToolbarDropdownMenuContent, {
|
|
77
|
+
iconBefore: iconBefore,
|
|
78
|
+
isDisabled: isDisabled,
|
|
79
|
+
testId: testId,
|
|
80
|
+
label: label,
|
|
81
|
+
onClick: onClick
|
|
82
|
+
}, /*#__PURE__*/React.createElement(Box, {
|
|
83
|
+
xcss: cx(hasSectionMargin && styles.sectionMargin, enableMaxHeight && styles.scrollContainer, expValEquals('platform_editor_toolbar_migrate_loom', 'isEnabled', true) && styles.firstSectionSeparator),
|
|
84
|
+
"data-toolbar-component": "menu"
|
|
85
|
+
}, children));
|
|
97
86
|
};
|
|
@@ -1,21 +1,9 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
2
|
import React, { createContext, useContext, useState } from 'react';
|
|
3
|
-
import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
|
|
4
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
5
3
|
var ToolbarDropdownMenuContext = /*#__PURE__*/createContext(undefined);
|
|
6
|
-
export var
|
|
7
|
-
var context = useContext(ToolbarDropdownMenuContext);
|
|
8
|
-
if (!context) {
|
|
9
|
-
throw new Error('useToolbarDropdownMenu must be used within ToolbarDropdownMenuProvider');
|
|
10
|
-
}
|
|
11
|
-
return context;
|
|
12
|
-
};
|
|
13
|
-
export var useToolbarDropdownMenuNew = function useToolbarDropdownMenuNew() {
|
|
4
|
+
export var useToolbarDropdownMenu = function useToolbarDropdownMenu() {
|
|
14
5
|
return useContext(ToolbarDropdownMenuContext);
|
|
15
6
|
};
|
|
16
|
-
export var useToolbarDropdownMenu = conditionalHooksFactory(function () {
|
|
17
|
-
return expValEquals('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true);
|
|
18
|
-
}, useToolbarDropdownMenuNew, useToolbarDropdownMenuOld);
|
|
19
7
|
export var ToolbarDropdownMenuProvider = function ToolbarDropdownMenuProvider(_ref) {
|
|
20
8
|
var children = _ref.children;
|
|
21
9
|
var _useState = useState(false),
|
|
@@ -4,9 +4,7 @@ interface ToolbarDropdownMenuContextValue {
|
|
|
4
4
|
isOpen: boolean;
|
|
5
5
|
openMenu: () => void;
|
|
6
6
|
}
|
|
7
|
-
export declare const
|
|
8
|
-
export declare const useToolbarDropdownMenuNew: () => ToolbarDropdownMenuContextValue | undefined;
|
|
9
|
-
export declare const useToolbarDropdownMenu: (...args: never[]) => ToolbarDropdownMenuContextValue | undefined;
|
|
7
|
+
export declare const useToolbarDropdownMenu: () => ToolbarDropdownMenuContextValue | undefined;
|
|
10
8
|
interface ToolbarDropdownMenuProviderProps {
|
|
11
9
|
children: React.ReactNode;
|
|
12
10
|
}
|
|
@@ -4,9 +4,7 @@ interface ToolbarDropdownMenuContextValue {
|
|
|
4
4
|
isOpen: boolean;
|
|
5
5
|
openMenu: () => void;
|
|
6
6
|
}
|
|
7
|
-
export declare const
|
|
8
|
-
export declare const useToolbarDropdownMenuNew: () => ToolbarDropdownMenuContextValue | undefined;
|
|
9
|
-
export declare const useToolbarDropdownMenu: (...args: never[]) => ToolbarDropdownMenuContextValue | undefined;
|
|
7
|
+
export declare const useToolbarDropdownMenu: () => ToolbarDropdownMenuContextValue | undefined;
|
|
10
8
|
interface ToolbarDropdownMenuProviderProps {
|
|
11
9
|
children: React.ReactNode;
|
|
12
10
|
}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"registry": "https://registry.npmjs.org/"
|
|
5
5
|
},
|
|
6
|
-
"version": "0.
|
|
6
|
+
"version": "0.12.0",
|
|
7
7
|
"description": "Common UI for Toolbars across the platform",
|
|
8
8
|
"atlassian": {
|
|
9
9
|
"team": "Editor: Jenga",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"atlaskit:src": "src/index.ts",
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@atlaskit/badge": "^18.2.0",
|
|
25
|
-
"@atlaskit/button": "^23.
|
|
25
|
+
"@atlaskit/button": "^23.5.0",
|
|
26
26
|
"@atlaskit/css": "^0.14.0",
|
|
27
27
|
"@atlaskit/dropdown-menu": "^16.3.0",
|
|
28
28
|
"@atlaskit/icon": "^28.3.0",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@atlaskit/platform-feature-flags-react": "^0.3.0",
|
|
33
33
|
"@atlaskit/popup": "^4.4.0",
|
|
34
34
|
"@atlaskit/primitives": "^14.15.0",
|
|
35
|
-
"@atlaskit/tmp-editor-statsig": "^13.
|
|
35
|
+
"@atlaskit/tmp-editor-statsig": "^13.1.0",
|
|
36
36
|
"@atlaskit/tokens": "^6.4.0",
|
|
37
37
|
"@atlaskit/tooltip": "^20.5.0",
|
|
38
38
|
"@babel/runtime": "^7.0.0",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
._1e0c1txw{display:flex}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
._1e0c1txw{display:flex}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
._1e0c1txw{display:flex}
|