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

package/es/TreeBrowser/v2/index.js

@@ -1,4 +1,5 @@
-var _dec, _class, _TreeBrowser;
+var _dec, _class;
+import "core-js/modules/es.array.includes.js";
 /*
  * The MIT License (MIT)
  *
@@ -40,76 +41,32 @@ category: components
 ---
 **/
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser = class TreeBrowser extends Component {
+let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = class TreeBrowser extends Component {
+  static displayName = "TreeBrowser";
+  static componentId = 'TreeBrowser';
+  static allowedProps = allowedProps;
+  static defaultProps = {
+    size: 'medium',
+    variant: 'folderTree',
+    showRootCollection: true,
+    collectionIcon: FolderClosedInstUIIcon,
+    collectionIconExpanded: FolderClosedInstUIIcon,
+    itemIcon: FileTextInstUIIcon,
+    getItemProps: props => props,
+    getCollectionProps: props => props,
+    defaultExpanded: [],
+    selectionType: 'none',
+    sortOrder: function () {
+      return 0;
+    },
+    animation: true
+  };
+  static Node = TreeNode;
+  static Collection = TreeCollection;
+  static Button = 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.codes.down:
-        case keycode.codes.j:
-          event.stopPropagation();
-          this.moveFocus(1);
-          break;
-        case keycode.codes.up:
-        case keycode.codes.k:
-          event.stopPropagation();
-          this.moveFocus(-1);
-          break;
-        case keycode.codes.home:
-        case keycode.codes.end:
-          event.stopPropagation();
-          this.homeOrEnd(event.keyCode);
-          break;
-        case keycode.codes.left:
-        case keycode.codes.right:
-          event.stopPropagation();
-          this.handleLeftOrRightArrow(event.keyCode, node);
-          break;
-        case keycode.codes.enter:
-        case keycode.codes.space:
-          event.stopPropagation();
-          this.handleActivation(event, node);
-          break;
-        default:
-          return;
-      }
-      event.preventDefault();
-    };
-    this.clearSelection = () => {
-      const onSelectionChange = this.props.onSelectionChange;
-
-      // Call the callback if provided (for controlled selection)
-      if (onSelectionChange) {
-        onSelectionChange('', 'item', void 0);
-      }
-
-      // Update internal state only if uncontrolled
-      if (typeof this.props.selection === 'undefined') {
-        this.setState({
-          selection: ''
-        });
-      }
-    };
-    this.getIsFlattened = collection => {
-      const _this$props2 = this.props,
-        rootId = _this$props2.rootId,
-        showRootCollection = _this$props2.showRootCollection;
-      return !showRootCollection && typeof rootId !== 'undefined' && collection.id === rootId;
-    };
     const initialState = {
       selection: ''
     };
@@ -126,20 +83,65 @@ let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser
     this.state = initialState;
   }
   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.codes.down:
+      case keycode.codes.j:
+        event.stopPropagation();
+        this.moveFocus(1);
+        break;
+      case keycode.codes.up:
+      case keycode.codes.k:
+        event.stopPropagation();
+        this.moveFocus(-1);
+        break;
+      case keycode.codes.home:
+      case keycode.codes.end:
+        event.stopPropagation();
+        this.homeOrEnd(event.keyCode);
+        break;
+      case keycode.codes.left:
+      case keycode.codes.right:
+        event.stopPropagation();
+        this.handleLeftOrRightArrow(event.keyCode, node);
+        break;
+      case keycode.codes.enter:
+      case keycode.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 {
@@ -159,8 +161,7 @@ let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser
     return typeof props.selection === 'undefined' ? state.selection : props.selection;
   }
   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)];
@@ -177,9 +178,10 @@ let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser
     }
   }
   handleSelection(id, type) {
-    const _this$props7 = this.props,
-      selectionType = _this$props7.selectionType,
-      onSelectionChange = _this$props7.onSelectionChange;
+    const {
+      selectionType,
+      onSelectionChange
+    } = this.props;
     if (selectionType !== 'single') return;
     const selection = `${type}_${id}`;
 
@@ -201,6 +203,23 @@ let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser
       });
     }
   }
