@pingux/astro 1.36.0-alpha.1 → 1.36.1-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.36.0](https://gitlab.corp.pingidentity.com/ux/pingux/compare/@pingux/astro@1.35.0...@pingux/astro@1.36.0) (2022-11-15)
+
+
+### Features
+
+* [UIP-5880] UiLibraryOverride theme - resolve navBar style conflicts ([d960e1f](https://gitlab.corp.pingidentity.com/ux/pingux/commit/d960e1f6f89794e7f56b73cd9a9d3766784118c3))
+
+
+
+
+
 # [1.35.0](https://gitlab.corp.pingidentity.com/ux/pingux/compare/@pingux/astro@1.34.0...@pingux/astro@1.35.0) (2022-11-10)
 
 

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

@@ -128,9 +128,10 @@ var logo = (0, _react2.jsx)("svg", {
   fill: "white"
 }));
 var data = [{
+  'data-id': 'dashboard-data-id',
+  heading: 'Dashboard',
   icon: _ViewDashboardIcon["default"],
   key: 'Dashboard',
-  heading: 'Dashboard',
   children: [(0, _react2.jsx)(_index.NavBarItemLink, {
     key: "Dashboard Link Group",
     id: "Dashboard Link Group",
@@ -142,6 +143,7 @@ var data = [{
     href: "https://pingidentity.com/"
   }, "Populations")]
 }, {
+  'data-id': 'identities-data-id',
   icon: _AccountMultipleIcon["default"],
   key: 'Identities',
   heading: 'Identities',
@@ -167,6 +169,7 @@ var data = [{
     href: "https://pingidentity.com/"
   }, "Roles")]
 }, {
+  'data-id': 'connections-data-id',
   icon: _TransitConnectionVariantIcon["default"],
   key: 'Connections',
   heading: 'Connections',
@@ -225,6 +228,7 @@ var data = [{
     href: "https://pingidentity.com/"
   }, "Resources")]
 }, {
+  'data-id': 'experiences-data-id',
   icon: _EmoticonHappyOutlineIcon["default"],
   key: 'Experiences',
   heading: 'Experiences',
@@ -284,6 +288,7 @@ var data = [{
   }, "Sender")]
 }];
 var secondData = [{
+  'data-id': 'mfa-data-id',
   icon: _FingerprintIcon["default"],
   key: 'MFA',
   heading: 'MFA',
@@ -298,6 +303,7 @@ var secondData = [{
     id: "MFA Button Group"
   }, "Group Test")]
 }, {
+  'data-id': 'risk-data-id',
   icon: _ScaleBalanceIcon["default"],
   key: 'Risk',
   heading: 'Risk',
@@ -312,6 +318,7 @@ var secondData = [{
     id: "Risk Button Group"
   }, "Group")]
 }, {
+  'data-id': 'verify-data-id',
   icon: Verify,
   key: 'Verify',
   heading: 'Verify',
@@ -326,6 +333,7 @@ var secondData = [{
     id: "Verify Button Group"
   }, "Group")]
 }, {
+  'data-id': 'credentials-data-id',
   icon: Credentials,
   key: 'Credentials',
   heading: 'Credentials',
@@ -341,6 +349,7 @@ var secondData = [{
   }, "Group")]
 }];
 var thirdData = [{
+  'data-id': 'environment-data-id',
   icon: _EarthIcon["default"],
   key: 'Environment',
   heading: 'Environment title that is so long, it wraps',

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

@@ -35,7 +35,10 @@ var _testWrapper = require("../../utils/testUtils/testWrapper");
 var _react2 = require("@emotion/react");
 
 var DATA_ID = 'data-id';
+var SECTION_BUTTON_DATA_ID = 'section-data-id';
 var data = [{
+  'data-id': SECTION_BUTTON_DATA_ID,
+  'data-testid': SECTION_BUTTON_DATA_ID,
   icon: _GlobeIcon["default"],
   key: 'Overview',
   heading: 'Overview',
@@ -361,4 +364,8 @@ test('should change focus between nav children on arrow key press', function ()
 test('should render NavBarSection with data-id', function () {
   getComponent();
   expect(_testWrapper.screen.getByTestId(DATA_ID)).toHaveAttribute(DATA_ID);
+});
+test('should render NavBarSection button with data-id', function () {
+  getComponent();
+  expect(_testWrapper.screen.getByTestId(SECTION_BUTTON_DATA_ID)).toHaveAttribute(DATA_ID);
 });

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

@@ -44,7 +44,8 @@ var _NavBarItemHeader = _interopRequireDefault(require("./NavBarItemHeader"));
 
 var _react2 = require("@emotion/react");
 
-var _excluded = ["hasSeparator", "title", "items"];
+var _excluded = ["hasSeparator", "title", "items"],
+    _excluded2 = ["key", "children"];
 
 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); }
 
@@ -96,7 +97,8 @@ var NavBarSection = function NavBarSection(_ref) {
 var SectionItem = function SectionItem(_ref2) {
   var item = _ref2.item;
   var key = item.key,
-      children = item.children;
+      children = item.children,
+      others = (0, _objectWithoutProperties2["default"])(item, _excluded2);
   var headerButtonRef = (0, _react.useRef)();
   var navBarState = (0, _NavBarContext.useNavBarContext)();
   var expandedKeys = navBarState.expandedKeys,
@@ -171,7 +173,7 @@ var SectionItem = function SectionItem(_ref2) {
     onPress: function onPress() {
       return onExpandedChange(!isExpanded);
     }
-  }, keyboardProps), (0, _react2.jsx)(_NavBarItemHeader["default"], {
+  }, keyboardProps, others), (0, _react2.jsx)(_NavBarItemHeader["default"], {
     item: item
   })), isExpanded && (0, _react2.jsx)(_NavBarItemBody["default"], {
     item: item,

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

@@ -104,9 +104,10 @@ var logo = ___EmotionJSX("svg", {
 }));
 
 var data = [{
+  'data-id': 'dashboard-data-id',
+  heading: 'Dashboard',
   icon: ViewDashboard,
   key: 'Dashboard',
-  heading: 'Dashboard',
   children: [___EmotionJSX(NavBarItemLink, {
     key: "Dashboard Link Group",
     id: "Dashboard Link Group",
@@ -118,6 +119,7 @@ var data = [{
     href: "https://pingidentity.com/"
   }, "Populations")]
 }, {
+  'data-id': 'identities-data-id',
   icon: AccountMultiple,
   key: 'Identities',
   heading: 'Identities',
@@ -143,6 +145,7 @@ var data = [{
     href: "https://pingidentity.com/"
   }, "Roles")]
 }, {
+  'data-id': 'connections-data-id',
   icon: TransitConnection,
   key: 'Connections',
   heading: 'Connections',
@@ -201,6 +204,7 @@ var data = [{
     href: "https://pingidentity.com/"
   }, "Resources")]
 }, {
+  'data-id': 'experiences-data-id',
   icon: EmoticonHappy,
   key: 'Experiences',
   heading: 'Experiences',
@@ -260,6 +264,7 @@ var data = [{
   }, "Sender")]
 }];
 var secondData = [{
+  'data-id': 'mfa-data-id',
   icon: Fingerprint,
   key: 'MFA',
   heading: 'MFA',
@@ -274,6 +279,7 @@ var secondData = [{
     id: "MFA Button Group"
   }, "Group Test")]
 }, {
+  'data-id': 'risk-data-id',
   icon: ScaleBalance,
   key: 'Risk',
   heading: 'Risk',
@@ -288,6 +294,7 @@ var secondData = [{
     id: "Risk Button Group"
   }, "Group")]
 }, {
+  'data-id': 'verify-data-id',
   icon: Verify,
   key: 'Verify',
   heading: 'Verify',
@@ -302,6 +309,7 @@ var secondData = [{
     id: "Verify Button Group"
   }, "Group")]
 }, {
+  'data-id': 'credentials-data-id',
   icon: Credentials,
   key: 'Credentials',
   heading: 'Credentials',
@@ -317,6 +325,7 @@ var secondData = [{
   }, "Group")]
 }];
 var thirdData = [{
+  'data-id': 'environment-data-id',
   icon: Earth,
   key: 'Environment',
   heading: 'Environment title that is so long, it wraps',

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

@@ -15,7 +15,10 @@ import axeTest from '../../utils/testUtils/testAxe';
 import { render, screen, fireEvent } from '../../utils/testUtils/testWrapper';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var DATA_ID = 'data-id';
+var SECTION_BUTTON_DATA_ID = 'section-data-id';
 var data = [{
+  'data-id': SECTION_BUTTON_DATA_ID,
+  'data-testid': SECTION_BUTTON_DATA_ID,
   icon: GlobeIcon,
   key: 'Overview',
   heading: 'Overview',
@@ -288,4 +291,8 @@ test('should change focus between nav children on arrow key press', function ()
 test('should render NavBarSection with data-id', function () {
   getComponent();
   expect(screen.getByTestId(DATA_ID)).toHaveAttribute(DATA_ID);
+});
+test('should render NavBarSection button with data-id', function () {
+  getComponent();
+  expect(screen.getByTestId(SECTION_BUTTON_DATA_ID)).toHaveAttribute(DATA_ID);
 });

package/lib/components/NavBarSection/NavBarSection.js

@@ -3,7 +3,8 @@ import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["hasSeparator", "title", "items"];
+var _excluded = ["hasSeparator", "title", "items"],
+    _excluded2 = ["key", "children"];
 import React, { useRef } from 'react';
 import { useFocusManager } from '@react-aria/focus';
 import { useKeyboard } from '@react-aria/interactions';
@@ -63,8 +64,11 @@ var NavBarSection = function NavBarSection(_ref) {
 
 var SectionItem = function SectionItem(_ref2) {
   var item = _ref2.item;
+
   var key = item.key,
-      children = item.children;
+      children = item.children,
+      others = _objectWithoutProperties(item, _excluded2);
+
   var headerButtonRef = useRef();
   var navBarState = useNavBarContext();
   var expandedKeys = navBarState.expandedKeys,
@@ -139,7 +143,7 @@ var SectionItem = function SectionItem(_ref2) {
     onPress: function onPress() {
       return onExpandedChange(!isExpanded);
     }
-  }, keyboardProps), ___EmotionJSX(NavBarItemHeader, {
+  }, keyboardProps, others), ___EmotionJSX(NavBarItemHeader, {
     item: item
   })), isExpanded && ___EmotionJSX(NavBarItemBody, {
     item: item,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "1.36.0-alpha.1",
+  "version": "1.36.1-alpha.0",
   "description": "PingUX themeable React component library",
   "repository": {
     "type": "git",