diff --git a/packages/shared-types/src/ComponentThemeVariables.ts b/packages/shared-types/src/ComponentThemeVariables.ts index a59ee88ab8..e2cf5c60bb 100644 --- a/packages/shared-types/src/ComponentThemeVariables.ts +++ b/packages/shared-types/src/ComponentThemeVariables.ts @@ -1472,10 +1472,6 @@ export type TopNavBarBrandTheme = { focusOutlineInset: string | 0 } -export type TopNavBarBreadcrumbTheme = { - color: Colors['textDarkest'] -} - export type TopNavBarItemTheme = { fontSize: Typography['fontSizeMedium'] fontFamily: Typography['fontFamily'] diff --git a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/index.tsx b/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/index.tsx index bffdd25bdb..7def65293b 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/index.tsx +++ b/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/index.tsx @@ -33,7 +33,6 @@ import { import TopNavBar from '../index' import { withStyle, jsx } from '@instructure/emotion' import generateStyle from '../TopNavBarBreadcrumb/styles' -import generateComponentTheme from '../TopNavBarBreadcrumb/theme' import { testable } from '@instructure/ui-testable' import { IconArrowOpenStartLine, @@ -50,7 +49,7 @@ id: TopNavBar.Breadcrumb --- @module TopNavBarBreadcrumb **/ -@withStyle(generateStyle, generateComponentTheme) +@withStyle(generateStyle, null) @testable() class TopNavBarBreadcrumb extends Component< TopNavBarBreadcrumbProps, diff --git a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/props.ts b/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/props.ts index a62cce3e5c..d20372fa99 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/props.ts +++ b/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/props.ts @@ -29,8 +29,7 @@ import { TopNavBarContextType } from '../TopNavBarContext' import { ChildrenOfType, OtherHTMLAttributes, - PropValidators, - TopNavBarBreadcrumbTheme + PropValidators } from '@instructure/shared-types' import TopNavBarBreadcrumb from './index' import { Children as ChildrenPropTypes } from '@instructure/ui-prop-types' @@ -39,7 +38,7 @@ import { Breadcrumb } from '@instructure/ui-breadcrumb' import type { BreadcrumbProps } from '@instructure/ui-breadcrumb' type TopNavBarBreadcrumbProps = TopNavBarBreadcrumbOwnProps & - WithStyleProps & + WithStyleProps & OtherHTMLAttributes type TopNavBarBreadcrumbState = { active: boolean } diff --git a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/styles.ts b/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/styles.ts index 7330a63261..3452aed7f1 100644 --- a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/styles.ts +++ b/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/styles.ts @@ -27,10 +27,8 @@ import { TopNavBarBreadcrumbStyle, TopNavBarBreadcrumbStyleProps } from './props' -import { TopNavBarBreadcrumbTheme } from '@instructure/shared-types' const generateStyle = ( - _componentTheme: TopNavBarBreadcrumbTheme, _props: TopNavBarBreadcrumbProps, _state: TopNavBarBreadcrumbStyleProps ): TopNavBarBreadcrumbStyle => { diff --git a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/theme.ts b/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/theme.ts deleted file mode 100644 index 4c7f4aea49..0000000000 --- a/packages/ui-top-nav-bar/src/TopNavBar/TopNavBarBreadcrumb/theme.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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 { TopNavBarBreadcrumbTheme } from '@instructure/shared-types' - -const generateComponentTheme = function ( - _theme: Theme -): TopNavBarBreadcrumbTheme { - const componentVariables: TopNavBarBreadcrumbTheme = { - color: 'oxford' - } - - return { - ...componentVariables - } -} - -export default generateComponentTheme