+  clearSelection = () => {
+    const {
+      onSelectionChange
+    } = this.props;
+
+    // Call the callback if provided (for controlled selection)
+    if (onSelectionChange) {
+      onSelectionChange('', 'item', undefined);
+    }
+
+    // Update internal state only if uncontrolled
+    if (typeof this.props.selection === 'undefined') {
+      this.setState({
+        selection: ''
+      });
+    }
+  };
   getNavigableNodes() {
     return Array.from(this.ref.querySelectorAll('[role="treeitem"]'));
   }
@@ -274,6 +293,13 @@ let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser
       return [];
     }
   }
+  getIsFlattened = collection => {
+    const {
+      rootId,
+      showRootCollection
+    } = this.props;
+    return !showRootCollection && typeof rootId !== 'undefined' && collection.id === rootId;
+  };
   getCollectionProps(collection) {
     return {
       id: collection.id,
@@ -307,14 +333,16 @@ let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser
     }, i));
   }
   render() {
-    const styles = this.props.styles;
+    const {
+      styles
+    } = this.props;
     return _jsx(TreeBrowserContext.Provider, {
       value: {
         animation: this.props.animation,
         clearSelection: this.clearSelection
       },
       children: _jsx("ul", {
-        css: styles === null || styles === void 0 ? void 0 : styles.treeBrowser,
+        css: styles?.treeBrowser,
         tabIndex: 0,
         role: "tree",
         onKeyDown: this.handleKeyDown,
@@ -327,21 +355,6 @@ let TreeBrowser = (_dec = withStyle(generateStyles), _dec(_class = (_TreeBrowser
       })
     });
   }
-}, _TreeBrowser.displayName = "TreeBrowser", _TreeBrowser.componentId = 'TreeBrowser', _TreeBrowser.allowedProps = allowedProps, _TreeBrowser.defaultProps = {
-  size: 'medium',
-  variant: 'folderTree',
-  showRootCollection: true,
-  collectionIcon: FolderClosedInstUIIcon,
-  collectionIconExpanded: FolderClosedInstUIIcon,
-  itemIcon: FileTextInstUIIcon,
-  getItemProps: props => props,
-  getCollectionProps: props => props,
-  defaultExpanded: [],
-  selectionType: 'none',
-  sortOrder: function () {
-    return 0;
-  },
-  animation: true
-}, _TreeBrowser.Node = TreeNode, _TreeBrowser.Collection = TreeCollection, _TreeBrowser.Button = TreeButton, _TreeBrowser)) || _class);
+}) || _class);
 export default TreeBrowser;
 export { TreeBrowser };

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

@@ -14,7 +14,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, _TreeButton;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -45,33 +45,36 @@ parent: TreeBrowser
 id: TreeBrowser.Button
 ---
 **/
-let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyleLegacy)(_styles.default, _theme.default), _dec(_class = (_TreeButton = class TreeButton extends _react.Component {
-  constructor(...args) {
-    super(...args);
-    this.ref = null;
-    this.handleRef = el => {
-      if (el && typeof this.props.containerRef === 'function') {
-        this.props.containerRef(el.parentElement);
-      }
-      this.ref = el;
-    };
-  }
+let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyleLegacy)(_styles.default, _theme.default), _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
+  };
+  ref = null;
   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
     });
   }
   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
     });
   }
   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", {
