@carbon-labs/react-ui-shell 0.26.0 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/components/SideNav.js +8 -4
- package/es/components/SideNavMenu.d.ts +5 -0
- package/es/components/SideNavMenu.js +20 -1
- package/es/components/SideNavToggle.d.ts +4 -0
- package/es/components/SideNavToggle.js +9 -1
- package/lib/components/SideNav.js +8 -4
- package/lib/components/SideNavMenu.d.ts +5 -0
- package/lib/components/SideNavMenu.js +20 -1
- package/lib/components/SideNavToggle.d.ts +4 -0
- package/lib/components/SideNavToggle.js +9 -1
- package/package.json +2 -2
- package/scss/styles/_side-nav.scss +11 -0
package/es/components/SideNav.js
CHANGED
|
@@ -344,6 +344,11 @@ function SideNavRenderFunction(_ref, ref) {
|
|
|
344
344
|
setInternalIsTreeview(value);
|
|
345
345
|
}
|
|
346
346
|
};
|
|
347
|
+
const SideNavToggleButton = /*#__PURE__*/React.createElement(SideNavToggle, {
|
|
348
|
+
className: !expandedState ? `${prefix}--side-nav__toggle--collapsed` : '',
|
|
349
|
+
renderIcon: expandedState ? SidePanelClose : SidePanelOpen,
|
|
350
|
+
onClick: () => setExpandedState(!expandedState)
|
|
351
|
+
}, sideNavToggleText);
|
|
347
352
|
return /*#__PURE__*/React.createElement(SideNavContext.Provider, {
|
|
348
353
|
value: {
|
|
349
354
|
expanded,
|
|
@@ -364,10 +369,9 @@ function SideNavRenderFunction(_ref, ref) {
|
|
|
364
369
|
ref: navRef,
|
|
365
370
|
className: `${prefix}--side-nav__navigation ${className}`,
|
|
366
371
|
inert: !isRail && navType !== SIDE_NAV_TYPE.PANEL && !(expanded || isLg) ? -1 : undefined
|
|
367
|
-
}, accessibilityLabel, eventHandlers, other), childrenToRender, navType === SIDE_NAV_TYPE.PANEL && /*#__PURE__*/React.createElement(
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
}, sideNavToggleText)));
|
|
372
|
+
}, accessibilityLabel, eventHandlers, other), childrenToRender, navType === SIDE_NAV_TYPE.PANEL && (expandedState ? SideNavToggleButton : /*#__PURE__*/React.createElement("div", {
|
|
373
|
+
className: `${prefix}--side-nav__toggle-container`
|
|
374
|
+
}, SideNavToggleButton))));
|
|
371
375
|
}
|
|
372
376
|
const SideNav = /*#__PURE__*/React.forwardRef(SideNavRenderFunction);
|
|
373
377
|
SideNav.displayName = 'SideNav';
|
|
@@ -31,6 +31,11 @@ export interface SideNavMenuProps {
|
|
|
31
31
|
* Specifies whether the SideNavMenu is in a large variation.
|
|
32
32
|
*/
|
|
33
33
|
large?: boolean;
|
|
34
|
+
/**
|
|
35
|
+
*
|
|
36
|
+
* A custom onClick handler hook that runs when the SideNavMenu is toggled.
|
|
37
|
+
*/
|
|
38
|
+
onMenuToggle?: () => void;
|
|
34
39
|
/**
|
|
35
40
|
* A custom icon to render next to the SideNavMenu title. This can be a function returning JSX or JSX itself.
|
|
36
41
|
*/
|
|
@@ -30,7 +30,8 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
30
30
|
large = false,
|
|
31
31
|
renderIcon: IconElement,
|
|
32
32
|
isSideNavExpanded,
|
|
33
|
-
title
|
|
33
|
+
title,
|
|
34
|
+
onMenuToggle
|
|
34
35
|
} = _ref;
|
|
35
36
|
const depth = propDepth;
|
|
36
37
|
const {
|
|
@@ -149,6 +150,9 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
149
150
|
function handleKeyDown(event) {
|
|
150
151
|
if (match(event, Escape)) {
|
|
151
152
|
setIsExpanded(false);
|
|
153
|
+
if (onMenuToggle) {
|
|
154
|
+
onMenuToggle();
|
|
155
|
+
}
|
|
152
156
|
}
|
|
153
157
|
if (isTreeview) {
|
|
154
158
|
const node = event.target;
|
|
@@ -161,6 +165,9 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
161
165
|
// collapse menu
|
|
162
166
|
if (isMenu && sideNavExpanded) {
|
|
163
167
|
if (isExpanded == 'true') {
|
|
168
|
+
if (onMenuToggle) {
|
|
169
|
+
onMenuToggle();
|
|
170
|
+
}
|
|
164
171
|
setIsExpanded(false);
|
|
165
172
|
|
|
166
173
|
// go to previous level's side nav menu button
|
|
@@ -185,6 +192,9 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
185
192
|
// expand menu when sidenav is expanded
|
|
186
193
|
if (isMenu && sideNavExpanded) {
|
|
187
194
|
setIsExpanded(true);
|
|
195
|
+
if (onMenuToggle) {
|
|
196
|
+
onMenuToggle();
|
|
197
|
+
}
|
|
188
198
|
|
|
189
199
|
// if already expanded, focus on first element
|
|
190
200
|
if (isExpanded == 'true') {
|
|
@@ -225,6 +235,10 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
225
235
|
"aria-expanded": isExpanded,
|
|
226
236
|
className: buttonClassName,
|
|
227
237
|
onClick: () => {
|
|
238
|
+
if (onMenuToggle) {
|
|
239
|
+
onMenuToggle();
|
|
240
|
+
}
|
|
241
|
+
|
|
228
242
|
// only when sidenav is panel view
|
|
229
243
|
if (navType == SIDE_NAV_TYPE.PANEL && !isExpanded && firstLink.current && !sideNavExpanded) {
|
|
230
244
|
setOpenPopover(!openPopover);
|
|
@@ -294,6 +308,11 @@ SideNavMenu.propTypes = {
|
|
|
294
308
|
* Specify if this is a large variation of the SideNavMenu
|
|
295
309
|
*/
|
|
296
310
|
large: PropTypes.bool,
|
|
311
|
+
/**
|
|
312
|
+
*
|
|
313
|
+
* A custom onClick handler hook that runs when the SideNavMenu is toggled.
|
|
314
|
+
*/
|
|
315
|
+
onMenuToggle: PropTypes.func,
|
|
297
316
|
/**
|
|
298
317
|
* Pass in a custom icon to render next to the `SideNavMenu` title
|
|
299
318
|
*/
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import { extends as _extends } from '../_virtual/_rollupPluginBabelHelpers.js';
|
|
9
|
+
import cx from '../_virtual/index.js';
|
|
9
10
|
import PropTypes from 'prop-types';
|
|
10
11
|
import React from 'react';
|
|
11
12
|
import { SideNavIcon } from '@carbon/react';
|
|
@@ -13,6 +14,7 @@ import { usePrefix } from '../internal/usePrefix.js';
|
|
|
13
14
|
|
|
14
15
|
const SideNavToggle = /*#__PURE__*/React.forwardRef(function SideNavToggle(_ref, ref) {
|
|
15
16
|
let {
|
|
17
|
+
className: customClassName,
|
|
16
18
|
renderIcon: IconElement,
|
|
17
19
|
tabIndex,
|
|
18
20
|
children,
|
|
@@ -20,7 +22,9 @@ const SideNavToggle = /*#__PURE__*/React.forwardRef(function SideNavToggle(_ref,
|
|
|
20
22
|
} = _ref;
|
|
21
23
|
const prefix = usePrefix();
|
|
22
24
|
return /*#__PURE__*/React.createElement("button", _extends({
|
|
23
|
-
className:
|
|
25
|
+
className: cx(customClassName, {
|
|
26
|
+
[`${prefix}--side-nav__toggle`]: true
|
|
27
|
+
}),
|
|
24
28
|
ref: ref,
|
|
25
29
|
type: "button",
|
|
26
30
|
tabIndex: tabIndex ?? 0
|
|
@@ -34,6 +38,10 @@ SideNavToggle.propTypes = {
|
|
|
34
38
|
* Specify the text content for the toggle
|
|
35
39
|
*/
|
|
36
40
|
children: PropTypes.node,
|
|
41
|
+
/**
|
|
42
|
+
* Specify an optional className to be applied to the button node
|
|
43
|
+
*/
|
|
44
|
+
className: PropTypes.string,
|
|
37
45
|
/**
|
|
38
46
|
* Provide an optional function to be called when clicked
|
|
39
47
|
*/
|
|
@@ -346,6 +346,11 @@ function SideNavRenderFunction(_ref, ref) {
|
|
|
346
346
|
setInternalIsTreeview(value);
|
|
347
347
|
}
|
|
348
348
|
};
|
|
349
|
+
const SideNavToggleButton = /*#__PURE__*/React.createElement(SideNavToggle.SideNavToggle, {
|
|
350
|
+
className: !expandedState ? `${prefix}--side-nav__toggle--collapsed` : '',
|
|
351
|
+
renderIcon: expandedState ? bucket15.SidePanelClose : bucket15.SidePanelOpen,
|
|
352
|
+
onClick: () => setExpandedState(!expandedState)
|
|
353
|
+
}, sideNavToggleText);
|
|
349
354
|
return /*#__PURE__*/React.createElement(SideNavContext.Provider, {
|
|
350
355
|
value: {
|
|
351
356
|
expanded,
|
|
@@ -366,10 +371,9 @@ function SideNavRenderFunction(_ref, ref) {
|
|
|
366
371
|
ref: navRef,
|
|
367
372
|
className: `${prefix}--side-nav__navigation ${className}`,
|
|
368
373
|
inert: !isRail && navType !== SIDE_NAV_TYPE.PANEL && !(expanded || isLg) ? -1 : undefined
|
|
369
|
-
}, accessibilityLabel, eventHandlers, other), childrenToRender, navType === SIDE_NAV_TYPE.PANEL && /*#__PURE__*/React.createElement(
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
}, sideNavToggleText)));
|
|
374
|
+
}, accessibilityLabel, eventHandlers, other), childrenToRender, navType === SIDE_NAV_TYPE.PANEL && (expandedState ? SideNavToggleButton : /*#__PURE__*/React.createElement("div", {
|
|
375
|
+
className: `${prefix}--side-nav__toggle-container`
|
|
376
|
+
}, SideNavToggleButton))));
|
|
373
377
|
}
|
|
374
378
|
const SideNav = /*#__PURE__*/React.forwardRef(SideNavRenderFunction);
|
|
375
379
|
SideNav.displayName = 'SideNav';
|
|
@@ -31,6 +31,11 @@ export interface SideNavMenuProps {
|
|
|
31
31
|
* Specifies whether the SideNavMenu is in a large variation.
|
|
32
32
|
*/
|
|
33
33
|
large?: boolean;
|
|
34
|
+
/**
|
|
35
|
+
*
|
|
36
|
+
* A custom onClick handler hook that runs when the SideNavMenu is toggled.
|
|
37
|
+
*/
|
|
38
|
+
onMenuToggle?: () => void;
|
|
34
39
|
/**
|
|
35
40
|
* A custom icon to render next to the SideNavMenu title. This can be a function returning JSX or JSX itself.
|
|
36
41
|
*/
|
|
@@ -32,7 +32,8 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
32
32
|
large = false,
|
|
33
33
|
renderIcon: IconElement,
|
|
34
34
|
isSideNavExpanded,
|
|
35
|
-
title
|
|
35
|
+
title,
|
|
36
|
+
onMenuToggle
|
|
36
37
|
} = _ref;
|
|
37
38
|
const depth = propDepth;
|
|
38
39
|
const {
|
|
@@ -151,6 +152,9 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
151
152
|
function handleKeyDown(event) {
|
|
152
153
|
if (match.match(event, keys.Escape)) {
|
|
153
154
|
setIsExpanded(false);
|
|
155
|
+
if (onMenuToggle) {
|
|
156
|
+
onMenuToggle();
|
|
157
|
+
}
|
|
154
158
|
}
|
|
155
159
|
if (isTreeview) {
|
|
156
160
|
const node = event.target;
|
|
@@ -163,6 +167,9 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
163
167
|
// collapse menu
|
|
164
168
|
if (isMenu && sideNavExpanded) {
|
|
165
169
|
if (isExpanded == 'true') {
|
|
170
|
+
if (onMenuToggle) {
|
|
171
|
+
onMenuToggle();
|
|
172
|
+
}
|
|
166
173
|
setIsExpanded(false);
|
|
167
174
|
|
|
168
175
|
// go to previous level's side nav menu button
|
|
@@ -187,6 +194,9 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
187
194
|
// expand menu when sidenav is expanded
|
|
188
195
|
if (isMenu && sideNavExpanded) {
|
|
189
196
|
setIsExpanded(true);
|
|
197
|
+
if (onMenuToggle) {
|
|
198
|
+
onMenuToggle();
|
|
199
|
+
}
|
|
190
200
|
|
|
191
201
|
// if already expanded, focus on first element
|
|
192
202
|
if (isExpanded == 'true') {
|
|
@@ -227,6 +237,10 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
|
|
|
227
237
|
"aria-expanded": isExpanded,
|
|
228
238
|
className: buttonClassName,
|
|
229
239
|
onClick: () => {
|
|
240
|
+
if (onMenuToggle) {
|
|
241
|
+
onMenuToggle();
|
|
242
|
+
}
|
|
243
|
+
|
|
230
244
|
// only when sidenav is panel view
|
|
231
245
|
if (navType == SideNav.SIDE_NAV_TYPE.PANEL && !isExpanded && firstLink.current && !sideNavExpanded) {
|
|
232
246
|
setOpenPopover(!openPopover);
|
|
@@ -296,6 +310,11 @@ SideNavMenu.propTypes = {
|
|
|
296
310
|
* Specify if this is a large variation of the SideNavMenu
|
|
297
311
|
*/
|
|
298
312
|
large: PropTypes.bool,
|
|
313
|
+
/**
|
|
314
|
+
*
|
|
315
|
+
* A custom onClick handler hook that runs when the SideNavMenu is toggled.
|
|
316
|
+
*/
|
|
317
|
+
onMenuToggle: PropTypes.func,
|
|
299
318
|
/**
|
|
300
319
|
* Pass in a custom icon to render next to the `SideNavMenu` title
|
|
301
320
|
*/
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
11
11
|
|
|
12
12
|
var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.js');
|
|
13
|
+
var index = require('../_virtual/index.js');
|
|
13
14
|
var PropTypes = require('prop-types');
|
|
14
15
|
var React = require('react');
|
|
15
16
|
var react = require('@carbon/react');
|
|
@@ -17,6 +18,7 @@ var usePrefix = require('../internal/usePrefix.js');
|
|
|
17
18
|
|
|
18
19
|
const SideNavToggle = /*#__PURE__*/React.forwardRef(function SideNavToggle(_ref, ref) {
|
|
19
20
|
let {
|
|
21
|
+
className: customClassName,
|
|
20
22
|
renderIcon: IconElement,
|
|
21
23
|
tabIndex,
|
|
22
24
|
children,
|
|
@@ -24,7 +26,9 @@ const SideNavToggle = /*#__PURE__*/React.forwardRef(function SideNavToggle(_ref,
|
|
|
24
26
|
} = _ref;
|
|
25
27
|
const prefix = usePrefix.usePrefix();
|
|
26
28
|
return /*#__PURE__*/React.createElement("button", _rollupPluginBabelHelpers.extends({
|
|
27
|
-
className:
|
|
29
|
+
className: index.default(customClassName, {
|
|
30
|
+
[`${prefix}--side-nav__toggle`]: true
|
|
31
|
+
}),
|
|
28
32
|
ref: ref,
|
|
29
33
|
type: "button",
|
|
30
34
|
tabIndex: tabIndex ?? 0
|
|
@@ -38,6 +42,10 @@ SideNavToggle.propTypes = {
|
|
|
38
42
|
* Specify the text content for the toggle
|
|
39
43
|
*/
|
|
40
44
|
children: PropTypes.node,
|
|
45
|
+
/**
|
|
46
|
+
* Specify an optional className to be applied to the button node
|
|
47
|
+
*/
|
|
48
|
+
className: PropTypes.string,
|
|
41
49
|
/**
|
|
42
50
|
* Provide an optional function to be called when clicked
|
|
43
51
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@carbon-labs/react-ui-shell",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.28.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"provenance": true
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ibm/telemetry-js": "^1.9.1"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "4a8aca9677b353f76cfcd7021a2665d95a22782c"
|
|
37
37
|
}
|
|
@@ -335,3 +335,14 @@ div:has(.#{$prefix}--header)
|
|
|
335
335
|
overflow: visible;
|
|
336
336
|
}
|
|
337
337
|
}
|
|
338
|
+
|
|
339
|
+
.#{$prefix}--side-nav__toggle-container {
|
|
340
|
+
position: absolute;
|
|
341
|
+
background: $background;
|
|
342
|
+
inline-size: 100%;
|
|
343
|
+
inset-block-end: 0;
|
|
344
|
+
|
|
345
|
+
.#{$prefix}--side-nav__toggle.#{$prefix}--side-nav__toggle--collapsed:hover {
|
|
346
|
+
background: $background-hover;
|
|
347
|
+
}
|
|
348
|
+
}
|