@instructure/ui-top-nav-bar 8.30.1-snapshot-15

package/src/TopNavBar/TopNavBarActionItems/TopNavBarActionItemsLocator.ts

@@ -0,0 +1,53 @@
+/*
+ * 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 { locator } from '@instructure/ui-test-locator'
+
+/* eslint-disable no-restricted-imports */
+// @ts-expect-error bypass no type definition found error
+import { TruncateListLocator } from '@instructure/ui-truncate-list/es/TruncateList/TruncateListLocator'
+/* eslint-enable no-restricted-imports */
+
+import { TopNavBarItemLocator } from '../TopNavBarItem/TopNavBarItemLocator'
+
+import { TopNavBarActionItems } from './index'
+
+export const TopNavBarActionItemsLocator = locator(
+  // @ts-expect-error ts-migrate(2339) FIXME: Property 'selector' does not exist on type 'typeof... Remove this comment to see the full error message
+  TopNavBarActionItems.selector,
+  {
+    findAllActionItems: (...args: any[]) => {
+      return TopNavBarItemLocator.findAll(...args)
+    },
+    findTruncateList: (...args: any[]) => {
+      return TruncateListLocator.find(...args)
+    },
+    findTruncateListTriggerItem: async (...args: any[]) => {
+      const truncateList = await TruncateListLocator.find(...args)
+      if (!truncateList) return undefined
+      const allItems = await TopNavBarItemLocator.findAll(...args)
+      return allItems[allItems.length - 1]
+    }
+  }
+)

package/src/TopNavBar/TopNavBarActionItems/index.tsx

