Skip to content

ECHOES-1427 Adjust layout aside padding #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marciopmoreira6 merged 1 commit into from
Jul 23, 2026
+60 −16
Merged

ECHOES-1427 Adjust layout aside padding #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/components/layout/LayoutSlots.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,24 @@ import { TextNode } from '~types/utils';
import { cssVar } from '~utils/design-tokens';
import { AsideSize, ContentGridArea, GlobalGridArea, PageGridArea, PageWidth } from './LayoutTypes';

const AsideSizeStyles: Record<AsideSize, CSSProperties> = {
[AsideSize.small]: { width: cssVar('layout-aside-width-small') },
[AsideSize.medium]: { width: cssVar('layout-aside-width-medium') },
[AsideSize.large]: { width: cssVar('layout-aside-width-large') },
type AsideSizeStyle = CSSProperties & {
'--aside-left-padding': string;
'--aside-left-width': string;
};

const AsideSizeStyles: Record<AsideSize, AsideSizeStyle> = {
[AsideSize.small]: {
'--aside-left-padding': cssVar('dimension-space-150'),
'--aside-left-width': cssVar('layout-aside-width-small'),
},
[AsideSize.medium]: {
'--aside-left-padding': cssVar('dimension-space-200'),
'--aside-left-width': cssVar('layout-aside-width-medium'),
},
[AsideSize.large]: {
'--aside-left-padding': cssVar('dimension-space-250'),
'--aside-left-width': cssVar('layout-aside-width-large'),
},
};

/*
Expand Down Expand Up @@ -97,7 +111,8 @@ const StyledAsideLeft = styled.div`
border-right: ${cssVar('border-width-default')} solid ${cssVar('color-border-weak')};

box-sizing: border-box;
padding: ${cssVar('dimension-space-250')};
padding: var(--aside-left-padding);
width: var(--aside-left-width);
`;
StyledAsideLeft.displayName = 'StyledAside';

Expand Down
51 changes: 40 additions & 11 deletions src/components/layout/__tests__/LayoutSlots-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@

import { screen } from '@testing-library/react';
import { render } from '~common/helpers/test-utils';
import { AsideLeft, PageContent, PageGrid } from '../LayoutSlots';
import { AsideLeft, PageContent, PageContentProps, PageGrid, PageGridProps } from '../LayoutSlots';
import { AsideSize, PageWidth } from '../LayoutTypes';

describe('PageGrid', () => {
it.each([[PageWidth.default, 'var(--echoes-layout-sizes-max-width-default)']])(
'should render correctly when %s',
(width, expected) => {
render(<PageGrid width={width}>content</PageGrid>);
renderPageGrid({ width });

expect(screen.getByText('content')).toHaveStyle({ maxWidth: expected });
},
);

it('should render correctly when fluid', () => {
render(<PageGrid width={PageWidth.fluid}>content</PageGrid>);
renderPageGrid({ width: PageWidth.fluid });

expect(screen.getByText('content')).not.toHaveStyle({
maxWidth: 'var(--echoes-layout-sizes-max-width-default)',
Expand All @@ -57,7 +57,7 @@ describe('PageGrid', () => {
'All done',
],
])('should render correctly when %s', async (_, args, ariaBusy, expectedText) => {
const { container } = render(<PageGrid {...args}>content</PageGrid>);
const { container } = renderPageGrid(args);

await expect(container).toHaveNoA11yViolations();

Expand All @@ -84,7 +84,7 @@ describe('PageContent', () => {
'All done',
],
])('should render correctly when %s', async (_, args, ariaBusy, expectedText) => {
const { container } = render(<PageContent {...args}>content</PageContent>);
const { container } = renderPageContent(args);

await expect(container).toHaveNoA11yViolations();

Expand All @@ -95,12 +95,41 @@ describe('PageContent', () => {

describe('AsideLeft', () => {
it.each([
[AsideSize.small, 'var(--echoes-layout-aside-width-small)'],
[AsideSize.medium, 'var(--echoes-layout-aside-width-medium)'],
[AsideSize.large, 'var(--echoes-layout-aside-width-large)'],
])('should render correctly when %s', (size, expected) => {
render(<AsideLeft size={size}>content</AsideLeft>);
[
AsideSize.small,
'var(--echoes-layout-aside-width-small)',
'var(--echoes-dimension-space-150)',
],
[
AsideSize.medium,
'var(--echoes-layout-aside-width-medium)',
'var(--echoes-dimension-space-200)',
],
[
AsideSize.large,
'var(--echoes-layout-aside-width-large)',
'var(--echoes-dimension-space-250)',
],
])('should render correctly when %s', (size, expectedWidth, expectedPadding) => {
renderAsideLeft(size);

expect(screen.getByText('content')).toHaveStyle({ width: expected });
expect(screen.getByText('content')).toHaveStyle({
'--aside-left-padding': expectedPadding,
'--aside-left-width': expectedWidth,
padding: 'var(--aside-left-padding)',
width: 'var(--aside-left-width)',
});
});
});

function renderPageGrid(props: PageGridProps = {}) {
return render(<PageGrid {...props}>content</PageGrid>);
}

function renderPageContent(props: PageContentProps = {}) {
return render(<PageContent {...props}>content</PageContent>);
}

function renderAsideLeft(size: `${AsideSize}`) {
return render(<AsideLeft size={size}>content</AsideLeft>);
}
Loading