@atlaskit/editor-common 98.2.4 → 98.2.6
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/monitoring/error.js +1 -1
- package/dist/cjs/styles/index.js +6 -0
- package/dist/cjs/styles/shared/plugins.js +24 -2
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/cjs/ui-menu/ColorPickerButton/index.js +75 -2
- package/dist/cjs/utils/page-element-counts.js +39 -1
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/styles/index.js +1 -1
- package/dist/es2019/styles/shared/plugins.js +23 -1
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/es2019/ui-menu/ColorPickerButton/index.js +76 -3
- package/dist/es2019/utils/page-element-counts.js +39 -1
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/styles/index.js +1 -1
- package/dist/esm/styles/shared/plugins.js +23 -1
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/esm/ui-menu/ColorPickerButton/index.js +76 -3
- package/dist/esm/utils/page-element-counts.js +39 -1
- package/dist/types/styles/index.d.ts +1 -1
- package/dist/types/styles/shared/plugins.d.ts +1 -0
- package/dist/types/utils/page-element-counts.d.ts +3 -0
- package/dist/types-ts4.5/styles/index.d.ts +1 -1
- package/dist/types-ts4.5/styles/shared/plugins.d.ts +1 -0
- package/dist/types-ts4.5/utils/page-element-counts.d.ts +3 -0
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 98.2.6
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#100162](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100162)
|
|
8
|
+
[`e80e57fc37719`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e80e57fc37719) -
|
|
9
|
+
[ux] ED-26089: Add 4px gap to main nav bar items
|
|
10
|
+
|
|
11
|
+
## 98.2.5
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [#100845](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100845)
|
|
16
|
+
[`bd4c63b5f9688`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bd4c63b5f9688) -
|
|
17
|
+
[ED-26055] Export a function from adf-utils used to detect the use of the nested-tables extension,
|
|
18
|
+
and add calculation of unexpectedly nested tables to editor-common utils
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 98.2.4
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
|
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
|
|
|
17
17
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
18
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
19
19
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
20
|
-
var packageVersion = "98.2.
|
|
20
|
+
var packageVersion = "98.2.6";
|
|
21
21
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
22
22
|
// Remove URL as it has UGC
|
|
23
23
|
// TODO: Sanitise the URL instead of just removing it
|
package/dist/cjs/styles/index.js
CHANGED
|
@@ -159,6 +159,12 @@ Object.defineProperty(exports, "buttonGroupStyle", {
|
|
|
159
159
|
return _plugins.buttonGroupStyle;
|
|
160
160
|
}
|
|
161
161
|
});
|
|
162
|
+
Object.defineProperty(exports, "buttonGroupStyleBeforeVisualRefresh", {
|
|
163
|
+
enumerable: true,
|
|
164
|
+
get: function get() {
|
|
165
|
+
return _plugins.buttonGroupStyleBeforeVisualRefresh;
|
|
166
|
+
}
|
|
167
|
+
});
|
|
162
168
|
Object.defineProperty(exports, "calcTableWidth", {
|
|
163
169
|
enumerable: true,
|
|
164
170
|
get: function get() {
|
|
@@ -3,11 +3,28 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.wrapperStyle = exports.triggerWrapperStylesWithPadding = exports.triggerWrapperStyles = exports.separatorStyles = exports.disableBlueBorderStyles = exports.buttonGroupStyle = void 0;
|
|
6
|
+
exports.wrapperStyle = exports.triggerWrapperStylesWithPadding = exports.triggerWrapperStyles = exports.separatorStyles = exports.disableBlueBorderStyles = exports.buttonGroupStyleBeforeVisualRefresh = exports.buttonGroupStyle = void 0;
|
|
7
7
|
var _react = require("@emotion/react");
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
9
9
|
|
|
10
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
10
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, -- Ignored via go/DSP-18766
|
|
11
|
+
var buttonGroupStyleBeforeVisualRefresh = exports.buttonGroupStyleBeforeVisualRefresh = (0, _react.css)({
|
|
12
|
+
display: 'inline-flex',
|
|
13
|
+
alignItems: 'center',
|
|
14
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
15
|
+
'& > div': {
|
|
16
|
+
display: 'flex'
|
|
17
|
+
},
|
|
18
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
19
|
+
button: {
|
|
20
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
21
|
+
'&:not([disabled])::after': {
|
|
22
|
+
border: 'none' // remove blue border when an item has been selected
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
11
28
|
var buttonGroupStyle = exports.buttonGroupStyle = (0, _react.css)({
|
|
12
29
|
display: 'inline-flex',
|
|
13
30
|
alignItems: 'center',
|
|
@@ -21,6 +38,11 @@ var buttonGroupStyle = exports.buttonGroupStyle = (0, _react.css)({
|
|
|
21
38
|
'&:not([disabled])::after': {
|
|
22
39
|
border: 'none' // remove blue border when an item has been selected
|
|
23
40
|
}
|
|
41
|
+
},
|
|
42
|
+
gap: "var(--ds-space-050, 4px)",
|
|
43
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
44
|
+
'div[role=group]': {
|
|
45
|
+
gap: "var(--ds-space-050, 4px)"
|
|
24
46
|
}
|
|
25
47
|
});
|
|
26
48
|
|
|
@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
23
23
|
* @jsx jsx
|
|
24
24
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
25
25
|
var packageName = "@atlaskit/editor-common";
|
|
26
|
-
var packageVersion = "98.2.
|
|
26
|
+
var packageVersion = "98.2.6";
|
|
27
27
|
var halfFocusRing = 1;
|
|
28
28
|
var dropOffset = '0, 8';
|
|
29
29
|
// Ignored via go/ees005
|
|
@@ -10,9 +10,11 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
10
10
|
var _react2 = require("@emotion/react");
|
|
11
11
|
var _withAnalyticsContext = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsContext"));
|
|
12
12
|
var _withAnalyticsEvents = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsEvents"));
|
|
13
|
+
var _new = _interopRequireDefault(require("@atlaskit/button/new"));
|
|
13
14
|
var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
|
|
14
15
|
var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
|
|
15
16
|
var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/chevron-down"));
|
|
17
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
18
|
var _primitives = require("@atlaskit/primitives");
|
|
17
19
|
var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
|
|
18
20
|
var _analytics = require("../../analytics");
|
|
@@ -38,6 +40,21 @@ var colorPickerExpandContainer = (0, _primitives.xcss)({
|
|
|
38
40
|
marginLeft: 'space.negative.050',
|
|
39
41
|
marginRight: 'space.negative.050'
|
|
40
42
|
});
|
|
43
|
+
var colorPickerExpandContainerVisualRefresh = (0, _primitives.xcss)({
|
|
44
|
+
marginTop: 'space.negative.025',
|
|
45
|
+
marginRight: 'space.negative.050'
|
|
46
|
+
});
|
|
47
|
+
var colorPickerButtonStyle = (0, _react2.css)({
|
|
48
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
49
|
+
button: {
|
|
50
|
+
'&::after': {
|
|
51
|
+
border: 'none'
|
|
52
|
+
},
|
|
53
|
+
'&:hover': {
|
|
54
|
+
backgroundColor: "var(--ds-background-selected, #E9F2FF)"
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
});
|
|
41
58
|
|
|
42
59
|
// Control the size of color picker buttons and preview
|
|
43
60
|
// TODO: https://product-fabric.atlassian.net/browse/DSP-4134
|
|
@@ -212,12 +229,69 @@ var ColorPickerButton = function ColorPickerButton(props) {
|
|
|
212
229
|
}
|
|
213
230
|
});
|
|
214
231
|
};
|
|
232
|
+
var buttonStyleVisualRefresh = function buttonStyleVisualRefresh() {
|
|
233
|
+
var _props$size4, _props$size5, _props$size6;
|
|
234
|
+
return (0, _react2.css)({
|
|
235
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
236
|
+
height: "".concat(!!((_props$size4 = props.size) !== null && _props$size4 !== void 0 && _props$size4.height) ? 'inherit' : ''),
|
|
237
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
238
|
+
'&:before': {
|
|
239
|
+
display: 'flex',
|
|
240
|
+
justifyContent: 'center',
|
|
241
|
+
alignItems: 'center',
|
|
242
|
+
alignSelf: 'center',
|
|
243
|
+
content: "''",
|
|
244
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
245
|
+
border: "1px solid ".concat(_uiColor.DEFAULT_BORDER_COLOR),
|
|
246
|
+
borderRadius: "var(--ds-border-radius, 3px)",
|
|
247
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
248
|
+
backgroundColor: currentColor || 'transparent',
|
|
249
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
250
|
+
width: ((_props$size5 = props.size) === null || _props$size5 === void 0 ? void 0 : _props$size5.width) || '14px',
|
|
251
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
252
|
+
height: ((_props$size6 = props.size) === null || _props$size6 === void 0 ? void 0 : _props$size6.height) || '14px',
|
|
253
|
+
marginTop: "var(--ds-space-025, 2px)"
|
|
254
|
+
}
|
|
255
|
+
});
|
|
256
|
+
};
|
|
215
257
|
return (0, _react2.jsx)("div", {
|
|
216
258
|
css: colorPickerButtonWrapper
|
|
217
259
|
}, (0, _react2.jsx)(_tooltip.default, {
|
|
218
260
|
content: title,
|
|
219
261
|
position: "top"
|
|
220
|
-
},
|
|
262
|
+
},
|
|
263
|
+
// eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
|
|
264
|
+
(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ? (0, _react2.jsx)("div", {
|
|
265
|
+
css: colorPickerButtonStyle
|
|
266
|
+
}, (0, _react2.jsx)(_new.default, {
|
|
267
|
+
appearance: 'subtle',
|
|
268
|
+
ref: buttonRef,
|
|
269
|
+
"aria-label": title,
|
|
270
|
+
"aria-expanded": props.isAriaExpanded ? isPopupOpen : undefined,
|
|
271
|
+
spacing: "compact",
|
|
272
|
+
onClick: togglePopup,
|
|
273
|
+
onKeyDown: function onKeyDown(event) {
|
|
274
|
+
if (event.key === 'Enter' || event.key === ' ') {
|
|
275
|
+
event.preventDefault();
|
|
276
|
+
togglePopup();
|
|
277
|
+
setIsOpenedByKeyboard(true);
|
|
278
|
+
}
|
|
279
|
+
},
|
|
280
|
+
"data-selected-color": props.currentColor,
|
|
281
|
+
isSelected: isPopupOpen
|
|
282
|
+
}, (0, _react2.jsx)(_primitives.Inline, {
|
|
283
|
+
alignBlock: "start"
|
|
284
|
+
}, (0, _react2.jsx)("span", {
|
|
285
|
+
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
|
|
286
|
+
css: buttonStyleVisualRefresh
|
|
287
|
+
}), (0, _react2.jsx)(_primitives.Box, {
|
|
288
|
+
xcss: colorPickerExpandContainerVisualRefresh
|
|
289
|
+
}, (0, _react2.jsx)(_chevronDown2.default, {
|
|
290
|
+
color: "currentColor",
|
|
291
|
+
spacing: "spacious",
|
|
292
|
+
LEGACY_fallbackIcon: _chevronDown.default,
|
|
293
|
+
label: "color-picker-chevron-down"
|
|
294
|
+
}))))) : (0, _react2.jsx)(_standardButton.default, {
|
|
221
295
|
appearance: 'subtle',
|
|
222
296
|
ref: buttonRef,
|
|
223
297
|
"aria-label": title,
|
|
@@ -231,7 +305,6 @@ var ColorPickerButton = function ColorPickerButton(props) {
|
|
|
231
305
|
setIsOpenedByKeyboard(true);
|
|
232
306
|
}
|
|
233
307
|
}
|
|
234
|
-
// TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
|
|
235
308
|
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
|
|
236
309
|
,
|
|
237
310
|
css: buttonStyle,
|
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getPageElementCounts = void 0;
|
|
7
|
+
var _transforms = require("@atlaskit/adf-utils/transforms");
|
|
7
8
|
var _traverse = require("@atlaskit/adf-utils/traverse");
|
|
8
9
|
/**
|
|
9
10
|
* Traverses a JSON document and counts the number of unique elements, text formatting and macros.
|
|
@@ -13,7 +14,8 @@ var getPageElementCounts = exports.getPageElementCounts = function getPageElemen
|
|
|
13
14
|
var pageElementCounts = {
|
|
14
15
|
elements: {},
|
|
15
16
|
textFormats: {},
|
|
16
|
-
macros: {}
|
|
17
|
+
macros: {},
|
|
18
|
+
unexpectedElements: {}
|
|
17
19
|
};
|
|
18
20
|
(0, _traverse.reduce)(doc, function (acc, node) {
|
|
19
21
|
if (node.type === 'text') {
|
|
@@ -32,6 +34,22 @@ var getPageElementCounts = exports.getPageElementCounts = function getPageElemen
|
|
|
32
34
|
if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
|
|
33
35
|
var _acc$macros$extension;
|
|
34
36
|
var extensionKey = node.attrs.extensionKey;
|
|
37
|
+
|
|
38
|
+
// If there is a nested table extension
|
|
39
|
+
if ((0, _transforms.isNestedTableExtension)(node)) {
|
|
40
|
+
if ('parameters' in node.attrs && node.attrs.parameters && 'adf' in node.attrs.parameters) {
|
|
41
|
+
// Check to see if the ADF contains a nested table
|
|
42
|
+
var adfString = node.attrs.parameters.adf;
|
|
43
|
+
var adf = JSON.parse(adfString);
|
|
44
|
+
if (adfString.includes('{"type":"table"')) {
|
|
45
|
+
if (getHasNestedTable(adf)) {
|
|
46
|
+
var _acc$unexpectedElemen;
|
|
47
|
+
acc.unexpectedElements['tablesNestedMoreThanOnce'] = ((_acc$unexpectedElemen = acc.unexpectedElements['tablesNestedMoreThanOnce']) !== null && _acc$unexpectedElemen !== void 0 ? _acc$unexpectedElemen : 0) + 1;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
35
53
|
// If macros extensionKey has <UUID>/<UUID>/static/ prepended to it, remove the prefix
|
|
36
54
|
if (extensionKey.includes('/static/')) {
|
|
37
55
|
var extensionKeyParts = extensionKey.split('/');
|
|
@@ -46,4 +64,24 @@ var getPageElementCounts = exports.getPageElementCounts = function getPageElemen
|
|
|
46
64
|
return acc;
|
|
47
65
|
}, pageElementCounts);
|
|
48
66
|
return pageElementCounts;
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Return true is the JSON document contains a table nested within a table
|
|
71
|
+
*/
|
|
72
|
+
var getHasNestedTable = function getHasNestedTable(node) {
|
|
73
|
+
return (0, _traverse.reduce)(node, function (hasNestedTable, node) {
|
|
74
|
+
if (hasNestedTable) {
|
|
75
|
+
return hasNestedTable;
|
|
76
|
+
}
|
|
77
|
+
if (node.type === 'table') {
|
|
78
|
+
return (0, _traverse.reduce)(node, function (acc, node) {
|
|
79
|
+
if (node.type === 'table') {
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
return acc;
|
|
83
|
+
}, false);
|
|
84
|
+
}
|
|
85
|
+
return hasNestedTable;
|
|
86
|
+
}, false);
|
|
49
87
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isFedRamp } from './environment';
|
|
2
2
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
3
3
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
4
|
-
const packageVersion = "98.2.
|
|
4
|
+
const packageVersion = "98.2.6";
|
|
5
5
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
6
6
|
// Remove URL as it has UGC
|
|
7
7
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -30,7 +30,7 @@ export { resizerStyles, resizerHandleClassName, resizerHandleTrackClassName, res
|
|
|
30
30
|
export { gridStyles, GRID_GUTTER } from './shared/grid';
|
|
31
31
|
export { smartCardStyles, FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, DATASOURCE_INNER_CONTAINER_CLASSNAME } from './shared/smartCard';
|
|
32
32
|
export { embedCardStyles, embedSpacingStyles } from './shared/embedCard';
|
|
33
|
-
export { buttonGroupStyle, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding } from './shared/plugins';
|
|
33
|
+
export { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding } from './shared/plugins';
|
|
34
34
|
export { UnsupportedSharedCssClassName, unsupportedStyles } from './shared/unsupported-content';
|
|
35
35
|
export { expandIconWrapperStyle, expandClassNames, expandIconContainerStyle } from './shared/expand';
|
|
36
36
|
export { sharedExpandStyles } from '../ui/Expand/sharedStyles';
|
|
@@ -1,6 +1,23 @@
|
|
|
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
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
3
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, -- Ignored via go/DSP-18766
|
|
4
|
+
export const buttonGroupStyleBeforeVisualRefresh = css({
|
|
5
|
+
display: 'inline-flex',
|
|
6
|
+
alignItems: 'center',
|
|
7
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
8
|
+
'& > div': {
|
|
9
|
+
display: 'flex'
|
|
10
|
+
},
|
|
11
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
12
|
+
button: {
|
|
13
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
14
|
+
'&:not([disabled])::after': {
|
|
15
|
+
border: 'none' // remove blue border when an item has been selected
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
21
|
export const buttonGroupStyle = css({
|
|
5
22
|
display: 'inline-flex',
|
|
6
23
|
alignItems: 'center',
|
|
@@ -14,6 +31,11 @@ export const buttonGroupStyle = css({
|
|
|
14
31
|
'&:not([disabled])::after': {
|
|
15
32
|
border: 'none' // remove blue border when an item has been selected
|
|
16
33
|
}
|
|
34
|
+
},
|
|
35
|
+
gap: "var(--ds-space-050, 4px)",
|
|
36
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
37
|
+
'div[role=group]': {
|
|
38
|
+
gap: "var(--ds-space-050, 4px)"
|
|
17
39
|
}
|
|
18
40
|
});
|
|
19
41
|
|
|
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
13
13
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
14
14
|
import Layer from '../Layer';
|
|
15
15
|
const packageName = "@atlaskit/editor-common";
|
|
16
|
-
const packageVersion = "98.2.
|
|
16
|
+
const packageVersion = "98.2.6";
|
|
17
17
|
const halfFocusRing = 1;
|
|
18
18
|
const dropOffset = '0, 8';
|
|
19
19
|
// Ignored via go/ees005
|
|
@@ -8,10 +8,12 @@ import React from 'react';
|
|
|
8
8
|
import { css, jsx } from '@emotion/react';
|
|
9
9
|
import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext';
|
|
10
10
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
11
|
-
import Button from '@atlaskit/button/
|
|
11
|
+
import Button from '@atlaskit/button/new';
|
|
12
|
+
import LegacyButton from '@atlaskit/button/standard-button';
|
|
12
13
|
import LegacyExpandIcon from '@atlaskit/icon/glyph/chevron-down';
|
|
13
14
|
import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
|
|
14
|
-
import {
|
|
15
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
16
|
+
import { Box, xcss, Inline } from '@atlaskit/primitives';
|
|
15
17
|
import Tooltip from '@atlaskit/tooltip';
|
|
16
18
|
import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, editorAnalyticsChannel, EVENT_TYPE } from '../../analytics';
|
|
17
19
|
import { ColorPalette, DEFAULT_BORDER_COLOR, getSelectedRowAndColumnFromPalette } from '../../ui-color';
|
|
@@ -30,6 +32,21 @@ const colorPickerExpandContainer = xcss({
|
|
|
30
32
|
marginLeft: 'space.negative.050',
|
|
31
33
|
marginRight: 'space.negative.050'
|
|
32
34
|
});
|
|
35
|
+
const colorPickerExpandContainerVisualRefresh = xcss({
|
|
36
|
+
marginTop: 'space.negative.025',
|
|
37
|
+
marginRight: 'space.negative.050'
|
|
38
|
+
});
|
|
39
|
+
const colorPickerButtonStyle = css({
|
|
40
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
41
|
+
button: {
|
|
42
|
+
'&::after': {
|
|
43
|
+
border: 'none'
|
|
44
|
+
},
|
|
45
|
+
'&:hover': {
|
|
46
|
+
backgroundColor: `${"var(--ds-background-selected, #E9F2FF)"}`
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
});
|
|
33
50
|
|
|
34
51
|
// Control the size of color picker buttons and preview
|
|
35
52
|
// TODO: https://product-fabric.atlassian.net/browse/DSP-4134
|
|
@@ -192,12 +209,69 @@ const ColorPickerButton = props => {
|
|
|
192
209
|
}
|
|
193
210
|
});
|
|
194
211
|
};
|
|
212
|
+
const buttonStyleVisualRefresh = () => {
|
|
213
|
+
var _props$size4, _props$size5, _props$size6;
|
|
214
|
+
return css({
|
|
215
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
216
|
+
height: `${!!((_props$size4 = props.size) !== null && _props$size4 !== void 0 && _props$size4.height) ? 'inherit' : ''}`,
|
|
217
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
218
|
+
'&:before': {
|
|
219
|
+
display: 'flex',
|
|
220
|
+
justifyContent: 'center',
|
|
221
|
+
alignItems: 'center',
|
|
222
|
+
alignSelf: 'center',
|
|
223
|
+
content: "''",
|
|
224
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
225
|
+
border: `1px solid ${DEFAULT_BORDER_COLOR}`,
|
|
226
|
+
borderRadius: "var(--ds-border-radius, 3px)",
|
|
227
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
228
|
+
backgroundColor: currentColor || 'transparent',
|
|
229
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
230
|
+
width: ((_props$size5 = props.size) === null || _props$size5 === void 0 ? void 0 : _props$size5.width) || '14px',
|
|
231
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
232
|
+
height: ((_props$size6 = props.size) === null || _props$size6 === void 0 ? void 0 : _props$size6.height) || '14px',
|
|
233
|
+
marginTop: `${"var(--ds-space-025, 2px)"}`
|
|
234
|
+
}
|
|
235
|
+
});
|
|
236
|
+
};
|
|
195
237
|
return jsx("div", {
|
|
196
238
|
css: colorPickerButtonWrapper
|
|
197
239
|
}, jsx(Tooltip, {
|
|
198
240
|
content: title,
|
|
199
241
|
position: "top"
|
|
242
|
+
},
|
|
243
|
+
// eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
|
|
244
|
+
fg('platform-visual-refresh-icons') ? jsx("div", {
|
|
245
|
+
css: colorPickerButtonStyle
|
|
200
246
|
}, jsx(Button, {
|
|
247
|
+
appearance: 'subtle',
|
|
248
|
+
ref: buttonRef,
|
|
249
|
+
"aria-label": title,
|
|
250
|
+
"aria-expanded": props.isAriaExpanded ? isPopupOpen : undefined,
|
|
251
|
+
spacing: "compact",
|
|
252
|
+
onClick: togglePopup,
|
|
253
|
+
onKeyDown: event => {
|
|
254
|
+
if (event.key === 'Enter' || event.key === ' ') {
|
|
255
|
+
event.preventDefault();
|
|
256
|
+
togglePopup();
|
|
257
|
+
setIsOpenedByKeyboard(true);
|
|
258
|
+
}
|
|
259
|
+
},
|
|
260
|
+
"data-selected-color": props.currentColor,
|
|
261
|
+
isSelected: isPopupOpen
|
|
262
|
+
}, jsx(Inline, {
|
|
263
|
+
alignBlock: "start"
|
|
264
|
+
}, jsx("span", {
|
|
265
|
+
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
|
|
266
|
+
css: buttonStyleVisualRefresh
|
|
267
|
+
}), jsx(Box, {
|
|
268
|
+
xcss: colorPickerExpandContainerVisualRefresh
|
|
269
|
+
}, jsx(ChevronDownIcon, {
|
|
270
|
+
color: "currentColor",
|
|
271
|
+
spacing: "spacious",
|
|
272
|
+
LEGACY_fallbackIcon: LegacyExpandIcon,
|
|
273
|
+
label: "color-picker-chevron-down"
|
|
274
|
+
}))))) : jsx(LegacyButton, {
|
|
201
275
|
appearance: 'subtle',
|
|
202
276
|
ref: buttonRef,
|
|
203
277
|
"aria-label": title,
|
|
@@ -211,7 +285,6 @@ const ColorPickerButton = props => {
|
|
|
211
285
|
setIsOpenedByKeyboard(true);
|
|
212
286
|
}
|
|
213
287
|
}
|
|
214
|
-
// TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
|
|
215
288
|
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
|
|
216
289
|
,
|
|
217
290
|
css: buttonStyle,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isNestedTableExtension } from '@atlaskit/adf-utils/transforms';
|
|
1
2
|
import { reduce } from '@atlaskit/adf-utils/traverse';
|
|
2
3
|
/**
|
|
3
4
|
* Traverses a JSON document and counts the number of unique elements, text formatting and macros.
|
|
@@ -7,7 +8,8 @@ export const getPageElementCounts = doc => {
|
|
|
7
8
|
const pageElementCounts = {
|
|
8
9
|
elements: {},
|
|
9
10
|
textFormats: {},
|
|
10
|
-
macros: {}
|
|
11
|
+
macros: {},
|
|
12
|
+
unexpectedElements: {}
|
|
11
13
|
};
|
|
12
14
|
reduce(doc, (acc, node) => {
|
|
13
15
|
if (node.type === 'text') {
|
|
@@ -26,6 +28,22 @@ export const getPageElementCounts = doc => {
|
|
|
26
28
|
if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
|
|
27
29
|
var _acc$macros$extension;
|
|
28
30
|
let extensionKey = node.attrs.extensionKey;
|
|
31
|
+
|
|
32
|
+
// If there is a nested table extension
|
|
33
|
+
if (isNestedTableExtension(node)) {
|
|
34
|
+
if ('parameters' in node.attrs && node.attrs.parameters && 'adf' in node.attrs.parameters) {
|
|
35
|
+
// Check to see if the ADF contains a nested table
|
|
36
|
+
const adfString = node.attrs.parameters.adf;
|
|
37
|
+
const adf = JSON.parse(adfString);
|
|
38
|
+
if (adfString.includes('{"type":"table"')) {
|
|
39
|
+
if (getHasNestedTable(adf)) {
|
|
40
|
+
var _acc$unexpectedElemen;
|
|
41
|
+
acc.unexpectedElements['tablesNestedMoreThanOnce'] = ((_acc$unexpectedElemen = acc.unexpectedElements['tablesNestedMoreThanOnce']) !== null && _acc$unexpectedElemen !== void 0 ? _acc$unexpectedElemen : 0) + 1;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
29
47
|
// If macros extensionKey has <UUID>/<UUID>/static/ prepended to it, remove the prefix
|
|
30
48
|
if (extensionKey.includes('/static/')) {
|
|
31
49
|
const extensionKeyParts = extensionKey.split('/');
|
|
@@ -40,4 +58,24 @@ export const getPageElementCounts = doc => {
|
|
|
40
58
|
return acc;
|
|
41
59
|
}, pageElementCounts);
|
|
42
60
|
return pageElementCounts;
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Return true is the JSON document contains a table nested within a table
|
|
65
|
+
*/
|
|
66
|
+
const getHasNestedTable = node => {
|
|
67
|
+
return reduce(node, (hasNestedTable, node) => {
|
|
68
|
+
if (hasNestedTable) {
|
|
69
|
+
return hasNestedTable;
|
|
70
|
+
}
|
|
71
|
+
if (node.type === 'table') {
|
|
72
|
+
return reduce(node, (acc, node) => {
|
|
73
|
+
if (node.type === 'table') {
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
return acc;
|
|
77
|
+
}, false);
|
|
78
|
+
}
|
|
79
|
+
return hasNestedTable;
|
|
80
|
+
}, false);
|
|
43
81
|
};
|
|
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
7
7
|
import { isFedRamp } from './environment';
|
|
8
8
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
9
9
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
10
|
-
var packageVersion = "98.2.
|
|
10
|
+
var packageVersion = "98.2.6";
|
|
11
11
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
12
12
|
// Remove URL as it has UGC
|
|
13
13
|
// TODO: Sanitise the URL instead of just removing it
|
package/dist/esm/styles/index.js
CHANGED
|
@@ -30,7 +30,7 @@ export { resizerStyles, resizerHandleClassName, resizerHandleTrackClassName, res
|
|
|
30
30
|
export { gridStyles, GRID_GUTTER } from './shared/grid';
|
|
31
31
|
export { smartCardStyles, FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, DATASOURCE_INNER_CONTAINER_CLASSNAME } from './shared/smartCard';
|
|
32
32
|
export { embedCardStyles, embedSpacingStyles } from './shared/embedCard';
|
|
33
|
-
export { buttonGroupStyle, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding } from './shared/plugins';
|
|
33
|
+
export { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding } from './shared/plugins';
|
|
34
34
|
export { UnsupportedSharedCssClassName, unsupportedStyles } from './shared/unsupported-content';
|
|
35
35
|
export { expandIconWrapperStyle, expandClassNames, expandIconContainerStyle } from './shared/expand';
|
|
36
36
|
export { sharedExpandStyles } from '../ui/Expand/sharedStyles';
|
|
@@ -1,6 +1,23 @@
|
|
|
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
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
3
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, -- Ignored via go/DSP-18766
|
|
4
|
+
export var buttonGroupStyleBeforeVisualRefresh = css({
|
|
5
|
+
display: 'inline-flex',
|
|
6
|
+
alignItems: 'center',
|
|
7
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
8
|
+
'& > div': {
|
|
9
|
+
display: 'flex'
|
|
10
|
+
},
|
|
11
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
12
|
+
button: {
|
|
13
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
14
|
+
'&:not([disabled])::after': {
|
|
15
|
+
border: 'none' // remove blue border when an item has been selected
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
21
|
export var buttonGroupStyle = css({
|
|
5
22
|
display: 'inline-flex',
|
|
6
23
|
alignItems: 'center',
|
|
@@ -14,6 +31,11 @@ export var buttonGroupStyle = css({
|
|
|
14
31
|
'&:not([disabled])::after': {
|
|
15
32
|
border: 'none' // remove blue border when an item has been selected
|
|
16
33
|
}
|
|
34
|
+
},
|
|
35
|
+
gap: "var(--ds-space-050, 4px)",
|
|
36
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
37
|
+
'div[role=group]': {
|
|
38
|
+
gap: "var(--ds-space-050, 4px)"
|
|
17
39
|
}
|
|
18
40
|
});
|
|
19
41
|
|
|
@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
20
20
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
21
21
|
import Layer from '../Layer';
|
|
22
22
|
var packageName = "@atlaskit/editor-common";
|
|
23
|
-
var packageVersion = "98.2.
|
|
23
|
+
var packageVersion = "98.2.6";
|
|
24
24
|
var halfFocusRing = 1;
|
|
25
25
|
var dropOffset = '0, 8';
|
|
26
26
|
// Ignored via go/ees005
|
|
@@ -9,10 +9,12 @@ import React from 'react';
|
|
|
9
9
|
import { css, jsx } from '@emotion/react';
|
|
10
10
|
import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext';
|
|
11
11
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
12
|
-
import Button from '@atlaskit/button/
|
|
12
|
+
import Button from '@atlaskit/button/new';
|
|
13
|
+
import LegacyButton from '@atlaskit/button/standard-button';
|
|
13
14
|
import LegacyExpandIcon from '@atlaskit/icon/glyph/chevron-down';
|
|
14
15
|
import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
|
|
15
|
-
import {
|
|
16
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
17
|
+
import { Box, xcss, Inline } from '@atlaskit/primitives';
|
|
16
18
|
import Tooltip from '@atlaskit/tooltip';
|
|
17
19
|
import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, editorAnalyticsChannel, EVENT_TYPE } from '../../analytics';
|
|
18
20
|
import { ColorPalette, DEFAULT_BORDER_COLOR, getSelectedRowAndColumnFromPalette } from '../../ui-color';
|
|
@@ -31,6 +33,21 @@ var colorPickerExpandContainer = xcss({
|
|
|
31
33
|
marginLeft: 'space.negative.050',
|
|
32
34
|
marginRight: 'space.negative.050'
|
|
33
35
|
});
|
|
36
|
+
var colorPickerExpandContainerVisualRefresh = xcss({
|
|
37
|
+
marginTop: 'space.negative.025',
|
|
38
|
+
marginRight: 'space.negative.050'
|
|
39
|
+
});
|
|
40
|
+
var colorPickerButtonStyle = css({
|
|
41
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
42
|
+
button: {
|
|
43
|
+
'&::after': {
|
|
44
|
+
border: 'none'
|
|
45
|
+
},
|
|
46
|
+
'&:hover': {
|
|
47
|
+
backgroundColor: "var(--ds-background-selected, #E9F2FF)"
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
});
|
|
34
51
|
|
|
35
52
|
// Control the size of color picker buttons and preview
|
|
36
53
|
// TODO: https://product-fabric.atlassian.net/browse/DSP-4134
|
|
@@ -205,12 +222,69 @@ var ColorPickerButton = function ColorPickerButton(props) {
|
|
|
205
222
|
}
|
|
206
223
|
});
|
|
207
224
|
};
|
|
225
|
+
var buttonStyleVisualRefresh = function buttonStyleVisualRefresh() {
|
|
226
|
+
var _props$size4, _props$size5, _props$size6;
|
|
227
|
+
return css({
|
|
228
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
229
|
+
height: "".concat(!!((_props$size4 = props.size) !== null && _props$size4 !== void 0 && _props$size4.height) ? 'inherit' : ''),
|
|
230
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
231
|
+
'&:before': {
|
|
232
|
+
display: 'flex',
|
|
233
|
+
justifyContent: 'center',
|
|
234
|
+
alignItems: 'center',
|
|
235
|
+
alignSelf: 'center',
|
|
236
|
+
content: "''",
|
|
237
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
238
|
+
border: "1px solid ".concat(DEFAULT_BORDER_COLOR),
|
|
239
|
+
borderRadius: "var(--ds-border-radius, 3px)",
|
|
240
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
241
|
+
backgroundColor: currentColor || 'transparent',
|
|
242
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
243
|
+
width: ((_props$size5 = props.size) === null || _props$size5 === void 0 ? void 0 : _props$size5.width) || '14px',
|
|
244
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
245
|
+
height: ((_props$size6 = props.size) === null || _props$size6 === void 0 ? void 0 : _props$size6.height) || '14px',
|
|
246
|
+
marginTop: "var(--ds-space-025, 2px)"
|
|
247
|
+
}
|
|
248
|
+
});
|
|
249
|
+
};
|
|
208
250
|
return jsx("div", {
|
|
209
251
|
css: colorPickerButtonWrapper
|
|
210
252
|
}, jsx(Tooltip, {
|
|
211
253
|
content: title,
|
|
212
254
|
position: "top"
|
|
255
|
+
},
|
|
256
|
+
// eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
|
|
257
|
+
fg('platform-visual-refresh-icons') ? jsx("div", {
|
|
258
|
+
css: colorPickerButtonStyle
|
|
213
259
|
}, jsx(Button, {
|
|
260
|
+
appearance: 'subtle',
|
|
261
|
+
ref: buttonRef,
|
|
262
|
+
"aria-label": title,
|
|
263
|
+
"aria-expanded": props.isAriaExpanded ? isPopupOpen : undefined,
|
|
264
|
+
spacing: "compact",
|
|
265
|
+
onClick: togglePopup,
|
|
266
|
+
onKeyDown: function onKeyDown(event) {
|
|
267
|
+
if (event.key === 'Enter' || event.key === ' ') {
|
|
268
|
+
event.preventDefault();
|
|
269
|
+
togglePopup();
|
|
270
|
+
setIsOpenedByKeyboard(true);
|
|
271
|
+
}
|
|
272
|
+
},
|
|
273
|
+
"data-selected-color": props.currentColor,
|
|
274
|
+
isSelected: isPopupOpen
|
|
275
|
+
}, jsx(Inline, {
|
|
276
|
+
alignBlock: "start"
|
|
277
|
+
}, jsx("span", {
|
|
278
|
+
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
|
|
279
|
+
css: buttonStyleVisualRefresh
|
|
280
|
+
}), jsx(Box, {
|
|
281
|
+
xcss: colorPickerExpandContainerVisualRefresh
|
|
282
|
+
}, jsx(ChevronDownIcon, {
|
|
283
|
+
color: "currentColor",
|
|
284
|
+
spacing: "spacious",
|
|
285
|
+
LEGACY_fallbackIcon: LegacyExpandIcon,
|
|
286
|
+
label: "color-picker-chevron-down"
|
|
287
|
+
}))))) : jsx(LegacyButton, {
|
|
214
288
|
appearance: 'subtle',
|
|
215
289
|
ref: buttonRef,
|
|
216
290
|
"aria-label": title,
|
|
@@ -224,7 +298,6 @@ var ColorPickerButton = function ColorPickerButton(props) {
|
|
|
224
298
|
setIsOpenedByKeyboard(true);
|
|
225
299
|
}
|
|
226
300
|
}
|
|
227
|
-
// TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
|
|
228
301
|
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
|
|
229
302
|
,
|
|
230
303
|
css: buttonStyle,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isNestedTableExtension } from '@atlaskit/adf-utils/transforms';
|
|
1
2
|
import { reduce } from '@atlaskit/adf-utils/traverse';
|
|
2
3
|
/**
|
|
3
4
|
* Traverses a JSON document and counts the number of unique elements, text formatting and macros.
|
|
@@ -7,7 +8,8 @@ export var getPageElementCounts = function getPageElementCounts(doc) {
|
|
|
7
8
|
var pageElementCounts = {
|
|
8
9
|
elements: {},
|
|
9
10
|
textFormats: {},
|
|
10
|
-
macros: {}
|
|
11
|
+
macros: {},
|
|
12
|
+
unexpectedElements: {}
|
|
11
13
|
};
|
|
12
14
|
reduce(doc, function (acc, node) {
|
|
13
15
|
if (node.type === 'text') {
|
|
@@ -26,6 +28,22 @@ export var getPageElementCounts = function getPageElementCounts(doc) {
|
|
|
26
28
|
if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
|
|
27
29
|
var _acc$macros$extension;
|
|
28
30
|
var extensionKey = node.attrs.extensionKey;
|
|
31
|
+
|
|
32
|
+
// If there is a nested table extension
|
|
33
|
+
if (isNestedTableExtension(node)) {
|
|
34
|
+
if ('parameters' in node.attrs && node.attrs.parameters && 'adf' in node.attrs.parameters) {
|
|
35
|
+
// Check to see if the ADF contains a nested table
|
|
36
|
+
var adfString = node.attrs.parameters.adf;
|
|
37
|
+
var adf = JSON.parse(adfString);
|
|
38
|
+
if (adfString.includes('{"type":"table"')) {
|
|
39
|
+
if (getHasNestedTable(adf)) {
|
|
40
|
+
var _acc$unexpectedElemen;
|
|
41
|
+
acc.unexpectedElements['tablesNestedMoreThanOnce'] = ((_acc$unexpectedElemen = acc.unexpectedElements['tablesNestedMoreThanOnce']) !== null && _acc$unexpectedElemen !== void 0 ? _acc$unexpectedElemen : 0) + 1;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
29
47
|
// If macros extensionKey has <UUID>/<UUID>/static/ prepended to it, remove the prefix
|
|
30
48
|
if (extensionKey.includes('/static/')) {
|
|
31
49
|
var extensionKeyParts = extensionKey.split('/');
|
|
@@ -40,4 +58,24 @@ export var getPageElementCounts = function getPageElementCounts(doc) {
|
|
|
40
58
|
return acc;
|
|
41
59
|
}, pageElementCounts);
|
|
42
60
|
return pageElementCounts;
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Return true is the JSON document contains a table nested within a table
|
|
65
|
+
*/
|
|
66
|
+
var getHasNestedTable = function getHasNestedTable(node) {
|
|
67
|
+
return reduce(node, function (hasNestedTable, node) {
|
|
68
|
+
if (hasNestedTable) {
|
|
69
|
+
return hasNestedTable;
|
|
70
|
+
}
|
|
71
|
+
if (node.type === 'table') {
|
|
72
|
+
return reduce(node, function (acc, node) {
|
|
73
|
+
if (node.type === 'table') {
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
return acc;
|
|
77
|
+
}, false);
|
|
78
|
+
}
|
|
79
|
+
return hasNestedTable;
|
|
80
|
+
}, false);
|
|
43
81
|
};
|
|
@@ -27,7 +27,7 @@ export { resizerStyles, resizerHandleClassName, resizerHandleTrackClassName, res
|
|
|
27
27
|
export { gridStyles, GRID_GUTTER } from './shared/grid';
|
|
28
28
|
export { smartCardStyles, FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, DATASOURCE_INNER_CONTAINER_CLASSNAME, } from './shared/smartCard';
|
|
29
29
|
export { embedCardStyles, embedSpacingStyles } from './shared/embedCard';
|
|
30
|
-
export { buttonGroupStyle, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding, } from './shared/plugins';
|
|
30
|
+
export { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding, } from './shared/plugins';
|
|
31
31
|
export { UnsupportedSharedCssClassName, unsupportedStyles } from './shared/unsupported-content';
|
|
32
32
|
export { expandIconWrapperStyle, expandClassNames, expandIconContainerStyle, } from './shared/expand';
|
|
33
33
|
export { sharedExpandStyles } from '../ui/Expand/sharedStyles';
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export declare const buttonGroupStyleBeforeVisualRefresh: import("@emotion/react").SerializedStyles;
|
|
1
2
|
export declare const buttonGroupStyle: import("@emotion/react").SerializedStyles;
|
|
2
3
|
export declare const separatorStyles: import("@emotion/react").SerializedStyles;
|
|
3
4
|
export declare const wrapperStyle: import("@emotion/react").SerializedStyles;
|
|
@@ -27,7 +27,7 @@ export { resizerStyles, resizerHandleClassName, resizerHandleTrackClassName, res
|
|
|
27
27
|
export { gridStyles, GRID_GUTTER } from './shared/grid';
|
|
28
28
|
export { smartCardStyles, FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, DATASOURCE_INNER_CONTAINER_CLASSNAME, } from './shared/smartCard';
|
|
29
29
|
export { embedCardStyles, embedSpacingStyles } from './shared/embedCard';
|
|
30
|
-
export { buttonGroupStyle, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding, } from './shared/plugins';
|
|
30
|
+
export { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh, disableBlueBorderStyles, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding, } from './shared/plugins';
|
|
31
31
|
export { UnsupportedSharedCssClassName, unsupportedStyles } from './shared/unsupported-content';
|
|
32
32
|
export { expandIconWrapperStyle, expandClassNames, expandIconContainerStyle, } from './shared/expand';
|
|
33
33
|
export { sharedExpandStyles } from '../ui/Expand/sharedStyles';
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export declare const buttonGroupStyleBeforeVisualRefresh: import("@emotion/react").SerializedStyles;
|
|
1
2
|
export declare const buttonGroupStyle: import("@emotion/react").SerializedStyles;
|
|
2
3
|
export declare const separatorStyles: import("@emotion/react").SerializedStyles;
|
|
3
4
|
export declare const wrapperStyle: import("@emotion/react").SerializedStyles;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "98.2.
|
|
3
|
+
"version": "98.2.6",
|
|
4
4
|
"description": "A package that contains common classes and components for editor and renderer",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -113,7 +113,7 @@
|
|
|
113
113
|
"dependencies": {
|
|
114
114
|
"@atlaskit/activity-provider": "^2.5.0",
|
|
115
115
|
"@atlaskit/adf-schema": "^46.1.0",
|
|
116
|
-
"@atlaskit/adf-utils": "^19.
|
|
116
|
+
"@atlaskit/adf-utils": "^19.15.0",
|
|
117
117
|
"@atlaskit/analytics-listeners": "^8.13.0",
|
|
118
118
|
"@atlaskit/analytics-namespaced-context": "^6.12.0",
|
|
119
119
|
"@atlaskit/analytics-next": "^10.2.0",
|
|
@@ -154,7 +154,7 @@
|
|
|
154
154
|
"@atlaskit/spinner": "^16.3.0",
|
|
155
155
|
"@atlaskit/task-decision": "^17.11.0",
|
|
156
156
|
"@atlaskit/textfield": "^6.7.0",
|
|
157
|
-
"@atlaskit/tmp-editor-statsig": "^2.
|
|
157
|
+
"@atlaskit/tmp-editor-statsig": "^2.33.0",
|
|
158
158
|
"@atlaskit/tokens": "^2.5.0",
|
|
159
159
|
"@atlaskit/tooltip": "^19.0.0",
|
|
160
160
|
"@atlaskit/width-detector": "^4.3.0",
|