@@ -0,0 +1,299 @@
+/*
+ * 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.
+ */
+
+/** @jsx jsx */
+import React, { Component } from 'react'
+
+import {
+  omitProps,
+  passthroughProps,
+  safeCloneElement,
+  withDeterministicId
+} from '@instructure/ui-react-utils'
+import { testable } from '@instructure/ui-testable'
+import { warn, error } from '@instructure/console'
+
+import { withStyle, jsx } from '@instructure/emotion'
+
+import { Drilldown } from '@instructure/ui-drilldown'
+import { IconMoreLine } from '@instructure/ui-icons'
+import { TruncateList } from '@instructure/ui-truncate-list'
+
+import { TopNavBarItem } from '../TopNavBarItem'
+import type { ItemChild } from '../TopNavBarItem/props'
+import {
+  mapItemsForDrilldown,
+  renderMappedItemDrilldownSubpages,
+  renderMappedItemsAsDrilldownOptions
+} from '../utils/mapItemsForDrilldown'
+import type { RenderOptionContent } from '../utils/mapItemsForDrilldown'
+
+import { TopNavBarContext } from '../TopNavBarContext'
+
+import generateStyle from './styles'
+import generateComponentTheme from './theme'
+
+import {
+  propTypes,
+  allowedProps,
+  TopNavBarActionItemsStyleProps
+} from './props'
+import type {
+  TopNavBarActionItemsProps,
+  TopNavBarActionItemsState
+} from './props'
+
+/**
+---
+parent: TopNavBar
+id: TopNavBar.ActionItems
+---
+@module TopNavBarActionItems
+@tsProps
+**/
+@withDeterministicId()
+@withStyle(generateStyle, generateComponentTheme)
+@testable()
+class TopNavBarActionItems extends Component<
+  TopNavBarActionItemsProps,
+  TopNavBarActionItemsState
+> {
+  static readonly componentId = 'TopNavBar.ActionItems'
+
+  static propTypes = propTypes
+  static allowedProps = allowedProps
+  static defaultProps = {}
+
+  declare context: React.ContextType<typeof TopNavBarContext>
+  static contextType = TopNavBarContext
+
+  ref: HTMLUListElement | null = null
+
+  private readonly _hiddenActionItemsMenuId: string
+  private readonly _hiddenActionItemsMenuTriggerId: string
+
+  handleRef = (el: HTMLUListElement | null) => {
+    const { elementRef } = this.props
+
+    this.ref = el
+
+    if (typeof elementRef === 'function') {
+      elementRef(el)
+    }
+  }
+
+  constructor(props: TopNavBarActionItemsProps) {
+    super(props)
+
+    this._hiddenActionItemsMenuId = props.deterministicId!(
+      'TopNavBarActionItems-hiddenActionItemsMenu'
+    )
+    this._hiddenActionItemsMenuTriggerId = props.deterministicId!(
+      'TopNavBarActionItems-hiddenActionItemsMenuTrigger'
+    )
+
+    this.state = {
+      key: 0,
+      visibleActionItemsCount: undefined
+    }
+  }
+
+  componentDidMount() {
+    this.props.makeStyles?.(this.makeStylesVariables)
+  }
+
+  componentDidUpdate(prevProps: TopNavBarActionItemsProps) {
+    this.props.makeStyles?.(this.makeStylesVariables)
+
+    if (
+      this.context.layout === 'smallViewport' &&
+      React.Children.count(prevProps.children) !==
+        React.Children.count(this.props.children)
+    ) {
+      this.setState({ key: this.state.key + 1 })
+    }
+  }
+
+  get makeStylesVariables(): TopNavBarActionItemsStyleProps {
+    return {
+      layout: this.context.layout
+    }
+  }
+
+  get childrenArray() {
+    const children = React.Children.toArray(this.props.children) as ItemChild[]
+
+    return children.map((child) => {
+      if (!child?.props) {
+        return null
+      }
+
+      const { id, renderAvatar, renderIcon, variant } = child.props
+
+      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: undefined,
+          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: 'icon'
+        })
+      }
+
+      return child
+    }) as ItemChild[]
+  }
+
+  renderOptionContent: RenderOptionContent = (children, itemProps) => {
+    const { styles } = this.props
+    const { status } = itemProps
+
+    return (
+      <span
+        css={
+          status === 'active'
+            ? styles?.dropdownMenuOptionActive
+            : styles?.dropdownMenuOption
+        }
+      >
+        {children}
+      </span>
+    )
+  }
+
+  renderHiddenActionItemsMenu(hiddenItems: ItemChild[]) {
+    const {
+      renderHiddenItemsMenuTriggerLabel,
+      renderHiddenItemsMenuTriggerTooltip
+    } = this.props
+
+    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 (
+      <TopNavBarItem
+        id={this._hiddenActionItemsMenuTriggerId}
+        renderIcon={IconMoreLine}
+        variant="icon"
+        tooltip={tooltip}
+        showSubmenuChevron={false}
+        renderSubmenu={
+          <Drilldown rootPageId={this._hiddenActionItemsMenuId}>
+            {[
+              <Drilldown.Page
+                id={this._hiddenActionItemsMenuId}
+                key={this._hiddenActionItemsMenuId}
+              >
+                {options}
+              </Drilldown.Page>,
+              ...subPages
+            ]}
+          </Drilldown>
+        }
+      >
+        {label}
+      </TopNavBarItem>
+    )
+  }
+
+  renderTruncatedActionItemList() {
+    const { listLabel, styles } = this.props
+
+    return (
+      <TruncateList
+        {...passthroughProps(omitProps(this.props, allowedProps))}
+        key={this.state.key} // rerender if child count changes
+        elementRef={this.handleRef}
+        css={styles?.topNavBarActionItems}
+        visibleItemsCount={this.state.visibleActionItemsCount}
+        onUpdate={({ visibleItemsCount }) => {
+          this.setState({ visibleActionItemsCount: visibleItemsCount })
+        }}
+        renderHiddenItemMenu={(hiddenChildren) =>
+          this.renderHiddenActionItemsMenu(hiddenChildren as ItemChild[])
+        }
+        aria-label={listLabel}
+      >
+        {this.childrenArray}
+      </TruncateList>
+    )
+  }
+
+  render() {
+    const { listLabel, styles } = this.props
+
+    if (!this.childrenArray.length) {
+      return null
+    }
+
+    if (this.context.layout === 'smallViewport') {
+      return this.renderTruncatedActionItemList()
+    }
+
+    return (
+      <ul
+        {...omitProps(this.props, allowedProps)}
+        ref={this.handleRef}
+        css={styles?.topNavBarActionItems}
+        aria-label={listLabel}
+      >
+        {this.childrenArray.map((item) => (
+          <li css={styles?.listItem} key={item.props.id}>
+            {item}
+          </li>
+        ))}
+      </ul>
+    )
+  }
+}
+
+export { TopNavBarActionItems }
+export default TopNavBarActionItems

