Skip to content

Commit 99ba814

Browse files
committed
feat(ui-breadcrumb): wip
1 parent 34e4acb commit 99ba814

File tree

2 files changed

+9
-65
lines changed

2 files changed

+9
-65
lines changed

packages/ui-breadcrumb/src/Breadcrumb/styles.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* SOFTWARE.
2323
*/
2424

25-
import type { NewComponentTypes, SharedTokens } from '@instructure/ui-themes'
25+
import type { NewComponentTypes } from '@instructure/ui-themes'
2626
import type { BreadcrumbProps, BreadcrumbStyle } from './props'
2727

2828
type StyleParams = {
@@ -41,46 +41,45 @@ type StyleParams = {
4141
*/
4242
const generateStyle = (
4343
componentTheme: NewComponentTypes['Breadcrumb'],
44-
params: StyleParams,
45-
_sharedTokens: SharedTokens
44+
params: StyleParams
4645
): BreadcrumbStyle => {
4746
const { size } = params
4847

4948
const crumbSizeVariants = {
50-
// TODO padding calculations
49+
// TODO fix padding calculations or gap tokens after View rework
5150
small: {
5251
fontSize: '0.875rem', // oldComponentTheme.smallFontSize,
53-
paddingInlineEnd: `calc(0.5rem + ${componentTheme.gapSm})`, // `calc(${componentTheme.smallSeparatorFontSize} * 2)`,
52+
paddingInlineEnd: componentTheme.gapSm, // `calc(${oldComponentTheme.smallSeparatorFontSize} * 2)`,
5453
paddingInlineStart: 0
5554
},
5655
medium: {
5756
fontSize: '1rem', // oldComponentTheme.mediumFontSize,
58-
paddingInlineEnd: `calc(0.75rem + ${componentTheme.gapMd})`, // `calc(${componentTheme.mediumSeparatorFontSize} * 2)`,
57+
paddingInlineEnd: componentTheme.gapMd, // `calc(${oldComponentTheme.mediumSeparatorFontSize} * 2)`,
5958
paddingInlineStart: 0
6059
},
6160
large: {
6261
fontSize: '1.375rem', // oldComponentTheme.largeFontSize,
63-
paddingInlineEnd: `calc(1rem + ${componentTheme.gapLg})`, // `calc(${componentTheme.largeSeparatorFontSize} * 2)`,
62+
paddingInlineEnd: componentTheme.gapLg, // `calc(${oldComponentTheme.largeSeparatorFontSize} * 2)`,
6463
paddingInlineStart: 0
6564
}
6665
}
6766

6867
const separatorSizeVariants = {
6968
small: {
7069
fontSize: '0.5rem', // oldComponentTheme.smallSeparatorFontSize,
71-
insetInlineEnd: `calc(0.5rem + ${componentTheme.gapSm})`, // separator size + gap
70+
insetInlineEnd: `calc(0.5rem + ${componentTheme.gapSm})`, // `calc(${oldComponentTheme.smallSeparatorFontSize} / 2)`
7271
insetInlineStart: 'auto',
7372
marginTop: `calc(-1 * (0.5rem / 2))` // `calc(-1 * (${oldComponentTheme.smallSeparatorFontSize} / 2))`
7473
},
7574
medium: {
7675
fontSize: '0.75rem', // oldComponentTheme.mediumSeparatorFontSize,
77-
insetInlineEnd: `calc(0.75rem + ${componentTheme.gapMd})`, // separator size + gap
76+
insetInlineEnd: `calc(0.75rem + ${componentTheme.gapMd})`, // `calc(${oldComponentTheme.mediumSeparatorFontSize} / 2)`
7877
insetInlineStart: 'auto',
7978
marginTop: `calc(-1 * (0.75rem / 2))` // `calc(-1 * (${oldComponentTheme.mediumSeparatorFontSize} / 2))`
8079
},
8180
large: {
8281
fontSize: '1rem', // oldComponentTheme.largeSeparatorFontSize,
83-
insetInlineEnd: `calc(1rem + ${componentTheme.gapLg})`, // separator size + gap
82+
insetInlineEnd: `calc(1rem + ${componentTheme.gapLg})`, // `calc(${oldComponentTheme.largeSeparatorFontSize} / 2)`
8483
insetInlineStart: 'auto',
8584
marginTop: `calc(-1 * (1rem / 2))` // `calc(-1 * (${oldComponentTheme.largeSeparatorFontSize} / 2))`
8685
}

packages/ui-breadcrumb/src/Breadcrumb/theme.ts

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)