@atlaskit/navigation-system 5.11.1 → 5.12.1
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 +17 -0
- package/dist/cjs/ui/menu-item/drag-and-drop/drag-preview.compiled.css +2 -1
- package/dist/cjs/ui/menu-item/drag-and-drop/drag-preview.js +3 -1
- package/dist/cjs/ui/menu-item/menu-item.compiled.css +1 -0
- package/dist/cjs/ui/menu-item/menu-item.js +6 -3
- package/dist/cjs/ui/top-nav-items/nav-logo/custom-logo.compiled.css +1 -0
- package/dist/cjs/ui/top-nav-items/nav-logo/custom-logo.js +2 -1
- package/dist/cjs/ui/top-nav-items/search.compiled.css +2 -1
- package/dist/cjs/ui/top-nav-items/search.js +3 -1
- package/dist/cjs/ui/top-nav-items/themed/button.compiled.css +1 -0
- package/dist/cjs/ui/top-nav-items/themed/button.js +3 -2
- package/dist/es2019/ui/menu-item/drag-and-drop/drag-preview.compiled.css +2 -1
- package/dist/es2019/ui/menu-item/drag-and-drop/drag-preview.js +3 -1
- package/dist/es2019/ui/menu-item/menu-item.compiled.css +1 -0
- package/dist/es2019/ui/menu-item/menu-item.js +6 -3
- package/dist/es2019/ui/top-nav-items/nav-logo/custom-logo.compiled.css +1 -0
- package/dist/es2019/ui/top-nav-items/nav-logo/custom-logo.js +2 -1
- package/dist/es2019/ui/top-nav-items/search.compiled.css +2 -1
- package/dist/es2019/ui/top-nav-items/search.js +3 -1
- package/dist/es2019/ui/top-nav-items/themed/button.compiled.css +1 -0
- package/dist/es2019/ui/top-nav-items/themed/button.js +3 -2
- package/dist/esm/ui/menu-item/drag-and-drop/drag-preview.compiled.css +2 -1
- package/dist/esm/ui/menu-item/drag-and-drop/drag-preview.js +3 -1
- package/dist/esm/ui/menu-item/menu-item.compiled.css +1 -0
- package/dist/esm/ui/menu-item/menu-item.js +6 -3
- package/dist/esm/ui/top-nav-items/nav-logo/custom-logo.compiled.css +1 -0
- package/dist/esm/ui/top-nav-items/nav-logo/custom-logo.js +2 -1
- package/dist/esm/ui/top-nav-items/search.compiled.css +2 -1
- package/dist/esm/ui/top-nav-items/search.js +3 -1
- package/dist/esm/ui/top-nav-items/themed/button.compiled.css +1 -0
- package/dist/esm/ui/top-nav-items/themed/button.js +3 -2
- package/package.json +18 -15
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlassian/navigation-system
|
|
2
2
|
|
|
3
|
+
## 5.12.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 5.12.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- [`b867e641d818d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b867e641d818d) -
|
|
14
|
+
Updated border radius values behind a feature gate `platform-dst-shape-theme-default`.
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- Updated dependencies
|
|
19
|
+
|
|
3
20
|
## 5.11.1
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
|
-
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
2
|
+
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
3
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}._189ee4h9{border-width:var(--ds-border-width,1px)}
|
|
3
4
|
._1dqonqa1{border-style:solid}
|
|
4
5
|
._1h6d1l7x{border-color:var(--ds-border,#0b120e24)}
|
|
5
6
|
._1ul9uuw1{min-width:200px}
|
|
@@ -9,6 +9,7 @@ exports.DragPreview = DragPreview;
|
|
|
9
9
|
require("./drag-preview.compiled.css");
|
|
10
10
|
var React = _interopRequireWildcard(require("react"));
|
|
11
11
|
var _runtime = require("@compiled/react/runtime");
|
|
12
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
12
13
|
var _expandableMenuItemLevelContext = require("../expandable-menu-item/expandable-menu-item-level-context");
|
|
13
14
|
var _menuItem = require("../menu-item");
|
|
14
15
|
var _menuItemSignals = require("../menu-item-signals");
|
|
@@ -27,6 +28,7 @@ function isSafari() {
|
|
|
27
28
|
}
|
|
28
29
|
var dragPreviewStyles = {
|
|
29
30
|
root: "_2rko12b0 _189ee4h9 _1h6d1l7x _1dqonqa1 _bfhkvuon _y4ti1b66 _p12fgx0z",
|
|
31
|
+
rootT26Shape: "_2rko1qi0",
|
|
30
32
|
safariFix: "_1ul9uuw1"
|
|
31
33
|
};
|
|
32
34
|
|
|
@@ -55,7 +57,7 @@ function DragPreview(_ref) {
|
|
|
55
57
|
React.createElement(_expandableMenuItemLevelContext.ExpandableMenuItemLevelContext.Provider, {
|
|
56
58
|
value: 0
|
|
57
59
|
}, /*#__PURE__*/React.createElement("div", {
|
|
58
|
-
className: (0, _runtime.ax)([dragPreviewStyles.root, isSafari() && dragPreviewStyles.safariFix])
|
|
60
|
+
className: (0, _runtime.ax)([dragPreviewStyles.root, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && dragPreviewStyles.rootT26Shape, isSafari() && dragPreviewStyles.safariFix])
|
|
59
61
|
}, /*#__PURE__*/React.createElement(_menuItem.MenuItemBase, {
|
|
60
62
|
elemBefore: elemBefore !== null && elemBefore !== void 0 ? elemBefore : _menuItemSignals.COLLAPSE_ELEM_BEFORE
|
|
61
63
|
}, children)))
|
|
@@ -16,6 +16,7 @@ var _react2 = require("@compiled/react");
|
|
|
16
16
|
var _avatar = require("@atlaskit/avatar");
|
|
17
17
|
var _forwardRefWithGeneric = _interopRequireDefault(require("@atlaskit/ds-lib/forward-ref-with-generic"));
|
|
18
18
|
var _mergeRefs = _interopRequireDefault(require("@atlaskit/ds-lib/merge-refs"));
|
|
19
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
19
20
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
20
21
|
var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
|
|
21
22
|
var _constants = require("./constants");
|
|
@@ -122,6 +123,7 @@ var onTopOfButtonOrAnchorStyles = {
|
|
|
122
123
|
var nestedOpenPopupCSSSelector = exports.nestedOpenPopupCSSSelector = '&:has([aria-expanded="true"][aria-haspopup="true"])';
|
|
123
124
|
var containerStyles = {
|
|
124
125
|
root: "_2rko12b0 _vchhusvi _1e0c11p5 _yv0e7dup _2z05hkll _1lmcu4vt _1ul9t9kd _4t3iviql _4cvr1h6o _uiztglyw _syazazsu _1yyu1j28 _91ju1txw _uomdidpf _pmxpidpf _db80idpf _qxq9kb7n _1rbv1wug _kwq51b66 _1swv19i6 _irr319i6 _t7p8kb7n _g4kikb7n _91nl1wug _ynyi1wug _iy5o1b66 _v4o21b66",
|
|
126
|
+
rootT26Shape: "_2rko1qi0",
|
|
125
127
|
removeElemAfter: "_91juglyw",
|
|
126
128
|
showHoverActions: "_uomdkb7n _pmxp1wug _db801b66",
|
|
127
129
|
removeElemAfterOnHoverOrOpenNestedPopup: "_1djyglyw _1mfcglyw _1sjuglyw",
|
|
@@ -132,6 +134,7 @@ var containerStyles = {
|
|
|
132
134
|
};
|
|
133
135
|
var buttonOrAnchorStyles = {
|
|
134
136
|
root: "_2rko12b0 _yyhyjvu9 _1ii7kb7n _1e0c11p5 _yv0enbh3 _2z05nbh3 _y4ti1b66 _bozg1b66 _1q511b66 _85i51b66 _bfhk1j28 _syazazsu _4cvr1h6o _y3gnv2br _14iu13ro",
|
|
137
|
+
rootT26Shape: "_2rko1qi0",
|
|
135
138
|
selected: "_syaz6x5g _14iunozp",
|
|
136
139
|
hasDragIndicator: "_1ifmglyw _1cykglyw _x0kw1txw _11om6b4r _7psyru3m _1uy01amc _bir2q7pw"
|
|
137
140
|
};
|
|
@@ -298,7 +301,7 @@ var MenuItemBaseNoRef = function MenuItemBaseNoRef(_ref2, forwardedRef) {
|
|
|
298
301
|
ref: visualContentRef,
|
|
299
302
|
"data-testid": testId ? "".concat(testId, "-container") : undefined,
|
|
300
303
|
"data-selected": isSelected,
|
|
301
|
-
className: (0, _runtime.ax)([containerStyles.root, isSelected && containerStyles.selected, isDragging && containerStyles.dragging, description && containerStyles.hasDescription, showHoverActionsWhenNotHovered && containerStyles.showHoverActions, showHoverActionsWhenNotHovered && elemAfter && containerStyles.removeElemAfter, actionsOnHover && elemAfter && containerStyles.removeElemAfterOnHoverOrOpenNestedPopup, isDisabled && containerStyles.disabled])
|
|
304
|
+
className: (0, _runtime.ax)([containerStyles.root, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && containerStyles.rootT26Shape, isSelected && containerStyles.selected, isDragging && containerStyles.dragging, description && containerStyles.hasDescription, showHoverActionsWhenNotHovered && containerStyles.showHoverActions, showHoverActionsWhenNotHovered && elemAfter && containerStyles.removeElemAfter, actionsOnHover && elemAfter && containerStyles.removeElemAfterOnHoverOrOpenNestedPopup, isDisabled && containerStyles.disabled])
|
|
302
305
|
}, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
|
|
303
306
|
content: function content() {
|
|
304
307
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, children), description ? /*#__PURE__*/_react.default.createElement("div", null, description) : null);
|
|
@@ -326,7 +329,7 @@ var MenuItemBaseNoRef = function MenuItemBaseNoRef(_ref2, forwardedRef) {
|
|
|
326
329
|
});
|
|
327
330
|
return isLink ? /*#__PURE__*/_react.default.createElement(_compiled.Anchor, (0, _extends2.default)({}, sharedProps, {
|
|
328
331
|
onClick: handleClick,
|
|
329
|
-
xcss: (0, _react2.cx)(buttonOrAnchorStyles.root, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator)
|
|
332
|
+
xcss: (0, _react2.cx)(buttonOrAnchorStyles.root, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && buttonOrAnchorStyles.rootT26Shape, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator)
|
|
330
333
|
// Needed to override Anchor style due to a compiled/emotion conflict
|
|
331
334
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
332
335
|
,
|
|
@@ -362,7 +365,7 @@ var MenuItemBaseNoRef = function MenuItemBaseNoRef(_ref2, forwardedRef) {
|
|
|
362
365
|
className: (0, _runtime.ax)([notchStyles.root])
|
|
363
366
|
}), interactiveElemContent) : /*#__PURE__*/_react.default.createElement(_compiled.Pressable, (0, _extends2.default)({}, sharedProps, {
|
|
364
367
|
onClick: handleClick,
|
|
365
|
-
xcss: (0, _react2.cx)(buttonOrAnchorStyles.root, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator),
|
|
368
|
+
xcss: (0, _react2.cx)(buttonOrAnchorStyles.root, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && buttonOrAnchorStyles.rootT26Shape, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator),
|
|
366
369
|
"aria-expanded": ariaExpanded,
|
|
367
370
|
isDisabled: isDisabled
|
|
368
371
|
}), interactiveElemContent);
|
|
@@ -20,6 +20,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
20
20
|
var anchorStyles = {
|
|
21
21
|
root: "_2rkofajl _1e0c1txw _4cvr1h6o _4t3izwfg",
|
|
22
22
|
customLogoBorderRadius: "_2rkofajl",
|
|
23
|
+
customLogoBorderRadiusT26Shape: "_2rko1mok",
|
|
23
24
|
newMargin: "_ahbq1b66",
|
|
24
25
|
newInteractionStates: "_irr31dpa _1di69yc7",
|
|
25
26
|
newInteractionStatesCustomTheming: "_irr31rps _1di6yhlj"
|
|
@@ -90,7 +91,7 @@ var CustomLogo = exports.CustomLogo = function CustomLogo(_ref) {
|
|
|
90
91
|
// @ts-expect-error - non-standard values for `borderRadius` and the custom theming interaction states
|
|
91
92
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
92
93
|
,
|
|
93
|
-
xcss: (0, _react2.cx)(anchorStyles.root, anchorStyles.customLogoBorderRadius, anchorStyles.newMargin, hasCustomTheme ? anchorStyles.newInteractionStatesCustomTheming : anchorStyles.newInteractionStates),
|
|
94
|
+
xcss: (0, _react2.cx)(anchorStyles.root, anchorStyles.customLogoBorderRadius, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && anchorStyles.customLogoBorderRadiusT26Shape, anchorStyles.newMargin, hasCustomTheme ? anchorStyles.newInteractionStatesCustomTheming : anchorStyles.newInteractionStates),
|
|
94
95
|
onClick: onClick
|
|
95
96
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
96
97
|
className: (0, _runtime.ax)([sharedIconOrLogoContainerStyles.root, iconContainerStyles.root, (0, _platformFeatureFlags.fg)('platform-team25-app-icon-tiles') && sharedIconOrLogoContainerStyles.appIconTilePaddingFlagged, isFhsEnabled && sharedIconOrLogoContainerStyles.withFullHeightSidebar])
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
|
-
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
2
|
+
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
3
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}._18zr12x7{padding-inline:var(--ds-space-075,6px)}
|
|
3
4
|
._1ii7kb7n{grid-row:1}
|
|
4
5
|
._1rjcze3t{padding-block:var(--ds-space-0,0)}
|
|
5
6
|
._yyhy11wp{grid-column:3}
|
|
@@ -12,12 +12,14 @@ var _runtime = require("@compiled/react/runtime");
|
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
13
|
var _css = require("@atlaskit/css");
|
|
14
14
|
var _search = _interopRequireDefault(require("@atlaskit/icon/core/search"));
|
|
15
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
16
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
16
17
|
var _useIsFhsEnabled = require("../fhs-rollout/use-is-fhs-enabled");
|
|
17
18
|
var _migration = require("./themed/migration");
|
|
18
19
|
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); }
|
|
19
20
|
var styles = {
|
|
20
21
|
root: "_2rko12b0 _1rjcze3t _18zr12x7 _yv0e1mfv _4cvr1h6o _bfhk1j9a _vchhusvi _80om1kdv _1e0cglyw _4t3izwfg _p12f1kvu _1bsb1osq _irr3l4ek _1di6r01l _114b11p5",
|
|
22
|
+
rootT26Shape: "_2rko1qi0",
|
|
21
23
|
buttonText: "_yyhyjvu9 _1ii7kb7n",
|
|
22
24
|
iconBefore: "_yyhykb7n _1ii7kb7n _1e0c1txw",
|
|
23
25
|
elemAfter: "_yyhy11wp _1ii7kb7n _1e0c1txw",
|
|
@@ -47,7 +49,7 @@ var Search = exports.Search = function Search(_ref) {
|
|
|
47
49
|
border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border-input, #8C8F97)")
|
|
48
50
|
},
|
|
49
51
|
onClick: onClick,
|
|
50
|
-
xcss: (0, _css.cx)(styles.root, isFhsEnabled && styles.fullHeightSidebar),
|
|
52
|
+
xcss: (0, _css.cx)(styles.root, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && styles.rootT26Shape, isFhsEnabled && styles.fullHeightSidebar),
|
|
51
53
|
interactionName: interactionName,
|
|
52
54
|
"aria-haspopup": ariaHaspopup
|
|
53
55
|
}, /*#__PURE__*/_react.default.createElement("span", {
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
._11q7esko{background:var(--ds-top-bar-button-primary-background)}
|
|
6
6
|
._11q7pkxg{background:var(--ds-top-bar-button-background)}
|
|
7
7
|
._14mj1kw7:after{border-radius:inherit}
|
|
8
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}
|
|
8
9
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
9
10
|
._9v7aze3t:after{inset:var(--ds-space-0,0)}
|
|
10
11
|
._v5649dqc{transition:background .1s ease-out}
|
|
@@ -88,6 +88,7 @@ var themedButtonDisabledText = exports.themedButtonDisabledText = '--ds-top-bar-
|
|
|
88
88
|
var themedButtonDisabledBackground = exports.themedButtonDisabledBackground = '--ds-top-bar-button-disabled-background';
|
|
89
89
|
var styles = {
|
|
90
90
|
root: "_zulp12x7 _11c82smr _2rkofajl _v5649dqc _4bfu1r31 _1hmsglyw _ajmmnqa1 _1rjcze3t _1e0c1txw _4cvr1h6o _1bah1h6o _4t3i5r7u _kqswh2mm _1nrm1r31 _1a3b1r31 _9oik1r31 _c2waglyw _4fprglyw _1bnxglyw _1iohnqa1 _5goinqa1 _jf4cnqa1",
|
|
91
|
+
rootT26Shape: "_2rko1qi0",
|
|
91
92
|
border: "_14mj1kw7 _9v7aze3t _1tv3nqa1 _39yqe4h9 _aetrb3bt _18postnw",
|
|
92
93
|
selected: "_11q71qds _syazw5ct _8l3m15jn _f8pjw5ct _1053w5ct _19lcjrv1 _30l3w5ct _j6xtnh62 _9h8hw5ct",
|
|
93
94
|
disabled: "_11q71c9b _syaz1i3i _8l3m1j28 _f8pj1i3i _10531i3i _19lc1c9b _30l31i3i _j6xt1c9b _9h8h1i3i"
|
|
@@ -130,7 +131,7 @@ var ThemedPressable = /*#__PURE__*/(0, _react.forwardRef)(function ThemedPressab
|
|
|
130
131
|
// @ts-expect-error
|
|
131
132
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
132
133
|
,
|
|
133
|
-
xcss: (0, _react2.cx)(styles.root, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled),
|
|
134
|
+
xcss: (0, _react2.cx)(styles.root, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && styles.rootT26Shape, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled),
|
|
134
135
|
isDisabled: isDisabled
|
|
135
136
|
}));
|
|
136
137
|
});
|
|
@@ -152,7 +153,7 @@ function ThemedAnchorFn(_ref3, ref) {
|
|
|
152
153
|
// @ts-expect-error
|
|
153
154
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
154
155
|
,
|
|
155
|
-
xcss: (0, _react2.cx)(styles.root, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled)
|
|
156
|
+
xcss: (0, _react2.cx)(styles.root, (0, _platformFeatureFlags.fg)('platform-dst-shape-theme-default') && styles.rootT26Shape, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled)
|
|
156
157
|
}));
|
|
157
158
|
}
|
|
158
159
|
/**
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
|
-
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
2
|
+
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
3
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}._189ee4h9{border-width:var(--ds-border-width,1px)}
|
|
3
4
|
._1dqonqa1{border-style:solid}
|
|
4
5
|
._1h6d1l7x{border-color:var(--ds-border,#0b120e24)}
|
|
5
6
|
._1ul9uuw1{min-width:200px}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import "./drag-preview.compiled.css";
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
6
|
import { ExpandableMenuItemLevelContext } from '../expandable-menu-item/expandable-menu-item-level-context';
|
|
6
7
|
import { MenuItemBase } from '../menu-item';
|
|
7
8
|
import { COLLAPSE_ELEM_BEFORE } from '../menu-item-signals';
|
|
@@ -21,6 +22,7 @@ function isSafari() {
|
|
|
21
22
|
}
|
|
22
23
|
const dragPreviewStyles = {
|
|
23
24
|
root: "_2rko12b0 _189ee4h9 _1h6d1l7x _1dqonqa1 _bfhkvuon _y4ti1b66 _p12fgx0z",
|
|
25
|
+
rootT26Shape: "_2rko1qi0",
|
|
24
26
|
safariFix: "_1ul9uuw1"
|
|
25
27
|
};
|
|
26
28
|
|
|
@@ -50,7 +52,7 @@ export function DragPreview({
|
|
|
50
52
|
React.createElement(ExpandableMenuItemLevelContext.Provider, {
|
|
51
53
|
value: 0
|
|
52
54
|
}, /*#__PURE__*/React.createElement("div", {
|
|
53
|
-
className: ax([dragPreviewStyles.root, isSafari() && dragPreviewStyles.safariFix])
|
|
55
|
+
className: ax([dragPreviewStyles.root, fg('platform-dst-shape-theme-default') && dragPreviewStyles.rootT26Shape, isSafari() && dragPreviewStyles.safariFix])
|
|
54
56
|
}, /*#__PURE__*/React.createElement(MenuItemBase, {
|
|
55
57
|
elemBefore: elemBefore !== null && elemBefore !== void 0 ? elemBefore : COLLAPSE_ELEM_BEFORE
|
|
56
58
|
}, children)))
|
|
@@ -7,6 +7,7 @@ import { cx } from '@compiled/react';
|
|
|
7
7
|
import { AvatarContext } from '@atlaskit/avatar';
|
|
8
8
|
import forwardRefWithGeneric from '@atlaskit/ds-lib/forward-ref-with-generic';
|
|
9
9
|
import mergeRefs from '@atlaskit/ds-lib/merge-refs';
|
|
10
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
11
|
import { Anchor, Pressable, Text } from '@atlaskit/primitives/compiled';
|
|
11
12
|
import Tooltip from '@atlaskit/tooltip';
|
|
12
13
|
import { expandableMenuItemIndentation } from './constants';
|
|
@@ -110,6 +111,7 @@ const onTopOfButtonOrAnchorStyles = {
|
|
|
110
111
|
export const nestedOpenPopupCSSSelector = '&:has([aria-expanded="true"][aria-haspopup="true"])';
|
|
111
112
|
const containerStyles = {
|
|
112
113
|
root: "_2rko12b0 _vchhusvi _1e0c11p5 _yv0e7dup _2z05hkll _1lmcu4vt _1ul9t9kd _4t3iviql _4cvr1h6o _uiztglyw _syazazsu _1yyu1j28 _91ju1txw _uomdidpf _pmxpidpf _db80idpf _qxq9kb7n _1rbv1wug _kwq51b66 _1swv19i6 _irr319i6 _t7p8kb7n _g4kikb7n _91nl1wug _ynyi1wug _iy5o1b66 _v4o21b66",
|
|
114
|
+
rootT26Shape: "_2rko1qi0",
|
|
113
115
|
removeElemAfter: "_91juglyw",
|
|
114
116
|
showHoverActions: "_uomdkb7n _pmxp1wug _db801b66",
|
|
115
117
|
removeElemAfterOnHoverOrOpenNestedPopup: "_1djyglyw _1mfcglyw _1sjuglyw",
|
|
@@ -120,6 +122,7 @@ const containerStyles = {
|
|
|
120
122
|
};
|
|
121
123
|
const buttonOrAnchorStyles = {
|
|
122
124
|
root: "_2rko12b0 _yyhyjvu9 _1ii7kb7n _1e0c11p5 _yv0enbh3 _2z05nbh3 _y4ti1b66 _bozg1b66 _1q511b66 _85i51b66 _bfhk1j28 _syazazsu _4cvr1h6o _y3gnv2br _14iu13ro",
|
|
125
|
+
rootT26Shape: "_2rko1qi0",
|
|
123
126
|
selected: "_syaz6x5g _14iunozp",
|
|
124
127
|
hasDragIndicator: "_1ifmglyw _1cykglyw _x0kw1txw _11om6b4r _7psyru3m _1uy01amc _bir2q7pw"
|
|
125
128
|
};
|
|
@@ -288,7 +291,7 @@ const MenuItemBaseNoRef = ({
|
|
|
288
291
|
ref: visualContentRef,
|
|
289
292
|
"data-testid": testId ? `${testId}-container` : undefined,
|
|
290
293
|
"data-selected": isSelected,
|
|
291
|
-
className: ax([containerStyles.root, isSelected && containerStyles.selected, isDragging && containerStyles.dragging, description && containerStyles.hasDescription, showHoverActionsWhenNotHovered && containerStyles.showHoverActions, showHoverActionsWhenNotHovered && elemAfter && containerStyles.removeElemAfter, actionsOnHover && elemAfter && containerStyles.removeElemAfterOnHoverOrOpenNestedPopup, isDisabled && containerStyles.disabled])
|
|
294
|
+
className: ax([containerStyles.root, fg('platform-dst-shape-theme-default') && containerStyles.rootT26Shape, isSelected && containerStyles.selected, isDragging && containerStyles.dragging, description && containerStyles.hasDescription, showHoverActionsWhenNotHovered && containerStyles.showHoverActions, showHoverActionsWhenNotHovered && elemAfter && containerStyles.removeElemAfter, actionsOnHover && elemAfter && containerStyles.removeElemAfterOnHoverOrOpenNestedPopup, isDisabled && containerStyles.disabled])
|
|
292
295
|
}, /*#__PURE__*/React.createElement(Tooltip, {
|
|
293
296
|
content: () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, children), description ? /*#__PURE__*/React.createElement("div", null, description) : null),
|
|
294
297
|
position: "right-start",
|
|
@@ -315,7 +318,7 @@ const MenuItemBaseNoRef = ({
|
|
|
315
318
|
};
|
|
316
319
|
return isLink ? /*#__PURE__*/React.createElement(Anchor, _extends({}, sharedProps, {
|
|
317
320
|
onClick: handleClick,
|
|
318
|
-
xcss: cx(buttonOrAnchorStyles.root, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator)
|
|
321
|
+
xcss: cx(buttonOrAnchorStyles.root, fg('platform-dst-shape-theme-default') && buttonOrAnchorStyles.rootT26Shape, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator)
|
|
319
322
|
// Needed to override Anchor style due to a compiled/emotion conflict
|
|
320
323
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
321
324
|
,
|
|
@@ -351,7 +354,7 @@ const MenuItemBaseNoRef = ({
|
|
|
351
354
|
className: ax([notchStyles.root])
|
|
352
355
|
}), interactiveElemContent) : /*#__PURE__*/React.createElement(Pressable, _extends({}, sharedProps, {
|
|
353
356
|
onClick: handleClick,
|
|
354
|
-
xcss: cx(buttonOrAnchorStyles.root, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator),
|
|
357
|
+
xcss: cx(buttonOrAnchorStyles.root, fg('platform-dst-shape-theme-default') && buttonOrAnchorStyles.rootT26Shape, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator),
|
|
355
358
|
"aria-expanded": ariaExpanded,
|
|
356
359
|
isDisabled: isDisabled
|
|
357
360
|
}), interactiveElemContent);
|
|
@@ -12,6 +12,7 @@ import { LogoRenderer } from './logo-renderer';
|
|
|
12
12
|
const anchorStyles = {
|
|
13
13
|
root: "_2rkofajl _1e0c1txw _4cvr1h6o _4t3izwfg",
|
|
14
14
|
customLogoBorderRadius: "_2rkofajl",
|
|
15
|
+
customLogoBorderRadiusT26Shape: "_2rko1mok",
|
|
15
16
|
newMargin: "_ahbq1b66",
|
|
16
17
|
newInteractionStates: "_irr31dpa _1di69yc7",
|
|
17
18
|
newInteractionStatesCustomTheming: "_irr31rps _1di6yhlj"
|
|
@@ -83,7 +84,7 @@ export const CustomLogo = ({
|
|
|
83
84
|
// @ts-expect-error - non-standard values for `borderRadius` and the custom theming interaction states
|
|
84
85
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
85
86
|
,
|
|
86
|
-
xcss: cx(anchorStyles.root, anchorStyles.customLogoBorderRadius, anchorStyles.newMargin, hasCustomTheme ? anchorStyles.newInteractionStatesCustomTheming : anchorStyles.newInteractionStates),
|
|
87
|
+
xcss: cx(anchorStyles.root, anchorStyles.customLogoBorderRadius, fg('platform-dst-shape-theme-default') && anchorStyles.customLogoBorderRadiusT26Shape, anchorStyles.newMargin, hasCustomTheme ? anchorStyles.newInteractionStatesCustomTheming : anchorStyles.newInteractionStates),
|
|
87
88
|
onClick: onClick
|
|
88
89
|
}, /*#__PURE__*/React.createElement("div", {
|
|
89
90
|
className: ax([sharedIconOrLogoContainerStyles.root, iconContainerStyles.root, fg('platform-team25-app-icon-tiles') && sharedIconOrLogoContainerStyles.appIconTilePaddingFlagged, isFhsEnabled && sharedIconOrLogoContainerStyles.withFullHeightSidebar])
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
|
-
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
2
|
+
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
3
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}._18zr12x7{padding-inline:var(--ds-space-075,6px)}
|
|
3
4
|
._1ii7kb7n{grid-row:1}
|
|
4
5
|
._1rjcze3t{padding-block:var(--ds-space-0,0)}
|
|
5
6
|
._yyhy11wp{grid-column:3}
|
|
@@ -4,11 +4,13 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
4
4
|
import React, { Fragment } from 'react';
|
|
5
5
|
import { cx } from '@atlaskit/css';
|
|
6
6
|
import SearchIcon from '@atlaskit/icon/core/search';
|
|
7
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
8
|
import { Pressable, Show, Text } from '@atlaskit/primitives/compiled';
|
|
8
9
|
import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
|
|
9
10
|
import { IconButton } from './themed/migration';
|
|
10
11
|
const styles = {
|
|
11
12
|
root: "_2rko12b0 _1rjcze3t _18zr12x7 _yv0e1mfv _4cvr1h6o _bfhk1j9a _vchhusvi _80om1kdv _1e0cglyw _4t3izwfg _p12f1kvu _1bsb1osq _irr3l4ek _1di6r01l _114b11p5",
|
|
13
|
+
rootT26Shape: "_2rko1qi0",
|
|
12
14
|
buttonText: "_yyhyjvu9 _1ii7kb7n",
|
|
13
15
|
iconBefore: "_yyhykb7n _1ii7kb7n _1e0c1txw",
|
|
14
16
|
elemAfter: "_yyhy11wp _1ii7kb7n _1e0c1txw",
|
|
@@ -38,7 +40,7 @@ export const Search = ({
|
|
|
38
40
|
border: `${"var(--ds-border-width, 1px)"} solid ${"var(--ds-border-input, #8C8F97)"}`
|
|
39
41
|
},
|
|
40
42
|
onClick: onClick,
|
|
41
|
-
xcss: cx(styles.root, isFhsEnabled && styles.fullHeightSidebar),
|
|
43
|
+
xcss: cx(styles.root, fg('platform-dst-shape-theme-default') && styles.rootT26Shape, isFhsEnabled && styles.fullHeightSidebar),
|
|
42
44
|
interactionName: interactionName,
|
|
43
45
|
"aria-haspopup": ariaHaspopup
|
|
44
46
|
}, /*#__PURE__*/React.createElement("span", {
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
._11q7esko{background:var(--ds-top-bar-button-primary-background)}
|
|
6
6
|
._11q7pkxg{background:var(--ds-top-bar-button-background)}
|
|
7
7
|
._14mj1kw7:after{border-radius:inherit}
|
|
8
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}
|
|
8
9
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
9
10
|
._9v7aze3t:after{inset:var(--ds-space-0,0)}
|
|
10
11
|
._v5649dqc{transition:background .1s ease-out}
|
|
@@ -73,6 +73,7 @@ export const themedButtonDisabledText = '--ds-top-bar-button-disabled-text';
|
|
|
73
73
|
export const themedButtonDisabledBackground = '--ds-top-bar-button-disabled-background';
|
|
74
74
|
const styles = {
|
|
75
75
|
root: "_zulp12x7 _11c82smr _2rkofajl _v5649dqc _4bfu1r31 _1hmsglyw _ajmmnqa1 _1rjcze3t _1e0c1txw _4cvr1h6o _1bah1h6o _4t3i5r7u _kqswh2mm _1nrm1r31 _1a3b1r31 _9oik1r31 _c2waglyw _4fprglyw _1bnxglyw _1iohnqa1 _5goinqa1 _jf4cnqa1",
|
|
76
|
+
rootT26Shape: "_2rko1qi0",
|
|
76
77
|
border: "_14mj1kw7 _9v7aze3t _1tv3nqa1 _39yqe4h9 _aetrb3bt _18postnw",
|
|
77
78
|
selected: "_11q71qds _syazw5ct _8l3m15jn _f8pjw5ct _1053w5ct _19lcjrv1 _30l3w5ct _j6xtnh62 _9h8hw5ct",
|
|
78
79
|
disabled: "_11q71c9b _syaz1i3i _8l3m1j28 _f8pj1i3i _10531i3i _19lc1c9b _30l31i3i _j6xt1c9b _9h8h1i3i"
|
|
@@ -114,7 +115,7 @@ const ThemedPressable = /*#__PURE__*/forwardRef(function ThemedPressable({
|
|
|
114
115
|
// @ts-expect-error
|
|
115
116
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
116
117
|
,
|
|
117
|
-
xcss: cx(styles.root, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled),
|
|
118
|
+
xcss: cx(styles.root, fg('platform-dst-shape-theme-default') && styles.rootT26Shape, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled),
|
|
118
119
|
isDisabled: isDisabled
|
|
119
120
|
}));
|
|
120
121
|
});
|
|
@@ -135,7 +136,7 @@ function ThemedAnchorFn({
|
|
|
135
136
|
// @ts-expect-error
|
|
136
137
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
137
138
|
,
|
|
138
|
-
xcss: cx(styles.root, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled)
|
|
139
|
+
xcss: cx(styles.root, fg('platform-dst-shape-theme-default') && styles.rootT26Shape, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled)
|
|
139
140
|
}));
|
|
140
141
|
}
|
|
141
142
|
/**
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
|
-
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
2
|
+
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
3
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}._189ee4h9{border-width:var(--ds-border-width,1px)}
|
|
3
4
|
._1dqonqa1{border-style:solid}
|
|
4
5
|
._1h6d1l7x{border-color:var(--ds-border,#0b120e24)}
|
|
5
6
|
._1ul9uuw1{min-width:200px}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import "./drag-preview.compiled.css";
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
6
|
import { ExpandableMenuItemLevelContext } from '../expandable-menu-item/expandable-menu-item-level-context';
|
|
6
7
|
import { MenuItemBase } from '../menu-item';
|
|
7
8
|
import { COLLAPSE_ELEM_BEFORE } from '../menu-item-signals';
|
|
@@ -20,6 +21,7 @@ function isSafari() {
|
|
|
20
21
|
}
|
|
21
22
|
var dragPreviewStyles = {
|
|
22
23
|
root: "_2rko12b0 _189ee4h9 _1h6d1l7x _1dqonqa1 _bfhkvuon _y4ti1b66 _p12fgx0z",
|
|
24
|
+
rootT26Shape: "_2rko1qi0",
|
|
23
25
|
safariFix: "_1ul9uuw1"
|
|
24
26
|
};
|
|
25
27
|
|
|
@@ -48,7 +50,7 @@ export function DragPreview(_ref) {
|
|
|
48
50
|
React.createElement(ExpandableMenuItemLevelContext.Provider, {
|
|
49
51
|
value: 0
|
|
50
52
|
}, /*#__PURE__*/React.createElement("div", {
|
|
51
|
-
className: ax([dragPreviewStyles.root, isSafari() && dragPreviewStyles.safariFix])
|
|
53
|
+
className: ax([dragPreviewStyles.root, fg('platform-dst-shape-theme-default') && dragPreviewStyles.rootT26Shape, isSafari() && dragPreviewStyles.safariFix])
|
|
52
54
|
}, /*#__PURE__*/React.createElement(MenuItemBase, {
|
|
53
55
|
elemBefore: elemBefore !== null && elemBefore !== void 0 ? elemBefore : COLLAPSE_ELEM_BEFORE
|
|
54
56
|
}, children)))
|
|
@@ -10,6 +10,7 @@ import { cx } from '@compiled/react';
|
|
|
10
10
|
import { AvatarContext } from '@atlaskit/avatar';
|
|
11
11
|
import forwardRefWithGeneric from '@atlaskit/ds-lib/forward-ref-with-generic';
|
|
12
12
|
import mergeRefs from '@atlaskit/ds-lib/merge-refs';
|
|
13
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
14
|
import { Anchor, Pressable, Text } from '@atlaskit/primitives/compiled';
|
|
14
15
|
import Tooltip from '@atlaskit/tooltip';
|
|
15
16
|
import { expandableMenuItemIndentation } from './constants';
|
|
@@ -113,6 +114,7 @@ var onTopOfButtonOrAnchorStyles = {
|
|
|
113
114
|
export var nestedOpenPopupCSSSelector = '&:has([aria-expanded="true"][aria-haspopup="true"])';
|
|
114
115
|
var containerStyles = {
|
|
115
116
|
root: "_2rko12b0 _vchhusvi _1e0c11p5 _yv0e7dup _2z05hkll _1lmcu4vt _1ul9t9kd _4t3iviql _4cvr1h6o _uiztglyw _syazazsu _1yyu1j28 _91ju1txw _uomdidpf _pmxpidpf _db80idpf _qxq9kb7n _1rbv1wug _kwq51b66 _1swv19i6 _irr319i6 _t7p8kb7n _g4kikb7n _91nl1wug _ynyi1wug _iy5o1b66 _v4o21b66",
|
|
117
|
+
rootT26Shape: "_2rko1qi0",
|
|
116
118
|
removeElemAfter: "_91juglyw",
|
|
117
119
|
showHoverActions: "_uomdkb7n _pmxp1wug _db801b66",
|
|
118
120
|
removeElemAfterOnHoverOrOpenNestedPopup: "_1djyglyw _1mfcglyw _1sjuglyw",
|
|
@@ -123,6 +125,7 @@ var containerStyles = {
|
|
|
123
125
|
};
|
|
124
126
|
var buttonOrAnchorStyles = {
|
|
125
127
|
root: "_2rko12b0 _yyhyjvu9 _1ii7kb7n _1e0c11p5 _yv0enbh3 _2z05nbh3 _y4ti1b66 _bozg1b66 _1q511b66 _85i51b66 _bfhk1j28 _syazazsu _4cvr1h6o _y3gnv2br _14iu13ro",
|
|
128
|
+
rootT26Shape: "_2rko1qi0",
|
|
126
129
|
selected: "_syaz6x5g _14iunozp",
|
|
127
130
|
hasDragIndicator: "_1ifmglyw _1cykglyw _x0kw1txw _11om6b4r _7psyru3m _1uy01amc _bir2q7pw"
|
|
128
131
|
};
|
|
@@ -289,7 +292,7 @@ var MenuItemBaseNoRef = function MenuItemBaseNoRef(_ref2, forwardedRef) {
|
|
|
289
292
|
ref: visualContentRef,
|
|
290
293
|
"data-testid": testId ? "".concat(testId, "-container") : undefined,
|
|
291
294
|
"data-selected": isSelected,
|
|
292
|
-
className: ax([containerStyles.root, isSelected && containerStyles.selected, isDragging && containerStyles.dragging, description && containerStyles.hasDescription, showHoverActionsWhenNotHovered && containerStyles.showHoverActions, showHoverActionsWhenNotHovered && elemAfter && containerStyles.removeElemAfter, actionsOnHover && elemAfter && containerStyles.removeElemAfterOnHoverOrOpenNestedPopup, isDisabled && containerStyles.disabled])
|
|
295
|
+
className: ax([containerStyles.root, fg('platform-dst-shape-theme-default') && containerStyles.rootT26Shape, isSelected && containerStyles.selected, isDragging && containerStyles.dragging, description && containerStyles.hasDescription, showHoverActionsWhenNotHovered && containerStyles.showHoverActions, showHoverActionsWhenNotHovered && elemAfter && containerStyles.removeElemAfter, actionsOnHover && elemAfter && containerStyles.removeElemAfterOnHoverOrOpenNestedPopup, isDisabled && containerStyles.disabled])
|
|
293
296
|
}, /*#__PURE__*/React.createElement(Tooltip, {
|
|
294
297
|
content: function content() {
|
|
295
298
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, children), description ? /*#__PURE__*/React.createElement("div", null, description) : null);
|
|
@@ -317,7 +320,7 @@ var MenuItemBaseNoRef = function MenuItemBaseNoRef(_ref2, forwardedRef) {
|
|
|
317
320
|
});
|
|
318
321
|
return isLink ? /*#__PURE__*/React.createElement(Anchor, _extends({}, sharedProps, {
|
|
319
322
|
onClick: handleClick,
|
|
320
|
-
xcss: cx(buttonOrAnchorStyles.root, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator)
|
|
323
|
+
xcss: cx(buttonOrAnchorStyles.root, fg('platform-dst-shape-theme-default') && buttonOrAnchorStyles.rootT26Shape, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator)
|
|
321
324
|
// Needed to override Anchor style due to a compiled/emotion conflict
|
|
322
325
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
323
326
|
,
|
|
@@ -353,7 +356,7 @@ var MenuItemBaseNoRef = function MenuItemBaseNoRef(_ref2, forwardedRef) {
|
|
|
353
356
|
className: ax([notchStyles.root])
|
|
354
357
|
}), interactiveElemContent) : /*#__PURE__*/React.createElement(Pressable, _extends({}, sharedProps, {
|
|
355
358
|
onClick: handleClick,
|
|
356
|
-
xcss: cx(buttonOrAnchorStyles.root, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator),
|
|
359
|
+
xcss: cx(buttonOrAnchorStyles.root, fg('platform-dst-shape-theme-default') && buttonOrAnchorStyles.rootT26Shape, topLevelSiblingStyles.root, isSelected && buttonOrAnchorStyles.selected, hasDragIndicator && buttonOrAnchorStyles.hasDragIndicator),
|
|
357
360
|
"aria-expanded": ariaExpanded,
|
|
358
361
|
isDisabled: isDisabled
|
|
359
362
|
}), interactiveElemContent);
|
|
@@ -12,6 +12,7 @@ import { LogoRenderer } from './logo-renderer';
|
|
|
12
12
|
var anchorStyles = {
|
|
13
13
|
root: "_2rkofajl _1e0c1txw _4cvr1h6o _4t3izwfg",
|
|
14
14
|
customLogoBorderRadius: "_2rkofajl",
|
|
15
|
+
customLogoBorderRadiusT26Shape: "_2rko1mok",
|
|
15
16
|
newMargin: "_ahbq1b66",
|
|
16
17
|
newInteractionStates: "_irr31dpa _1di69yc7",
|
|
17
18
|
newInteractionStatesCustomTheming: "_irr31rps _1di6yhlj"
|
|
@@ -82,7 +83,7 @@ export var CustomLogo = function CustomLogo(_ref) {
|
|
|
82
83
|
// @ts-expect-error - non-standard values for `borderRadius` and the custom theming interaction states
|
|
83
84
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
84
85
|
,
|
|
85
|
-
xcss: cx(anchorStyles.root, anchorStyles.customLogoBorderRadius, anchorStyles.newMargin, hasCustomTheme ? anchorStyles.newInteractionStatesCustomTheming : anchorStyles.newInteractionStates),
|
|
86
|
+
xcss: cx(anchorStyles.root, anchorStyles.customLogoBorderRadius, fg('platform-dst-shape-theme-default') && anchorStyles.customLogoBorderRadiusT26Shape, anchorStyles.newMargin, hasCustomTheme ? anchorStyles.newInteractionStatesCustomTheming : anchorStyles.newInteractionStates),
|
|
86
87
|
onClick: onClick
|
|
87
88
|
}, /*#__PURE__*/React.createElement("div", {
|
|
88
89
|
className: ax([sharedIconOrLogoContainerStyles.root, iconContainerStyles.root, fg('platform-team25-app-icon-tiles') && sharedIconOrLogoContainerStyles.appIconTilePaddingFlagged, isFhsEnabled && sharedIconOrLogoContainerStyles.withFullHeightSidebar])
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
|
-
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
2
|
+
._2rko12b0{border-radius:var(--ds-radius-small,4px)}
|
|
3
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}._18zr12x7{padding-inline:var(--ds-space-075,6px)}
|
|
3
4
|
._1ii7kb7n{grid-row:1}
|
|
4
5
|
._1rjcze3t{padding-block:var(--ds-space-0,0)}
|
|
5
6
|
._yyhy11wp{grid-column:3}
|
|
@@ -4,11 +4,13 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
4
4
|
import React, { Fragment } from 'react';
|
|
5
5
|
import { cx } from '@atlaskit/css';
|
|
6
6
|
import SearchIcon from '@atlaskit/icon/core/search';
|
|
7
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
8
|
import { Pressable, Show, Text } from '@atlaskit/primitives/compiled';
|
|
8
9
|
import { useIsFhsEnabled } from '../fhs-rollout/use-is-fhs-enabled';
|
|
9
10
|
import { IconButton } from './themed/migration';
|
|
10
11
|
var styles = {
|
|
11
12
|
root: "_2rko12b0 _1rjcze3t _18zr12x7 _yv0e1mfv _4cvr1h6o _bfhk1j9a _vchhusvi _80om1kdv _1e0cglyw _4t3izwfg _p12f1kvu _1bsb1osq _irr3l4ek _1di6r01l _114b11p5",
|
|
13
|
+
rootT26Shape: "_2rko1qi0",
|
|
12
14
|
buttonText: "_yyhyjvu9 _1ii7kb7n",
|
|
13
15
|
iconBefore: "_yyhykb7n _1ii7kb7n _1e0c1txw",
|
|
14
16
|
elemAfter: "_yyhy11wp _1ii7kb7n _1e0c1txw",
|
|
@@ -38,7 +40,7 @@ export var Search = function Search(_ref) {
|
|
|
38
40
|
border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border-input, #8C8F97)")
|
|
39
41
|
},
|
|
40
42
|
onClick: onClick,
|
|
41
|
-
xcss: cx(styles.root, isFhsEnabled && styles.fullHeightSidebar),
|
|
43
|
+
xcss: cx(styles.root, fg('platform-dst-shape-theme-default') && styles.rootT26Shape, isFhsEnabled && styles.fullHeightSidebar),
|
|
42
44
|
interactionName: interactionName,
|
|
43
45
|
"aria-haspopup": ariaHaspopup
|
|
44
46
|
}, /*#__PURE__*/React.createElement("span", {
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
._11q7esko{background:var(--ds-top-bar-button-primary-background)}
|
|
6
6
|
._11q7pkxg{background:var(--ds-top-bar-button-background)}
|
|
7
7
|
._14mj1kw7:after{border-radius:inherit}
|
|
8
|
+
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}
|
|
8
9
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
9
10
|
._9v7aze3t:after{inset:var(--ds-space-0,0)}
|
|
10
11
|
._v5649dqc{transition:background .1s ease-out}
|
|
@@ -80,6 +80,7 @@ export var themedButtonDisabledText = '--ds-top-bar-button-disabled-text';
|
|
|
80
80
|
export var themedButtonDisabledBackground = '--ds-top-bar-button-disabled-background';
|
|
81
81
|
var styles = {
|
|
82
82
|
root: "_zulp12x7 _11c82smr _2rkofajl _v5649dqc _4bfu1r31 _1hmsglyw _ajmmnqa1 _1rjcze3t _1e0c1txw _4cvr1h6o _1bah1h6o _4t3i5r7u _kqswh2mm _1nrm1r31 _1a3b1r31 _9oik1r31 _c2waglyw _4fprglyw _1bnxglyw _1iohnqa1 _5goinqa1 _jf4cnqa1",
|
|
83
|
+
rootT26Shape: "_2rko1qi0",
|
|
83
84
|
border: "_14mj1kw7 _9v7aze3t _1tv3nqa1 _39yqe4h9 _aetrb3bt _18postnw",
|
|
84
85
|
selected: "_11q71qds _syazw5ct _8l3m15jn _f8pjw5ct _1053w5ct _19lcjrv1 _30l3w5ct _j6xtnh62 _9h8hw5ct",
|
|
85
86
|
disabled: "_11q71c9b _syaz1i3i _8l3m1j28 _f8pj1i3i _10531i3i _19lc1c9b _30l31i3i _j6xt1c9b _9h8h1i3i"
|
|
@@ -122,7 +123,7 @@ var ThemedPressable = /*#__PURE__*/forwardRef(function ThemedPressable(_ref2, re
|
|
|
122
123
|
// @ts-expect-error
|
|
123
124
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
124
125
|
,
|
|
125
|
-
xcss: cx(styles.root, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled),
|
|
126
|
+
xcss: cx(styles.root, fg('platform-dst-shape-theme-default') && styles.rootT26Shape, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled),
|
|
126
127
|
isDisabled: isDisabled
|
|
127
128
|
}));
|
|
128
129
|
});
|
|
@@ -144,7 +145,7 @@ function ThemedAnchorFn(_ref3, ref) {
|
|
|
144
145
|
// @ts-expect-error
|
|
145
146
|
// eslint-disable-next-line @compiled/no-suppress-xcss
|
|
146
147
|
,
|
|
147
|
-
xcss: cx(styles.root, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled)
|
|
148
|
+
xcss: cx(styles.root, fg('platform-dst-shape-theme-default') && styles.rootT26Shape, shapeStyles[shape], hasBorder && styles.border, appearanceStyles[appearance], isSelected && styles.selected, isDisabled && styles.disabled)
|
|
148
149
|
}));
|
|
149
150
|
}
|
|
150
151
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/navigation-system",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.12.1",
|
|
4
4
|
"description": "The latest navigation system for Atlassian apps.",
|
|
5
5
|
"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
|
|
6
6
|
"author": "Atlassian Pty Ltd",
|
|
@@ -67,20 +67,20 @@
|
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@atlaskit/analytics-next": "^11.1.0",
|
|
70
|
-
"@atlaskit/avatar": "^25.
|
|
71
|
-
"@atlaskit/button": "^23.
|
|
72
|
-
"@atlaskit/css": "^0.
|
|
70
|
+
"@atlaskit/avatar": "^25.6.0",
|
|
71
|
+
"@atlaskit/button": "^23.8.0",
|
|
72
|
+
"@atlaskit/css": "^0.18.0",
|
|
73
73
|
"@atlaskit/ds-lib": "^5.3.0",
|
|
74
|
-
"@atlaskit/icon": "^29.
|
|
74
|
+
"@atlaskit/icon": "^29.2.0",
|
|
75
75
|
"@atlaskit/layering": "^3.4.0",
|
|
76
76
|
"@atlaskit/logo": "^19.9.0",
|
|
77
77
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
78
|
-
"@atlaskit/popup": "^4.
|
|
78
|
+
"@atlaskit/popup": "^4.7.0",
|
|
79
79
|
"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
|
|
80
80
|
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
|
|
81
81
|
"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
|
|
82
82
|
"@atlaskit/primitives": "^16.4.0",
|
|
83
|
-
"@atlaskit/tokens": "^8.
|
|
83
|
+
"@atlaskit/tokens": "^8.6.0",
|
|
84
84
|
"@atlaskit/tooltip": "^20.11.0",
|
|
85
85
|
"@atlaskit/visually-hidden": "^3.0.0",
|
|
86
86
|
"@babel/runtime": "^7.0.0",
|
|
@@ -98,26 +98,26 @@
|
|
|
98
98
|
"@af/integration-testing": "workspace:^",
|
|
99
99
|
"@af/visual-regression": "workspace:^",
|
|
100
100
|
"@atlaskit/app-provider": "^3.2.0",
|
|
101
|
-
"@atlaskit/badge": "^18.
|
|
101
|
+
"@atlaskit/badge": "^18.3.0",
|
|
102
102
|
"@atlaskit/banner": "^14.0.0",
|
|
103
103
|
"@atlaskit/breadcrumbs": "^15.3.0",
|
|
104
104
|
"@atlaskit/dropdown-menu": "^16.3.0",
|
|
105
|
-
"@atlaskit/form": "^
|
|
105
|
+
"@atlaskit/form": "^15.0.0",
|
|
106
106
|
"@atlaskit/heading": "^5.2.0",
|
|
107
107
|
"@atlaskit/link": "^3.2.0",
|
|
108
|
-
"@atlaskit/lozenge": "^13.
|
|
108
|
+
"@atlaskit/lozenge": "^13.2.0",
|
|
109
109
|
"@atlaskit/menu": "^8.4.0",
|
|
110
|
-
"@atlaskit/modal-dialog": "^14.
|
|
110
|
+
"@atlaskit/modal-dialog": "^14.9.0",
|
|
111
111
|
"@atlaskit/onboarding": "^14.4.0",
|
|
112
112
|
"@atlaskit/page-header": "^12.1.0",
|
|
113
113
|
"@atlaskit/page-layout": "^4.2.0",
|
|
114
114
|
"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
|
|
115
|
-
"@atlaskit/select": "^21.
|
|
115
|
+
"@atlaskit/select": "^21.6.0",
|
|
116
116
|
"@atlaskit/skeleton": "^2.1.0",
|
|
117
|
-
"@atlaskit/textfield": "^8.
|
|
117
|
+
"@atlaskit/textfield": "^8.2.0",
|
|
118
118
|
"@atlassian/feature-flags-test-utils": "^1.0.0",
|
|
119
|
-
"@atlassian/gemini": "^1.
|
|
120
|
-
"@atlassian/search-dialog": "^9.
|
|
119
|
+
"@atlassian/gemini": "^1.24.0",
|
|
120
|
+
"@atlassian/search-dialog": "^9.10.0",
|
|
121
121
|
"@atlassian/ssr-tests": "workspace:^",
|
|
122
122
|
"@atlassian/test-utils": "^1.0.0",
|
|
123
123
|
"@atlassian/testing-library": "^0.4.0",
|
|
@@ -190,6 +190,9 @@
|
|
|
190
190
|
},
|
|
191
191
|
"platform-dst-nav-app-icon-height-fix": {
|
|
192
192
|
"type": "boolean"
|
|
193
|
+
},
|
|
194
|
+
"platform-dst-shape-theme-default": {
|
|
195
|
+
"type": "boolean"
|
|
193
196
|
}
|
|
194
197
|
},
|
|
195
198
|
"homepage": "https://atlassian.design/components/navigation-system"
|