@instructure/ui-top-nav-bar 11.7.2-snapshot-49 → 11.7.2-snapshot-50

package/CHANGELOG.md

@@ -3,9 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [11.7.2-snapshot-49](https://github.com/instructure/instructure-ui/compare/v11.7.1...v11.7.2-snapshot-49) (2026-04-16)
+## [11.7.2-snapshot-50](https://github.com/instructure/instructure-ui/compare/v11.7.1...v11.7.2-snapshot-50) (2026-04-21)
 
-**Note:** Version bump only for package @instructure/ui-top-nav-bar
+
+### Features
+
+* **many:** rework TopNavBar ([bf40e4f](https://github.com/instructure/instructure-ui/commit/bf40e4f380dce5edc45a0f0bc83d5a5070d3be2b))
+
+
+### BREAKING CHANGES
+
+* **many:** contains breaking changes due to component using the new theming system
+
+INSTUI-4967
 
 
 

package/es/TopNavBar/v1/TopNavBarActionItems/index.js

@@ -1,3 +1,6 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["listLabel", "styles", "renderHiddenItemsMenuTriggerLabel", "renderHiddenItemsMenuTriggerTooltip"],
+  _excluded2 = ["listLabel", "styles", "renderHiddenItemsMenuTriggerLabel", "renderHiddenItemsMenuTriggerTooltip"];
 var _dec, _dec2, _class, _TopNavBarActionItems;
 /*
  * The MIT License (MIT)
@@ -152,9 +155,12 @@ let TopNavBarActionItems = (_dec = withDeterministicId(), _dec2 = withStyle(gene
   renderTruncatedActionItemList() {
     const _this$props4 = this.props,
       listLabel = _this$props4.listLabel,
-      styles = _this$props4.styles;
+      styles = _this$props4.styles,
+      renderHiddenItemsMenuTriggerLabel = _this$props4.renderHiddenItemsMenuTriggerLabel,
+      renderHiddenItemsMenuTriggerTooltip = _this$props4.renderHiddenItemsMenuTriggerTooltip,
+      restProps = _objectWithoutProperties(_this$props4, _excluded);
     return _createElement(TruncateList, {
-      ...passthroughProps(omitProps(this.props, allowedProps)),
+      ...passthroughProps(omitProps(restProps, allowedProps)),
       key: this.state.key // rerender if child count changes
       ,
       elementRef: this.handleRef,
@@ -174,7 +180,10 @@ let TopNavBarActionItems = (_dec = withDeterministicId(), _dec2 = withStyle(gene
   render() {
     const _this$props5 = this.props,
       listLabel = _this$props5.listLabel,
-      styles = _this$props5.styles;
+      styles = _this$props5.styles,
+      renderHiddenItemsMenuTriggerLabel = _this$props5.renderHiddenItemsMenuTriggerLabel,
+      renderHiddenItemsMenuTriggerTooltip = _this$props5.renderHiddenItemsMenuTriggerTooltip,
+      restProps = _objectWithoutProperties(_this$props5, _excluded2);
     if (!this.childrenArray.length) {
       return null;
     }
@@ -182,7 +191,7 @@ let TopNavBarActionItems = (_dec = withDeterministicId(), _dec2 = withStyle(gene
       return this.renderTruncatedActionItemList();
     }
     return _jsx("ul", {
-      ...omitProps(this.props, allowedProps),
+      ...omitProps(restProps, allowedProps),
       ref: this.handleRef,
       css: styles === null || styles === void 0 ? void 0 : styles.topNavBarActionItems,
       "aria-label": listLabel,

package/es/TopNavBar/v1/TopNavBarLayout/SmallViewportLayout/styles.js

@@ -141,7 +141,6 @@ const generateStyle = (componentTheme, _props, state) => {
       [`#${drilldownId}`]: {
         height: '100%',
         '&::before': {
-          // display: 'none'
           top: '4px',
           left: '4px',
           right: '4px',

package/es/TopNavBar/v1/TopNavBarMenuItems/index.js

@@ -1,3 +1,5 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["listLabel", "styles", "renderHiddenItemsMenuTriggerLabel", "renderHiddenItemsMenuTriggerAriaLabel"];
 var _dec, _dec2, _class, _TopNavBarMenuItems, _span;
 /*
  * The MIT License (MIT)
@@ -158,7 +160,10 @@ let TopNavBarMenuItems = (_dec = withDeterministicId(), _dec2 = withStyle(genera
   render() {
     const _this$props4 = this.props,
       listLabel = _this$props4.listLabel,
-      styles = _this$props4.styles;
+      styles = _this$props4.styles,
+      renderHiddenItemsMenuTriggerLabel = _this$props4.renderHiddenItemsMenuTriggerLabel,
+      renderHiddenItemsMenuTriggerAriaLabel = _this$props4.renderHiddenItemsMenuTriggerAriaLabel,
+      restProps = _objectWithoutProperties(_this$props4, _excluded);
     if (!this.childrenArray.length) {
       return null;
     }
@@ -167,7 +172,7 @@ let TopNavBarMenuItems = (_dec = withDeterministicId(), _dec2 = withStyle(genera
       return null;
     }
     return _createElement(TruncateList, {
-      ...omitProps(this.props, allowedProps),
+      ...omitProps(restProps, allowedProps),
       key: this.state.key // rerender if child count changes
       ,
       elementRef: this.handleRef,

package/es/TopNavBar/v2/TopNavBarActionItems/index.js

@@ -0,0 +1,206 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["listLabel", "styles", "renderHiddenItemsMenuTriggerLabel", "renderHiddenItemsMenuTriggerTooltip"],
+  _excluded2 = ["listLabel", "styles", "renderHiddenItemsMenuTriggerLabel", "renderHiddenItemsMenuTriggerTooltip"];
+var _dec, _dec2, _class, _TopNavBarActionItems;
+/*
+ * 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 { Children, Component } from 'react';
+import { omitProps, passthroughProps, safeCloneElement, withDeterministicId } from '@instructure/ui-react-utils';
+import { warn, error } from '@instructure/console';
+import { withStyle } from '@instructure/emotion';
+import { Drilldown } from '@instructure/ui-drilldown/latest';
+import { MoreVerticalInstUIIcon } from '@instructure/ui-icons';
+import { TruncateList } from '@instructure/ui-truncate-list';
+import { TopNavBarItem } from "../TopNavBarItem/index.js";
+import { mapItemsForDrilldown, renderMappedItemDrilldownSubpages, renderMappedItemsAsDrilldownOptions } from "../utils/mapItemsForDrilldown.js";
+import { TopNavBarContext } from "../TopNavBarContext.js";
+import generateStyle from "./styles.js";
+import { allowedProps } from "./props.js";
+import { jsx as _jsx } from "@emotion/react/jsx-runtime";
+import { createElement as _createElement } from "@emotion/react";
+/**
+---
+parent: TopNavBar
+id: TopNavBar.ActionItems
+---
+@module TopNavBarActionItems
+**/
+let TopNavBarActionItems = (_dec = withDeterministicId(), _dec2 = withStyle(generateStyle, 'TopNavBarActionItems'), _dec(_class = _dec2(_class = (_TopNavBarActionItems = class TopNavBarActionItems extends Component {
+  constructor(props) {
+    super(props);
+    this.ref = null;
+    this._hiddenActionItemsMenuId = void 0;
+    this._hiddenActionItemsMenuTriggerId = void 0;
+    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;
+      return _jsx("span", {
+        css: status === 'active' ? styles === null || styles === void 0 ? void 0 : styles.dropdownMenuOptionActive : styles === null || styles === void 0 ? void 0 : styles.dropdownMenuOption,
+        children: children
+      });
+    };
+    this._hiddenActionItemsMenuId = props.deterministicId('TopNavBarActionItems-hiddenActionItemsMenu');
+    this._hiddenActionItemsMenuTriggerId = props.deterministicId('TopNavBarActionItems-hiddenActionItemsMenuTrigger');
+    this.state = {
+      key: 0,
+      visibleActionItemsCount: void 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);
+  }
+  componentDidUpdate(prevProps) {
+    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);
+    if (this.context.layout === 'smallViewport' && Children.count(prevProps.children) !== Children.count(this.props.children)) {
+      this.setState({
+        key: this.state.key + 1
+      });
+    }
+  }
+  get makeStylesVariables() {
+    return {
+      layout: this.context.layout
+    };
+  }
+  get childrenArray() {
+    const children = Children.toArray(this.props.children);
+    return children.map(child => {
+      if (!(child !== null && child !== void 0 && child.props)) {
+        return null;
+      }
+      const _child$props = child.props,
+        id = _child$props.id,
+        renderAvatar = _child$props.renderAvatar,
+        renderIcon = _child$props.renderIcon,
+        variant = _child$props.variant;
+      if (renderAvatar) {
+        warn(false, `Items in <TopNavBar.ActionItems> are not allowed to have avatars, please remove it from item with the id "${id}".`);
+        return safeCloneElement(child, {
+          renderAvatar: void 0,
+          variant: 'default'
+        });
+      }
+      if (this.context.layout === 'smallViewport' && variant !== 'icon') {
+        if (!renderIcon) {
+          error(false, `Items in <TopNavBar.ActionItems> are required to have the \`renderIcon\` prop, because only the icons are displayed due to the lack of space. Please add an icon to the item with the id "${id}".`);
+          return null;
+        }
+        return safeCloneElement(child, {
+          variant: variant === 'forceIconWithLabel' ? 'default' : 'icon'
+        });
+      }
+      return child;
+    });
+  }
+  renderHiddenActionItemsMenu(hiddenItems) {
+    const _this$props3 = this.props,
+      renderHiddenItemsMenuTriggerLabel = _this$props3.renderHiddenItemsMenuTriggerLabel,
+      renderHiddenItemsMenuTriggerTooltip = _this$props3.renderHiddenItemsMenuTriggerTooltip;
+    const mappedItems = mapItemsForDrilldown(hiddenItems, {
+      renderOptionContent: this.renderOptionContent
+    });
+    const subPages = renderMappedItemDrilldownSubpages(mappedItems);
+    const options = renderMappedItemsAsDrilldownOptions(mappedItems);
+    const label = typeof renderHiddenItemsMenuTriggerLabel === 'function' ? renderHiddenItemsMenuTriggerLabel(hiddenItems.length) : renderHiddenItemsMenuTriggerLabel;
+    const tooltip = typeof renderHiddenItemsMenuTriggerTooltip === 'function' ? renderHiddenItemsMenuTriggerTooltip(hiddenItems.length) : renderHiddenItemsMenuTriggerTooltip;
+    return _jsx(TopNavBarItem, {
+      id: this._hiddenActionItemsMenuTriggerId,
+      renderIcon: MoreVerticalInstUIIcon,
+      variant: "icon",
+      tooltip: tooltip,
+      showSubmenuChevron: false,
+      renderSubmenu: _jsx(Drilldown, {
+        shouldSetAriaExpanded: false,
+        rootPageId: this._hiddenActionItemsMenuId,
+        children: [_jsx(Drilldown.Page, {
+          id: this._hiddenActionItemsMenuId,
+          children: options
+        }, this._hiddenActionItemsMenuId), ...subPages]
+      }),
+      children: label
+    });
+  }
+  renderTruncatedActionItemList() {
+    const _this$props4 = this.props,
+      listLabel = _this$props4.listLabel,
+      styles = _this$props4.styles,
+      renderHiddenItemsMenuTriggerLabel = _this$props4.renderHiddenItemsMenuTriggerLabel,
+      renderHiddenItemsMenuTriggerTooltip = _this$props4.renderHiddenItemsMenuTriggerTooltip,
+      restProps = _objectWithoutProperties(_this$props4, _excluded);
+    return _createElement(TruncateList, {
+      ...passthroughProps(omitProps(restProps, allowedProps)),
+      key: this.state.key // rerender if child count changes
+      ,
+      elementRef: this.handleRef,
+      css: styles === null || styles === void 0 ? void 0 : styles.topNavBarActionItems,
+      visibleItemsCount: this.state.visibleActionItemsCount,
+      onUpdate: ({
+        visibleItemsCount
+      }) => {
+        this.setState({
+          visibleActionItemsCount: visibleItemsCount
+        });
+      },
+      renderHiddenItemMenu: hiddenChildren => this.renderHiddenActionItemsMenu(hiddenChildren),
+      "aria-label": listLabel
+    }, this.childrenArray);
+  }
+  render() {
+    const _this$props5 = this.props,
+      listLabel = _this$props5.listLabel,
+      styles = _this$props5.styles,
+      renderHiddenItemsMenuTriggerLabel = _this$props5.renderHiddenItemsMenuTriggerLabel,
+      renderHiddenItemsMenuTriggerTooltip = _this$props5.renderHiddenItemsMenuTriggerTooltip,
+      restProps = _objectWithoutProperties(_this$props5, _excluded2);
+    if (!this.childrenArray.length) {
+      return null;
+    }
+    if (this.context.layout === 'smallViewport') {
+      return this.renderTruncatedActionItemList();
+    }
+    return _jsx("ul", {
+      ...omitProps(restProps, allowedProps),
+      ref: this.handleRef,
+      css: styles === null || styles === void 0 ? void 0 : styles.topNavBarActionItems,
+      "aria-label": listLabel,
+      "data-cid": "TopNavBarActionItems",
+      children: this.childrenArray.map(item => _jsx("li", {
+        css: styles === null || styles === void 0 ? void 0 : styles.listItem,
+        children: item
+      }, item.props.id))
+    });
+  }
+}, _TopNavBarActionItems.displayName = "TopNavBarActionItems", _TopNavBarActionItems.componentId = 'TopNavBar.ActionItems', _TopNavBarActionItems.allowedProps = allowedProps, _TopNavBarActionItems.defaultProps = {}, _TopNavBarActionItems.contextType = TopNavBarContext, _TopNavBarActionItems)) || _class) || _class);
+export { TopNavBarActionItems };
+export default TopNavBarActionItems;

package/es/TopNavBar/v2/TopNavBarActionItems/props.js

@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+const allowedProps = ['children', 'listLabel', 'renderHiddenItemsMenuTriggerLabel', 'renderHiddenItemsMenuTriggerTooltip', 'elementRef'];
+export { allowedProps };

package/es/TopNavBar/v2/TopNavBarActionItems/styles.js

@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+/**
+ * ---
+ * private: true
+ * ---
+ * Generates the style object from the theme and provided additional information
+ * @param  {Object} componentTheme The theme variable object.
+ * @param  {Object} props the props of the component, the style is applied to
+ * @param  {Object} state the state of the component, the style is applied to
+ * @return {Object} The final style object, which will be used in the component
+ */
+const generateStyle = (componentTheme, _props, _sharedTokens, state) => {
+  const dropdownMenuOptionStyle = {
+    display: 'inline-block',
+    padding: `0 ${componentTheme.smallViewportDropdownMenuActiveOptionIndicatorSpacing}`
+  };
+  return {
+    topNavBarActionItems: {
+      label: 'topNavBarActionItems',
+      boxSizing: 'border-box',
+      listStyleType: 'none',
+      margin: '0',
+      padding: '0',
+      flex: '0 0',
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'stretch',
+      justifyContent: 'flex-end',
+      ...(state.layout === 'smallViewport' && {
+        flex: '1 1',
+        marginInlineStart: componentTheme.smallViewportActionItemContainerMargin,
+        maxWidth: componentTheme.smallViewportActionItemContainerMaxWidth
+      })
+    },
+    listItem: {
+      label: 'topNavBarActionItems__listItem',
+      flex: '0 0'
+    },
+    dropdownMenuOption: {
+      label: 'topNavBarActionItems__dropdownMenuOption',
+      ...dropdownMenuOptionStyle
+    },
+    dropdownMenuOptionActive: {
+      label: 'topNavBarActionItems__dropdownMenuOptionActive',
+      ...dropdownMenuOptionStyle,
+      fontWeight: componentTheme.smallViewportDropdownMenuActiveOptionFontWeight,
+      paddingBlockEnd: componentTheme.smallViewportDropdownMenuActiveOptionIndicatorSpacing,
+      borderBottom: `${componentTheme.smallViewportDropdownMenuActiveOptionIndicatorWidth} solid ${componentTheme.smallViewportDropdownMenuActiveOptionIndicatorColor}`
+    }
+  };
+};
+export default generateStyle;

package/es/TopNavBar/v2/TopNavBarBrand/index.js

@@ -0,0 +1,117 @@
+var _dec, _class, _TopNavBarBrand;
+/*
+ * 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 { Component } from 'react';
+import { getElementType, omitProps } from '@instructure/ui-react-utils';
+import { withStyle, InstUISettingsProvider } from '@instructure/emotion';
+import { ScreenReaderContent } from '@instructure/ui-a11y-content';
+import { View } from '@instructure/ui-view/latest';
+import { TopNavBarContext } from "../TopNavBarContext.js";
+import generateStyle from "./styles.js";
+import { allowedProps } from "./props.js";
+import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
+/**
+---
+parent: TopNavBar
+id: TopNavBar.Brand
+---
+@module TopNavBarBrand
+**/
+let TopNavBarBrand = (_dec = withStyle(generateStyle, 'TopNavBarBrand'), _dec(_class = (_TopNavBarBrand = class TopNavBarBrand extends Component {
+  constructor(...args) {
+    super(...args);
+    this.ref = null;
+    this.handleRef = el => {
+      const elementRef = this.props.elementRef;
+      this.ref = el;
+      if (typeof elementRef === 'function') {
+        elementRef(el);
+      }
+    };
+  }
+  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);
+  }
+  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);
+  }
+  get makeStylesVariables() {
+    return {
+      layout: this.context.layout
+    };
+  }
+  render() {
+    const _this$props3 = this.props,
+      screenReaderLabel = _this$props3.screenReaderLabel,
+      renderIcon = _this$props3.renderIcon,
+      href = _this$props3.href,
+      onClick = _this$props3.onClick,
+      styles = _this$props3.styles;
+    const ElementType = getElementType(TopNavBarBrand, this.props);
+    return _jsx("div", {
+      ref: this.handleRef,
+      css: styles === null || styles === void 0 ? void 0 : styles.topNavBarBrand,
+      "data-cid": "TopNavBarBrand",
+      children: renderIcon && _jsx(InstUISettingsProvider, {
+        theme: currentTheme => {
+          var _currentTheme$newThem, _currentTheme$newThem2;
+          return {
+            newTheme: {
+              sharedTokens: {
+                focusOutline: {
+                  ...(currentTheme === null || currentTheme === void 0 ? void 0 : (_currentTheme$newThem = currentTheme.newTheme) === null || _currentTheme$newThem === void 0 ? void 0 : (_currentTheme$newThem2 = _currentTheme$newThem.sharedTokens) === null || _currentTheme$newThem2 === void 0 ? void 0 : _currentTheme$newThem2.focusOutline),
+                  inset: styles === null || styles === void 0 ? void 0 : styles.focusOutlineInset
+                }
+              }
+            }
+          };
+        },
+        children: _jsxs(View, {
+          ...omitProps(this.props, allowedProps),
+          css: styles === null || styles === void 0 ? void 0 : styles.container,
+          as: ElementType,
+          href: href,
+          onClick: onClick,
+          position: "relative",
+          focusColor: this.context.inverseColor ? 'info' : 'inverse',
+          focusPosition: "inset",
+          borderRadius: "medium",
+          children: [_jsx(ScreenReaderContent, {
+            children: screenReaderLabel
+          }), renderIcon && this.context.layout !== 'smallViewport' && _jsx("div", {
+            css: styles === null || styles === void 0 ? void 0 : styles.iconContainer,
+            role: "presentation",
+            "aria-hidden": "true",
+            children: renderIcon
+          })]
+        })
+      })
+    });
+  }
+}, _TopNavBarBrand.displayName = "TopNavBarBrand", _TopNavBarBrand.componentId = 'TopNavBar.Brand', _TopNavBarBrand.allowedProps = allowedProps, _TopNavBarBrand.defaultProps = {}, _TopNavBarBrand.contextType = TopNavBarContext, _TopNavBarBrand)) || _class);
+export { TopNavBarBrand };
+export default TopNavBarBrand;

