@pingux/astro 2.27.0 → 2.27.1-alpha.1

package/lib/components/TreeView/TreeViewItem.js

@@ -1,47 +1,46 @@
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
-import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
+import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import FileIcon from '@pingux/mdi-react/FileIcon';
+import { useOption } from '@react-aria/listbox';
 import PropTypes from 'prop-types';
 import { useTreeViewContext } from '../../context/TreeViewContext';
 import { Box } from '../../index';
 import TreeViewRow from './TreeViewRow';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var TreeViewItem = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context, _context2, _context3;
   var item = props.item,
     title = props.title;
+  var key = item.key;
   var treeItemRef = useRef();
   /* istanbul ignore next */
   useImperativeHandle(ref, function () {
     return treeItemRef.current;
   });
   var _useTreeViewContext = useTreeViewContext(),
-    state = _useTreeViewContext.state,
-    tree = _useTreeViewContext.tree;
-  var isExpanded = _includesInstanceProperty(_context = _Array$from(state.expandedKeys)).call(_context, item.key);
-  var isSelected = _includesInstanceProperty(_context2 = _Array$from(tree.selectedKeys)).call(_context2, item.key);
-  var isDisabled = _includesInstanceProperty(_context3 = _Array$from(state.disabledKeys)).call(_context3, item.key);
-
-  // this component may seem unnecessary, but it will be where the
-  // useOption and dragAndDrop stuff will go
-  // this comment will be removed at that time.
-
-  return ___EmotionJSX(Box, {
+    state = _useTreeViewContext.state;
+  var _useOption = useOption({
+      key: key
+    }, state, treeItemRef),
+    optionProps = _useOption.optionProps,
+    isSelected = _useOption.isSelected,
+    isDisabled = _useOption.isDisabled;
+  var isExpanded = state.expandedKeys.has(key);
+  return ___EmotionJSX(Box, _extends({
     as: "li",
     isRow: true,
     ref: treeItemRef,
+    "aria-disabled": isDisabled
+  }, optionProps, {
     role: "treeitem",
-    "aria-selected": isSelected,
-    "aria-disabled": isDisabled,
     sx: {
       width: '100%',
       ml: '36px',
       ':not(:last-child)': {
         pb: 'sm'
       }
-    }
-  }, ___EmotionJSX(TreeViewRow, {
+    },
+    "aria-selected": isSelected
+  }), ___EmotionJSX(TreeViewRow, {
     item: item,
     title: title,
     mainIcon: FileIcon,

package/lib/components/TreeView/TreeViewSection.js

@@ -1,7 +1,8 @@
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
-import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
+import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import { useOption } from '@react-aria/listbox';
 import PropTypes from 'prop-types';
 import { useTreeViewContext } from '../../context/TreeViewContext';
 import { Box, TreeViewItem } from '../../index';
@@ -9,22 +10,26 @@ import { SectionOrItemRender } from './TreeView';
 import TreeViewRow from './TreeViewRow';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var TreeViewSection = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context, _context2, _context3, _context4;
+  var _context;
   var item = props.item,
     items = props.items,
     title = props.title;
+  var key = item.key;
   var treeSectionRef = useRef();
   /* istanbul ignore next */
   useImperativeHandle(ref, function () {
     return treeSectionRef.current;
   });
   var _useTreeViewContext = useTreeViewContext(),
-    state = _useTreeViewContext.state,
-    tree = _useTreeViewContext.tree;
-  var isExpanded = _includesInstanceProperty(_context = _Array$from(state.expandedKeys)).call(_context, item.key);
-  var isSelected = _includesInstanceProperty(_context2 = _Array$from(tree.selectedKeys)).call(_context2, item.key);
-  var isDisabled = _includesInstanceProperty(_context3 = _Array$from(state.disabledKeys)).call(_context3, item.key);
-  return ___EmotionJSX(Box, {
+    state = _useTreeViewContext.state;
+  var _useOption = useOption({
+      key: key
+    }, state, treeSectionRef),
+    optionProps = _useOption.optionProps,
+    isDisabled = _useOption.isDisabled,
+    isSelected = _useOption.isSelected;
+  var isExpanded = state.expandedKeys.has(key);
+  return ___EmotionJSX(Box, _extends({
     ref: treeSectionRef,
     as: "li",
     sx: {
@@ -32,11 +37,12 @@ var TreeViewSection = /*#__PURE__*/forwardRef(function (props, ref) {
         pb: 'sm'
       }
     },
-    role: "treeitem",
     "aria-expanded": isExpanded,
-    "aria-selected": isSelected,
     "aria-disabled": isDisabled
-  }, ___EmotionJSX(TreeViewRow, {
+  }, optionProps, {
+    role: "treeitem",
+    "aria-selected": isSelected
+  }), ___EmotionJSX(TreeViewRow, {
     item: item,
     title: title,
     items: items,
@@ -50,7 +56,7 @@ var TreeViewSection = /*#__PURE__*/forwardRef(function (props, ref) {
     sx: {
       pl: 'md'
     }
-  }, _mapInstanceProperty(_context4 = _Array$from(items)).call(_context4, function (_item) {
+  }, _mapInstanceProperty(_context = _Array$from(items)).call(_context, function (_item) {
     var _item$value$items;
     return SectionOrItemRender(((_item$value$items = _item.value.items) === null || _item$value$items === void 0 ? void 0 : _item$value$items.length) > 0, ___EmotionJSX(TreeViewSection, {
       item: _item,

package/lib/recipes/TrialExperienceStatusBar.stories.js

@@ -1,22 +1,10 @@
-import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
-import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
-import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-import _Object$getOwnPropertyDescriptor from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor";
-import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
-import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
-import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
-import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useState } from 'react';
 import CheckCircleIcon from '@pingux/mdi-react/CheckCircleIcon';
 import { Box, Icon, IconButton, Link, Separator, Text } from '../index';
+import { FIGMA_LINKS } from '../utils/designUtils/figmaLinks.js';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export default {
   title: 'Recipes/Trial Experience Nav'
@@ -66,36 +54,53 @@ var EarthCircleIcon = function EarthCircleIcon() {
 };
 var RadioButtonIcon = function RadioButtonIcon(props) {
   return ___EmotionJSX("svg", _extends({
-    "data-name": "Layer 1",
+    viewBox: "0 0 22 22",
+    fill: "none",
     xmlns: "http://www.w3.org/2000/svg",
-    viewBox: "0 0 17.5 17.5",
     "aria-labelledby": "radio-button-icon-title"
   }, props), ___EmotionJSX("title", {
     id: "radio-button-icon-title"
   }, "Radio Button Icon"), ___EmotionJSX("path", {
-    className: "cls-1",
-    fill: "#B3BEE8",
-    d: "M9,18.25A8.75,8.75,0,1,1,17.75,9.5,8.76,8.76,0,0,1,9,18.25ZM9,1.75A7.75,7.75,0,1,0,16.75,9.5,7.76,7.76,0,0,0,9,1.75Z",
-    transform: "translate(-0.25 -0.75)"
+    d: "M11 18.3333C9.05508 18.3333 7.18982 17.5607 5.81455 16.1854C4.43928 14.8102 3.66667 12.9449 3.66667 11C3.66667 9.05507 4.43928 7.18981 5.81455 5.81455C7.18982 4.43928 9.05508 3.66666 11 3.66666C12.9449 3.66666 14.8102 4.43928 16.1854 5.81455C17.5607 7.18981 18.3333 9.05507 18.3333 11C18.3333 12.9449 17.5607 14.8102 16.1854 16.1854C14.8102 17.5607 12.9449 18.3333 11 18.3333ZM11 1.83333C9.79621 1.83333 8.60422 2.07043 7.49207 2.5311C6.37992 2.99177 5.36939 3.66698 4.51819 4.51818C2.7991 6.23727 1.83333 8.56884 1.83333 11C1.83333 13.4311 2.7991 15.7627 4.51819 17.4818C5.36939 18.333 6.37992 19.0082 7.49207 19.4689C8.60422 19.9296 9.79621 20.1667 11 20.1667C13.4311 20.1667 15.7627 19.2009 17.4818 17.4818C19.2009 15.7627 20.1667 13.4311 20.1667 11C20.1667 9.79621 19.9296 8.60421 19.4689 7.49206C19.0082 6.37991 18.333 5.36939 17.4818 4.51818C16.6306 3.66698 15.6201 2.99177 14.5079 2.5311C13.3958 2.07043 12.2038 1.83333 11 1.83333Z",
+    fill: "#B3BEE8"
   }), ___EmotionJSX("circle", {
-    className: "cls-2",
-    cx: "8.75",
-    cy: "8.75",
-    r: "8.05",
+    cx: "11",
+    cy: "11",
+    r: "8",
     fill: "white"
   }));
 };
+var IntegrateYourAppIcon = function IntegrateYourAppIcon(props) {
+  return ___EmotionJSX("svg", _extends({
+    width: "24",
+    height: "24",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg",
+    "aria-labelledby": "integrate-your-app-icon-title"
+  }, props), ___EmotionJSX("title", {
+    id: "integrate-your-app-icon-title"
+  }, "Integrate Your App Icon"), ___EmotionJSX("path", {
+    d: "M2 5H5V8H2V5ZM8.98124 9.18922C8.40906 8.51487 7.5878 8 6 8V5C8.4122 5 10.0909 5.86013 11.2688 7.24828C12.3198 8.48703 12.8987 10.0806 13.3691 11.3758L13.4097 11.4874C13.9318 12.9231 14.3502 14.0229 15.0188 14.8108C15.5909 15.4851 16.4122 16 18 16V19H6V16H11.0563C10.9745 15.8905 10.8976 15.7846 10.8245 15.6841L10.7869 15.6323C10.2778 14.9323 9.93844 14.4905 9.36346 14.1517C8.79448 13.8164 7.83564 13.5 6 13.5V10.5C7.7039 10.5 9.02155 10.73 10.0813 11.1674C9.7558 10.3671 9.42315 9.71004 8.98124 9.18922ZM5 10.5H2V13.5H5V10.5ZM2 16H5V19H2V16ZM22 16H19V19H22V16Z",
+    fill: "#FF8324"
+  }));
+};
 var data = [{
   title: 'Design a Solution',
   icon: ArtIcon,
   iconTitle: 'Art Icon',
   key: 0,
   links: [{
+    isLinkSelected: true,
     title: 'Registration'
   }, {
+    isLinkSelected: true,
     title: 'Authentication'
   }, {
+    isLinkSelected: true,
     title: 'Profile management'
+  }, {
+    title: 'Account recovery'
   }, {
     title: 'Experience your solution'
   }]
@@ -119,6 +124,9 @@ var data = [{
   iconTitle: 'Earth Circle Icon',
   key: 2,
   links: [{
+    customIcon: IntegrateYourAppIcon,
+    title: 'Integrate your app'
+  }, {
     title: 'Learn about DaVinci'
   }, {
     title: 'View a workflow'
@@ -131,7 +139,11 @@ var sx = {
     justifyContent: 'center',
     mr: 'sm',
     borderRadius: '50%',
-    zIndex: 3
+    zIndex: 3,
+    '& > svg ': {
+      width: '28px',
+      height: '28px'
+    }
   },
   headingSeparator: {
     flexGrow: 1,
@@ -146,7 +158,7 @@ var sx = {
     color: 'accent.30',
     lineHeight: '18px',
     fontWeight: '3',
-    m: '12px 0px 28px 5px',
+    m: '12px 0px 28px 0px',
     maxWidth: '195px'
   },
   linkRowIconButton: {
@@ -174,19 +186,12 @@ var sx = {
       fill: 'accent.80'
     }
   },
-  linkRowSeparator: {
-    flexGrow: 1,
-    backgroundColor: 'accent.30',
-    width: '1px !important',
-    zIndex: 2,
-    m: '-4px 5px -5px 11.5px !important'
-  },
   linkRowText: {
     fontSize: 'md',
     color: '#163CE3',
     lineHeight: '18px',
     fontWeight: '0',
-    m: '3px 0px 20px 10px',
+    m: '3px 0px 15px 10px',
     maxWidth: '140px'
   },
   container: {
@@ -204,26 +209,11 @@ var Stage = function Stage(_ref) {
     iconTitle = _ref.iconTitle,
     links = _ref.links,
     isLastStage = _ref.isLastStage;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    selectedLinks = _useState2[0],
-    updateSelectedLinks = _useState2[1];
-  var onSelectionChange = function onSelectionChange(thisIndex) {
-    var _context2;
-    var newArray = [];
-    if (_includesInstanceProperty(selectedLinks).call(selectedLinks, thisIndex)) {
-      newArray = _filterInstanceProperty(selectedLinks).call(selectedLinks, function (link) {
-        return link !== thisIndex;
-      });
-    } else {
-      var _context;
-      newArray = _concatInstanceProperty(_context = []).call(_context, selectedLinks, [thisIndex]);
-    }
-    updateSelectedLinks(_concatInstanceProperty(_context2 = []).call(_context2, newArray));
-  };
   return ___EmotionJSX(Box, {
     isRow: true
-  }, ___EmotionJSX(Box, null, ___EmotionJSX(Box, {
+  }, ___EmotionJSX(Box, {
+    mr: "xs"
+  }, ___EmotionJSX(Box, {
     minWidth: "39.5px",
     minHeight: "39.5px",
     sx: sx.iconContainer
@@ -233,7 +223,7 @@ var Stage = function Stage(_ref) {
       name: iconTitle
     },
     color: "accent.40",
-    size: "24px",
+    size: "15px",
     sx: {
       zIndex: 3
     }
@@ -245,66 +235,40 @@ var Stage = function Stage(_ref) {
   }, title), ___EmotionJSX(Box, {
     pl: "0px",
     mb: "25px"
-  }, _mapInstanceProperty(links).call(links, function (link, index) {
+  }, _mapInstanceProperty(links).call(links, function (link) {
     return ___EmotionJSX(LinkRow, _extends({}, link, {
-      onSelectionChange: onSelectionChange,
-      index: index,
-      isLinkSelected: selectedLinks.length !== 0,
-      isLastLink: index === links.length - 1,
       key: link.title
     }));
   }))));
 };
 var LinkRow = function LinkRow(_ref2) {
-  var index = _ref2.index,
-    isLastLink = _ref2.isLastLink,
+  var title = _ref2.title,
     isLinkSelected = _ref2.isLinkSelected,
-    onSelectionChange = _ref2.onSelectionChange,
-    title = _ref2.title;
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isSelected = _useState4[0],
-    handleSelectionChange = _useState4[1];
-  var _useState5 = useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    verticalSeparatorHeight = _useState6[0],
-    setVerticalSeparatorHeight = _useState6[1];
-  var iconRef = useRef();
-  var rowRef = useRef();
-  useEffect(function () {
-    var _rowRef$current$getBo = rowRef.current.getBoundingClientRect(),
-      height = _rowRef$current$getBo.height;
-    var _iconRef$current$getB = iconRef.current.getBoundingClientRect(),
-      iconRefHeight = _iconRef$current$getB.height;
-    var marginAccommodation = 4;
-    var halfIconHeight = iconRefHeight / 2;
-    setVerticalSeparatorHeight(height - halfIconHeight - marginAccommodation);
-  }, [iconRef, rowRef]);
+    customIcon = _ref2.customIcon;
+  var _useState = useState(isLinkSelected),
+    _useState2 = _slicedToArray(_useState, 2),
+    isSelected = _useState2[0],
+    handleSelectionChange = _useState2[1];
   var onIconPress = function onIconPress() {
     handleSelectionChange(!isSelected);
-    onSelectionChange(index);
   };
   return ___EmotionJSX(Box, {
-    isRow: true,
-    ref: rowRef
-  }, ___EmotionJSX(Box, null, ___EmotionJSX(IconButton, {
+    isRow: true
+  }, ___EmotionJSX(Box, null, customIcon ? ___EmotionJSX(Icon, {
+    icon: customIcon,
+    size: "22px"
+  }) : ___EmotionJSX(IconButton, {
     "aria-label": "completed step icon indicator",
     onPress: onIconPress,
-    ref: iconRef,
     sx: sx.linkRowIconButton
   }, ___EmotionJSX(Icon, {
     icon: isSelected ? CheckCircleIcon : RadioButtonIcon,
-    size: "sm",
-    sx: isSelected ? sx.linkRowIconButton : sx.linkRowIconNotSelected,
+    size: "22px",
+    sx: isSelected ? sx.linkRowIconSelected : sx.linkRowIconNotSelected,
     title: {
       name: 'Check Circle Icon'
     }
-  })), !isLastLink && isLinkSelected && ___EmotionJSX(Separator, {
-    orientation: "vertical",
-    sx: _objectSpread(_objectSpread({}, sx.linkRowSeparator), {}, {
-      maxHeight: verticalSeparatorHeight
-    })
-  })), ___EmotionJSX(Link, {
+  }))), ___EmotionJSX(Link, {
     href: "https://www.pingidentity.com",
     sx: sx.linkRowText,
     target: "_blank"
@@ -327,4 +291,10 @@ export var Default = function Default() {
       key: stage.title
     });
   })));
+};
+Default.parameters = {
+  design: {
+    type: 'figma',
+    url: FIGMA_LINKS.trialExperienceNav["default"]
+  }
 };

package/lib/utils/designUtils/figmaLinks.js

@@ -114,6 +114,9 @@ export var FIGMA_LINKS = {
   slider: {
     "default": 'https://www.figma.com/file/bpbEw54gTTcdIiZs4PKK1p/Astro-Specs?node-id=43112%3A1773&mode=dev'
   },
+  trialExperienceNav: {
+    "default": 'https://www.figma.com/file/bpbEw54gTTcdIiZs4PKK1p/Astro-Specs?node-id=43368%3A159&mode=dev'
+  },
   trialExperienceButtons: {
     "default": 'https://www.figma.com/file/bpbEw54gTTcdIiZs4PKK1p/Astro-Specs?node-id=43369%3A445'
   },

package/package.json

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