Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion services/app/source/01-global/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@layer global {
@import './normalize/normalize';
@import './html-elements/index';
@import './constrain/constrain';
@import './icon/icon';
}
22 changes: 22 additions & 0 deletions services/app/source/02-layouts/Constrain/Constrain.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import constrainArgs from './constrain.yml';
import ConstrainLayout from './Constrain';

const meta: Meta<typeof ConstrainLayout> = {
title: 'Layouts/Constrain',
component: ConstrainLayout,
};

type Story = StoryObj<typeof ConstrainLayout>;

const Constrain: Story = {
render: args => (
<ConstrainLayout {...args}>
<SampleContent>Constrain Layout Content</SampleContent>
</ConstrainLayout>
),
args: constrainArgs,
};
export default meta;
export { Constrain };
23 changes: 23 additions & 0 deletions services/app/source/02-layouts/Constrain/Constrain.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import clsx from 'clsx';
import { GessoComponent } from 'gesso';
import { ReactNode } from 'react';
import styles from './constrain.module.css';

interface ConstrainProps extends GessoComponent {
children?: ReactNode;
isHidden?: boolean;
}

function Constrain({
children,
isHidden = false,
modifierClasses,
}: ConstrainProps): JSX.Element {
return isHidden ? (
<>{children}</>
) : (
<div className={clsx(styles.constrain, modifierClasses)}>{children}</div>
);
}

export default Constrain;
2 changes: 2 additions & 0 deletions services/app/source/02-layouts/Constrain/constrain.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
modifierClasses: ''
13 changes: 4 additions & 9 deletions services/app/source/02-layouts/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import Constrain from '../Constrain/Constrain';
import { ReactNode } from 'react';
import styles from './footer.module.css';

Expand All @@ -18,15 +19,9 @@ function Footer({
className={clsx(styles.wrapper, modifierClasses)}
role="contentinfo"
>
<div
className={clsx(
styles.inner,
hasConstrain && 'constrain',
constrainClasses,
)}
>
{children}
</div>
<Constrain isHidden={!hasConstrain} modifierClasses={constrainClasses}>
<div className={styles.inner}>{children}</div>
</Constrain>
</footer>
);
}
Expand Down
13 changes: 4 additions & 9 deletions services/app/source/02-layouts/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import Constrain from '../Constrain/Constrain';
import { ReactNode } from 'react';
import styles from './header.module.css';

Expand All @@ -15,15 +16,9 @@ function Header({
}: HeaderProps): JSX.Element {
return (
<header role="banner" className={clsx(styles.wrapper, modifierClasses)}>
<div
className={clsx(
styles.inner,
hasConstrain && 'constrain',
constrainClasses,
)}
>
{children}
</div>
<Constrain isHidden={!hasConstrain} modifierClasses={constrainClasses}>
<div className={styles.inner}>{children}</div>
</Constrain>
</header>
);
}
Expand Down
5 changes: 3 additions & 2 deletions services/app/source/02-layouts/Main/Main.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import Constrain from '../Constrain/Constrain';
import { ReactNode } from 'react';
import styles from './main.module.css';

Expand All @@ -22,9 +23,9 @@ function Main({
role="main"
tabIndex={-1}
>
<div className={clsx(hasConstrain && 'constrain', constrainClasses)}>
<Constrain isHidden={!hasConstrain} modifierClasses={constrainClasses}>
{children}
</div>
</Constrain>
</main>
);
}
Expand Down
5 changes: 3 additions & 2 deletions services/app/source/02-layouts/Section/Section.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import Constrain from '../Constrain/Constrain';
import { ElementType, ReactNode } from 'react';
import styles from './section.module.css';

Expand All @@ -19,10 +20,10 @@ function Section({
}: SectionProps): JSX.Element {
return (
<section className={clsx(styles.section, modifierClasses)}>
<div className={clsx(hasConstrain && 'constrain', constrainClasses)}>
<Constrain isHidden={!hasConstrain} modifierClasses={constrainClasses}>
{title && <TitleElement className={styles.title}>{title}</TitleElement>}
<div className={styles.content}>{children}</div>
</div>
</Constrain>
</section>
);
}
Expand Down
5 changes: 3 additions & 2 deletions services/app/source/03-components/Breadcrumb/Breadcrumb.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import clsx from 'clsx';
import { GessoComponent } from 'gesso';
import Constrain from '../../02-layouts/Constrain/Constrain';
import Link from 'next/link';
import { ElementType } from 'react';
import styles from './breadcrumb.module.css';
Expand Down Expand Up @@ -30,7 +31,7 @@ function Breadcrumb({
aria-labelledby={breadcrumbId}
className={styles.breadcrumb}
>
<div className="constrain">
<Constrain>
<TitleElement
id={breadcrumbId}
className={clsx(styles.title, hideTitle && 'u-visually-hidden')}
Expand All @@ -51,7 +52,7 @@ function Breadcrumb({
</li>
))}
</ol>
</div>
</Constrain>
</nav>
);
}
Expand Down