package/src/TopNavBar/TopNavBarActionItems/props.ts

@@ -0,0 +1,152 @@
+/*
+ * 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 React from 'react'
+import PropTypes from 'prop-types'
+
+import { Children as ChildrenPropTypes } from '@instructure/ui-prop-types'
+import type { WithStyleProps, ComponentStyle } from '@instructure/emotion'
+import type { WithDeterministicIdProps } from '@instructure/ui-react-utils'
+import type {
+  TopNavBarActionItemsTheme,
+  OtherHTMLAttributes,
+  PropValidators,
+  ChildrenOfType
+} from '@instructure/shared-types'
+
+import { TopNavBarItem } from '../TopNavBarItem'
+import { topNavBarItemTooltipPropType } from '../TopNavBarItem/props'
+import type {
+  ItemChild,
+  TopNavBarItemTooltipType
+} from '../TopNavBarItem/props'
+import type { TopNavBarContextType } from '../TopNavBarContext'
+
+import { TopNavBarActionItems } from './index'
+
+type ActionItemsChild = React.ComponentElement<
+  TopNavBarActionItemsProps,
+  TopNavBarActionItems
+>
+
+type TopNavBarActionItemsOwnProps = {
+  /**
+   * Children of type: `<TopNavBar.Item>`.
+   *
+   * Items in small viewport mode are __required__ to have the `renderIcon` prop,
+   * because only the icons are displayed due to the lack of space.
+   */
+  children?: ChildrenOfType<ItemChild>
+
+  /**
+   * An 'aria-label' for the action items list.
+   */
+  listLabel?: string
+
+  /**
+   * In __smallViewport__ mode, a __required__ label for the trigger item
+   * of the hidden list items menu, used as an accessible screen reader label.
+   * (The list is not truncated in __desktop__ mode.)
+   *
+   * When there is not enough room to list all the action items,
+   * they will be accessible via a dropdown menu at the end of the list.
+   */
+  renderHiddenItemsMenuTriggerLabel:
+    | string
+    | ((hiddenChildrenCount: number) => string)
+
+  /**
+   * In __smallViewport__ mode, an optional tooltip for the trigger item
+   * of the hidden list items menu.
+   * (The list is not truncated in __desktop__ mode.)
+   *
+   * When there is not enough room to list all the action items,
+   * they will be accessible via a dropdown menu at the end of the list.
+   */
+  renderHiddenItemsMenuTriggerTooltip?:
+    | TopNavBarItemTooltipType
+    | ((hiddenChildrenCount: number) => TopNavBarItemTooltipType)
+
+  /**
+   * A function that returns a reference to root HTML element
+   */
+  elementRef?: (el: HTMLUListElement | null) => void
+}
+
+type PropKeys = keyof TopNavBarActionItemsOwnProps
+
+type AllowedPropKeys = Readonly<Array<PropKeys>>
+
+type TopNavBarActionItemsProps = TopNavBarActionItemsOwnProps &
+  WithStyleProps<TopNavBarActionItemsTheme, TopNavBarActionItemsStyle> &
+  OtherHTMLAttributes<TopNavBarActionItemsOwnProps> &
+  WithDeterministicIdProps
+
+type TopNavBarActionItemsStyle = ComponentStyle<
+  | 'topNavBarActionItems'
+  | 'listItem'
+  | 'dropdownMenuOption'
+  | 'dropdownMenuOptionActive'
+>
+
+type TopNavBarActionItemsState = {
+  key: number
+  visibleActionItemsCount?: number
+}
+
+type TopNavBarActionItemsStyleProps = {
+  layout?: TopNavBarContextType['layout']
+}
+
+const propTypes: PropValidators<PropKeys> = {
+  children: ChildrenPropTypes.oneOf([TopNavBarItem]),
+  listLabel: PropTypes.string,
+  renderHiddenItemsMenuTriggerLabel: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.func
+  ]).isRequired,
+  renderHiddenItemsMenuTriggerTooltip: PropTypes.oneOfType([
+    topNavBarItemTooltipPropType,
+    PropTypes.func
+  ]),
+  elementRef: PropTypes.func
+}
+
+const allowedProps: AllowedPropKeys = [
+  'children',
+  'listLabel',
+  'renderHiddenItemsMenuTriggerLabel',
+  'renderHiddenItemsMenuTriggerTooltip',
+  'elementRef'
+]
+
+export type {
+  ActionItemsChild,
+  TopNavBarActionItemsProps,
+  TopNavBarActionItemsOwnProps,
+  TopNavBarActionItemsState,
+  TopNavBarActionItemsStyleProps,
+  TopNavBarActionItemsStyle
+}
+export { propTypes, allowedProps }

