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
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"overrides": [
{
"files": ["**/*.stories.tsx"],
"files": ["**/*.stories.tsx", "**/*Args.tsx"],
"rules": {
"@next/next/no-img-element": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
Expand Down
6 changes: 5 additions & 1 deletion lib/plop-templates/Data.hbs
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
---
import { {{> propsName }} } from './{{ componentName }}';

const {{> argsName }} = {} satisfies {{> propsName }};

export default {{> argsName }};
4 changes: 2 additions & 2 deletions lib/plop-templates/Story.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
import {{> componentAlias }} from './{{ componentName }}';
import data from './{{ kebabCase componentName }}.yml';
import {{> argsName }} from './{{> argsName }}';

const meta: Meta<typeof {{> componentAlias }}> = {
title: '{{ titleCase (cascadeLayer componentFolder) }}/{{ componentTitle }}',
Expand All @@ -12,7 +12,7 @@ type Story = StoryObj<typeof {{> componentAlias }}>;

const Default: Story = {
args: {
...data,
...{{> argsName }},
},
};

Expand Down
3 changes: 2 additions & 1 deletion plopfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ async function generator(plop) {

plop.setPartial('propsName', '{{ componentName }}Props');
plop.setPartial('componentAlias', '{{ componentName }}Component');
plop.setPartial('argsName', '{{ camelCase componentName }}Args');

plop.setGenerator('component', {
description: 'Create a new React component',
Expand Down Expand Up @@ -194,7 +195,7 @@ Include Story?: {{ useStorybook }}
if (data.useStorybook) {
actions.push({
type: 'add',
path: './source/{{ componentLocation }}/{{ componentName }}/{{ kebabCase componentName }}.yml',
path: './source/{{ componentLocation }}/{{ componentName }}/{{ camelCase componentName }}Args.ts',
templateFile: './lib/plop-templates/Data.hbs',
});
actions.push({
Expand Down
2 changes: 1 addition & 1 deletion source/02-layouts/Constrain/Constrain.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import ConstrainLayout from './Constrain';
import constrainArgs from './constrain.yml';
import constrainArgs from './constrainArgs';

const meta: Meta<typeof ConstrainLayout> = {
title: 'Layouts/Constrain',
Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/Constrain/Constrain.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { GessoComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import styles from './constrain.module.css';

interface ConstrainProps extends GessoComponent {
Expand All @@ -21,3 +21,4 @@ function Constrain({
}

export default Constrain;
export type { ConstrainProps };
2 changes: 0 additions & 2 deletions source/02-layouts/Constrain/constrain.yml

This file was deleted.

5 changes: 5 additions & 0 deletions source/02-layouts/Constrain/constrainArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { ConstrainProps } from '@/source/02-layouts/Constrain/Constrain';

export default {
modifierClasses: '',
} satisfies ConstrainProps;
2 changes: 1 addition & 1 deletion source/02-layouts/Footer/Footer.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import FooterLayout from './Footer';
import footerArgs from './footer.yml';
import footerArgs from './footerArgs';

const meta: Meta<typeof FooterLayout> = {
title: 'Layouts/Footer',
Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import Constrain from '../Constrain/Constrain';
import styles from './footer.module.css';

Expand All @@ -27,3 +27,4 @@ function Footer({
}

export default Footer;
export type { FooterProps };
4 changes: 0 additions & 4 deletions source/02-layouts/Footer/footer.yml

This file was deleted.

7 changes: 7 additions & 0 deletions source/02-layouts/Footer/footerArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { FooterProps } from '@/source/02-layouts/Footer/Footer';

export default {
hasConstrain: true,
modifierClasses: '',
constrainClasses: '',
} satisfies FooterProps;
2 changes: 1 addition & 1 deletion source/02-layouts/Grid/Grid.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import GridLayout from './Grid';
import gridArgs from './grid.yml';
import gridArgs from './gridArgs';

function GridDemo(): JSX.Element {
const arr = Array.from(Array(6).keys());
Expand Down
1 change: 1 addition & 0 deletions source/02-layouts/Grid/Grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ function Grid({
}

export default Grid;
export type { GridProps };
3 changes: 0 additions & 3 deletions source/02-layouts/Grid/grid.yml

This file was deleted.

6 changes: 6 additions & 0 deletions source/02-layouts/Grid/gridArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { GridProps } from '@/source/02-layouts/Grid/Grid';

export default {
numCols: 3,
modifierClasses: '',
} satisfies GridProps;
2 changes: 1 addition & 1 deletion source/02-layouts/Header/Header.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import HeaderLayout from './Header';
import headerArgs from './header.yml';
import headerArgs from './headerArgs';

const meta: Meta<typeof HeaderLayout> = {
title: 'Layouts/Header',
Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import Constrain from '../Constrain/Constrain';
import styles from './header.module.css';

Expand All @@ -24,3 +24,4 @@ function Header({
}

export default Header;
export type { HeaderProps };
4 changes: 0 additions & 4 deletions source/02-layouts/Header/header.yml

This file was deleted.

7 changes: 7 additions & 0 deletions source/02-layouts/Header/headerArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { HeaderProps } from '@/source/02-layouts/Header/Header';

export default {
hasConstrain: true,
modifierClasses: '',
constrainClasses: '',
} satisfies HeaderProps;
2 changes: 1 addition & 1 deletion source/02-layouts/InlineForm/InlineForm.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import InlineFormLayout from './InlineForm';
import inlineFormArgs from './inline-form.yml';
import inlineFormArgs from './inlineFormArgs';

const meta: Meta<typeof InlineFormLayout> = {
title: 'Layouts/Inline Form',
Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/InlineForm/InlineForm.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { GessoComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import styles from './inline-form.module.css';

interface InlineFormProps extends GessoComponent {
Expand All @@ -23,3 +23,4 @@ function InlineForm({
}

export default InlineForm;
export type { InlineFormProps };
3 changes: 0 additions & 3 deletions source/02-layouts/InlineForm/inline-form.yml

This file was deleted.

6 changes: 6 additions & 0 deletions source/02-layouts/InlineForm/inlineFormArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { InlineFormProps } from '@/source/02-layouts/InlineForm/InlineForm';

export default {
wrap: true,
modifierClasses: '',
} satisfies InlineFormProps;
2 changes: 1 addition & 1 deletion source/02-layouts/Main/Main.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import MainLayout from './Main';
import mainArgs from './main.yml';
import mainArgs from './mainArgs';

const meta: Meta<typeof MainLayout> = {
title: 'Layouts/Main',
Expand Down
5 changes: 3 additions & 2 deletions source/02-layouts/Main/Main.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import Constrain from '../Constrain/Constrain';
import styles from './main.module.css';

interface MainProps extends ConstrainComponent {
id?: string;
children: ReactNode;
children?: ReactNode;
}

function Main({
Expand All @@ -31,3 +31,4 @@ function Main({
}

export default Main;
export type { MainProps };
5 changes: 0 additions & 5 deletions source/02-layouts/Main/main.yml

This file was deleted.

8 changes: 8 additions & 0 deletions source/02-layouts/Main/mainArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { MainProps } from '@/source/02-layouts/Main/Main';

export default {
id: 'main',
hasConstrain: true,
modifierClasses: '',
constrainClasses: '',
} satisfies MainProps;
5 changes: 1 addition & 4 deletions source/02-layouts/Media/Media.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import parse from 'html-react-parser';
import MediaLayout from './Media';
import styles from './media.module.css';
import mediaArgs from './media.yml';
import mediaArgs from './mediaArgs';

const meta: Meta<typeof MediaLayout> = {
title: 'Layouts/Media',
Expand All @@ -22,8 +21,6 @@ type Story = StoryObj<typeof MediaLayout>;
const Default: Story = {
args: {
...mediaArgs,
media: parse(mediaArgs.media),
mediaContent: parse(mediaArgs.mediaContent),
},
};

Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/Media/Media.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { GessoComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import styles from './media.module.css';

interface MediaProps extends GessoComponent {
Expand All @@ -22,3 +22,4 @@ function Media({
}

export default Media;
export type { MediaProps };
7 changes: 0 additions & 7 deletions source/02-layouts/Media/media.yml

This file was deleted.

14 changes: 14 additions & 0 deletions source/02-layouts/Media/mediaArgs.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { MediaProps } from '@/source/02-layouts/Media/Media';

export default {
media: (
<img src="http://fpoimg.com/200x150?text=Media Image" alt="Media Image" />
),
mediaContent: (
<p>
Lorem, ipsum dolor sit amet consectetur adipisicing elit. Molestiae
necessitatibus fuga provident aut.
</p>
),
modifierClasses: '',
} satisfies MediaProps;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
import ResponsiveTableComponent from './ResponsiveTable';
import responsiveTableArgs from './responsive-table.yml';
import responsiveTableArgs from './responsiveTableArgs';

const meta: Meta<typeof ResponsiveTableComponent> = {
title: 'Layouts/Responsive Table',
Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/ResponsiveTable/ResponsiveTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { GessoComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import styles from './responsive-table.module.css';

interface ResponsiveTableProps extends GessoComponent {
Expand All @@ -26,3 +26,4 @@ function ResponsiveTable({
}

export default ResponsiveTable;
export type { ResponsiveTableProps };
2 changes: 0 additions & 2 deletions source/02-layouts/ResponsiveTable/responsive-table.yml

This file was deleted.

5 changes: 5 additions & 0 deletions source/02-layouts/ResponsiveTable/responsiveTableArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { ResponsiveTableProps } from '@/source/02-layouts/ResponsiveTable/ResponsiveTable';

export default {
labelledBy: 'tablecaption01',
} satisfies ResponsiveTableProps;
2 changes: 1 addition & 1 deletion source/02-layouts/Section/Section.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';
import SectionLayout from './Section';
import sectionArgs from './section.yml';
import sectionArgs from './sectionArgs';

const meta: Meta<typeof SectionLayout> = {
title: 'Layouts/Section',
Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/Section/Section.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { ConstrainComponent } from 'gesso';
import { ElementType, ReactNode } from 'react';
import { ElementType, JSX, ReactNode } from 'react';
import Constrain from '../Constrain/Constrain';
import styles from './section.module.css';

Expand Down Expand Up @@ -29,3 +29,4 @@ function Section({
}

export default Section;
export type { SectionProps };
4 changes: 0 additions & 4 deletions source/02-layouts/Section/section.yml

This file was deleted.

7 changes: 7 additions & 0 deletions source/02-layouts/Section/sectionArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { SectionProps } from '@/source/02-layouts/Section/Section';

export default {
title: 'Section title',
hasConstrain: false,
titleElement: 'h2',
} satisfies SectionProps;
2 changes: 1 addition & 1 deletion source/02-layouts/Sidebar/Sidebar.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import SampleContent from '../../06-utility/storybook/SampleContent';
import SidebarLayout from './Sidebar';
import sidebarArgs from './sidebar.yml';
import sidebarArgs from './sidebarArgs';

const meta: Meta<typeof SidebarLayout> = {
title: 'Layouts/Sidebar',
Expand Down
3 changes: 2 additions & 1 deletion source/02-layouts/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import { GessoComponent } from 'gesso';
import { ReactNode } from 'react';
import { JSX, ReactNode } from 'react';
import styles from './sidebar.module.css';

interface SidebarProps extends GessoComponent {
Expand Down Expand Up @@ -48,3 +48,4 @@ function Sidebar({
}

export default Sidebar;
export type { SidebarProps };
2 changes: 0 additions & 2 deletions source/02-layouts/Sidebar/sidebar.yml

This file was deleted.

Loading