@instructure/ui-tree-browser 11.7.3-snapshot-25 → 11.7.3-snapshot-27

package/lib/TreeBrowser/v2/TreeCollection/index.js

@@ -14,7 +14,7 @@ var _props = require("./props");
 var _TreeBrowserContext = _interopRequireDefault(require("../TreeBrowserContext"));
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 var _react2 = require("@emotion/react");
-var _dec, _class, _TreeCollection;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -44,72 +44,88 @@ parent: TreeBrowser
 id: TreeBrowser.Collection
 ---
 **/
-let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_styles.default, 'TreeBrowserTreeCollection'), _dec(_class = (_TreeCollection = class TreeCollection extends _react.Component {
+let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_styles.default, 'TreeBrowserTreeCollection'), _dec(_class = class TreeCollection extends _react.Component {
+  static displayName = "TreeCollection";
+  static componentId = 'TreeBrowser.Collection';
+  static allowedProps = _props.allowedProps;
+  static contextType = _TreeBrowserContext.default;
+  static defaultProps = {
+    collections: [],
+    items: [],
+    expanded: false,
+    selection: '',
+    size: 'medium',
+    variant: 'folderTree',
+    getItemProps: props => props,
+    getCollectionProps: props => props,
+    isCollectionFlattened: false
+  };
+  ref = null;
   constructor(props) {
     super(props);
-    this.ref = null;
-    this.handleFocus = (e, item) => {
-      e.stopPropagation();
-      this.setState({
-        focused: `${item.type}_${item.id}`
-      });
-    };
-    this.handleBlur = (e, _item) => {
-      e.stopPropagation();
-      this.setState({
-        focused: ''
-      });
-    };
-    this.handleCollectionClick = e => {
-      const _this$props = this.props,
-        id = _this$props.id,
-        onCollectionClick = _this$props.onCollectionClick,
-        expanded = _this$props.expanded;
-      const collection = {
-        id,
-        expanded: !expanded,
-        type: 'collection'
-      };
-      if (onCollectionClick && typeof onCollectionClick === 'function') {
-        onCollectionClick(e, collection);
-      }
-    };
-    this.handleCollectionKeyDown = e => {
-      const _this$props2 = this.props,
-        id = _this$props2.id,
-        onKeyDown = _this$props2.onKeyDown,
-        expanded = _this$props2.expanded;
-      const collection = {
-        id,
-        expanded: !expanded,
-        type: 'collection'
-      };
-      if (onKeyDown && typeof onKeyDown === 'function') {
-        onKeyDown(e, collection);
-      }
-    };
     this.state = {
       focused: ''
     };
   }
   componentDidMount() {
-    var _this$props$makeStyle, _this$props3, _this$context;
-    (_this$props$makeStyle = (_this$props3 = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props3, {
-      animation: (_this$context = this.context) === null || _this$context === void 0 ? void 0 : _this$context.animation
+    this.props.makeStyles?.({
+      animation: this.context?.animation
     });
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props4, _this$context2;
-    (_this$props$makeStyle2 = (_this$props4 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props4, {
-      animation: (_this$context2 = this.context) === null || _this$context2 === void 0 ? void 0 : _this$context2.animation
+    this.props.makeStyles?.({
+      animation: this.context?.animation
     });
   }
   get itemsLevel() {
-    const _this$props5 = this.props,
-      level = _this$props5.level,
-      isCollectionFlattened = _this$props5.isCollectionFlattened;
+    const {
+      level,
+      isCollectionFlattened
+    } = this.props;
     return isCollectionFlattened ? level : level + 1;
   }
+  handleFocus = (e, item) => {
+    e.stopPropagation();
+    this.setState({
+      focused: `${item.type}_${item.id}`
+    });
+  };
+  handleBlur = (e, _item) => {
+    e.stopPropagation();
+    this.setState({
+      focused: ''
+    });
+  };
+  handleCollectionClick = e => {
+    const {
+      id,
+      onCollectionClick,
+      expanded
+    } = this.props;
+    const collection = {
+      id,
+      expanded: !expanded,
+      type: 'collection'
+    };
+    if (onCollectionClick && typeof onCollectionClick === 'function') {
+      onCollectionClick(e, collection);
+    }
+  };
+  handleCollectionKeyDown = e => {
+    const {
+      id,
+      onKeyDown,
+      expanded
+    } = this.props;
+    const collection = {
+      id,
+      expanded: !expanded,
+      type: 'collection'
+    };
+    if (onKeyDown && typeof onKeyDown === 'function') {
+      onKeyDown(e, collection);
+    }
+  };
   get collectionsCount() {
     const collections = this.props.collections;
     return collections && collections.length > 0 ? collections.length : 0;
@@ -122,10 +138,11 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
     return this.collectionsCount + this.itemsCount + (this.props.renderBeforeItems ? 1 : 0) + (this.props.renderAfterItems ? 1 : 0);
   }
   sortChildren() {
-    const _this$props6 = this.props,
-      collections = _this$props6.collections,
-      items = _this$props6.items,
-      compareFunc = _this$props6.compareFunc;
+    const {
+      collections,
+      items,
+      compareFunc
+    } = this.props;
     if (!compareFunc) return [];
     const collections_ = collections ? collections.map(collection => {
       return {
@@ -144,13 +161,14 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
     return renderQueue;
   }
   renderChildren() {
-    const _this$props7 = this.props,
-      collections = _this$props7.collections,
-      items = _this$props7.items,
-      id = _this$props7.id,
-      renderBeforeItems = _this$props7.renderBeforeItems,
-      renderAfterItems = _this$props7.renderAfterItems,
-      compareFunc = _this$props7.compareFunc;
+    const {
+      collections,
+      items,
+      id,
+      renderBeforeItems,
+      renderAfterItems,
+      compareFunc
+    } = this.props;
     let position = 1;
     const sortedChildren = this.sortChildren();
     return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -168,11 +186,12 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
     });
   }
   renderCollectionChildren(collectionId, child, position, keyword) {
-    const _this$props8 = this.props,
-      selection = _this$props8.selection,
-      onKeyDown = _this$props8.onKeyDown,
-      getItemProps = _this$props8.getItemProps,
-      styles = _this$props8.styles;
+    const {
+      selection,
+      onKeyDown,
+      getItemProps,
+      styles
+    } = this.props;
     const key = `${collectionId}_${keyword}`;
     const ariaSelected = {};
     if (selection) {
@@ -194,7 +213,7 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
       id: key
       /* eslint-disable-next-line jsx-a11y/role-has-required-aria-props */,
       role: "treeitem",
-      css: styles === null || styles === void 0 ? void 0 : styles.item,
+      css: styles?.item,
       tabIndex: -1,
       "aria-posinset": position,
       "aria-setsize": this.childCount,
@@ -212,7 +231,7 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
         if (typeof child.props.onKeyDown === 'function') {
           child.props.onKeyDown(e);
         } else {
-          onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(e, itemHash);
+          onKeyDown?.(e, itemHash);
         }
       },
       onBlur: e => this.handleBlur(e, itemHash),
@@ -241,12 +260,13 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
     });
   }
   renderItemNode(item, position) {
-    const _this$props9 = this.props,
-      selection = _this$props9.selection,
-      onItemClick = _this$props9.onItemClick,
-      onKeyDown = _this$props9.onKeyDown,
-      getItemProps = _this$props9.getItemProps,
-      styles = _this$props9.styles;
+    const {
+      selection,
+      onItemClick,
+      onKeyDown,
+      getItemProps,
+      styles
+    } = this.props;
     const ariaSelected = {};
     if (selection) {
       ariaSelected['aria-selected'] = selection === `item_${item.id}`;
@@ -270,12 +290,12 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
       /* eslint-disable-next-line jsx-a11y/role-has-required-aria-props */,
       role: "treeitem",
       "aria-label": item.name,
-      css: styles === null || styles === void 0 ? void 0 : styles.item,
+      css: styles?.item,
       "aria-level": this.itemsLevel,
       "aria-posinset": position,
       "aria-setsize": this.childCount,
-      onClick: e => onItemClick === null || onItemClick === void 0 ? void 0 : onItemClick(e, itemHash),
-      onKeyDown: e => onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(e, itemHash),
+      onClick: e => onItemClick?.(e, itemHash),
+      onKeyDown: e => onKeyDown?.(e, itemHash),
       onFocus: e => this.handleFocus(e, itemHash),
       onBlur: e => this.handleBlur(e, itemHash),
       ...ariaSelected,
@@ -297,17 +317,18 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
     };
   }
   render() {
-    const _this$props0 = this.props,
-      id = _this$props0.id,
-      name = _this$props0.name,
-      expanded = _this$props0.expanded,
-      collectionIcon = _this$props0.collectionIcon,
-      collectionIconExpanded = _this$props0.collectionIconExpanded,
-      isCollectionFlattened = _this$props0.isCollectionFlattened,
-      getCollectionProps = _this$props0.getCollectionProps,
-      level = _this$props0.level,
-      position = _this$props0.position,
-      styles = _this$props0.styles;
+    const {
+      id,
+      name,
+      expanded,
+      collectionIcon,
+      collectionIconExpanded,
+      isCollectionFlattened,
+      getCollectionProps,
+      level,
+      position,
+      styles
+    } = this.props;
     const collectionProps = getCollectionProps({
       ...this.getCommonButtonProps(),
       expanded: expanded,
@@ -320,14 +341,14 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
       level
     });
     const ariaSelected = {
-      'aria-selected': void 0
+      'aria-selected': undefined
     };
     if (this.props.selection) ariaSelected['aria-selected'] = this.props.selection === `collection_${id}`;
     return isCollectionFlattened ? this.renderChildren() : (0, _jsxRuntime.jsxs)("li", {
       ref: el => {
         this.ref = el;
       },
-      css: styles === null || styles === void 0 ? void 0 : styles.treeCollection,
+      css: styles?.treeCollection,
       tabIndex: -1
       /* eslint-disable-next-line jsx-a11y/role-has-required-aria-props */,
       role: "treeitem",
@@ -352,21 +373,11 @@ let TreeCollection = exports.TreeCollection = (_dec = (0, _emotion.withStyle)(_s
         ...collectionProps
       }), expanded && this.childCount > 0 && (0, _jsxRuntime.jsx)("ul", {
         "aria-label": name,
-        css: styles === null || styles === void 0 ? void 0 : styles.list,
+        css: styles?.list,
         role: "group",
         children: this.renderChildren()
       })]
     });
   }
-}, _TreeCollection.displayName = "TreeCollection", _TreeCollection.componentId = 'TreeBrowser.Collection', _TreeCollection.allowedProps = _props.allowedProps, _TreeCollection.contextType = _TreeBrowserContext.default, _TreeCollection.defaultProps = {
-  collections: [],
-  items: [],
-  expanded: false,
-  selection: '',
-  size: 'medium',
-  variant: 'folderTree',
-  getItemProps: props => props,
-  getCollectionProps: props => props,
-  isCollectionFlattened: false
-}, _TreeCollection)) || _class);
+}) || _class);
 var _default = exports.default = TreeCollection;

package/lib/TreeBrowser/v2/TreeCollection/styles.js

@@ -47,8 +47,10 @@ const list = (0, _emotion.keyframes)`
  */
 
 const generateStyles = (componentTheme, props, sharedTokens, state) => {
-  const size = props.size,
-    variant = props.variant;
+  const {
+    size,
+    variant
+  } = props;
   const sizeMap = {
     small: {
       indent: {

package/lib/TreeBrowser/v2/TreeNode/index.js

@@ -13,7 +13,7 @@ var _styles = _interopRequireDefault(require("../TreeButton/styles"));
 var _props = require("./props");
 var _TreeBrowserContext = _interopRequireDefault(require("../TreeBrowserContext"));
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _dec, _class, _TreeNode;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -54,51 +54,61 @@ id: TreeBrowser.Node
 A helper class used to render the :renderBeforeItems and :renderAfterItems
 in the TreeBrowser.
 **/
-let TreeNode = exports.TreeNode = (_dec = (0, _emotion.withStyle)(_styles.default, 'TreeBrowserTreeButton'), _dec(_class = (_TreeNode = class TreeNode extends _react.Component {
-  constructor(...args) {
-    super(...args);
-    this.ref = null;
-    this.state = {
-      isHovered: false
-    };
-    this.handleRef = el => {
-      if (el && typeof this.props.containerRef === 'function') {
-        this.props.containerRef(el.parentElement);
-      }
-      this.ref = el;
-    };
-    this.handleMouseEnter = () => {
-      if (this.props.hoverable) {
-        this.setState({
-          isHovered: true
-        });
-      }
-    };
-    this.handleMouseLeave = () => {
-      if (this.props.hoverable) {
-        this.setState({
-          isHovered: false
-        });
-      }
-    };
-  }
+let TreeNode = exports.TreeNode = (_dec = (0, _emotion.withStyle)(_styles.default, 'TreeBrowserTreeButton'), _dec(_class = class TreeNode extends _react.Component {
+  static displayName = "TreeNode";
+  static componentId = 'TreeBrowser.Node';
+  static allowedProps = _props.allowedProps;
+  static contextType = _TreeBrowserContext.default;
+  static defaultProps = {
+    size: 'medium',
+    variant: 'folderTree',
+    selected: false,
+    focused: false,
+    hoverable: true
+  };
+  ref = null;
+  state = {
+    isHovered: false
+  };
   componentDidMount() {
-    var _this$props$makeStyle, _this$props, _this$context;
-    (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props, {
-      animation: (_this$context = this.context) === null || _this$context === void 0 ? void 0 : _this$context.animation,
+    this.props.makeStyles?.({
+      animation: this.context?.animation,
       hoverable: this.props.hoverable
     });
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props2, _this$context2;
-    (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2, {
-      animation: (_this$context2 = this.context) === null || _this$context2 === void 0 ? void 0 : _this$context2.animation,
+    this.props.makeStyles?.({
+      animation: this.context?.animation,
       hoverable: this.props.hoverable
     });
   }
+  handleRef = el => {
+    if (el && typeof this.props.containerRef === 'function') {
+      this.props.containerRef(el.parentElement);
+    }
+    this.ref = el;
+  };
+  handleMouseEnter = () => {
+    if (this.props.hoverable) {
+      this.setState({
+        isHovered: true
+      });
+    }
+  };
+  handleMouseLeave = () => {
+    if (this.props.hoverable) {
+      this.setState({
+        isHovered: false
+      });
+    }
+  };
   getIconColor() {
-    const selected = this.props.selected;
-    const isHovered = this.state.isHovered;
+    const {
+      selected
+    } = this.props;
+    const {
+      isHovered
+    } = this.state;
 
     // Priority: selected > hover > default
     if (selected) return 'onColor';
@@ -106,14 +116,15 @@ let TreeNode = exports.TreeNode = (_dec = (0, _emotion.withStyle)(_styles.defaul
     return 'baseColor';
   }
   renderItemImage() {
-    const _this$props3 = this.props,
-      thumbnail = _this$props3.thumbnail,
-      itemIcon = _this$props3.itemIcon,
-      styles = _this$props3.styles,
-      size = _this$props3.size;
+    const {
+      thumbnail,
+      itemIcon,
+      styles,
+      size
+    } = this.props;
     if (thumbnail) {
       return (0, _jsxRuntime.jsx)("div", {
-        css: styles === null || styles === void 0 ? void 0 : styles.thumbnail,
+        css: styles?.thumbnail,
         children: (0, _jsxRuntime.jsx)(_latest.Img, {
           src: thumbnail,
           constrain: "cover",
@@ -126,37 +137,32 @@ let TreeNode = exports.TreeNode = (_dec = (0, _emotion.withStyle)(_styles.defaul
       const iconColor = this.getIconColor();
       const iconElement = (0, _renderIconWithProps.renderIconWithProps)(itemIcon, iconSize, iconColor);
       return (0, _jsxRuntime.jsx)("div", {
-        css: styles === null || styles === void 0 ? void 0 : styles.icon,
+        css: styles?.icon,
         children: iconElement
       });
     }
-    return void 0;
+    return undefined;
   }
   render() {
-    const _this$props4 = this.props,
-      children = _this$props4.children,
-      styles = _this$props4.styles;
+    const {
+      children,
+      styles
+    } = this.props;
     return (0, _jsxRuntime.jsx)("div", {
       ref: this.handleRef,
       tabIndex: -1,
-      css: styles === null || styles === void 0 ? void 0 : styles.treeButton,
+      css: styles?.treeButton,
       "data-cid": "TreeNode",
       onMouseEnter: this.handleMouseEnter,
       onMouseLeave: this.handleMouseLeave,
       children: (0, _jsxRuntime.jsxs)("span", {
-        css: styles === null || styles === void 0 ? void 0 : styles.layout,
+        css: styles?.layout,
         children: [this.renderItemImage(), (0, _jsxRuntime.jsx)("span", {
-          css: styles === null || styles === void 0 ? void 0 : styles.node,
+          css: styles?.node,
           children: children
         })]
       })
     });
   }
-}, _TreeNode.displayName = "TreeNode", _TreeNode.componentId = 'TreeBrowser.Node', _TreeNode.allowedProps = _props.allowedProps, _TreeNode.contextType = _TreeBrowserContext.default, _TreeNode.defaultProps = {
-  size: 'medium',
-  variant: 'folderTree',
-  selected: false,
-  focused: false,
-  hoverable: true
-}, _TreeNode)) || _class);
+}) || _class);
 var _default = exports.default = TreeNode;