Skip to content
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

Convert @fluentui/react-text stories to index.stories.tsx approach #23662

Merged
merged 3 commits into from
Jun 23, 2022
Merged

Convert @fluentui/react-text stories to index.stories.tsx approach #23662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d21f1
chore: Convert Text to index based stories
micahgodbolt Jun 22, 2022
1f1b211
changefile
micahgodbolt Jun 22, 2022
01c30a7
Merge branch 'master' into 23661-text-stories-index
micahgodbolt Jun 22, 2022
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-text-a50df107-186b-4e4b-ab2b-806d0e31b0b7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: Convert Text to index based stories",
"packageName": "@fluentui/react-text",
"email": "[email protected]",
"dependentChangeType": "none"
}
2 changes: 1 addition & 1 deletion packages/react-components/react-text/.storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const rootMain = require('../../../../.storybook/main');

module.exports = /** @type {Omit<import('../../../../.storybook/main'), 'typescript'|'babel'>} */ ({
...rootMain,
stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/*.stories.@(ts|tsx)'],
stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/index.stories.@(ts|tsx)'],
addons: [...rootMain.addons],
webpackFinal: (config, options) => {
const localConfig = { ...rootMain.webpackFinal(config, options) };
Expand Down
4 changes: 2 additions & 2 deletions ...eact-text/src/stories/Default.stories.tsx → ...text/src/stories/Text/Default.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { makeStyles } from '@griffel/react';
import { Text } from '../Text';
import type { TextProps } from '../Text';
import { Text } from '@fluentui/react-text';
import type { TextProps } from '@fluentui/react-text';

const useStyles = makeStyles({
container: {
Expand Down
0 ...act-text/src/stories/TextBestPractices.md → ...ext/src/stories/Text/TextBestPractices.md
View file
Open in desktop
File renamed without changes.
0 ...react-text/src/stories/TextDescription.md → ...-text/src/stories/Text/TextDescription.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...act-text/src/stories/TextFont.stories.tsx → ...ext/src/stories/Text/TextFont.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Text } from '../index';
import { Text } from '@fluentui/react-text';

export const Font = () => (
<div style={{ display: 'flex', gap: 20 }}>
Expand Down
2 changes: 1 addition & 1 deletion ...t-text/src/stories/TextItalic.stories.tsx → ...t/src/stories/Text/TextItalic.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import { Text } from '../index';
import { Text } from '@fluentui/react-text';

export const Italic = () => <Text italic>Italic text</Text>;
2 changes: 1 addition & 1 deletion ...act-text/src/stories/TextSize.stories.tsx → ...ext/src/stories/Text/TextSize.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Text } from '../index';
import { Text } from '@fluentui/react-text';

export const Size = () => (
<div style={{ display: 'flex', gap: 10, alignItems: 'baseline' }}>
Expand Down
2 changes: 1 addition & 1 deletion ...src/stories/TextStrikeThrough.stories.tsx → ...tories/Text/TextStrikeThrough.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import { Text } from '../index';
import { Text } from '@fluentui/react-text';

export const StrikeThrough = () => <Text strikethrough>Strikethrough text</Text>;
2 changes: 1 addition & 1 deletion ...text/src/stories/TextTruncate.stories.tsx → ...src/stories/Text/TextTruncate.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Text } from '../index';
import { Text } from '@fluentui/react-text';

export const Truncate = () => (
<Text truncate style={{ width: 100, overflow: 'hidden', whiteSpace: 'nowrap' }} block>
Expand Down
13 changes: 12 additions & 1 deletion ...xt/src/stories/TextTypography.stories.tsx → ...c/stories/Text/TextTypography.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import * as React from 'react';
import { Body1, Caption1, Display, Subtitle1, LargeTitle, Title1, Title2, Title3, Subtitle2, Caption2 } from '../index';
import {
Body1,
Caption1,
Display,
Subtitle1,
LargeTitle,
Title1,
Title2,
Title3,
Subtitle2,
Caption2,
Comment on lines +3 to +12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: You could go the extra mile and order these alphabetically

Suggested change
Body1,
Caption1,
Display,
Subtitle1,
LargeTitle,
Title1,
Title2,
Title3,
Subtitle2,
Caption2,
Body1,
Caption1,
Caption2,
Display,
LargeTitle,
Subtitle1,
Subtitle2,
Title1,
Title2,
Title3,

} from '@fluentui/react-text';

export const Typography = () => (
<>
Expand Down
2 changes: 1 addition & 1 deletion ...ext/src/stories/TextUnderline.stories.tsx → ...rc/stories/Text/TextUnderline.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import { Text } from '../index';
import { Text } from '@fluentui/react-text';

export const Underline = () => <Text underline>Underlined text</Text>;
2 changes: 1 addition & 1 deletion ...t-text/src/stories/TextWeight.stories.tsx → ...t/src/stories/Text/TextWeight.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Text } from '../index';
import { Text } from '@fluentui/react-text';

export const Weight = () => (
<div style={{ display: 'flex', gap: 20 }}>
Expand Down
2 changes: 1 addition & 1 deletion ...s/react-text/src/stories/Text.stories.tsx → ...t-text/src/stories/Text/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta } from '@storybook/react';
import { Text } from '../Text';
import { Text } from '@fluentui/react-text';
import textDescriptionMd from './TextDescription.md';
import textBestPractices from './TextBestPractices.md';

Expand Down