@instructure/ui-tree-browser 11.7.3-snapshot-7 → 11.7.3-snapshot-26

package/lib/TreeBrowser/v1/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.TreeBrowser = void 0;
+require("core-js/modules/es.array.includes.js");
 var _react = require("react");
 var _keycode = _interopRequireDefault(require("keycode"));
 var _IconFolderLine = require("@instructure/ui-icons/lib/generated/IconFolderLine.js");
@@ -20,7 +21,7 @@ var _theme = _interopRequireDefault(require("./theme"));
 var _props = require("./props");
 var _TreeBrowserContext = _interopRequireDefault(require("./TreeBrowserContext"));
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _dec, _class, _TreeBrowser;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -49,61 +50,32 @@ var _dec, _class, _TreeBrowser;
 category: components
 ---
 **/
-let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_styles.default, _theme.default), _dec(_class = (_TreeBrowser = class TreeBrowser extends _react.Component {
+let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_styles.default, _theme.default), _dec(_class = class TreeBrowser extends _react.Component {
+  static displayName = "TreeBrowser";
+  static componentId = 'TreeBrowser';
+  static allowedProps = _props.allowedProps;
+  static defaultProps = {
+    size: 'medium',
+    variant: 'folderTree',
+    showRootCollection: true,
+    collectionIcon: _IconFolderLine.IconFolderLine,
+    collectionIconExpanded: _IconFolderLine.IconFolderLine,
+    itemIcon: _IconDocumentLine.IconDocumentLine,
+    getItemProps: props => props,
+    getCollectionProps: props => props,
+    defaultExpanded: [],
+    selectionType: 'none',
+    sortOrder: function () {
+      return 0;
+    },
+    animation: true
+  };
+  static Node = _TreeNode.TreeNode;
+  static Collection = _TreeCollection.TreeCollection;
+  static Button = _TreeButton.TreeButton;
+  ref = null;
   constructor(props) {
     super(props);
-    this.ref = null;
-    this.handleCollectionClick = (e, collection, expand = true) => {
-      e.stopPropagation();
-      const onCollectionClick = this.props.onCollectionClick;
-      if (expand) this.expandOrCollapseNode(collection);
-      onCollectionClick === null || onCollectionClick === void 0 ? void 0 : onCollectionClick(collection.id, collection); // TODO: this should pass the event as the first arg
-      this.handleSelection(collection.id, 'collection');
-    };
-    this.handleItemClick = (e, item) => {
-      var _this$props$onItemCli, _this$props;
-      e.stopPropagation();
-      (_this$props$onItemCli = (_this$props = this.props).onItemClick) === null || _this$props$onItemCli === void 0 ? void 0 : _this$props$onItemCli.call(_this$props, item);
-      this.handleSelection(item.id, 'item');
-    };
-    this.handleKeyDown = (event, node) => {
-      switch (event.keyCode) {
-        case _keycode.default.codes.down:
-        case _keycode.default.codes.j:
-          event.stopPropagation();
-          this.moveFocus(1);
-          break;
-        case _keycode.default.codes.up:
-        case _keycode.default.codes.k:
-          event.stopPropagation();
-          this.moveFocus(-1);
-          break;
-        case _keycode.default.codes.home:
-        case _keycode.default.codes.end:
-          event.stopPropagation();
-          this.homeOrEnd(event.keyCode);
-          break;
-        case _keycode.default.codes.left:
-        case _keycode.default.codes.right:
-          event.stopPropagation();
-          this.handleLeftOrRightArrow(event.keyCode, node);
-          break;
-        case _keycode.default.codes.enter:
-        case _keycode.default.codes.space:
-          event.stopPropagation();
-          this.handleActivation(event, node);
-          break;
-        default:
-          return;
-      }
-      event.preventDefault();
-    };
-    this.getIsFlattened = collection => {
-      const _this$props2 = this.props,
-        rootId = _this$props2.rootId,
-        showRootCollection = _this$props2.showRootCollection;
-      return !showRootCollection && typeof rootId !== 'undefined' && collection.id === rootId;
-    };
     if (typeof this.props.expanded === 'undefined') {
       this.state = {
         expanded: this.props.defaultExpanded,
@@ -116,20 +88,65 @@ let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_s
     }
   }
   componentDidMount() {
-    var _this$props$makeStyle, _this$props3;
-    (_this$props$makeStyle = (_this$props3 = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props3);
+    this.props.makeStyles?.();
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props4;
-    (_this$props$makeStyle2 = (_this$props4 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props4);
+    this.props.makeStyles?.();
   }
   get _root() {
     return this.ref;
   }
+  handleCollectionClick = (e, collection, expand = true) => {
+    e.stopPropagation();
+    const {
+      onCollectionClick
+    } = this.props;
+    if (expand) this.expandOrCollapseNode(collection);
+    onCollectionClick?.(collection.id, collection); // TODO: this should pass the event as the first arg
+    this.handleSelection(collection.id, 'collection');
+  };
+  handleItemClick = (e, item) => {
+    e.stopPropagation();
+    this.props.onItemClick?.(item);
+    this.handleSelection(item.id, 'item');
+  };
+  handleKeyDown = (event, node) => {
+    switch (event.keyCode) {
+      case _keycode.default.codes.down:
+      case _keycode.default.codes.j:
+        event.stopPropagation();
+        this.moveFocus(1);
+        break;
+      case _keycode.default.codes.up:
+      case _keycode.default.codes.k:
+        event.stopPropagation();
+        this.moveFocus(-1);
+        break;
+      case _keycode.default.codes.home:
+      case _keycode.default.codes.end:
+        event.stopPropagation();
+        this.homeOrEnd(event.keyCode);
+        break;
+      case _keycode.default.codes.left:
+      case _keycode.default.codes.right:
+        event.stopPropagation();
+        this.handleLeftOrRightArrow(event.keyCode, node);
+        break;
+      case _keycode.default.codes.enter:
+      case _keycode.default.codes.space:
+        event.stopPropagation();
+        this.handleActivation(event, node);
+        break;
+      default:
+        return;
+    }
+    event.preventDefault();
+  };
   get collections() {
-    const _this$props5 = this.props,
-      collections = _this$props5.collections,
-      rootId = _this$props5.rootId;
+    const {
+      collections,
+      rootId
+    } = this.props;
     if (typeof rootId !== 'undefined') {
       return [collections[rootId]];
     } else {
@@ -143,8 +160,7 @@ let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_s
     return typeof props.expanded === 'undefined' ? state.expanded : props.expanded;
   }
   expandOrCollapseNode(collection) {
-    var _this$props$onCollect, _this$props6;
-    (_this$props$onCollect = (_this$props6 = this.props).onCollectionToggle) === null || _this$props$onCollect === void 0 ? void 0 : _this$props$onCollect.call(_this$props6, collection);
+    this.props.onCollectionToggle?.(collection);
     if (typeof this.props.expanded === 'undefined') {
       this.setState((state, props) => {
         const expanded = [...this.getExpanded(state, props)];
@@ -161,7 +177,9 @@ let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_s
     }
   }
   handleSelection(id, type) {
-    const selectionType = this.props.selectionType;
+    const {
+      selectionType
+    } = this.props;
     selectionType === 'single' && this.setState(state => {
       const selection = `${type}_${id}`;
       if (state.selection !== selection) {
@@ -246,6 +264,13 @@ let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_s
       return [];
     }
   }
+  getIsFlattened = collection => {
+    const {
+      rootId,
+      showRootCollection
+    } = this.props;
+    return !showRootCollection && typeof rootId !== 'undefined' && collection.id === rootId;
+  };
   getCollectionProps(collection) {
     return {
       id: collection.id,
@@ -279,13 +304,15 @@ let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_s
     }, i));
   }
   render() {
-    const styles = this.props.styles;
+    const {
+      styles
+    } = this.props;
     return (0, _jsxRuntime.jsx)(_TreeBrowserContext.default.Provider, {
       value: {
         animation: this.props.animation
       },
       children: (0, _jsxRuntime.jsx)("ul", {
-        css: styles === null || styles === void 0 ? void 0 : styles.treeBrowser,
+        css: styles?.treeBrowser,
         tabIndex: 0,
         role: "tree",
         onKeyDown: this.handleKeyDown,
@@ -298,20 +325,5 @@ let TreeBrowser = exports.TreeBrowser = (_dec = (0, _emotion.withStyleLegacy)(_s
       })
     });
   }
-}, _TreeBrowser.displayName = "TreeBrowser", _TreeBrowser.componentId = 'TreeBrowser', _TreeBrowser.allowedProps = _props.allowedProps, _TreeBrowser.defaultProps = {
-  size: 'medium',
-  variant: 'folderTree',
-  showRootCollection: true,
-  collectionIcon: _IconFolderLine.IconFolderLine,
-  collectionIconExpanded: _IconFolderLine.IconFolderLine,
-  itemIcon: _IconDocumentLine.IconDocumentLine,
-  getItemProps: props => props,
-  getCollectionProps: props => props,
-  defaultExpanded: [],
-  selectionType: 'none',
-  sortOrder: function () {
-    return 0;
-  },
-  animation: true
-}, _TreeBrowser.Node = _TreeNode.TreeNode, _TreeBrowser.Collection = _TreeCollection.TreeCollection, _TreeBrowser.Button = _TreeButton.TreeButton, _TreeBrowser)) || _class);
+}) || _class);
 var _default = exports.default = TreeBrowser;

package/lib/TreeBrowser/v1/theme.js

@@ -34,14 +34,15 @@ exports.default = void 0;
  * @return {Object} The final theme object with the overrides and component variables
  */
 const generateComponentTheme = theme => {
-  var _colors$contrasts;
-  const colors = theme.colors,
-    borders = theme.borders;
+  const {
+    colors,
+    borders
+  } = theme;
   const componentVariables = {
-    borderRadius: borders === null || borders === void 0 ? void 0 : borders.radiusMedium,
-    focusOutlineWidth: borders === null || borders === void 0 ? void 0 : borders.widthMedium,
-    focusOutlineColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts = colors.contrasts) === null || _colors$contrasts === void 0 ? void 0 : _colors$contrasts.blue4570,
-    focusOutlineStyle: borders === null || borders === void 0 ? void 0 : borders.style
+    borderRadius: borders?.radiusMedium,
+    focusOutlineWidth: borders?.widthMedium,
+    focusOutlineColor: colors?.contrasts?.blue4570,
+    focusOutlineStyle: borders?.style
   };
   return {
     ...componentVariables

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

@@ -13,7 +13,7 @@ var _styles = _interopRequireDefault(require("./styles"));
 var _props = require("./props");
 var _TreeBrowserContext = _interopRequireDefault(require("../TreeBrowserContext"));
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _dec, _class, _TreeButton;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -51,52 +51,42 @@ parent: TreeBrowser
 id: TreeBrowser.Button
 ---
 **/
-let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyle)(_styles.default, 'TreeBrowserTreeButton'), _dec(_class = (_TreeButton = class TreeButton 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 TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyle)(_styles.default, 'TreeBrowserTreeButton'), _dec(_class = class TreeButton extends _react.Component {
+  static displayName = "TreeButton";
+  static componentId = 'TreeBrowser.Button';
+  static allowedProps = _props.allowedProps;
+  static contextType = _TreeBrowserContext.default;
+  static defaultProps = {
+    type: 'treeButton',
+    size: 'medium',
+    variant: 'folderTree',
+    selected: false,
+    focused: false,
+    expanded: 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
     });
   }
   defaultContentRenderer(props) {
-    const name = props.name,
-      descriptor = props.descriptor,
-      styles = props.styles;
+    const {
+      name,
+      descriptor,
+      styles
+    } = props;
     return (0, _jsxRuntime.jsxs)("span", {
       css: styles.layout,
       children: [this.renderImage(), (0, _jsxRuntime.jsxs)("span", {
@@ -113,8 +103,12 @@ let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyle)(_styles.de
     });
   }
   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';
@@ -122,7 +116,9 @@ let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyle)(_styles.de
     return 'baseColor';
   }
   renderImage() {
-    const type = this.props.type;
+    const {
+      type
+    } = this.props;
     switch (type) {
       case 'collection':
         return this.renderCollectionIcon();
@@ -131,36 +127,38 @@ let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyle)(_styles.de
       default:
         break;
     }
-    return void 0;
+    return undefined;
   }
   renderCollectionIcon() {
-    const _this$props3 = this.props,
-      expanded = _this$props3.expanded,
-      collectionIcon = _this$props3.collectionIcon,
-      collectionIconExpanded = _this$props3.collectionIconExpanded,
-      styles = _this$props3.styles,
-      size = _this$props3.size;
+    const {
+      expanded,
+      collectionIcon,
+      collectionIconExpanded,
+      styles,
+      size
+    } = this.props;
     if (collectionIcon || collectionIconExpanded) {
       const icon = expanded ? collectionIconExpanded : collectionIcon;
       const iconSize = treeBrowserSizeToIconSize[size];
       const iconColor = this.getIconColor();
       const iconElement = (0, _renderIconWithProps.renderIconWithProps)(icon, 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;
   }
   renderItemImage() {
-    const _this$props4 = this.props,
-      thumbnail = _this$props4.thumbnail,
-      itemIcon = _this$props4.itemIcon,
-      styles = _this$props4.styles,
-      size = _this$props4.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",
@@ -173,36 +171,49 @@ let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyle)(_styles.de
       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;
   }
+  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
+      });
+    }
+  };
   render() {
-    const _this$props5 = this.props,
-      styles = _this$props5.styles,
-      renderContent = _this$props5.renderContent;
+    const {
+      styles,
+      renderContent
+    } = this.props;
     const buttonContent = renderContent ? renderContent(this.props) : this.defaultContentRenderer(this.props);
     // VoiceOver can't navigate without the buttons, even though they don't do anything
     return (0, _jsxRuntime.jsx)("button", {
       ref: this.handleRef,
       tabIndex: -1,
       type: "button",
-      css: styles === null || styles === void 0 ? void 0 : styles.treeButton,
+      css: styles?.treeButton,
       "data-cid": "TreeButton",
       onMouseEnter: this.handleMouseEnter,
       onMouseLeave: this.handleMouseLeave,
       children: buttonContent
     });
   }
-}, _TreeButton.displayName = "TreeButton", _TreeButton.componentId = 'TreeBrowser.Button', _TreeButton.allowedProps = _props.allowedProps, _TreeButton.contextType = _TreeBrowserContext.default, _TreeButton.defaultProps = {
-  type: 'treeButton',
-  size: 'medium',
-  variant: 'folderTree',
-  selected: false,
-  focused: false,
-  expanded: false,
-  hoverable: true
-}, _TreeButton)) || _class);
+}) || _class);
 var _default = exports.default = TreeButton;

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

