@pareto-engineering/design-system 4.0.0-alpha.20 → 4.0.0-alpha.21

package/dist/cjs/a/ContentTree/ContentTree.js

@@ -23,7 +23,8 @@ const ContentTree = _ref => {
     className: userClassName,
     style,
     target,
-    selectors
+    selectors,
+    color
     // ...otherProps
   } = _ref;
   (0, React.useInsertionEffect)(() => {
@@ -36,6 +37,7 @@ const ContentTree = _ref => {
     style: style
     // {...otherProps}
   }, /*#__PURE__*/React.createElement(_common.Tree, {
+    color: color,
     tree: contentTree
   }));
 };
@@ -61,7 +63,11 @@ ContentTree.propTypes = {
    */
   target: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.shape({
     current: _propTypes.default.node
-  })])
+  })]),
+  /**
+   * The color for the tree.
+   */
+  color: _propTypes.default.string
 };
 ContentTree.defaultProps = {
   selectors: ['h2', 'h3']

package/dist/cjs/a/ContentTree/common/Tree/Tree.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _exports = _interopRequireDefault(require("@pareto-engineering/bem/exports"));
+var _ = require("../../../..");
 var _useFirstVisibleNode = _interopRequireDefault(require("../useFirstVisibleNode"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -27,7 +28,8 @@ const Tree = _ref => {
     className: userClassName,
     style,
     tree,
-    displayDepth
+    displayDepth,
+    color
     // ...otherProps
   } = _ref;
   // The nodeIds to be used to get the first visible node
@@ -62,11 +64,11 @@ const Tree = _ref => {
     }, node.text)), node.children.length > 0 && /*#__PURE__*/React.createElement("ul", null, node.children.map(child => getNestedTree(child, depth - 1))));
   };
   const ContentTree = (0, React.useMemo)(() => tree.map(node => getNestedTree(node, displayDepth)), [tree]);
-  return /*#__PURE__*/React.createElement("ul", {
+  return ContentTree.length ? /*#__PURE__*/React.createElement(_.Card, {
     id: id,
-    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
+    className: [baseClassName, componentClassName, userClassName, color && `x-${color}`].filter(e => e).join(' '),
     style: style
-  }, ContentTree);
+  }, /*#__PURE__*/React.createElement(_.Card.Section, null, /*#__PURE__*/React.createElement("ul", null, ContentTree))) : null;
 };
 Tree.propTypes = {
   /**
@@ -95,9 +97,14 @@ Tree.propTypes = {
   /**
    * The levels of the tree to display.
    */
-  displayDepth: _propTypes.default.number
+  displayDepth: _propTypes.default.number,
+  /**
+   * The color of the tree.
+   */
+  color: _propTypes.default.string
 };
 Tree.defaultProps = {
+  color: 'interactive',
   displayDepth: 4
 };
 var _default = Tree;

package/dist/cjs/a/ContentTree/styles.scss

@@ -3,26 +3,38 @@
 
 @use "@pareto-engineering/bem";
 
+$default-dot-size: .5em;
 $default-margin: 1em;
 $default-padding: 1em;
 
 .#{bem.$base}.content-tree {
-  ul {
-    list-style: none;
-
-    > li > p > a {
-      color: var(--paragraph);
-    }
-  }
-
-  .#{bem.$base}.tree {
-    padding: 0;
+  > .#{bem.$base}.tree {
     position: sticky;
     top: 0;
 
+    ul {
+      list-style: none;
+      padding: 0 $default-padding;
+
+      > li > p > a {
+        color: var(--paragraph);
+        text-decoration: none;
+      }
+    }
+
     .#{bem.$modifier-active} {
-      color: var(--highlighted);
-      transition: color .2s;
+      font-weight: 700;
+
+      &::before {
+        background: var(--x);
+        border-radius: 50%;
+        content: "";
+        display: inline-block;
+        height: $default-dot-size;
+        margin-right: $default-margin;
+        text-align: center;
+        width: $default-dot-size;
+      }
     }
 
     li:not(:last-child) {
@@ -34,5 +46,3 @@ $default-padding: 1em;
     }
   }
 }
-
-