@@ -88,7 +91,9 @@ let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyleLegacy)(_sty
     });
   }
   renderImage() {
-    const type = this.props.type;
+    const {
+      type
+    } = this.props;
     switch (type) {
       case 'collection':
         return this.renderCollectionIcon();
@@ -97,30 +102,32 @@ let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyleLegacy)(_sty
       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;
+    const {
+      expanded,
+      collectionIcon,
+      collectionIconExpanded,
+      styles
+    } = this.props;
     if (collectionIcon || collectionIconExpanded) {
       return (0, _jsxRuntime.jsx)("div", {
-        css: styles === null || styles === void 0 ? void 0 : styles.icon,
+        css: styles?.icon,
         children: (0, _callRenderProp.callRenderProp)(expanded ? collectionIconExpanded : collectionIcon)
       });
     }
-    return void 0;
+    return undefined;
   }
   renderItemImage() {
-    const _this$props4 = this.props,
-      thumbnail = _this$props4.thumbnail,
-      itemIcon = _this$props4.itemIcon,
-      styles = _this$props4.styles;
+    const {
+      thumbnail,
+      itemIcon,
+      styles
+    } = 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)(_v11_.Img, {
           src: thumbnail,
           constrain: "cover",
@@ -130,33 +137,33 @@ let TreeButton = exports.TreeButton = (_dec = (0, _emotion.withStyleLegacy)(_sty
     }
     if (itemIcon) {
       return (0, _jsxRuntime.jsx)("div", {
-        css: styles === null || styles === void 0 ? void 0 : styles.icon,
+        css: styles?.icon,
         children: (0, _callRenderProp.callRenderProp)(itemIcon)
       });
     }
-    return void 0;
+    return undefined;
   }
+  handleRef = el => {
+    if (el && typeof this.props.containerRef === 'function') {
+      this.props.containerRef(el.parentElement);
+    }
+    this.ref = el;
+  };
   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",
       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
-}, _TreeButton)) || _class);
+}) || _class);
 var _default = exports.default = TreeButton;

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

