@instructure/ui-top-nav-bar 8.33.1 → 8.33.2

package/lib/TopNavBar/TopNavBarLayout/SmallViewportLayout/index.js

@@ -1,64 +1,36 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.TopNavBarSmallViewportLayout = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
-
 var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
-
 var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
-
 var _px = require("@instructure/ui-utils/lib/px.js");
-
 var _console = require("@instructure/console");
-
 var _testable = require("@instructure/ui-testable/lib/testable.js");
-
 var _getBoundingClientRect = require("@instructure/ui-dom-utils/lib/getBoundingClientRect.js");
-
 var _requestAnimationFrame = require("@instructure/ui-dom-utils/lib/requestAnimationFrame.js");
-
 var _emotion = require("@instructure/emotion");
-
 var _Tray = require("@instructure/ui-tray/lib/Tray");
-
 var _IconXLine2 = require("@instructure/ui-icons/lib/IconXLine.js");
-
 var _IconHamburgerLine2 = require("@instructure/ui-icons/lib/IconHamburgerLine.js");
-
 var _IconArrowOpenDownSolid = require("@instructure/ui-icons/lib/IconArrowOpenDownSolid.js");
-
 var _IconArrowOpenUpSolid = require("@instructure/ui-icons/lib/IconArrowOpenUpSolid.js");
-
 var _Avatar = require("@instructure/ui-avatar/lib/Avatar");
-
 var _Dialog = require("@instructure/ui-dialog/lib/Dialog");
-
 var _Drilldown = require("@instructure/ui-drilldown/lib/Drilldown");
-
 var _TopNavBarItem = require("../../TopNavBarItem");
-
 var _mapItemsForDrilldown = require("../../utils/mapItemsForDrilldown");
-
 var _TopNavBarContext = require("../../TopNavBarContext");
-
 var _styles = _interopRequireDefault(require("./styles"));
-
 var _theme = _interopRequireDefault(require("./theme"));
-
 var _props = require("./props");
-
 var _dec, _dec2, _dec3, _class, _class2, _IconXLine, _IconHamburgerLine;
