Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeltaranto committed Sep 4, 2024
1 parent 69ab011 commit 3568615
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: () => (
<Stack space="small">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -109,7 +112,7 @@ export function resolveCollapsibleAlignmentProps({
collapseDesktop ? 'stretch' : alignItemsDesktop,
alignItemsWide,
])
: defaultAlignItems,
: resolvedNonCollapsedAlignItems,
},
} as const;
}

0 comments on commit 3568615

Please sign in to comment.