@@ -51,11 +51,13 @@ const transform = (0, _emotion.keyframes)`
  * @return {Object} The final style object, which will be used in the component
  */
 const generateStyles = (componentTheme, props, state) => {
-  const size = props.size,
-    variant = props.variant,
-    selected = props.selected,
-    focused = props.focused,
-    level = props.level;
+  const {
+    size,
+    variant,
+    selected,
+    focused,
+    level
+  } = props;
   const isRootButton = level && level === 1;
   const sizeMap = {
     small: {

package/lib/TreeBrowser/v1/TreeButton/theme.js

@@ -34,12 +34,13 @@ exports.default = void 0;
  * @return {Object} The final theme object with the overrides and component variables
  */
 const generateComponentTheme = theme => {
-  var _colors$contrasts, _colors$contrasts2, _colors$contrasts3, _colors$contrasts4, _colors$contrasts5, _colors$contrasts6, _colors$contrasts7, _colors$contrasts8, _colors$contrasts9;
-  const colors = theme.colors,
-    borders = theme.borders,
-    typography = theme.typography,
-    themeName = theme.key,
-    spacing = theme.spacing;
+  const {
+    colors,
+    borders,
+    typography,
+    key: themeName,
+    spacing
+  } = theme;
   const themeSpecificStyles = {
     canvas: {
       iconColor: theme['ic-brand-font-color-dark'],
@@ -50,32 +51,32 @@ const generateComponentTheme = theme => {
     }
   };
   const componentVariables = {
-    hoverBackgroundColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts = colors.contrasts) === null || _colors$contrasts === void 0 ? void 0 : _colors$contrasts.blue4570,
-    hoverTextColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts2 = colors.contrasts) === null || _colors$contrasts2 === void 0 ? void 0 : _colors$contrasts2.white1010,
-    focusOutlineWidth: borders === null || borders === void 0 ? void 0 : borders.widthMedium,
-    focusOutlineColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts3 = colors.contrasts) === null || _colors$contrasts3 === void 0 ? void 0 : _colors$contrasts3.blue4570,
-    focusOutlineStyle: borders === null || borders === void 0 ? void 0 : borders.style,
-    iconColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts4 = colors.contrasts) === null || _colors$contrasts4 === void 0 ? void 0 : _colors$contrasts4.grey125125,
-    iconsMarginRight: spacing === null || spacing === void 0 ? void 0 : spacing.xSmall,
-    descriptorMarginTop: spacing === null || spacing === void 0 ? void 0 : spacing.xxxSmall,
-    descriptorTextColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts5 = colors.contrasts) === null || _colors$contrasts5 === void 0 ? void 0 : _colors$contrasts5.grey125125,
-    descriptorFontSizeSmall: typography === null || typography === void 0 ? void 0 : typography.fontSizeXSmall,
-    descriptorFontSizeMedium: typography === null || typography === void 0 ? void 0 : typography.fontSizeXSmall,
-    descriptorFontSizeLarge: typography === null || typography === void 0 ? void 0 : typography.fontSizeSmall,
-    nameTextColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts6 = colors.contrasts) === null || _colors$contrasts6 === void 0 ? void 0 : _colors$contrasts6.blue4570,
-    nameFontSizeSmall: typography === null || typography === void 0 ? void 0 : typography.fontSizeXSmall,
-    nameFontSizeMedium: typography === null || typography === void 0 ? void 0 : typography.fontSizeSmall,
-    nameFontSizeLarge: typography === null || typography === void 0 ? void 0 : typography.fontSizeMedium,
-    baseSpacingSmall: spacing === null || spacing === void 0 ? void 0 : spacing.xSmall,
-    baseSpacingMedium: spacing === null || spacing === void 0 ? void 0 : spacing.small,
+    hoverBackgroundColor: colors?.contrasts?.blue4570,
+    hoverTextColor: colors?.contrasts?.white1010,
+    focusOutlineWidth: borders?.widthMedium,
+    focusOutlineColor: colors?.contrasts?.blue4570,
+    focusOutlineStyle: borders?.style,
+    iconColor: colors?.contrasts?.grey125125,
+    iconsMarginRight: spacing?.xSmall,
+    descriptorMarginTop: spacing?.xxxSmall,
+    descriptorTextColor: colors?.contrasts?.grey125125,
+    descriptorFontSizeSmall: typography?.fontSizeXSmall,
+    descriptorFontSizeMedium: typography?.fontSizeXSmall,
+    descriptorFontSizeLarge: typography?.fontSizeSmall,
+    nameTextColor: colors?.contrasts?.blue4570,
+    nameFontSizeSmall: typography?.fontSizeXSmall,
+    nameFontSizeMedium: typography?.fontSizeSmall,
+    nameFontSizeLarge: typography?.fontSizeMedium,
+    baseSpacingSmall: spacing?.xSmall,
+    baseSpacingMedium: spacing?.small,
     baseSpacingLarge: '1rem',
-    borderWidth: borders === null || borders === void 0 ? void 0 : borders.widthSmall,
-    borderRadius: borders === null || borders === void 0 ? void 0 : borders.radiusMedium,
-    borderColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts7 = colors.contrasts) === null || _colors$contrasts7 === void 0 ? void 0 : _colors$contrasts7.grey4570,
-    textLineHeight: typography === null || typography === void 0 ? void 0 : typography.lineHeightCondensed,
-    selectedTextColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts8 = colors.contrasts) === null || _colors$contrasts8 === void 0 ? void 0 : _colors$contrasts8.white1010,
-    selectedBackgroundColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts9 = colors.contrasts) === null || _colors$contrasts9 === void 0 ? void 0 : _colors$contrasts9.grey4570,
-    selectedOutlineWidth: borders === null || borders === void 0 ? void 0 : borders.widthLarge
+    borderWidth: borders?.widthSmall,
+    borderRadius: borders?.radiusMedium,
+    borderColor: colors?.contrasts?.grey4570,
+    textLineHeight: typography?.lineHeightCondensed,
+    selectedTextColor: colors?.contrasts?.white1010,
+    selectedBackgroundColor: colors?.contrasts?.grey4570,
+    selectedOutlineWidth: borders?.widthLarge
   };
   return {
     ...componentVariables,