@atlaskit/atlassian-navigation 2.6.15 → 2.6.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/cjs/components/PrimaryItemsContainerV2/index.js +83 -43
- package/dist/cjs/components/ProductHome/product-home.js +10 -2
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/components/PrimaryItemsContainerV2/index.js +68 -44
- package/dist/es2019/components/ProductHome/product-home.js +9 -2
- package/dist/es2019/version.json +1 -1
- package/dist/esm/components/PrimaryItemsContainerV2/index.js +85 -45
- package/dist/esm/components/ProductHome/product-home.js +10 -2
- package/dist/esm/version.json +1 -1
- package/dist/types/components/PrimaryItemsContainerV2/index.d.ts +1 -3
- package/dist/types-ts4.5/components/PrimaryItemsContainerV2/index.d.ts +1 -3
- package/package.json +4 -4
- package/__perf__/default.tsx +0 -14
- package/docs/01-intro.tsx +0 -46
- package/docs/02-atlassian-navigation.tsx +0 -38
- package/docs/03-product-home.tsx +0 -73
- package/docs/04-app-switcher.tsx +0 -29
- package/docs/05-create.tsx +0 -37
- package/docs/06-primary-actions.tsx +0 -64
- package/docs/07-secondary-actions.tsx +0 -206
- package/docs/96-skeleton-buttons.tsx +0 -88
- package/docs/97-theming.tsx +0 -45
- package/docs/98-overflow-menu.tsx +0 -49
- package/docs/99-migrating-from-navigation-next.tsx +0 -52
- package/docs/ert/skeleton-create-button.tsx +0 -3
- package/docs/ert/skeleton-icon-button.tsx +0 -3
- package/docs/ert/skeleton-primary-button.tsx +0 -3
- package/docs/ert/skeleton-switcher-button.tsx +0 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @atlaskit/atlassian-navigation
|
|
2
2
|
|
|
3
|
+
## 2.6.17
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`1ed303de3e8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1ed303de3e8) - Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 2.6.16
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`aa737a93ee3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/aa737a93ee3) - Bug fix for primary items container behind the "platform.design-system-team.navigation-v2-no-jank_5yhbd" feature flag.
|
|
14
|
+
|
|
3
15
|
## 2.6.15
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
|
@@ -10,34 +10,33 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
|
|
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
11
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
|
-
var _react2 = require("@emotion/react");
|
|
14
13
|
var _popup = _interopRequireDefault(require("@atlaskit/popup"));
|
|
14
|
+
var _primitives = require("@atlaskit/primitives");
|
|
15
15
|
var _responsive = require("@atlaskit/primitives/responsive");
|
|
16
16
|
var _overflow = require("../../controllers/overflow");
|
|
17
17
|
var _PrimaryDropdownButton = require("../PrimaryDropdownButton");
|
|
18
|
-
var
|
|
19
|
-
/** @jsx jsx */
|
|
18
|
+
var _xcss2;
|
|
20
19
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
21
20
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
22
|
-
var
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
var sharedContainerStyles = (0, _primitives.xcss)({
|
|
22
|
+
height: '100%',
|
|
23
|
+
alignItems: 'stretch',
|
|
24
|
+
paddingInlineEnd: 'space.050',
|
|
25
|
+
gap: 'space.100'
|
|
26
26
|
});
|
|
27
|
-
var
|
|
28
|
-
display: 'none'
|
|
29
|
-
minWidth: 0,
|
|
30
|
-
gap: "var(--ds-space-100, 8px)"
|
|
31
|
-
});
|
|
32
|
-
var smallContainerStyles = (0, _react2.css)((0, _defineProperty2.default)({}, _responsive.UNSAFE_media.below.sm, {
|
|
33
|
-
display: 'flex'
|
|
27
|
+
var smallContainerStyles = (0, _primitives.xcss)((0, _defineProperty2.default)({}, _responsive.media.above.sm, {
|
|
28
|
+
display: 'none'
|
|
34
29
|
}));
|
|
35
|
-
var mediumContainerStyles = (0,
|
|
30
|
+
var mediumContainerStyles = (0, _primitives.xcss)((_xcss2 = {
|
|
31
|
+
display: 'none'
|
|
32
|
+
}, (0, _defineProperty2.default)(_xcss2, _responsive.media.above.sm, {
|
|
36
33
|
display: 'flex'
|
|
37
|
-
}), (0, _defineProperty2.default)(
|
|
34
|
+
}), (0, _defineProperty2.default)(_xcss2, _responsive.media.above.lg, {
|
|
38
35
|
display: 'none'
|
|
39
|
-
}),
|
|
40
|
-
var largeContainerStyles = (0,
|
|
36
|
+
}), _xcss2));
|
|
37
|
+
var largeContainerStyles = (0, _primitives.xcss)((0, _defineProperty2.default)({
|
|
38
|
+
display: 'none'
|
|
39
|
+
}, _responsive.media.above.lg, {
|
|
41
40
|
display: 'flex'
|
|
42
41
|
}));
|
|
43
42
|
var MoreItemsPopup = function MoreItemsPopup(_ref) {
|
|
@@ -60,20 +59,20 @@ var MoreItemsPopup = function MoreItemsPopup(_ref) {
|
|
|
60
59
|
return setIsMoreOpen(true);
|
|
61
60
|
}, []);
|
|
62
61
|
var trigger = (0, _react.useCallback)(function (triggerProps) {
|
|
63
|
-
return
|
|
62
|
+
return /*#__PURE__*/_react.default.createElement(_PrimaryDropdownButton.PrimaryDropdownButton, (0, _extends2.default)({
|
|
64
63
|
onClick: onMoreClick,
|
|
65
64
|
isSelected: isMoreOpen,
|
|
66
65
|
testId: testId ? "".concat(testId, "-overflow-menu-trigger") : 'overflow-menu-trigger'
|
|
67
66
|
}, triggerProps), moreLabel);
|
|
68
67
|
}, [moreLabel, onMoreClick, isMoreOpen, testId]);
|
|
69
68
|
var content = (0, _react.useCallback)(function () {
|
|
70
|
-
return
|
|
69
|
+
return /*#__PURE__*/_react.default.createElement(_overflow.OverflowProvider, {
|
|
71
70
|
isVisible: false,
|
|
72
71
|
openOverflowMenu: openOverflowMenu,
|
|
73
72
|
closeOverflowMenu: onMoreClose
|
|
74
73
|
}, items);
|
|
75
74
|
}, [items, openOverflowMenu, onMoreClose]);
|
|
76
|
-
return
|
|
75
|
+
return /*#__PURE__*/_react.default.createElement(_popup.default, {
|
|
77
76
|
placement: "bottom-start",
|
|
78
77
|
isOpen: isMoreOpen,
|
|
79
78
|
onClose: onMoreClose,
|
|
@@ -91,6 +90,33 @@ var PrimaryItemsContainer = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
|
|
|
91
90
|
Create = _ref2.create,
|
|
92
91
|
theme = _ref2.theme,
|
|
93
92
|
testId = _ref2.testId;
|
|
93
|
+
// We render a CSS media query based nav at first to handle SSR, then use
|
|
94
|
+
// our useMediaQuery hook once we are hydrated so there is only one set of nav items
|
|
95
|
+
var _useState3 = (0, _react.useState)(false),
|
|
96
|
+
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
97
|
+
isClient = _useState4[0],
|
|
98
|
+
setIsClient = _useState4[1];
|
|
99
|
+
(0, _react.useEffect)(function () {
|
|
100
|
+
setIsClient(true);
|
|
101
|
+
}, []);
|
|
102
|
+
|
|
103
|
+
// Setting up our media queries to use once app is hydrated
|
|
104
|
+
var mqSm = (0, _responsive.UNSAFE_useMediaQuery)('above.sm', function (event) {
|
|
105
|
+
return setIsAboveSm(event.matches);
|
|
106
|
+
});
|
|
107
|
+
var _useState5 = (0, _react.useState)(mqSm === null || mqSm === void 0 ? void 0 : mqSm.matches),
|
|
108
|
+
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
|
|
109
|
+
isAboveSm = _useState6[0],
|
|
110
|
+
setIsAboveSm = _useState6[1];
|
|
111
|
+
var mqLg = (0, _responsive.UNSAFE_useMediaQuery)('above.lg', function (event) {
|
|
112
|
+
return setIsAboveLg(event.matches);
|
|
113
|
+
});
|
|
114
|
+
var _useState7 = (0, _react.useState)(mqLg === null || mqLg === void 0 ? void 0 : mqLg.matches),
|
|
115
|
+
_useState8 = (0, _slicedToArray2.default)(_useState7, 2),
|
|
116
|
+
isAboveLg = _useState8[0],
|
|
117
|
+
setIsAboveLg = _useState8[1];
|
|
118
|
+
|
|
119
|
+
// Filter out any falsy items passed in
|
|
94
120
|
var filteredItems = (0, _react.useMemo)(function () {
|
|
95
121
|
return _react.default.Children.toArray(items).filter(function (item) {
|
|
96
122
|
return !!item;
|
|
@@ -105,9 +131,15 @@ var PrimaryItemsContainer = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
|
|
|
105
131
|
var smallMaxItems = 0;
|
|
106
132
|
var mediumMaxItems = 3;
|
|
107
133
|
var largeMaxItems = 8;
|
|
134
|
+
|
|
135
|
+
// We re-use this in both the CSS media query nav that loads in for SSR,
|
|
136
|
+
// and the JS/hook media query nav that is used once hydrated
|
|
108
137
|
var navItems = (0, _react.useMemo)(function () {
|
|
109
138
|
return {
|
|
110
|
-
|
|
139
|
+
small: {
|
|
140
|
+
navBarItems: [],
|
|
141
|
+
overflowItems: filteredItems
|
|
142
|
+
},
|
|
111
143
|
medium: {
|
|
112
144
|
navBarItems: filteredItems.slice(0, mediumMaxItems),
|
|
113
145
|
overflowItems: filteredItems.slice(mediumMaxItems, filteredItems.length)
|
|
@@ -118,32 +150,40 @@ var PrimaryItemsContainer = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
|
|
|
118
150
|
}
|
|
119
151
|
};
|
|
120
152
|
}, [filteredItems]);
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
153
|
+
var hydratedNavItems = (0, _react.useMemo)(function () {
|
|
154
|
+
if (isAboveLg) {
|
|
155
|
+
return navItems.large;
|
|
156
|
+
}
|
|
157
|
+
if (isAboveSm && !isAboveLg) {
|
|
158
|
+
return navItems.medium;
|
|
159
|
+
}
|
|
160
|
+
return navItems.small;
|
|
161
|
+
}, [isAboveLg, isAboveSm, navItems.large, navItems.medium, navItems.small]);
|
|
162
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isClient ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_primitives.Inline, {
|
|
163
|
+
testId: testId && "".concat(testId, "-primary-actions"),
|
|
164
|
+
xcss: sharedContainerStyles
|
|
165
|
+
}, hydratedNavItems.navBarItems, hydratedNavItems.overflowItems.length > 0 && /*#__PURE__*/_react.default.createElement(MoreItemsPopup, {
|
|
166
|
+
moreLabel: moreLabel,
|
|
167
|
+
items: hydratedNavItems.overflowItems,
|
|
168
|
+
testId: testId
|
|
169
|
+
}))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_primitives.Inline, {
|
|
170
|
+
xcss: [sharedContainerStyles, smallContainerStyles]
|
|
171
|
+
}, filteredItems.length > smallMaxItems &&
|
|
172
|
+
/*#__PURE__*/
|
|
173
|
+
// We don't need to pass items into popup, it won't be interactive (SSR only)
|
|
174
|
+
_react.default.createElement(MoreItemsPopup, {
|
|
132
175
|
moreLabel: moreLabel,
|
|
133
|
-
items: filteredItems,
|
|
134
176
|
testId: testId
|
|
135
|
-
})), (
|
|
136
|
-
|
|
137
|
-
}, navItems.medium.navBarItems, navItems.medium.overflowItems.length > 0 &&
|
|
177
|
+
})), /*#__PURE__*/_react.default.createElement(_primitives.Inline, {
|
|
178
|
+
xcss: [sharedContainerStyles, mediumContainerStyles]
|
|
179
|
+
}, navItems.medium.navBarItems, navItems.medium.overflowItems.length > 0 && /*#__PURE__*/_react.default.createElement(MoreItemsPopup, {
|
|
138
180
|
moreLabel: moreLabel,
|
|
139
|
-
items: navItems.medium.overflowItems,
|
|
140
181
|
testId: testId
|
|
141
|
-
})), (
|
|
142
|
-
|
|
143
|
-
}, navItems.large.navBarItems, navItems.large.overflowItems.length > 0 &&
|
|
182
|
+
})), /*#__PURE__*/_react.default.createElement(_primitives.Inline, {
|
|
183
|
+
xcss: [sharedContainerStyles, largeContainerStyles]
|
|
184
|
+
}, navItems.large.navBarItems, navItems.large.overflowItems.length > 0 && /*#__PURE__*/_react.default.createElement(MoreItemsPopup, {
|
|
144
185
|
moreLabel: moreLabel,
|
|
145
|
-
items: navItems.large.overflowItems,
|
|
146
186
|
testId: testId
|
|
147
|
-
})), Create &&
|
|
187
|
+
}))), Create && /*#__PURE__*/_react.default.createElement(Create, null));
|
|
148
188
|
});
|
|
149
189
|
exports.PrimaryItemsContainer = PrimaryItemsContainer;
|
|
@@ -98,12 +98,20 @@ var productIconStyles = (0, _react2.css)((0, _defineProperty2.default)({
|
|
|
98
98
|
}));
|
|
99
99
|
var siteTitleStyles = (0, _react2.css)({
|
|
100
100
|
display: 'flex',
|
|
101
|
+
// Overridden in PFF styles applied below; consolidate in FF cleanup
|
|
101
102
|
marginRight: "var(--ds-space-050, 4px)",
|
|
102
103
|
marginLeft: "var(--ds-space-050, 4px)",
|
|
103
104
|
paddingRight: "var(--ds-space-200, 16px)",
|
|
104
105
|
alignItems: 'center'
|
|
105
106
|
});
|
|
106
|
-
|
|
107
|
+
|
|
108
|
+
// When cleaning up feature flag, these styles can be moved into the above block
|
|
109
|
+
var featureFlaggedSiteTitleStyles = (0, _react2.css)((0, _defineProperty2.default)({
|
|
110
|
+
// Under the FF, we've made the site title handle it's spacing, with the
|
|
111
|
+
// PrimaryItemsContainer not needing to worry about its paddingInlineStart.
|
|
112
|
+
// This makes it cleaner for the title styles to appear and disappear with mq's
|
|
113
|
+
marginRight: "var(--ds-space-100, 8px)"
|
|
114
|
+
}, "@media (max-width: ".concat(_constants.PRODUCT_HOME_BREAKPOINT - 0.1, "px)"), {
|
|
107
115
|
display: 'none'
|
|
108
116
|
}));
|
|
109
117
|
|
|
@@ -174,7 +182,7 @@ var ProductHome = function ProductHome(_ref) {
|
|
|
174
182
|
style: {
|
|
175
183
|
borderRight: theme.mode.productHome.borderRight
|
|
176
184
|
},
|
|
177
|
-
css: [siteTitleStyles, (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.navigation-v2-no-jank_5yhbd') &&
|
|
185
|
+
css: [siteTitleStyles, (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.navigation-v2-no-jank_5yhbd') && featureFlaggedSiteTitleStyles],
|
|
178
186
|
"data-testid": testId && "".concat(testId, "-site-title")
|
|
179
187
|
}, siteTitle));
|
|
180
188
|
};
|
package/dist/cjs/version.json
CHANGED
|
@@ -1,28 +1,23 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
|
-
|
|
3
|
-
import React, { memo, useCallback, useMemo, useState } from 'react';
|
|
4
|
-
import { css, jsx } from '@emotion/react';
|
|
2
|
+
import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
|
|
5
3
|
import Popup from '@atlaskit/popup';
|
|
6
|
-
import {
|
|
4
|
+
import { Inline, xcss } from '@atlaskit/primitives';
|
|
5
|
+
import { media, UNSAFE_useMediaQuery as useMediaQuery } from '@atlaskit/primitives/responsive';
|
|
7
6
|
import { OverflowProvider } from '../../controllers/overflow';
|
|
8
7
|
import { PrimaryDropdownButton } from '../PrimaryDropdownButton';
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
const sharedContainerStyles = xcss({
|
|
9
|
+
height: '100%',
|
|
10
|
+
alignItems: 'stretch',
|
|
11
|
+
paddingInlineEnd: 'space.050',
|
|
12
|
+
gap: 'space.100'
|
|
13
13
|
});
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
gap: "var(--ds-space-100, 8px)"
|
|
18
|
-
});
|
|
19
|
-
const smallContainerStyles = css({
|
|
20
|
-
// eslint-disable-next-line @atlaskit/design-system/no-nested-styles
|
|
21
|
-
[UNSAFE_media.below.sm]: {
|
|
22
|
-
display: 'flex'
|
|
14
|
+
const smallContainerStyles = xcss({
|
|
15
|
+
[media.above.sm]: {
|
|
16
|
+
display: 'none'
|
|
23
17
|
}
|
|
24
18
|
});
|
|
25
|
-
const mediumContainerStyles =
|
|
19
|
+
const mediumContainerStyles = xcss({
|
|
20
|
+
display: 'none',
|
|
26
21
|
[media.above.sm]: {
|
|
27
22
|
display: 'flex'
|
|
28
23
|
},
|
|
@@ -30,7 +25,8 @@ const mediumContainerStyles = css({
|
|
|
30
25
|
display: 'none'
|
|
31
26
|
}
|
|
32
27
|
});
|
|
33
|
-
const largeContainerStyles =
|
|
28
|
+
const largeContainerStyles = xcss({
|
|
29
|
+
display: 'none',
|
|
34
30
|
[media.above.lg]: {
|
|
35
31
|
display: 'flex'
|
|
36
32
|
}
|
|
@@ -44,17 +40,17 @@ const MoreItemsPopup = ({
|
|
|
44
40
|
const onMoreClose = useCallback(() => setIsMoreOpen(false), []);
|
|
45
41
|
const onMoreClick = useCallback(() => setIsMoreOpen(current => !current), []);
|
|
46
42
|
const openOverflowMenu = useCallback(() => setIsMoreOpen(true), []);
|
|
47
|
-
const trigger = useCallback(triggerProps =>
|
|
43
|
+
const trigger = useCallback(triggerProps => /*#__PURE__*/React.createElement(PrimaryDropdownButton, _extends({
|
|
48
44
|
onClick: onMoreClick,
|
|
49
45
|
isSelected: isMoreOpen,
|
|
50
46
|
testId: testId ? `${testId}-overflow-menu-trigger` : 'overflow-menu-trigger'
|
|
51
47
|
}, triggerProps), moreLabel), [moreLabel, onMoreClick, isMoreOpen, testId]);
|
|
52
|
-
const content = useCallback(() =>
|
|
48
|
+
const content = useCallback(() => /*#__PURE__*/React.createElement(OverflowProvider, {
|
|
53
49
|
isVisible: false,
|
|
54
50
|
openOverflowMenu: openOverflowMenu,
|
|
55
51
|
closeOverflowMenu: onMoreClose
|
|
56
52
|
}, items), [items, openOverflowMenu, onMoreClose]);
|
|
57
|
-
return
|
|
53
|
+
return /*#__PURE__*/React.createElement(Popup, {
|
|
58
54
|
placement: "bottom-start",
|
|
59
55
|
isOpen: isMoreOpen,
|
|
60
56
|
onClose: onMoreClose,
|
|
@@ -73,6 +69,20 @@ export const PrimaryItemsContainer = /*#__PURE__*/memo(({
|
|
|
73
69
|
theme,
|
|
74
70
|
testId
|
|
75
71
|
}) => {
|
|
72
|
+
// We render a CSS media query based nav at first to handle SSR, then use
|
|
73
|
+
// our useMediaQuery hook once we are hydrated so there is only one set of nav items
|
|
74
|
+
const [isClient, setIsClient] = useState(false);
|
|
75
|
+
useEffect(() => {
|
|
76
|
+
setIsClient(true);
|
|
77
|
+
}, []);
|
|
78
|
+
|
|
79
|
+
// Setting up our media queries to use once app is hydrated
|
|
80
|
+
const mqSm = useMediaQuery('above.sm', event => setIsAboveSm(event.matches));
|
|
81
|
+
const [isAboveSm, setIsAboveSm] = useState(mqSm === null || mqSm === void 0 ? void 0 : mqSm.matches);
|
|
82
|
+
const mqLg = useMediaQuery('above.lg', event => setIsAboveLg(event.matches));
|
|
83
|
+
const [isAboveLg, setIsAboveLg] = useState(mqLg === null || mqLg === void 0 ? void 0 : mqLg.matches);
|
|
84
|
+
|
|
85
|
+
// Filter out any falsy items passed in
|
|
76
86
|
const filteredItems = useMemo(() => React.Children.toArray(items).filter(item => !!item), [items]);
|
|
77
87
|
// NOTE: we could make these max items configurable in the future. For now
|
|
78
88
|
// we are using sensible defaults. Anything over the max gets put in the
|
|
@@ -83,9 +93,15 @@ export const PrimaryItemsContainer = /*#__PURE__*/memo(({
|
|
|
83
93
|
const smallMaxItems = 0;
|
|
84
94
|
const mediumMaxItems = 3;
|
|
85
95
|
const largeMaxItems = 8;
|
|
96
|
+
|
|
97
|
+
// We re-use this in both the CSS media query nav that loads in for SSR,
|
|
98
|
+
// and the JS/hook media query nav that is used once hydrated
|
|
86
99
|
const navItems = useMemo(() => {
|
|
87
100
|
return {
|
|
88
|
-
|
|
101
|
+
small: {
|
|
102
|
+
navBarItems: [],
|
|
103
|
+
overflowItems: filteredItems
|
|
104
|
+
},
|
|
89
105
|
medium: {
|
|
90
106
|
navBarItems: filteredItems.slice(0, mediumMaxItems),
|
|
91
107
|
overflowItems: filteredItems.slice(mediumMaxItems, filteredItems.length)
|
|
@@ -96,31 +112,39 @@ export const PrimaryItemsContainer = /*#__PURE__*/memo(({
|
|
|
96
112
|
}
|
|
97
113
|
};
|
|
98
114
|
}, [filteredItems]);
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
115
|
+
const hydratedNavItems = useMemo(() => {
|
|
116
|
+
if (isAboveLg) {
|
|
117
|
+
return navItems.large;
|
|
118
|
+
}
|
|
119
|
+
if (isAboveSm && !isAboveLg) {
|
|
120
|
+
return navItems.medium;
|
|
121
|
+
}
|
|
122
|
+
return navItems.small;
|
|
123
|
+
}, [isAboveLg, isAboveSm, navItems.large, navItems.medium, navItems.small]);
|
|
124
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, isClient ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Inline, {
|
|
125
|
+
testId: testId && `${testId}-primary-actions`,
|
|
126
|
+
xcss: sharedContainerStyles
|
|
127
|
+
}, hydratedNavItems.navBarItems, hydratedNavItems.overflowItems.length > 0 && /*#__PURE__*/React.createElement(MoreItemsPopup, {
|
|
128
|
+
moreLabel: moreLabel,
|
|
129
|
+
items: hydratedNavItems.overflowItems,
|
|
130
|
+
testId: testId
|
|
131
|
+
}))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Inline, {
|
|
132
|
+
xcss: [sharedContainerStyles, smallContainerStyles]
|
|
133
|
+
}, filteredItems.length > smallMaxItems &&
|
|
134
|
+
/*#__PURE__*/
|
|
135
|
+
// We don't need to pass items into popup, it won't be interactive (SSR only)
|
|
136
|
+
React.createElement(MoreItemsPopup, {
|
|
110
137
|
moreLabel: moreLabel,
|
|
111
|
-
items: filteredItems,
|
|
112
138
|
testId: testId
|
|
113
|
-
})),
|
|
114
|
-
|
|
115
|
-
}, navItems.medium.navBarItems, navItems.medium.overflowItems.length > 0 &&
|
|
139
|
+
})), /*#__PURE__*/React.createElement(Inline, {
|
|
140
|
+
xcss: [sharedContainerStyles, mediumContainerStyles]
|
|
141
|
+
}, navItems.medium.navBarItems, navItems.medium.overflowItems.length > 0 && /*#__PURE__*/React.createElement(MoreItemsPopup, {
|
|
116
142
|
moreLabel: moreLabel,
|
|
117
|
-
items: navItems.medium.overflowItems,
|
|
118
143
|
testId: testId
|
|
119
|
-
})),
|
|
120
|
-
|
|
121
|
-
}, navItems.large.navBarItems, navItems.large.overflowItems.length > 0 &&
|
|
144
|
+
})), /*#__PURE__*/React.createElement(Inline, {
|
|
145
|
+
xcss: [sharedContainerStyles, largeContainerStyles]
|
|
146
|
+
}, navItems.large.navBarItems, navItems.large.overflowItems.length > 0 && /*#__PURE__*/React.createElement(MoreItemsPopup, {
|
|
122
147
|
moreLabel: moreLabel,
|
|
123
|
-
items: navItems.large.overflowItems,
|
|
124
148
|
testId: testId
|
|
125
|
-
})), Create &&
|
|
149
|
+
}))), Create && /*#__PURE__*/React.createElement(Create, null));
|
|
126
150
|
});
|
|
@@ -95,12 +95,19 @@ const productIconStyles = css({
|
|
|
95
95
|
});
|
|
96
96
|
const siteTitleStyles = css({
|
|
97
97
|
display: 'flex',
|
|
98
|
+
// Overridden in PFF styles applied below; consolidate in FF cleanup
|
|
98
99
|
marginRight: "var(--ds-space-050, 4px)",
|
|
99
100
|
marginLeft: "var(--ds-space-050, 4px)",
|
|
100
101
|
paddingRight: "var(--ds-space-200, 16px)",
|
|
101
102
|
alignItems: 'center'
|
|
102
103
|
});
|
|
103
|
-
|
|
104
|
+
|
|
105
|
+
// When cleaning up feature flag, these styles can be moved into the above block
|
|
106
|
+
const featureFlaggedSiteTitleStyles = css({
|
|
107
|
+
// Under the FF, we've made the site title handle it's spacing, with the
|
|
108
|
+
// PrimaryItemsContainer not needing to worry about its paddingInlineStart.
|
|
109
|
+
// This makes it cleaner for the title styles to appear and disappear with mq's
|
|
110
|
+
marginRight: "var(--ds-space-100, 8px)",
|
|
104
111
|
// eslint-disable-next-line @atlaskit/design-system/no-nested-styles
|
|
105
112
|
[`@media (max-width: ${PRODUCT_HOME_BREAKPOINT - 0.1}px)`]: {
|
|
106
113
|
display: 'none'
|
|
@@ -181,7 +188,7 @@ const ProductHome = ({
|
|
|
181
188
|
style: {
|
|
182
189
|
borderRight: theme.mode.productHome.borderRight
|
|
183
190
|
},
|
|
184
|
-
css: [siteTitleStyles, getBooleanFF('platform.design-system-team.navigation-v2-no-jank_5yhbd') &&
|
|
191
|
+
css: [siteTitleStyles, getBooleanFF('platform.design-system-team.navigation-v2-no-jank_5yhbd') && featureFlaggedSiteTitleStyles],
|
|
185
192
|
"data-testid": testId && `${testId}-site-title`
|
|
186
193
|
}, siteTitle));
|
|
187
194
|
};
|
package/dist/es2019/version.json
CHANGED
|
@@ -1,33 +1,32 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
3
3
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
4
|
-
var
|
|
5
|
-
|
|
6
|
-
import React, { memo, useCallback, useMemo, useState } from 'react';
|
|
7
|
-
import { css, jsx } from '@emotion/react';
|
|
4
|
+
var _xcss2;
|
|
5
|
+
import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
|
|
8
6
|
import Popup from '@atlaskit/popup';
|
|
9
|
-
import {
|
|
7
|
+
import { Inline, xcss } from '@atlaskit/primitives';
|
|
8
|
+
import { media, UNSAFE_useMediaQuery as useMediaQuery } from '@atlaskit/primitives/responsive';
|
|
10
9
|
import { OverflowProvider } from '../../controllers/overflow';
|
|
11
10
|
import { PrimaryDropdownButton } from '../PrimaryDropdownButton';
|
|
12
|
-
var
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
var sharedContainerStyles = xcss({
|
|
12
|
+
height: '100%',
|
|
13
|
+
alignItems: 'stretch',
|
|
14
|
+
paddingInlineEnd: 'space.050',
|
|
15
|
+
gap: 'space.100'
|
|
16
16
|
});
|
|
17
|
-
var
|
|
18
|
-
display: 'none'
|
|
19
|
-
minWidth: 0,
|
|
20
|
-
gap: "var(--ds-space-100, 8px)"
|
|
21
|
-
});
|
|
22
|
-
var smallContainerStyles = css(_defineProperty({}, UNSAFE_media.below.sm, {
|
|
23
|
-
display: 'flex'
|
|
17
|
+
var smallContainerStyles = xcss(_defineProperty({}, media.above.sm, {
|
|
18
|
+
display: 'none'
|
|
24
19
|
}));
|
|
25
|
-
var mediumContainerStyles =
|
|
20
|
+
var mediumContainerStyles = xcss((_xcss2 = {
|
|
21
|
+
display: 'none'
|
|
22
|
+
}, _defineProperty(_xcss2, media.above.sm, {
|
|
26
23
|
display: 'flex'
|
|
27
|
-
}), _defineProperty(
|
|
24
|
+
}), _defineProperty(_xcss2, media.above.lg, {
|
|
28
25
|
display: 'none'
|
|
29
|
-
}),
|
|
30
|
-
var largeContainerStyles =
|
|
26
|
+
}), _xcss2));
|
|
27
|
+
var largeContainerStyles = xcss(_defineProperty({
|
|
28
|
+
display: 'none'
|
|
29
|
+
}, media.above.lg, {
|
|
31
30
|
display: 'flex'
|
|
32
31
|
}));
|
|
33
32
|
var MoreItemsPopup = function MoreItemsPopup(_ref) {
|
|
@@ -50,20 +49,20 @@ var MoreItemsPopup = function MoreItemsPopup(_ref) {
|
|
|
50
49
|
return setIsMoreOpen(true);
|
|
51
50
|
}, []);
|
|
52
51
|
var trigger = useCallback(function (triggerProps) {
|
|
53
|
-
return
|
|
52
|
+
return /*#__PURE__*/React.createElement(PrimaryDropdownButton, _extends({
|
|
54
53
|
onClick: onMoreClick,
|
|
55
54
|
isSelected: isMoreOpen,
|
|
56
55
|
testId: testId ? "".concat(testId, "-overflow-menu-trigger") : 'overflow-menu-trigger'
|
|
57
56
|
}, triggerProps), moreLabel);
|
|
58
57
|
}, [moreLabel, onMoreClick, isMoreOpen, testId]);
|
|
59
58
|
var content = useCallback(function () {
|
|
60
|
-
return
|
|
59
|
+
return /*#__PURE__*/React.createElement(OverflowProvider, {
|
|
61
60
|
isVisible: false,
|
|
62
61
|
openOverflowMenu: openOverflowMenu,
|
|
63
62
|
closeOverflowMenu: onMoreClose
|
|
64
63
|
}, items);
|
|
65
64
|
}, [items, openOverflowMenu, onMoreClose]);
|
|
66
|
-
return
|
|
65
|
+
return /*#__PURE__*/React.createElement(Popup, {
|
|
67
66
|
placement: "bottom-start",
|
|
68
67
|
isOpen: isMoreOpen,
|
|
69
68
|
onClose: onMoreClose,
|
|
@@ -81,6 +80,33 @@ export var PrimaryItemsContainer = /*#__PURE__*/memo(function (_ref2) {
|
|
|
81
80
|
Create = _ref2.create,
|
|
82
81
|
theme = _ref2.theme,
|
|
83
82
|
testId = _ref2.testId;
|
|
83
|
+
// We render a CSS media query based nav at first to handle SSR, then use
|
|
84
|
+
// our useMediaQuery hook once we are hydrated so there is only one set of nav items
|
|
85
|
+
var _useState3 = useState(false),
|
|
86
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
87
|
+
isClient = _useState4[0],
|
|
88
|
+
setIsClient = _useState4[1];
|
|
89
|
+
useEffect(function () {
|
|
90
|
+
setIsClient(true);
|
|
91
|
+
}, []);
|
|
92
|
+
|
|
93
|
+
// Setting up our media queries to use once app is hydrated
|
|
94
|
+
var mqSm = useMediaQuery('above.sm', function (event) {
|
|
95
|
+
return setIsAboveSm(event.matches);
|
|
96
|
+
});
|
|
97
|
+
var _useState5 = useState(mqSm === null || mqSm === void 0 ? void 0 : mqSm.matches),
|
|
98
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
99
|
+
isAboveSm = _useState6[0],
|
|
100
|
+
setIsAboveSm = _useState6[1];
|
|
101
|
+
var mqLg = useMediaQuery('above.lg', function (event) {
|
|
102
|
+
return setIsAboveLg(event.matches);
|
|
103
|
+
});
|
|
104
|
+
var _useState7 = useState(mqLg === null || mqLg === void 0 ? void 0 : mqLg.matches),
|
|
105
|
+
_useState8 = _slicedToArray(_useState7, 2),
|
|
106
|
+
isAboveLg = _useState8[0],
|
|
107
|
+
setIsAboveLg = _useState8[1];
|
|
108
|
+
|
|
109
|
+
// Filter out any falsy items passed in
|
|
84
110
|
var filteredItems = useMemo(function () {
|
|
85
111
|
return React.Children.toArray(items).filter(function (item) {
|
|
86
112
|
return !!item;
|
|
@@ -95,9 +121,15 @@ export var PrimaryItemsContainer = /*#__PURE__*/memo(function (_ref2) {
|
|
|
95
121
|
var smallMaxItems = 0;
|
|
96
122
|
var mediumMaxItems = 3;
|
|
97
123
|
var largeMaxItems = 8;
|
|
124
|
+
|
|
125
|
+
// We re-use this in both the CSS media query nav that loads in for SSR,
|
|
126
|
+
// and the JS/hook media query nav that is used once hydrated
|
|
98
127
|
var navItems = useMemo(function () {
|
|
99
128
|
return {
|
|
100
|
-
|
|
129
|
+
small: {
|
|
130
|
+
navBarItems: [],
|
|
131
|
+
overflowItems: filteredItems
|
|
132
|
+
},
|
|
101
133
|
medium: {
|
|
102
134
|
navBarItems: filteredItems.slice(0, mediumMaxItems),
|
|
103
135
|
overflowItems: filteredItems.slice(mediumMaxItems, filteredItems.length)
|
|
@@ -108,31 +140,39 @@ export var PrimaryItemsContainer = /*#__PURE__*/memo(function (_ref2) {
|
|
|
108
140
|
}
|
|
109
141
|
};
|
|
110
142
|
}, [filteredItems]);
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
143
|
+
var hydratedNavItems = useMemo(function () {
|
|
144
|
+
if (isAboveLg) {
|
|
145
|
+
return navItems.large;
|
|
146
|
+
}
|
|
147
|
+
if (isAboveSm && !isAboveLg) {
|
|
148
|
+
return navItems.medium;
|
|
149
|
+
}
|
|
150
|
+
return navItems.small;
|
|
151
|
+
}, [isAboveLg, isAboveSm, navItems.large, navItems.medium, navItems.small]);
|
|
152
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, isClient ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Inline, {
|
|
153
|
+
testId: testId && "".concat(testId, "-primary-actions"),
|
|
154
|
+
xcss: sharedContainerStyles
|
|
155
|
+
}, hydratedNavItems.navBarItems, hydratedNavItems.overflowItems.length > 0 && /*#__PURE__*/React.createElement(MoreItemsPopup, {
|
|
156
|
+
moreLabel: moreLabel,
|
|
157
|
+
items: hydratedNavItems.overflowItems,
|
|
158
|
+
testId: testId
|
|
159
|
+
}))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Inline, {
|
|
160
|
+
xcss: [sharedContainerStyles, smallContainerStyles]
|
|
161
|
+
}, filteredItems.length > smallMaxItems &&
|
|
162
|
+
/*#__PURE__*/
|
|
163
|
+
// We don't need to pass items into popup, it won't be interactive (SSR only)
|
|
164
|
+
React.createElement(MoreItemsPopup, {
|
|
122
165
|
moreLabel: moreLabel,
|
|
123
|
-
items: filteredItems,
|
|
124
166
|
testId: testId
|
|
125
|
-
})),
|
|
126
|
-
|
|
127
|
-
}, navItems.medium.navBarItems, navItems.medium.overflowItems.length > 0 &&
|
|
167
|
+
})), /*#__PURE__*/React.createElement(Inline, {
|
|
168
|
+
xcss: [sharedContainerStyles, mediumContainerStyles]
|
|
169
|
+
}, navItems.medium.navBarItems, navItems.medium.overflowItems.length > 0 && /*#__PURE__*/React.createElement(MoreItemsPopup, {
|
|
128
170
|
moreLabel: moreLabel,
|
|
129
|
-
items: navItems.medium.overflowItems,
|
|
130
171
|
testId: testId
|
|
131
|
-
})),
|
|
132
|
-
|
|
133
|
-
}, navItems.large.navBarItems, navItems.large.overflowItems.length > 0 &&
|
|
172
|
+
})), /*#__PURE__*/React.createElement(Inline, {
|
|
173
|
+
xcss: [sharedContainerStyles, largeContainerStyles]
|
|
174
|
+
}, navItems.large.navBarItems, navItems.large.overflowItems.length > 0 && /*#__PURE__*/React.createElement(MoreItemsPopup, {
|
|
134
175
|
moreLabel: moreLabel,
|
|
135
|
-
items: navItems.large.overflowItems,
|
|
136
176
|
testId: testId
|
|
137
|
-
})), Create &&
|
|
177
|
+
}))), Create && /*#__PURE__*/React.createElement(Create, null));
|
|
138
178
|
});
|