Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(core): add borderDefaults to CoreTokenName and tokenDefaults (#5026)

Geervan7a0be949799f
diff --git a/packages/core/src/theme/defineTheme.ts b/packages/core/src/theme/defineTheme.ts
index f041d4a9d3..dcdd91ca56 100644
--- a/packages/core/src/theme/defineTheme.ts
+++ b/packages/core/src/theme/defineTheme.ts
@@ -48,6 +48,7 @@ import {
colorDefaults,
spacingDefaults,
sizeDefaults,
+ borderDefaults,
focusDefaults,
radiusDefaults,
shadowDefaults,
@@ -81,6 +82,7 @@ export type CoreTokenName =
| keyof typeof colorDefaults
| keyof typeof spacingDefaults
| keyof typeof sizeDefaults
+ | keyof typeof borderDefaults
| keyof typeof focusDefaults
| keyof typeof radiusDefaults
| keyof typeof shadowDefaults
@@ -385,6 +387,7 @@ export const tokenDefaults: Record<string, string> = {
...colorDefaults,
...spacingDefaults,
...sizeDefaults,
+ ...borderDefaults,
...focusDefaults,
...radiusDefaults,
...shadowDefaults,
diff --git a/packages/core/src/theme/tokens.test.ts b/packages/core/src/theme/tokens.test.ts
index f586d3026f..ac8faf2651 100644
--- a/packages/core/src/theme/tokens.test.ts
+++ b/packages/core/src/theme/tokens.test.ts
@@ -40,6 +40,18 @@ describe('resolveThemeTokens', () => {
const tokens = resolveThemeTokens(null, {mode: 'light'});
expect(tokens['--color-text-primary']).toBe('#0A1317');
expect(tokens['--spacing-1']).toBe('4px');
+ expect(tokens['--border-width']).toBe('1px');
+ });
+
+ it('resolves --border-width when overridden in defineTheme', () => {
+ const arcadeTheme = defineTheme({
+ name: 'arcade',
+ tokens: {
+ '--border-width': '2px',
+ },
+ });
+ const tokens = resolveThemeTokens(arcadeTheme, {mode: 'light'});
+ expect(tokens['--border-width']).toBe('2px');
});
it('resolves tuple overrides using original input tokens', () => {
diff --git a/packages/core/src/theme/useTheme.test.tsx b/packages/core/src/theme/useTheme.test.tsx
index 461b534962..c6e8abb539 100644
--- a/packages/core/src/theme/useTheme.test.tsx
+++ b/packages/core/src/theme/useTheme.test.tsx
@@ -80,6 +80,24 @@ describe('useTheme', () => {
});
// --spacing-1 is not overridden — should be the default '4px'
expect(result.current.token('--spacing-1')).toBe('4px');
+ expect(result.current.token('--border-width')).toBe('1px');
+ });
+
+ it('resolves --border-width override when defined in theme', () => {
+ const arcadeTheme = defineTheme({
+ name: 'arcade',
+ tokens: {
+ '--border-width': '2px',
+ },
+ });
+ const {result} = renderHook(() => useTheme(), {
+ wrapper: ({children}) => (
+ <Theme theme={arcadeTheme} mode="light">
+ {children}
+ </Theme>
+ ),
+ });
+ expect(result.current.token('--border-width')).toBe('2px');
});
it('resolves default light-dark() string tokens for the mode', () => {