-
 /**
 ---
 private: true
@@ -68,7 +40,6 @@ private: true
 let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec3 = (0, _testable.testable)(), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = class TopNavBarSmallViewportLayout extends _react.Component {
   constructor(props) {
     var _props$styles;
-
     super(props);
     this.ref = null;
     this._trayContainerId = void 0;
@@ -80,27 +51,23 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
     this._inPlaceDialogCloseButtonId = void 0;
     this._separatorId = void 0;
     this._raf = [];
-
     this.handleRef = el => {
       const elementRef = this.props.elementRef;
       this.ref = el;
-
       if (typeof elementRef === 'function') {
         elementRef(el);
       }
     };
-
     this.renderOptionContent = (children, itemProps) => {
       const styles = this.props.styles;
       const status = itemProps.status,
-            renderAvatar = itemProps.renderAvatar;
+        renderAvatar = itemProps.renderAvatar;
       let content = children;
       let optionStyle = status === 'active' ? styles === null || styles === void 0 ? void 0 : styles.dropdownMenuOptionActive : styles === null || styles === void 0 ? void 0 : styles.dropdownMenuOption;
-
       if (renderAvatar) {
         const avatarName = renderAvatar.avatarName,
-              avatarSrc = renderAvatar.avatarSrc,
-              avatarAlt = renderAvatar.avatarAlt;
+          avatarSrc = renderAvatar.avatarSrc,
+          avatarAlt = renderAvatar.avatarAlt;
         const label = avatarAlt || (typeof children === 'string' ? children : void 0);
         optionStyle = styles === null || styles === void 0 ? void 0 : styles.dropdownMenuOptionWithAvatar;
         content = (0, _emotion.jsx)(_react.default.Fragment, null, (0, _emotion.jsx)(_Avatar.Avatar, {
@@ -113,12 +80,10 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
           "aria-hidden": "true"
         }), children);
       }
-
       return (0, _emotion.jsx)("span", {
         css: optionStyle
       }, content);
     };
-
     this._trayContainerId = props.deterministicId('TopNavBarSmallViewportLayout-trayContainer');
     this._trayId = props.deterministicId('TopNavBarSmallViewportLayout-tray');
     this._menuId = props.deterministicId('TopNavBarSmallViewportLayout-menu');
@@ -133,28 +98,21 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
       menuBottomPosition: (0, _px.px)(((_props$styles = props.styles) === null || _props$styles === void 0 ? void 0 : _props$styles.navbarHeight) || 0)
     };
   }
-
   componentDidMount() {
     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, this.makeStylesVariables);
     this.updateMenuBottomPosition();
   }
-
   componentDidUpdate() {
     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, this.makeStylesVariables);
   }
-
   componentWillUnmount() {
     this._raf.forEach(request => request.cancel());
-
     if (this.state.isDropdownMenuOpen) {
       this.toggleDropdownMenu();
     }
   }
-
   get makeStylesVariables() {
     return {
       isDropdownMenuVisible: this.state.isDropdownMenuVisible,
@@ -164,104 +122,80 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
       inverseColor: this.context.inverseColor
     };
   }
-
   hasBrandBlock(renderBrand) {
     return !!renderBrand && (!!renderBrand.props.renderName || !!renderBrand.props.renderIcon);
   }
-
   hasMenuItemsBlock(renderMenuItems) {
     return !!renderMenuItems && _react.default.Children.count(renderMenuItems.props.children) > 0;
   }
-
   hasActionItemsBlock(renderActionItems) {
     return !!renderActionItems && _react.default.Children.count(renderActionItems.props.children) > 0;
   }
-
   hasUserBlock(renderUser) {
     return !!renderUser && _react.default.Children.count(renderUser.props.children) > 0;
   }
-
   get hasSubmenu() {
     return (this.dropdownMenuContent || []).length > 0;
   }
-
   get isInPlaceDialogOpen() {
     var _this$props$renderInP;
-
     return (_this$props$renderInP = this.props.renderInPlaceDialogConfig) === null || _this$props$renderInP === void 0 ? void 0 : _this$props$renderInP.open;
   }
-
   get mappedUserOptions() {
     const renderUser = this.props.renderUser;
-
     if (!this.hasUserBlock(renderUser)) {
       return [];
     }
-
     const userChildren = _react.default.Children.toArray(renderUser.props.children);
-
     return (0, _mapItemsForDrilldown.mapItemsForDrilldown)(userChildren, {
       renderOptionContent: this.renderOptionContent
     });
   }
-
   get mappedMenuItemsOptions() {
     const renderMenuItems = this.props.renderMenuItems;
-
     if (!this.hasMenuItemsBlock(renderMenuItems)) {
       return [];
     }
-
     const menuItemsChildren = _react.default.Children.toArray(renderMenuItems.props.children);
-
     return (0, _mapItemsForDrilldown.mapItemsForDrilldown)(menuItemsChildren, {
       renderOptionContent: this.renderOptionContent,
       currentPageId: renderMenuItems.props.currentPageId
     });
   }
-
   get extractDrilldownSubpages() {
     return (0, _mapItemsForDrilldown.renderMappedItemDrilldownSubpages)([...this.mappedUserOptions, ...this.mappedMenuItemsOptions]);
   }
-
   updateMenuBottomPosition() {
     const boundingRect = (0, _getBoundingClientRect.getBoundingClientRect)(this.ref);
     this.setState({
       menuBottomPosition: boundingRect.top + boundingRect.height
     });
   }
-
   toggleDropdownMenu() {
     const onDropdownMenuToggle = this.props.onDropdownMenuToggle;
     const isDropdownMenuOpen = this.state.isDropdownMenuOpen;
-
     if (!isDropdownMenuOpen) {
       this.updateMenuBottomPosition();
     }
-
     if (typeof onDropdownMenuToggle === 'function') {
       onDropdownMenuToggle(!isDropdownMenuOpen);
     }
-
     this.setState({
       isDropdownMenuOpen: !isDropdownMenuOpen
     });
   }
-
   renderMenuTrigger() {
     const _this$props3 = this.props,
-          dropdownMenuToggleButtonLabel = _this$props3.dropdownMenuToggleButtonLabel,
-          dropdownMenuToggleButtonTooltip = _this$props3.dropdownMenuToggleButtonTooltip,
-          renderBrand = _this$props3.renderBrand,
-          alternativeTitle = _this$props3.alternativeTitle,
-          styles = _this$props3.styles;
+      dropdownMenuToggleButtonLabel = _this$props3.dropdownMenuToggleButtonLabel,
+      dropdownMenuToggleButtonTooltip = _this$props3.dropdownMenuToggleButtonTooltip,
+      renderBrand = _this$props3.renderBrand,
+      alternativeTitle = _this$props3.alternativeTitle,
+      styles = _this$props3.styles;
     const isDropdownMenuOpen = this.state.isDropdownMenuOpen;
     let menuTrigger;
     const menuTriggerStyle = [styles === null || styles === void 0 ? void 0 : styles.menuTrigger, ...(alternativeTitle ? [styles === null || styles === void 0 ? void 0 : styles.alternativeTitleContainer] : [])];
-
     if (!this.hasSubmenu) {
       menuTrigger = null;
-
       if (alternativeTitle) {
         (0, _console.warn)(false, 'There are no menu items or user menu to display in the <TopNavBar> dropdown menu! The menu trigger and the alternative title will not display.');
       }
@@ -293,25 +227,21 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
         renderIcon: isDropdownMenuOpen ? _IconXLine || (_IconXLine = (0, _emotion.jsx)(_IconXLine2.IconXLine, null)) : _IconHamburgerLine || (_IconHamburgerLine = (0, _emotion.jsx)(_IconHamburgerLine2.IconHamburgerLine, null))
       }), dropdownMenuToggleButtonLabel));
     }
-
     return (0, _emotion.jsx)("div", {
       css: styles === null || styles === void 0 ? void 0 : styles.menuTriggerContainer
     }, menuTrigger, this.hasBrandBlock(renderBrand) && !alternativeTitle && (0, _emotion.jsx)("div", {
       css: styles === null || styles === void 0 ? void 0 : styles.brandContainer
     }, renderBrand));
   }
-
   get dropdownMenuContent() {
     const _this$props4 = this.props,
-          renderUser = _this$props4.renderUser,
-          renderMenuItems = _this$props4.renderMenuItems;
+      renderUser = _this$props4.renderUser,
+      renderMenuItems = _this$props4.renderMenuItems;
     const hasMenuItems = this.hasMenuItemsBlock(renderMenuItems);
     const hasUser = this.hasUserBlock(renderUser);
     let pageChildren = [];
-
     if (hasUser) {
       pageChildren = (0, _mapItemsForDrilldown.renderMappedItemsAsDrilldownOptions)(this.mappedUserOptions);
-
       if (hasMenuItems) {
         pageChildren.push((0, _emotion.jsx)(_Drilldown.Drilldown.Separator, {
           id: this._separatorId,
@@ -319,18 +249,15 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
         }));
       }
     }
-
     if (hasMenuItems) {
       pageChildren = [...pageChildren, ...(0, _mapItemsForDrilldown.renderMappedItemsAsDrilldownOptions)(this.mappedMenuItemsOptions)];
     }
-
     return pageChildren.length ? pageChildren : void 0;
   }
-
   renderDropdownMenu() {
     const _this$props5 = this.props,
-          dropdownMenuLabel = _this$props5.dropdownMenuLabel,
-          onDropdownMenuSelect = _this$props5.onDropdownMenuSelect;
+      dropdownMenuLabel = _this$props5.dropdownMenuLabel,
+      onDropdownMenuSelect = _this$props5.onDropdownMenuSelect;
     return (0, _emotion.jsx)(_Drilldown.Drilldown, {
       id: this._drilldownId,
       rootPageId: this._menuId,
@@ -341,7 +268,6 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
         if (typeof onDropdownMenuSelect === 'function') {
           onDropdownMenuSelect(e, args);
         }
-
         if (args.selectedOption.props.href) {
           this.toggleDropdownMenu();
         }
@@ -351,14 +277,11 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
       key: this._menuId
     }, this.dropdownMenuContent), ...this.extractDrilldownSubpages]);
   }
-
   renderDropdownMenuTray() {
     const trayMountNode = this.props.trayMountNode;
-
     if (!this.hasSubmenu) {
       return null;
     }
-
     return (0, _emotion.jsx)(_Tray.Tray, {
       id: this._trayId,
       label: '',
@@ -393,39 +316,32 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
       }
     }, this.renderDropdownMenu());
   }
-
   renderInPlaceDialog() {
     const _this$props6 = this.props,
-          renderInPlaceDialogConfig = _this$props6.renderInPlaceDialogConfig,
-          styles = _this$props6.styles;
-
+      renderInPlaceDialogConfig = _this$props6.renderInPlaceDialogConfig,
+      styles = _this$props6.styles;
     if (!renderInPlaceDialogConfig) {
       return null;
     }
-
     const content = renderInPlaceDialogConfig.content,
-          open = renderInPlaceDialogConfig.open,
-          onClose = renderInPlaceDialogConfig.onClose,
-          closeButtonLabel = renderInPlaceDialogConfig.closeButtonLabel,
-          shouldContainFocus = renderInPlaceDialogConfig.shouldContainFocus,
-          shouldCloseOnEscape = renderInPlaceDialogConfig.shouldCloseOnEscape,
-          shouldCloseOnDocumentClick = renderInPlaceDialogConfig.shouldCloseOnDocumentClick,
-          returnFocusElement = renderInPlaceDialogConfig.returnFocusElement;
-
+      open = renderInPlaceDialogConfig.open,
+      onClose = renderInPlaceDialogConfig.onClose,
+      closeButtonLabel = renderInPlaceDialogConfig.closeButtonLabel,
+      shouldContainFocus = renderInPlaceDialogConfig.shouldContainFocus,
+      shouldCloseOnEscape = renderInPlaceDialogConfig.shouldCloseOnEscape,
+      shouldCloseOnDocumentClick = renderInPlaceDialogConfig.shouldCloseOnDocumentClick,
+      returnFocusElement = renderInPlaceDialogConfig.returnFocusElement;
     const handleClose = () => {
       if (typeof onClose === 'function') {
         onClose();
       }
-
       if (returnFocusElement) {
         this._raf.push((0, _requestAnimationFrame.requestAnimationFrame)(() => {
           var _returnFocusElement;
-
           (_returnFocusElement = returnFocusElement()) === null || _returnFocusElement === void 0 ? void 0 : _returnFocusElement.focus();
         }));
       }
     };
-
     const dialog = (0, _emotion.jsx)(_Dialog.Dialog, {
       display: "block",
       open: open,
@@ -450,13 +366,12 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
     }, closeButtonLabel))));
     return dialog;
   }
-
   render() {
     const _this$props7 = this.props,
-          trayMountNode = _this$props7.trayMountNode,
-          navLabel = _this$props7.navLabel,
-          renderActionItems = _this$props7.renderActionItems,
-          styles = _this$props7.styles;
+      trayMountNode = _this$props7.trayMountNode,
+      navLabel = _this$props7.navLabel,
+      renderActionItems = _this$props7.renderActionItems,
+      styles = _this$props7.styles;
     return (0, _emotion.jsx)("nav", Object.assign({}, (0, _omitProps.omitProps)(this.props, _props.allowedProps), {
       ref: this.handleRef,
       "aria-label": navLabel
@@ -469,7 +384,6 @@ let TopNavBarSmallViewportLayout = (_dec = (0, _withDeterministicId.withDetermin
       id: this._trayContainerId
     }), this.renderDropdownMenuTray());
   }
-
 }, _class2.displayName = "TopNavBarSmallViewportLayout", _class2.componentId = 'TopNavBar.SmallViewportLayout', _class2.propTypes = _props.propTypes, _class2.allowedProps = _props.allowedProps, _class2.defaultProps = {}, _class2.contextType = _TopNavBarContext.TopNavBarContext, _class2)) || _class) || _class) || _class);
 exports.TopNavBarSmallViewportLayout = TopNavBarSmallViewportLayout;
 var _default = TopNavBarSmallViewportLayout;

package/lib/TopNavBar/TopNavBarLayout/SmallViewportLayout/props.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.propTypes = exports.allowedProps = void 0;
-
 var _props = require("../props");
-
 /*
  * The MIT License (MIT)
  *
@@ -30,11 +28,14 @@ var _props = require("../props");
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-const propTypes = { // Edit PropTypes in TopNabBarLayout/props.ts
+
+const propTypes = {
+  // Edit PropTypes in TopNabBarLayout/props.ts
   ..._props.commonPropTypes,
   ..._props.smallViewportPropTypes
 };
 exports.propTypes = propTypes;
-const allowedProps = [// Edit allowed props in TopNabBarLayout/props.ts
+const allowedProps = [
+// Edit allowed props in TopNabBarLayout/props.ts
 ..._props.commonAllowedProps, ..._props.smallViewportAllowedProps];
 exports.allowedProps = allowedProps;

package/lib/TopNavBar/TopNavBarLayout/SmallViewportLayout/styles.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /*
  * The MIT License (MIT)
  *
@@ -41,10 +40,10 @@ exports.default = void 0;
  */
 const generateStyle = (componentTheme, _props, state) => {
   const isDropdownMenuVisible = state.isDropdownMenuVisible,
-        drilldownId = state.drilldownId,
-        trayId = state.trayId,
-        menuBottomPosition = state.menuBottomPosition,
-        inverseColor = state.inverseColor;
+    drilldownId = state.drilldownId,
+    trayId = state.trayId,
+    menuBottomPosition = state.menuBottomPosition,
+    inverseColor = state.inverseColor;
   const dropdownMenuTopPosition = componentTheme.smallViewportTrayFixTopPosition || `${menuBottomPosition}px`;
   const dropdownMenuOptionStyle = {
     display: 'inline-block',
@@ -161,6 +160,5 @@ const generateStyle = (componentTheme, _props, state) => {
     navbarHeight: componentTheme.smallViewportHeight
   };
 };
-
 var _default = generateStyle;
 exports.default = _default;

package/lib/TopNavBar/TopNavBarLayout/SmallViewportLayout/theme.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /*
  * The MIT License (MIT)
  *
@@ -36,10 +35,10 @@ exports.default = void 0;
  */
 const generateComponentTheme = theme => {
   const colors = theme.colors,
-        stacking = theme.stacking,
-        typography = theme.typography,
-        spacing = theme.spacing,
-        borders = theme.borders;
+    stacking = theme.stacking,
+    typography = theme.typography,
+    spacing = theme.spacing,
+    borders = theme.borders;
   const componentVariables = {
     smallViewportFontSize: typography === null || typography === void 0 ? void 0 : typography.fontSizeMedium,
     smallViewportFontFamily: typography === null || typography === void 0 ? void 0 : typography.fontFamily,
@@ -61,9 +60,9 @@ const generateComponentTheme = theme => {
     smallViewportAlternativeTitleInlineMargin: spacing === null || spacing === void 0 ? void 0 : spacing.xxSmall,
     smallViewportAlternativeTitleBlockMargin: '0'
   };
-  return { ...componentVariables
+  return {
+    ...componentVariables
   };
 };
-
 var _default = generateComponentTheme;
 exports.default = _default;

package/lib/TopNavBar/TopNavBarLayout/TopNavBarLayoutLocator.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TopNavBarLayoutLocator = void 0;
-
 var _locator = require("@instructure/ui-test-locator/lib/utils/locator.js");
-
 var _TopNavBarDesktopLayoutLocator = require("./DesktopLayout/TopNavBarDesktopLayoutLocator");
-
 var _TopNavBarSmallViewportLayoutLocator = require("./SmallViewportLayout/TopNavBarSmallViewportLayoutLocator");
-
 var _index = require("./index");
-
 /*
  * The MIT License (MIT)
  *
@@ -36,6 +31,7 @@ var _index = require("./index");
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 // TODO: this type seems to be too complex, try to fix it later
 const TopNavBarLayoutLocator = (0, _locator.locator)(_index.TopNavBarLayout.selector, {
   findDesktopLayout: function () {

package/lib/TopNavBar/TopNavBarLayout/index.js

@@ -1,36 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.TopNavBarLayout = void 0;
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _testable = require("@instructure/ui-testable/lib/testable.js");
-
 var _emotion = require("@instructure/emotion");
-
 var _TopNavBarContext = require("../TopNavBarContext");
-
 var _theme = _interopRequireDefault(require("./theme"));
-
 var _SmallViewportLayout = require("./SmallViewportLayout");
-
 var _DesktopLayout = require("./DesktopLayout");
-
 var _props = require("./props");
-
 const _excluded = ["desktopConfig", "smallViewportConfig", "styles", "makeStyles"];
-
 var _dec, _dec2, _class, _class2;
-
 /**
 ---
 parent: TopNavBar
@@ -43,19 +29,18 @@ let TopNavBarLayout = (_dec = (0, _emotion.withStyle)(null, _theme.default), _de
   constructor() {
     super(...arguments);
     this.ref = null;
-
     this.handleRef = el => {
       const elementRef = this.props.elementRef;
       this.ref = el;
-
       if (typeof elementRef === 'function') {
         elementRef(el);
       }
     };
   }
-
   get sortedThemeOverride() {
-    const themeOverride = this.props.themeOverride; // TODO: try to type better, the themeOverride types are not prepared to be inherited and sorted
+    const themeOverride = this.props.themeOverride;
+
+    // TODO: try to type better, the themeOverride types are not prepared to be inherited and sorted
 
     if (!themeOverride || typeof themeOverride === 'function') {
       return {
@@ -63,10 +48,8 @@ let TopNavBarLayout = (_dec = (0, _emotion.withStyle)(null, _theme.default), _de
         smallViewportThemeOverride: themeOverride
       };
     }
-
     const desktopThemeOverride = {};
     const smallViewportThemeOverride = {};
-
     for (const key in themeOverride) {
       if (key.startsWith('smallViewport')) {
         const variable = key;
@@ -76,34 +59,29 @@ let TopNavBarLayout = (_dec = (0, _emotion.withStyle)(null, _theme.default), _de
         desktopThemeOverride[variable] = themeOverride[variable];
       }
     }
-
     return {
       desktopThemeOverride,
       smallViewportThemeOverride
     };
   }
-
   render() {
     const _this$props = this.props,
-          desktopConfig = _this$props.desktopConfig,
-          smallViewportConfig = _this$props.smallViewportConfig,
-          styles = _this$props.styles,
-          makeStyles = _this$props.makeStyles,
-          restProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
-
+      desktopConfig = _this$props.desktopConfig,
+      smallViewportConfig = _this$props.smallViewportConfig,
+      styles = _this$props.styles,
+      makeStyles = _this$props.makeStyles,
+      restProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
     if (this.context.layout === 'smallViewport') {
       return (0, _emotion.jsx)(_SmallViewportLayout.TopNavBarSmallViewportLayout, Object.assign({}, smallViewportConfig, restProps, {
         themeOverride: this.sortedThemeOverride.smallViewportThemeOverride,
         elementRef: this.handleRef
       }));
     }
-
     return (0, _emotion.jsx)(_DesktopLayout.TopNavBarDesktopLayout, Object.assign({}, desktopConfig, restProps, {
       themeOverride: this.sortedThemeOverride.desktopThemeOverride,
       elementRef: this.handleRef
     }));
   }
-
 }, _class2.displayName = "TopNavBarLayout", _class2.componentId = 'TopNavBar.Layout', _class2.propTypes = _props.propTypes, _class2.allowedProps = _props.allowedProps, _class2.defaultProps = {
   desktopConfig: {},
   smallViewportConfig: {}

package/lib/TopNavBar/TopNavBarLayout/props.js

@@ -1,28 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.smallViewportPropTypes = exports.smallViewportAllowedProps = exports.propTypes = exports.desktopPropTypes = exports.desktopAllowedProps = exports.commonPropTypes = exports.commonAllowedProps = exports.allowedProps = void 0;
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _Children = require("@instructure/ui-prop-types/lib/Children.js");
-
 var _element = require("@instructure/ui-prop-types/lib/element.js");
-
 var _TopNavBarActionItems = require("../TopNavBarActionItems");
-
 var _TopNavBarBrand = require("../TopNavBarBrand");
-
 var _TopNavBarMenuItems = require("../TopNavBarMenuItems");
-
 var _TopNavBarUser = require("../TopNavBarUser");
-
 var _props = require("../TopNavBarItem/props");
-
 /*
  * The MIT License (MIT)
  *
@@ -46,6 +36,7 @@ var _props = require("../TopNavBarItem/props");
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 const commonPropTypes = {
   renderBrand: _Children.Children.oneOf([_TopNavBarBrand.TopNavBarBrand]),
   renderMenuItems: _Children.Children.oneOf([_TopNavBarMenuItems.TopNavBarMenuItems]),
@@ -79,7 +70,8 @@ const smallViewportPropTypes = {
   onDropdownMenuSelect: _propTypes.default.func
 };
 exports.smallViewportPropTypes = smallViewportPropTypes;
-const propTypes = { ...commonPropTypes,
+const propTypes = {
+  ...commonPropTypes,
   desktopConfig: _propTypes.default.shape(desktopPropTypes),
   smallViewportConfig: _propTypes.default.shape(smallViewportPropTypes).isRequired
 };