package/dist/es/a/ContentTree/ContentTree.js

@@ -17,7 +17,8 @@ const ContentTree = ({
   className: userClassName,
   style,
   target,
-  selectors
+  selectors,
+  color
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -30,6 +31,7 @@ const ContentTree = ({
     style: style
     // {...otherProps}
   }, /*#__PURE__*/React.createElement(Tree, {
+    color: color,
     tree: contentTree
   }));
 };
@@ -55,7 +57,11 @@ ContentTree.propTypes = {
    */
   target: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({
     current: PropTypes.node
-  })])
+  })]),
+  /**
+   * The color for the tree.
+   */
+  color: PropTypes.string
 };
 ContentTree.defaultProps = {
   selectors: ['h2', 'h3']

package/dist/es/a/ContentTree/common/Tree/Tree.js

@@ -3,6 +3,7 @@ import * as React from 'react';
 import { useState, useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import styleNames from '@pareto-engineering/bem/exports';
+import { Card } from "../../../..";
 
 // Local Definitions
 
@@ -18,7 +19,8 @@ const Tree = ({
   className: userClassName,
   style,
   tree,
-  displayDepth
+  displayDepth,
+  color
   // ...otherProps
 }) => {
   // The nodeIds to be used to get the first visible node
@@ -53,11 +55,11 @@ const Tree = ({
     }, node.text)), node.children.length > 0 && /*#__PURE__*/React.createElement("ul", null, node.children.map(child => getNestedTree(child, depth - 1))));
   };
   const ContentTree = useMemo(() => tree.map(node => getNestedTree(node, displayDepth)), [tree]);
-  return /*#__PURE__*/React.createElement("ul", {
+  return ContentTree.length ? /*#__PURE__*/React.createElement(Card, {
     id: id,
-    className: [baseClassName, componentClassName, userClassName].filter(e => e).join(' '),
+    className: [baseClassName, componentClassName, userClassName, color && `x-${color}`].filter(e => e).join(' '),
     style: style
-  }, ContentTree);
+  }, /*#__PURE__*/React.createElement(Card.Section, null, /*#__PURE__*/React.createElement("ul", null, ContentTree))) : null;
 };
 Tree.propTypes = {
   /**
@@ -86,9 +88,14 @@ Tree.propTypes = {
   /**
    * The levels of the tree to display.
    */
-  displayDepth: PropTypes.number
+  displayDepth: PropTypes.number,
+  /**
+   * The color of the tree.
+   */
+  color: PropTypes.string
 };
 Tree.defaultProps = {
+  color: 'interactive',
   displayDepth: 4
 };
 export default Tree;

package/dist/es/a/ContentTree/styles.scss

@@ -3,26 +3,38 @@
 
 @use "@pareto-engineering/bem";
 
+$default-dot-size: .5em;
 $default-margin: 1em;
 $default-padding: 1em;
 
 .#{bem.$base}.content-tree {
-  ul {
-    list-style: none;
-
-    > li > p > a {
-      color: var(--paragraph);
-    }
-  }
-
-  .#{bem.$base}.tree {
-    padding: 0;
+  > .#{bem.$base}.tree {
     position: sticky;
     top: 0;
 
+    ul {
+      list-style: none;
+      padding: 0 $default-padding;
+
+      > li > p > a {
+        color: var(--paragraph);
+        text-decoration: none;
+      }
+    }
+
     .#{bem.$modifier-active} {
-      color: var(--highlighted);
-      transition: color .2s;
+      font-weight: 700;
+
+      &::before {
+        background: var(--x);
+        border-radius: 50%;
+        content: "";
+        display: inline-block;
+        height: $default-dot-size;
+        margin-right: $default-margin;
+        text-align: center;
+        width: $default-dot-size;
+      }
     }
 
     li:not(:last-child) {
@@ -34,5 +46,3 @@ $default-padding: 1em;
     }
   }
 }
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pareto-engineering/design-system",
-  "version": "4.0.0-alpha.20",
+  "version": "4.0.0-alpha.21",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
@@ -67,5 +67,5 @@
     "relay-test-utils": "^15.0.0"
   },
   "browserslist": "> 2%",