@@ -51,10 +51,12 @@ const transform = (0, _emotion.keyframes)`
  * @return {Object} The final style object, which will be used in the component
  */
 const generateStyles = (componentTheme, props, sharedTokens, state) => {
-  const size = props.size,
-    variant = props.variant,
-    selected = props.selected,
-    level = props.level;
+  const {
+    size,
+    variant,
+    selected,
+    level
+  } = props;
   const isRootButton = level && level === 1;
   const sizeMap = {
     small: {
@@ -217,7 +219,7 @@ const generateStyles = (componentTheme, props, sharedTokens, state) => {
       borderRadius: componentTheme.borderRadius,
       position: 'relative',
       zIndex: 1,
-      ...(state !== null && state !== void 0 && state.animation ? {
+      ...(state?.animation ? {
         transform: 'translate3d(-2%, 0, 0)',
         opacity: 0.01,
         transformOrigin: 'left center',
@@ -229,7 +231,7 @@ const generateStyles = (componentTheme, props, sharedTokens, state) => {
       } : {}),
       outline: '0',
       padding: '0',
-      ...(sharedTokens !== null && sharedTokens !== void 0 && sharedTokens.focusOutline ? (0, _emotion.calcFocusOutlineStyles)(sharedTokens.focusOutline) : {}),
+      ...(sharedTokens?.focusOutline ? (0, _emotion.calcFocusOutlineStyles)(sharedTokens.focusOutline) : {}),
       ...(variant === 'folderTree' && !isRootButton && {
         '&::before': {
           content: '""',
@@ -246,10 +248,10 @@ const generateStyles = (componentTheme, props, sharedTokens, state) => {
           ...sizeMap[size][variant].before
         },
         '&:hover::before': {
-          visibility: state !== null && state !== void 0 && state.hoverable ? 'hidden' : 'visible'
+          visibility: state?.hoverable ? 'hidden' : 'visible'
         }
       }),
-      ...((state === null || state === void 0 ? void 0 : state.hoverable) !== false && {
+      ...(state?.hoverable !== false && {
         '&:hover': {
           backgroundColor: selected ? componentTheme.selectedBackgroundColor : componentTheme.hoverBackgroundColor,
           '[class$=-treeButton__textName], [class$=-treeButton__textDescriptor], [class$=-treeButton__node]': {