package/src/TopNavBar/TopNavBarActionItems/styles.ts

@@ -0,0 +1,92 @@
+/*
+ * 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 type { TopNavBarActionItemsTheme } from '@instructure/shared-types'
+import type {
+  TopNavBarActionItemsProps,
+  TopNavBarActionItemsStyleProps,
+  TopNavBarActionItemsStyle
+} from './props'
+
+/**
+ * ---
+ * 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: TopNavBarActionItemsTheme,
+  _props: TopNavBarActionItemsProps,
+  state: TopNavBarActionItemsStyleProps
+): TopNavBarActionItemsStyle => {
+  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/src/TopNavBar/TopNavBarActionItems/theme.ts

@@ -0,0 +1,51 @@
+/*
+ * 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 type { Theme } from '@instructure/ui-themes'
+import type { TopNavBarActionItemsTheme } from '@instructure/shared-types'
+
+/**
+ * Generates the theme object for the component from the theme and provided additional information
+ * @param  {Object} theme The actual theme object.
+ * @return {Object} The final theme object with the overrides and component variables
+ */
+const generateComponentTheme = (theme: Theme): TopNavBarActionItemsTheme => {
+  const { typography, spacing, borders } = theme
+
+  const componentVariables: TopNavBarActionItemsTheme = {
+    smallViewportActionItemContainerMargin: spacing?.xxLarge,
+    smallViewportActionItemContainerMaxWidth: '50%',
+
+    smallViewportDropdownMenuActiveOptionFontWeight: typography?.fontWeightBold,
+    smallViewportDropdownMenuActiveOptionIndicatorSpacing: '0.25rem',
+    smallViewportDropdownMenuActiveOptionIndicatorWidth: borders?.widthMedium,
+    smallViewportDropdownMenuActiveOptionIndicatorColor: 'currentColor'
+  }
+
+  return {
+    ...componentVariables
+  }
+}
+
+export default generateComponentTheme

package/src/TopNavBar/TopNavBarBrand/TopNavBarBrandLocator.ts

@@ -0,0 +1,44 @@
+/*
+ * 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 { locator } from '@instructure/ui-test-locator'
+import { find } from '@instructure/ui-test-utils'
+
+import { TopNavBarBrand } from './index'
+
+// @ts-expect-error ts-migrate(2339) FIXME: Property 'selector' does not exist on type 'typeof... Remove this comment to see the full error message
+export const TopNavBarBrandLocator = locator(TopNavBarBrand.selector, {
+  findContainer: (...args: any[]) => {
+    return find('[class$="-topNavBarBrand__container"]', ...args)
+  },
+  findBrandNameContainer: (...args: any[]) => {
+    return find('[class$="-topNavBarBrand__nameContainer"]', ...args)
+  },
+  findBrandIconContainer: (...args: any[]) => {
+    return find('[class$="-topNavBarBrand__iconContainer"]', ...args)
+  },
+  findScreenReaderLabel: (...args: any[]) => {
+    return find('[class$="-screenReaderContent"]', ...args)
+  }
+})