-  "gitHead": "fffe052db834d7127d1270b562f935789ae17a3a"
+  "gitHead": "470f5e6dbe7b4b4da5f6e066303e9a41a744583e"
 }

package/src/ui/a/ContentTree/ContentTree.jsx

@@ -23,6 +23,7 @@ const ContentTree = ({
   style,
   target,
   selectors,
+  color,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -35,9 +36,7 @@ const ContentTree = ({
     <div
       id={id}
       className={[
-
         baseClassName,
-
         componentClassName,
         userClassName,
       ]
@@ -46,7 +45,7 @@ const ContentTree = ({
       style={style}
       // {...otherProps}
     >
-      <Tree tree={contentTree} />
+      <Tree color={color} tree={contentTree} />
     </div>
   )
 }
@@ -79,6 +78,11 @@ ContentTree.propTypes = {
     PropTypes.func,
     PropTypes.shape({ current: PropTypes.node }),
   ]),
+
+  /**
+   * The color for the tree.
+   */
+  color:PropTypes.string,
 }
 
 ContentTree.defaultProps = {

package/src/ui/a/ContentTree/common/Tree/Tree.jsx

@@ -7,6 +7,8 @@ import PropTypes from 'prop-types'
 
 import styleNames from '@pareto-engineering/bem/exports'
 
+import { Card } from 'ui'
+
 // Local Definitions
 
 import useFirstVisibleNode from '../useFirstVisibleNode'
@@ -24,6 +26,7 @@ const Tree = ({
   style,
   tree,
   displayDepth,
+  color,
   // ...otherProps
 }) => {
   // The nodeIds to be used to get the first visible node
@@ -80,23 +83,26 @@ const Tree = ({
     [tree],
   )
 
-  return (
-    <ul
+  return ContentTree.length ? (
+    <Card
       id={id}
       className={[
-
         baseClassName,
-
         componentClassName,
         userClassName,
+        color && `x-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
       style={style}
     >
-      {ContentTree}
-    </ul>
-  )
+      <Card.Section>
+        <ul>
+          {ContentTree}
+        </ul>
+      </Card.Section>
+    </Card>
+  ) : null
 }
 Tree.propTypes = {
   /**
@@ -129,9 +135,15 @@ Tree.propTypes = {
    * The levels of the tree to display.
    */
   displayDepth:PropTypes.number,
+
+  /**
+   * The color of the tree.
+   */
+  color:PropTypes.string,
 }
 
 Tree.defaultProps = {
+  color       :'interactive',
   displayDepth:4,
 }
 

package/src/ui/a/ContentTree/styles.scss

@@ -3,26 +3,38 @@
 
 @use "@pareto-engineering/bem";
 
+$default-dot-size: .5em;
 $default-margin: 1em;
 $default-padding: 1em;
 
 .#{bem.$base}.content-tree {
-  ul {
-    list-style: none;
-
-    > li > p > a {
-      color: var(--paragraph);
-    }
-  }
-
-  .#{bem.$base}.tree {
-    padding: 0;
+  > .#{bem.$base}.tree {
     position: sticky;
     top: 0;
 
+    ul {
+      list-style: none;
+      padding: 0 $default-padding;
+
+      > li > p > a {
+        color: var(--paragraph);
+        text-decoration: none;
+      }
+    }
+
     .#{bem.$modifier-active} {
-      color: var(--highlighted);
-      transition: color .2s;
+      font-weight: 700;
+
+      &::before {
+        background: var(--x);
+        border-radius: 50%;
+        content: "";
+        display: inline-block;
+        height: $default-dot-size;
+        margin-right: $default-margin;
+        text-align: center;
+        width: $default-dot-size;
+      }
     }
 
     li:not(:last-child) {
@@ -34,5 +46,3 @@ $default-padding: 1em;
     }
   }
 }
-
-

package/tests/__snapshots__/Storyshots.test.js.snap

@@ -598,11 +598,7 @@ exports[`Storyshots a/ContentTree Base 1`] = `
   </main>
   <div
     className="base content-tree v5 ml-v"
-  >
-    <ul
-      className="base tree"
-    />
-  </div>
+  />
 </div>
 `;