package/es/TopNavBar/v2/TopNavBarBrand/props.js

@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+const allowedProps = ['screenReaderLabel', 'renderIcon', 'iconBackground', 'href', 'onClick', 'as', 'elementRef'];
+export { allowedProps };

package/es/TopNavBar/v2/TopNavBarBrand/styles.js

@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+/**
+ * ---
+ * private: true
+ * ---
+ * Generates the style object from the theme and provided additional information
+ * @param  {Object} componentTheme The theme variable object.
+ * @param  {Object} props the props of the component, the style is applied to
+ * @param  {Object} state the state of the component, the style is applied to
+ * @return {Object} The final style object, which will be used in the component
+ */
+const generateStyle = (componentTheme, props, _sharedTokens, state) => {
+  const iconBackground = props.iconBackground;
+  const isDesktop = state.layout === 'desktop';
+  return {
+    topNavBarBrand: {
+      label: 'topNavBarBrand',
+      display: 'flex',
+      alignItems: 'stretch'
+    },
+    container: {
+      label: 'topNavBarBrand__container',
+      display: 'flex',
+      justifyContent: 'flex-start',
+      alignItems: 'stretch',
+      border: 0,
+      padding: 0,
+      margin: 0,
+      appearance: 'none',
+      textDecoration: 'none'
+    },
+    name: {
+      label: 'topNavBarBrand__name',
+      display: 'flex',
+      alignItems: 'center',
+      height: componentTheme.logoHeight
+    },
+    iconContainer: {
+      label: 'topNavBarBrand__iconContainer',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+      pointerEvents: 'none',
+      padding: componentTheme.iconPadding,
+      background: isDesktop ? iconBackground : void 0
+    },
+    icon: {
+      label: 'topNavBarBrand__icon',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center'
+    },
+    focusOutlineInset: componentTheme.focusOutlineInset
+  };
+};
+export default generateStyle;