diff --git a/packages/braid-design-system/src/lib/components/Column/Column.tsx b/packages/braid-design-system/src/lib/components/Column/Column.tsx index 09e12f80a37..10b2a9ad044 100644 --- a/packages/braid-design-system/src/lib/components/Column/Column.tsx +++ b/packages/braid-design-system/src/lib/components/Column/Column.tsx @@ -77,7 +77,7 @@ export const Column = ({ mobile: collapseMobile && align !== 'left' ? 'flex' : 'block', tablet: collapseTablet && align !== 'left' ? 'flex' : 'block', desktop: collapseDesktop && align !== 'left' ? 'flex' : 'block', - wide: align !== 'left' ? 'flex' : 'block', + wide: 'block', } as const; return ( diff --git a/packages/braid-design-system/src/lib/components/Stack/Stack.screenshots.tsx b/packages/braid-design-system/src/lib/components/Stack/Stack.screenshots.tsx index 48006422b96..66844bf7432 100644 --- a/packages/braid-design-system/src/lib/components/Stack/Stack.screenshots.tsx +++ b/packages/braid-design-system/src/lib/components/Stack/Stack.screenshots.tsx @@ -59,7 +59,7 @@ export const screenshots: ComponentScreenshot = { }, { label: - 'Test - Should flatten fragments (6 placeholders should be evenly spaced)', + 'Test - Should handle fragments (6 placeholders should be evenly spaced)', Container, Example: () => ( diff --git a/packages/braid-design-system/src/lib/utils/collapsibleAlignmentProps.ts b/packages/braid-design-system/src/lib/utils/collapsibleAlignmentProps.ts index 1d70d1660c2..594c2559a47 100644 --- a/packages/braid-design-system/src/lib/utils/collapsibleAlignmentProps.ts +++ b/packages/braid-design-system/src/lib/utils/collapsibleAlignmentProps.ts @@ -64,8 +64,11 @@ export function resolveCollapsibleAlignmentProps({ wide: justifyContentWide = justifyContentDesktop, } = normalizedAlign; + const resolvedNonCollapsedAlignItems = alignY + ? alignYToFlexAlign(alignY) || defaultAlignItems + : defaultAlignItems; const normalizedAlignY = normalizeResponsiveValue( - alignYToFlexAlign(alignY) || defaultAlignItems, + resolvedNonCollapsedAlignItems, ); const { mobile: alignItemsMobile = defaultAlignItems, @@ -109,7 +112,7 @@ export function resolveCollapsibleAlignmentProps({ collapseDesktop ? 'stretch' : alignItemsDesktop, alignItemsWide, ]) - : defaultAlignItems, + : resolvedNonCollapsedAlignItems, }, } as const; }