@pingux/astro 2.21.0-alpha.1 → 2.21.0-alpha.2

package/lib/cjs/components/NavBar/NavBar.js

@@ -23,11 +23,12 @@ var _useProgressiveState3 = _interopRequireDefault(require("../../hooks/useProgr
 var _isIterable = require("../../utils/devUtils/props/isIterable");
 var _Box = _interopRequireDefault(require("../Box/Box"));
 var _react2 = require("@emotion/react");
-var _excluded = ["defaultSelectedKey", "selectedKey", "setSelectedKey", "hasRestoreFocus", "defaultExpandedKeys", "children", "variant"];
+var _excluded = ["isAuto\u0421ollapsible", "defaultSelectedKey", "selectedKey", "setSelectedKey", "hasRestoreFocus", "defaultExpandedKeys", "children", "variant"];
 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); }
 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; }
 var NavBar = function NavBar(props) {
-  var defaultSelectedKey = props.defaultSelectedKey,
+  var isAutoСollapsible = props.isAutoСollapsible,
+    defaultSelectedKey = props.defaultSelectedKey,
     selectedKeyProp = props.selectedKey,
     setSelectedKeyProp = props.setSelectedKey,
     hasRestoreFocus = props.hasRestoreFocus,
@@ -35,7 +36,8 @@ var NavBar = function NavBar(props) {
     children = props.children,
     variant = props.variant,
     others = (0, _objectWithoutProperties2["default"])(props, _excluded);
-  var _useState = (0, _react.useState)(defaultExpandedKeys),
+  var initialExpandedKeys = isAutoСollapsible && defaultExpandedKeys.length ? defaultExpandedKeys[0] : defaultExpandedKeys;
+  var _useState = (0, _react.useState)(initialExpandedKeys),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     expandedKeys = _useState2[0],
     setExpandedKeys = _useState2[1];
@@ -53,13 +55,16 @@ var NavBar = function NavBar(props) {
     item: children,
     key: children.key
   }];
-  var contextValue = {
-    selectedKey: selectedKey,
-    setSelectedKey: setSelectedKeyProp || setSelectedKey,
-    expandedKeys: expandedKeys,
-    setExpandedKeys: setExpandedKeys,
-    navStyles: navStyles
-  };
+  var contextValue = (0, _react.useMemo)(function () {
+    return {
+      isAutoСollapsible: isAutoСollapsible,
+      selectedKey: selectedKey,
+      setSelectedKey: setSelectedKeyProp || setSelectedKey,
+      expandedKeys: expandedKeys,
+      setExpandedKeys: setExpandedKeys,
+      navStyles: navStyles
+    };
+  }, [isAutoСollapsible, selectedKey, setSelectedKeyProp, setSelectedKey, expandedKeys, setExpandedKeys, navStyles]);
   return (0, _react2.jsx)(_NavBarContext.NavBarContext.Provider, {
     value: contextValue
   }, (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
@@ -100,6 +105,8 @@ var FocusableItem = function FocusableItem(props) {
   return childWithFocusHandle;
 };
 NavBar.propTypes = {
+  /** Allows only one item to be expanded. */
+  isAutoСollapsible: _propTypes["default"].bool,
   /** This applies a style to the entire nav tree. the options are default and popup. */
   variant: _propTypes["default"].oneOf(['default', 'popupNav']),
   /** Whether or not the focus will return to the previously focused element upon unmount. */
@@ -118,6 +125,7 @@ NavBar.propTypes = {
   setSelectedKey: _propTypes["default"].func
 };
 NavBar.defaultProps = {
+  isAutoСollapsible: false,
   defaultSelectedKey: '',
   defaultExpandedKeys: [],
   variant: 'default',

package/lib/cjs/components/NavBar/NavBar.stories.js

@@ -8,7 +8,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = exports.Controlled = void 0;
+exports["default"] = exports.Default = exports.Controlled = exports.AutoCollapse = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
@@ -474,4 +474,42 @@ var Controlled = function Controlled() {
     "data-id": "third-nav-bar-section"
   })));
 };
-exports.Controlled = Controlled;
+exports.Controlled = Controlled;
+var AutoCollapse = function AutoCollapse() {
+  return (0, _react2.jsx)(_index.NavBar, {
+    isAutoСollapsible: true
+  }, (0, _react2.jsx)(_index.Box, {
+    padding: "md",
+    key: "top-logo-parent"
+  }, (0, _react2.jsx)(_index.Link, {
+    "aria-label": "home link",
+    href: "https://pingidentity.com",
+    target: "_blank"
+  }, logo)), (0, _react2.jsx)(_index.Separator, {
+    m: 0,
+    backgroundColor: "neutral.60"
+  }), (0, _react2.jsx)(_index.Box, {
+    variant: "navBar.sectionContainer",
+    paddingBottom: "xl",
+    key: "first-section-container"
+  }, (0, _react2.jsx)(_index.NavBarItem, {
+    "data-id": "nav-bar-item",
+    icon: _GlobeIcon["default"],
+    id: "Overview",
+    key: "Overview",
+    text: "Overview"
+  }), (0, _react2.jsx)(_index.NavBarSection, {
+    items: data,
+    "data-id": "nav-bar-section"
+  }), (0, _react2.jsx)(_index.NavBarSection, {
+    items: secondData,
+    hasSeparator: true,
+    title: "PingOne Services",
+    "data-id": "second-nav-bar-section"
+  }), (0, _react2.jsx)(_index.NavBarSection, {
+    items: thirdData,
+    hasSeparator: true,
+    "data-id": "third-nav-bar-section"
+  })));
+};
+exports.AutoCollapse = AutoCollapse;

package/lib/cjs/components/NavBar/NavBar.test.js

@@ -49,12 +49,12 @@ var data = [{
   icon: _ViewDashboardIcon["default"],
   key: 'Dashboard',
   heading: 'Dashboard',
-  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles']
+  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles', 'Dashboard Unique']
 }, {
   icon: _AccountMultipleIcon["default"],
   key: 'Identities',
   heading: 'Identities',
-  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles']
+  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles', 'Identities Unique']
 }, {
   icon: _TransitConnectionVariantIcon["default"],
   key: 'Connections',
@@ -468,4 +468,18 @@ test('controlled version: items can be updated.', function () {
   expect(thisitem).toBeInTheDocument();
   _userEvent["default"].click(button);
   expect(_testWrapper.screen.queryByTestId('Environment title that is so long, it wraps')).not.toBeInTheDocument();
+});
+test('expand only one item', function () {
+  getComponent({
+    isAutoСollapsible: true
+  });
+  expect(_testWrapper.screen.queryByText('Dashboard Unique')).not.toBeInTheDocument();
+  expect(_testWrapper.screen.queryByText('Identities Unique')).not.toBeInTheDocument();
+  var headerButtons = _testWrapper.screen.getAllByRole('button');
+  _userEvent["default"].click(headerButtons[1]);
+  expect(_testWrapper.screen.queryByText('Dashboard Unique')).toBeInTheDocument();
+  expect(_testWrapper.screen.queryByText('Identities Unique')).not.toBeInTheDocument();
+  _userEvent["default"].click(headerButtons[2]);
+  expect(_testWrapper.screen.queryByText('Dashboard Unique')).not.toBeInTheDocument();
+  expect(_testWrapper.screen.queryByText('Identities Unique')).toBeInTheDocument();
 });

package/lib/cjs/components/NavBarSection/NavBarSection.js

@@ -78,7 +78,8 @@ var SectionItem = function SectionItem(_ref2) {
     children = item.children,
     others = (0, _objectWithoutProperties2["default"])(item, _excluded2);
   var navBarState = (0, _NavBarContext.useNavBarContext)();
-  var expandedKeys = navBarState.expandedKeys,
+  var isAutoСollapsible = navBarState.isAutoСollapsible,
+    expandedKeys = navBarState.expandedKeys,
     setExpandedKeys = navBarState.setExpandedKeys;
   var isExpanded = (0, _includes["default"])(expandedKeys).call(expandedKeys, key);
   var firstChildKey = children.length ? children[0].key : null;
@@ -87,7 +88,7 @@ var SectionItem = function SectionItem(_ref2) {
     var newArray;
     if (isOpen) {
       var _context;
-      newArray = (0, _concat["default"])(_context = []).call(_context, expandedKeys, [key]);
+      newArray = isAutoСollapsible ? [key] : (0, _concat["default"])(_context = []).call(_context, expandedKeys, [key]);
     } else {
       newArray = (0, _filter["default"])(expandedKeys).call(expandedKeys, function (thiskey) {
         return thiskey !== key;

package/lib/components/NavBar/NavBar.js

@@ -1,10 +1,10 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["defaultSelectedKey", "selectedKey", "setSelectedKey", "hasRestoreFocus", "defaultExpandedKeys", "children", "variant"];
+var _excluded = ["isAuto\u0421ollapsible", "defaultSelectedKey", "selectedKey", "setSelectedKey", "hasRestoreFocus", "defaultExpandedKeys", "children", "variant"];
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { FocusScope, useFocusManager } from '@react-aria/focus';
 import PropTypes from 'prop-types';
 import { NavBarContext } from '../../context/NavBarContext';
@@ -14,7 +14,8 @@ import { isIterableProp } from '../../utils/devUtils/props/isIterable';
 import Box from '../Box/Box';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var NavBar = function NavBar(props) {
-  var defaultSelectedKey = props.defaultSelectedKey,
+  var isAutoСollapsible = props.isAutoСollapsible,
+    defaultSelectedKey = props.defaultSelectedKey,
     selectedKeyProp = props.selectedKey,
     setSelectedKeyProp = props.setSelectedKey,
     hasRestoreFocus = props.hasRestoreFocus,
@@ -22,7 +23,8 @@ var NavBar = function NavBar(props) {
     children = props.children,
     variant = props.variant,
     others = _objectWithoutProperties(props, _excluded);
-  var _useState = useState(defaultExpandedKeys),
+  var initialExpandedKeys = isAutoСollapsible && defaultExpandedKeys.length ? defaultExpandedKeys[0] : defaultExpandedKeys;
+  var _useState = useState(initialExpandedKeys),
     _useState2 = _slicedToArray(_useState, 2),
     expandedKeys = _useState2[0],
     setExpandedKeys = _useState2[1];
@@ -40,13 +42,16 @@ var NavBar = function NavBar(props) {
     item: children,
     key: children.key
   }];
-  var contextValue = {
-    selectedKey: selectedKey,
-    setSelectedKey: setSelectedKeyProp || setSelectedKey,
-    expandedKeys: expandedKeys,
-    setExpandedKeys: setExpandedKeys,
-    navStyles: navStyles
-  };
+  var contextValue = useMemo(function () {
+    return {
+      isAutoСollapsible: isAutoСollapsible,
+      selectedKey: selectedKey,
+      setSelectedKey: setSelectedKeyProp || setSelectedKey,
+      expandedKeys: expandedKeys,
+      setExpandedKeys: setExpandedKeys,
+      navStyles: navStyles
+    };
+  }, [isAutoСollapsible, selectedKey, setSelectedKeyProp, setSelectedKey, expandedKeys, setExpandedKeys, navStyles]);
   return ___EmotionJSX(NavBarContext.Provider, {
     value: contextValue
   }, ___EmotionJSX(Box, _extends({
@@ -87,6 +92,8 @@ var FocusableItem = function FocusableItem(props) {
   return childWithFocusHandle;
 };
 NavBar.propTypes = {
+  /** Allows only one item to be expanded. */
+  isAutoСollapsible: PropTypes.bool,
   /** This applies a style to the entire nav tree. the options are default and popup. */
   variant: PropTypes.oneOf(['default', 'popupNav']),
   /** Whether or not the focus will return to the previously focused element upon unmount. */
@@ -105,6 +112,7 @@ NavBar.propTypes = {
   setSelectedKey: PropTypes.func
 };
 NavBar.defaultProps = {
+  isAutoСollapsible: false,
   defaultSelectedKey: '',
   defaultExpandedKeys: [],
   variant: 'default',

package/lib/components/NavBar/NavBar.stories.js

@@ -458,4 +458,41 @@ export var Controlled = function Controlled() {
     items: customData,
     "data-id": "third-nav-bar-section"
   })));
+};
+export var AutoCollapse = function AutoCollapse() {
+  return ___EmotionJSX(NavBar, {
+    isAutoСollapsible: true
+  }, ___EmotionJSX(Box, {
+    padding: "md",
+    key: "top-logo-parent"
+  }, ___EmotionJSX(Link, {
+    "aria-label": "home link",
+    href: "https://pingidentity.com",
+    target: "_blank"
+  }, logo)), ___EmotionJSX(Separator, {
+    m: 0,
+    backgroundColor: "neutral.60"
+  }), ___EmotionJSX(Box, {
+    variant: "navBar.sectionContainer",
+    paddingBottom: "xl",
+    key: "first-section-container"
+  }, ___EmotionJSX(NavBarItem, {
+    "data-id": "nav-bar-item",
+    icon: GlobeIcon,
+    id: "Overview",
+    key: "Overview",
+    text: "Overview"
+  }), ___EmotionJSX(NavBarSection, {
+    items: data,
+    "data-id": "nav-bar-section"
+  }), ___EmotionJSX(NavBarSection, {
+    items: secondData,
+    hasSeparator: true,
+    title: "PingOne Services",
+    "data-id": "second-nav-bar-section"
+  }), ___EmotionJSX(NavBarSection, {
+    items: thirdData,
+    hasSeparator: true,
+    "data-id": "third-nav-bar-section"
+  })));
 };

package/lib/components/NavBar/NavBar.test.js

@@ -40,12 +40,12 @@ var data = [{
   icon: ViewDashboard,
   key: 'Dashboard',
   heading: 'Dashboard',
-  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles']
+  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles', 'Dashboard Unique']
 }, {
   icon: AccountMultiple,
   key: 'Identities',
   heading: 'Identities',
-  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles']
+  children: ['Users', 'Group', 'Populations', 'Attributes', 'Roles', 'Identities Unique']
 }, {
   icon: TransitConnection,
   key: 'Connections',
@@ -459,4 +459,18 @@ test('controlled version: items can be updated.', function () {
   expect(thisitem).toBeInTheDocument();
   userEvent.click(button);
   expect(screen.queryByTestId('Environment title that is so long, it wraps')).not.toBeInTheDocument();
+});
+test('expand only one item', function () {
+  getComponent({
+    isAutoСollapsible: true
+  });
+  expect(screen.queryByText('Dashboard Unique')).not.toBeInTheDocument();
+  expect(screen.queryByText('Identities Unique')).not.toBeInTheDocument();
+  var headerButtons = screen.getAllByRole('button');
+  userEvent.click(headerButtons[1]);
+  expect(screen.queryByText('Dashboard Unique')).toBeInTheDocument();
+  expect(screen.queryByText('Identities Unique')).not.toBeInTheDocument();
+  userEvent.click(headerButtons[2]);
+  expect(screen.queryByText('Dashboard Unique')).not.toBeInTheDocument();
+  expect(screen.queryByText('Identities Unique')).toBeInTheDocument();
 });

package/lib/components/NavBarSection/NavBarSection.js

@@ -66,7 +66,8 @@ var SectionItem = function SectionItem(_ref2) {
     children = item.children,
     others = _objectWithoutProperties(item, _excluded2);
   var navBarState = useNavBarContext();
-  var expandedKeys = navBarState.expandedKeys,
+  var isAutoСollapsible = navBarState.isAutoСollapsible,
+    expandedKeys = navBarState.expandedKeys,
     setExpandedKeys = navBarState.setExpandedKeys;
   var isExpanded = _includesInstanceProperty(expandedKeys).call(expandedKeys, key);
   var firstChildKey = children.length ? children[0].key : null;
@@ -75,7 +76,7 @@ var SectionItem = function SectionItem(_ref2) {
     var newArray;
     if (isOpen) {
       var _context;
-      newArray = _concatInstanceProperty(_context = []).call(_context, expandedKeys, [key]);
+      newArray = isAutoСollapsible ? [key] : _concatInstanceProperty(_context = []).call(_context, expandedKeys, [key]);
     } else {
       newArray = _filterInstanceProperty(expandedKeys).call(expandedKeys, function (thiskey) {
         return thiskey !== key;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "2.21.0-alpha.1",
+  "version": "2.21.0-alpha.2",
   "description": "React component library for Ping Identity's design system",
   "repository": {
     "type": "git",