@instructure/ui-navigation 8.8.1-snapshot.8 → 8.9.1

package/es/Navigation/NavigationItem/index.js

@@ -26,7 +26,6 @@ var _dec, _dec2, _class, _class2, _temp;
 
 /** @jsx jsx */
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { testable } from '@instructure/ui-testable';
 import { omitProps, getElementType } from '@instructure/ui-react-utils';
 import { Tooltip } from '@instructure/ui-tooltip';
@@ -34,51 +33,58 @@ import { hasVisibleChildren } from '@instructure/ui-a11y-utils';
 import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-
+import { allowedProps, propTypes } from './props';
 /**
 ---
 parent: Navigation
 id: Navigation.Item
 ---
 **/
+
 let NavigationItem = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = testable(), _dec(_class = _dec2(_class = (_temp = _class2 = class NavigationItem extends Component {
   componentDidMount() {
-    this.props.makeStyles({
-      minimized: this.minimized
+    var _this$props$makeStyle, _this$props;
+
+    (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props, {
+      minimized: this.props.minimized
     });
   }
 
   componentDidUpdate() {
-    this.props.makeStyles({
-      minimized: this.minimized
+    var _this$props$makeStyle2, _this$props2;
+
+    (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2, {
+      minimized: this.props.minimized
     });
   }
 
   renderLink() {
+    var _this$props$styles, _this$props$styles2, _this$props$styles3;
+
     const ElementType = getElementType(NavigationItem, this.props);
-    const _this$props = this.props,
-          href = _this$props.href,
-          onClick = _this$props.onClick,
-          icon = _this$props.icon,
-          label = _this$props.label;
+    const _this$props3 = this.props,
+          href = _this$props3.href,
+          onClick = _this$props3.onClick,
+          icon = _this$props3.icon,
+          label = _this$props3.label;
     const props = omitProps(this.props, NavigationItem.propTypes);
     return jsx(ElementType, Object.assign({}, props, {
       href: href,
       onClick: onClick,
-      css: this.props.styles.navigationItem,
+      css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.navigationItem,
       "aria-label": this.props.minimized ? label : void 0
     }), jsx("div", {
-      css: this.props.styles.icon,
+      css: (_this$props$styles2 = this.props.styles) === null || _this$props$styles2 === void 0 ? void 0 : _this$props$styles2.icon,
       "aria-hidden": "true"
     }, icon), !this.props.minimized ? jsx("div", {
-      css: this.props.styles.label
+      css: (_this$props$styles3 = this.props.styles) === null || _this$props$styles3 === void 0 ? void 0 : _this$props$styles3.label
     }, label) : null);
   }
 
   render() {
-    const _this$props2 = this.props,
-          minimized = _this$props2.minimized,
-          label = _this$props2.label;
+    const _this$props4 = this.props,
+          minimized = _this$props4.minimized,
+          label = _this$props4.label;
     const link = this.renderLink();
     return minimized && hasVisibleChildren(label) ? jsx(Tooltip, {
       renderTip: label,
@@ -86,52 +92,11 @@ let NavigationItem = (_dec = withStyle(generateStyle, generateComponentTheme), _
     }, link) : link;
   }
 
-}, _class2.displayName = "NavigationItem", _class2.componentId = 'Navigation.Item', _class2.propTypes = {
-  // eslint-disable-next-line react/require-default-props
-  makeStyles: PropTypes.func,
-  // eslint-disable-next-line react/require-default-props
-  styles: PropTypes.object,
-
-  /**
-   * The visual to display (ex. an Image, Logo, Avatar, or Icon)
-   */
-  icon: PropTypes.node.isRequired,
-
-  /**
-   * The text to display  for the Navigation Link
-   */
-  label: PropTypes.node.isRequired,
-
-  /**
-   * The element type to render as (will default to `<a>` if href is provided)
-   */
-  as: PropTypes.elementType,
-
-  /**
-   * If the NavigationItem goes to a new page, pass an href
-   */
-  href: PropTypes.string,
-
-  /**
-   * If the NavigationItem does not go to a new page pass an onClick
-   */
-  onClick: PropTypes.func,
-
-  /**
-   * Denotes which NavigationItem is currently selected
-   */
-  selected: PropTypes.bool,
-
-  /**
-   * When minimized is set to true, the `<Navigation />` shows icons only while the text becomes a tooltip. When it is set to false, the `<Navigation />` shows text in addition to the icons
-   */
-  minimized: PropTypes.bool
-}, _class2.defaultProps = {
+}, _class2.displayName = "NavigationItem", _class2.componentId = 'Navigation.Item', _class2.allowedProps = allowedProps, _class2.propTypes = propTypes, _class2.defaultProps = {
   as: 'a',
   onClick: function (e, selected) {},
   selected: false,
-  minimized: false,
-  href: void 0
+  minimized: false
 }, _temp)) || _class) || _class);
 export default NavigationItem;
 export { NavigationItem };

package/{src/AppNav/types.ts → es/Navigation/NavigationItem/props.js}

@@ -21,19 +21,42 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+import PropTypes from 'prop-types';
+const propTypes = {
+  /**
+   * The visual to display (ex. an Image, Logo, Avatar, or Icon)
+   */
+  icon: PropTypes.node.isRequired,
 
-import type { Spacing } from '@instructure/emotion'
+  /**
+   * The text to display  for the Navigation Link
+   */
+  label: PropTypes.node.isRequired,
 
-export type AppNavProps = {
-  screenReaderLabel: string
-  debounce?: number
-  renderBeforeItems?: React.ReactNode | ((...args: any[]) => any)
-  renderAfterItems?: React.ReactNode | ((...args: any[]) => any)
-  margin?: Spacing
-  elementRef?: (...args: any[]) => any
-  renderTruncateLabel?: React.ReactNode | ((...args: any[]) => any)
-  onUpdate?: (...args: any[]) => any
-  visibleItemsCount?: number
-  makeStyles?: (...args: any[]) => any
-  styles?: any
-}
+  /**
+   * The element type to render as (will default to `<a>` if href is provided)
+   */
+  as: PropTypes.elementType,
+
+  /**
+   * If the NavigationItem goes to a new page, pass an href
+   */
+  href: PropTypes.string,
+
+  /**
+   * If the NavigationItem does not go to a new page pass an onClick
+   */
+  onClick: PropTypes.func,
+
+  /**
+   * Denotes which NavigationItem is currently selected
+   */
+  selected: PropTypes.bool,
+
+  /**
+   * When minimized is set to true, the `<Navigation />` shows icons only while the text becomes a tooltip. When it is set to false, the `<Navigation />` shows text in addition to the icons
+   */
+  minimized: PropTypes.bool
+};
+const allowedProps = ['icon', 'label', 'as', 'href', 'onClick', 'selected', 'minimized'];
+export { propTypes, allowedProps };

package/es/Navigation/index.js

@@ -26,9 +26,7 @@ var _dec, _dec2, _class, _class2, _temp;
 
 /** @jsx jsx */
 import { Component, Children } from 'react';
-import PropTypes from 'prop-types';
 import { testable } from '@instructure/ui-testable';
-import { controllable, Children as ChildrenPropTypes } from '@instructure/ui-prop-types';
 import { omitProps, safeCloneElement } from '@instructure/ui-react-utils';
 import { IconMoveStartLine } from '@instructure/ui-icons';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
@@ -36,6 +34,7 @@ import { withStyle, jsx } from '@instructure/emotion';
 import { NavigationItem } from './NavigationItem';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
+import { allowedProps, propTypes } from './props';
 
 const navMinimized = ({
   minimized
@@ -67,13 +66,17 @@ let Navigation = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2
   }
 
   componentDidMount() {
-    this.props.makeStyles({
+    var _this$props$makeStyle, _this$props;
+
+    (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props, {
       minimized: this.minimized
     });
   }
 
   componentDidUpdate() {
-    this.props.makeStyles({
+    var _this$props$makeStyle2, _this$props2;
+
+    (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2, {
       minimized: this.minimized
     });
   }
@@ -92,11 +95,13 @@ let Navigation = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2
 
   renderChildren() {
     return Children.map(this.props.children, child => {
+      var _this$props$styles;
+
       const navItem = safeCloneElement(child, {
         minimized: this.state.minimized
       });
       return jsx("li", {
-        css: this.props.styles.list
+        css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.list
       }, navItem);
     });
   }
@@ -106,77 +111,33 @@ let Navigation = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2
   }
 
   render() {
+    var _this$props$styles2, _this$props$styles3, _this$props$styles4, _this$props$styles5;
+
     const label = this.props.label;
     const props = omitProps(this.props, Navigation.propTypes, ['minimized']);
     return jsx("nav", Object.assign({}, props, {
-      css: this.props.styles.navigation,
+      css: (_this$props$styles2 = this.props.styles) === null || _this$props$styles2 === void 0 ? void 0 : _this$props$styles2.navigation,
       "aria-label": label
     }), jsx("ul", {
-      css: this.props.styles.content
+      css: (_this$props$styles3 = this.props.styles) === null || _this$props$styles3 === void 0 ? void 0 : _this$props$styles3.content
     }, this.renderChildren()), jsx("div", {
-      css: this.props.styles.toggle
+      css: (_this$props$styles4 = this.props.styles) === null || _this$props$styles4 === void 0 ? void 0 : _this$props$styles4.toggle
     }, jsx(NavigationItem, {
       "aria-expanded": !this.minimized,
       onClick: this.handleNavToggle,
       icon: jsx(IconMoveStartLine, {
-        css: this.props.styles.toggleIcon,
+        css: (_this$props$styles5 = this.props.styles) === null || _this$props$styles5 === void 0 ? void 0 : _this$props$styles5.toggleIcon,
         inline: false
       }),
       label: jsx(ScreenReaderContent, null, this.toggleMessage())
     })));
   }
 
-}, _class2.displayName = "Navigation", _class2.componentId = 'Navigation', _class2.propTypes = {
-  // eslint-disable-next-line react/require-default-props
-  makeStyles: PropTypes.func,
-  // eslint-disable-next-line react/require-default-props
-  styles: PropTypes.object,
-
-  /**
-   * children of type Navigation.Item
-   */
-  children: ChildrenPropTypes.oneOf([NavigationItem]),
-
-  /**
-   * When minimized is set to true, the `<Navigation />` shows icons only while the text becomes a tooltip. When it is set to false, the `<Navigation />` shows text in addition to the icons
-   */
-  minimized: controllable(PropTypes.bool, 'onMinimized', 'defaultMinimized'),
-
-  /**
-   * Whether the `<Navigation />` is initially minimized (uncontrolled)
-   */
-  defaultMinimized: PropTypes.bool,
-  onMinimized: PropTypes.func,
-
-  /**
-   * Screen reader label for the main Navigation
-   */
-  label: PropTypes.string.isRequired,
-
-  /**
-   * Screen reader label for the toggle button expanded/minimized state
-   */
-  toggleLabel: PropTypes.shape({
-    expandedLabel: PropTypes.string,
-    minimizedLabel: PropTypes.string
-  }).isRequired,
-
-  /**
-   * If the `<Navigation.Item>` goes to a new page, pass an href
-   */
-  href: PropTypes.string,
-
-  /**
-   * If the `<Navigation.Item>` does not go to a new page pass an onClick
-   */
-  onClick: PropTypes.func
-}, _class2.defaultProps = {
+}, _class2.displayName = "Navigation", _class2.componentId = 'Navigation', _class2.allowedProps = allowedProps, _class2.propTypes = propTypes, _class2.defaultProps = {
   children: null,
   defaultMinimized: false,
   onMinimized: function (event, minimized) {},
-  onClick: function (e) {},
-  href: void 0,
-  minimized: void 0
+  onClick: function (e) {}
 }, _class2.Item = NavigationItem, _temp)) || _class) || _class);
 export default Navigation;
 export { Navigation, NavigationItem };

package/es/Navigation/props.js

@@ -0,0 +1,68 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - present Instructure, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import PropTypes from 'prop-types';
+import { controllable, Children as ChildrenPropTypes } from '@instructure/ui-prop-types';
+import { NavigationItem } from './NavigationItem';
+const propTypes = {
+  /**
+   * children of type Navigation.Item
+   */
+  children: ChildrenPropTypes.oneOf([NavigationItem]),
+
+  /**
+   * When minimized is set to true, the `<Navigation />` shows icons only while the text becomes a tooltip. When it is set to false, the `<Navigation />` shows text in addition to the icons
+   */
+  minimized: controllable(PropTypes.bool, 'onMinimized', 'defaultMinimized'),
+
+  /**
+   * Whether the `<Navigation />` is initially minimized (uncontrolled)
+   */
+  defaultMinimized: PropTypes.bool,
+  onMinimized: PropTypes.func,
+
+  /**
+   * Screen reader label for the main Navigation
+   */
+  label: PropTypes.string.isRequired,
+
+  /**
+   * Screen reader label for the toggle button expanded/minimized state
+   */
+  toggleLabel: PropTypes.shape({
+    expandedLabel: PropTypes.string,
+    minimizedLabel: PropTypes.string
+  }).isRequired,
+
+  /**
+   * If the `<Navigation.Item>` goes to a new page, pass an href
+   */
+  href: PropTypes.string,
+
+  /**
+   * If the `<Navigation.Item>` does not go to a new page pass an onClick
+   */
+  onClick: PropTypes.func
+};
+const allowedProps = ['children', 'minimized', 'defaultMinimized', 'onMinimized', 'label', 'toggleLabel', 'href', 'onClick'];
+export { propTypes, allowedProps };

package/lib/AppNav/Item/index.js

@@ -9,8 +9,6 @@ exports.Item = exports.default = void 0;
 
 var _react = require("react");
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _console = require("@instructure/console");
 
 var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
@@ -33,6 +31,8 @@ var _styles = _interopRequireDefault(require("./styles"));
 
 var _theme = _interopRequireDefault(require("./theme"));
 
+var _props = require("./props");
+
 var _dec, _dec2, _class, _class2, _temp;
 
 /**
@@ -61,23 +61,29 @@ let Item = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
   }
 
   componentDidMount() {
-    this.props.makeStyles();
+    var _this$props$makeStyle, _this$props2;
+
+    (_this$props$makeStyle = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props2);
   }
 
   componentDidUpdate() {
-    this.props.makeStyles();
+    var _this$props$makeStyle2, _this$props3;
+
+    (_this$props$makeStyle2 = (_this$props3 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props3);
   }
 
   render() {
+    var _this$props$styles, _this$props$styles2;
+
     const ElementType = (0, _getElementType.getElementType)(Item, this.props);
-    const _this$props2 = this.props,
-          renderIcon = _this$props2.renderIcon,
-          renderLabel = _this$props2.renderLabel,
-          href = _this$props2.href,
-          elementRef = _this$props2.elementRef,
-          renderAfter = _this$props2.renderAfter,
-          cursor = _this$props2.cursor,
-          isDisabled = _this$props2.isDisabled;
+    const _this$props4 = this.props,
+          renderIcon = _this$props4.renderIcon,
+          renderLabel = _this$props4.renderLabel,
+          href = _this$props4.href,
+          elementRef = _this$props4.elementRef,
+          renderAfter = _this$props4.renderAfter,
+          cursor = _this$props4.cursor,
+          isDisabled = _this$props4.isDisabled;
     const icon = (0, _callRenderProp.callRenderProp)(renderIcon);
     const label = (0, _callRenderProp.callRenderProp)(renderLabel);
     const labelIsForScreenReaders = (0, _matchComponentTypes.matchComponentTypes)(label, [_ScreenReaderContent.ScreenReaderContent]);
@@ -98,78 +104,16 @@ let Item = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
       onFocus: this.handleFocus,
       onBlur: this.handleBlur,
       cursor: isDisabled ? 'not-allowed' : cursor,
-      css: this.props.styles.item
+      css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.item
     }), icon, labelIsForScreenReaders ? label : (0, _emotion.jsx)("span", {
-      css: this.props.styles.label
+      css: (_this$props$styles2 = this.props.styles) === null || _this$props$styles2 === void 0 ? void 0 : _this$props$styles2.label
     }, label), renderAfter && (0, _callRenderProp.callRenderProp)(renderAfter));
   }
 
-}, _class2.displayName = "Item", _class2.componentId = 'AppNav.Item', _class2.propTypes = {
-  // eslint-disable-next-line react/require-default-props
-  makeStyles: _propTypes.default.func,
-  // eslint-disable-next-line react/require-default-props
-  styles: _propTypes.default.object,
-
-  /**
-   * The text to display. If the `icon` prop is used, label text must be wrapped
-   * in `ScreenReaderContent`.
-   */
-  renderLabel: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]).isRequired,
-
-  /**
-   * Content to display after the renderLabel text, such as a badge
-   */
-  renderAfter: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
-
-  /**
-   * The visual to display (ex. an Image, Logo, Avatar, or Icon)
-   */
-  renderIcon: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
-
-  /**
-   * If the item goes to a new page, pass an href
-   */
-  href: _propTypes.default.string,
-
-  /**
-   * If the item does not go to a new page, pass an onClick
-   */
-  onClick: _propTypes.default.func,
-
-  /**
-   * Denotes which item is currently selected
-   */
-  isSelected: _propTypes.default.bool,
-
-  /**
-   * provides a reference to the underlying focusable (`button` or `a`) element
-   */
-  elementRef: _propTypes.default.func,
-
-  /**
-   * The element type to render as (will default to `<a>` if href is provided)
-   */
-  as: _propTypes.default.elementType,
-
-  /**
-   * Specify the mouse cursor to use on :hover.
-   * The `pointer` cursor is used by default.
-   */
-  cursor: _propTypes.default.string,
-
-  /**
-   * Disables the link or button visually and functionally
-   */
-  isDisabled: _propTypes.default.bool
-}, _class2.defaultProps = {
+}, _class2.displayName = "Item", _class2.componentId = 'AppNav.Item', _class2.allowedProps = _props.allowedProps, _class2.propTypes = _props.propTypes, _class2.defaultProps = {
   children: null,
   onClick: function (event) {},
   isSelected: false,
-  href: void 0,
-  elementRef: void 0,
-  renderIcon: void 0,
-  renderAfter: void 0,
-  as: void 0,
   cursor: 'pointer',
   isDisabled: false
 }, _temp)) || _class) || _class);