Skip to content

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

TypeScript

fix(theme-neutral): refine segmented control inset (#5851)

rubyycheung95e7bfacbbac
diff --git a/.changeset/neutral-segmented-control-inset.md b/.changeset/neutral-segmented-control-inset.md
new file mode 100644
index 0000000000..65efd8bee3
--- /dev/null
+++ b/.changeset/neutral-segmented-control-inset.md
@@ -0,0 +1,8 @@
+---
+'@astryxdesign/theme-neutral': patch
+'@astryxdesign/cli': patch
+---
+
+[fix] Give Neutral segmented controls a roomier inset while preserving their outside height.
+
+@rubyycheung
diff --git a/packages/cli/assets/templates/themes/neutral/neutralTheme.ts b/packages/cli/assets/templates/themes/neutral/neutralTheme.ts
index 2b08362bfe..0ffd52635b 100644
--- a/packages/cli/assets/templates/themes/neutral/neutralTheme.ts
+++ b/packages/cli/assets/templates/themes/neutral/neutralTheme.ts
@@ -486,6 +486,28 @@ export const neutralTheme = defineTheme({
'variant:error': {backgroundColor: statusFill.error},
},
+ // Give the Neutral segmented control a roomier inset without changing its
+ // outside height. The selected item stays flat against the tinted track.
+ 'segmented-control': {
+ base: {
+ padding: 'var(--spacing-1)',
+ },
+ },
+ 'segmented-control-item': {
+ 'size:sm': {
+ height: 'calc(var(--size-element-sm) - 8px)',
+ },
+ 'size:md': {
+ height: 'calc(var(--size-element-md) - 8px)',
+ },
+ 'size:lg': {
+ height: 'calc(var(--size-element-lg) - 8px)',
+ },
+ selected: {
+ boxShadow: 'none',
+ },
+ },
+
banner: {
base: {
'--color-neutral': 'var(--astryx-theme-neutral-color-on-tint-neutral)',
diff --git a/packages/themes/neutral/src/neutralTheme.test.ts b/packages/themes/neutral/src/neutralTheme.test.ts
index 29258be8ef..2626d1b12d 100644
--- a/packages/themes/neutral/src/neutralTheme.test.ts
+++ b/packages/themes/neutral/src/neutralTheme.test.ts
@@ -68,3 +68,17 @@ describe('neutral Banner tint mappings', () => {
});
});
});
+
+describe('neutral theme component overrides', () => {
+ it('keeps the roomier segmented-control inset height-neutral', () => {
+ expect(neutralTheme.components?.['segmented-control']).toEqual({
+ base: {padding: 'var(--spacing-1)'},
+ });
+ expect(neutralTheme.components?.['segmented-control-item']).toEqual({
+ 'size:sm': {height: 'calc(var(--size-element-sm) - 8px)'},
+ 'size:md': {height: 'calc(var(--size-element-md) - 8px)'},
+ 'size:lg': {height: 'calc(var(--size-element-lg) - 8px)'},
+ selected: {boxShadow: 'none'},
+ });
+ });
+});
diff --git a/packages/themes/neutral/src/neutralTheme.ts b/packages/themes/neutral/src/neutralTheme.ts
index 2b08362bfe..0ffd52635b 100644
--- a/packages/themes/neutral/src/neutralTheme.ts
+++ b/packages/themes/neutral/src/neutralTheme.ts
@@ -486,6 +486,28 @@ export const neutralTheme = defineTheme({
'variant:error': {backgroundColor: statusFill.error},
},
+ // Give the Neutral segmented control a roomier inset without changing its
+ // outside height. The selected item stays flat against the tinted track.
+ 'segmented-control': {
+ base: {
+ padding: 'var(--spacing-1)',
+ },
+ },
+ 'segmented-control-item': {
+ 'size:sm': {
+ height: 'calc(var(--size-element-sm) - 8px)',
+ },
+ 'size:md': {
+ height: 'calc(var(--size-element-md) - 8px)',
+ },
+ 'size:lg': {
+ height: 'calc(var(--size-element-lg) - 8px)',
+ },
+ selected: {
+ boxShadow: 'none',
+ },
+ },
+
banner: {
base: {
'--color-neutral': 'var(--astryx-theme-neutral-color-on-tint-neutral)',