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

feat: wip csf factories #685

Draft
wants to merge 2 commits into
base: feat/scroll-to-selected-story
Choose a base branch
from
Draft

feat: wip csf factories #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f253d2
feat: wip csf factories
dannyhw Feb 12, 2025
e67db5b
fix: use beta version
dannyhw Feb 13, 2025
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
13 changes: 9 additions & 4 deletions examples/expo-example/.storybook-web/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { StorybookConfig } from '@storybook/react-webpack5';
import type { StorybookConfig } from '@storybook/react-native-web-vite';
import { join, dirname } from 'path';
Copy link

Choose a reason for hiding this comment

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

Good stuff


/**
* This function is used to resolve the absolute path of a package.
* It is needed in projects that use Yarn PnP or are set up within a monorepo.
Expand All @@ -14,17 +15,21 @@ type ServerStorybookConfig = StorybookConfig & {

const main: ServerStorybookConfig = {
stories: ['../components/**/*.stories.?(ts|tsx|js|jsx)'],

addons: [
getAbsolutePath('@storybook/addon-webpack5-compiler-babel'),
getAbsolutePath('@storybook/addon-essentials'),
getAbsolutePath('@storybook/addon-interactions'),
'@storybook/addon-react-native-web',
// note why does this break with get absolute?
'@storybook/addon-react-native-server',
'storybook-addon-deep-controls',
],

framework: {
name: '@storybook/react-native-web-vite',
options: {},
},

// logLevel: 'debug',
framework: getAbsolutePath('@storybook/react-webpack5'),

reactNativeServerOptions: {
host: 'localhost',
Expand Down
6 changes: 3 additions & 3 deletions examples/expo-example/.storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { View, Appearance } from 'react-native';
import { withBackgrounds } from '@storybook/addon-ondevice-backgrounds';
import type { Preview } from '@storybook/react';
import { definePreview } from '@storybook/react/preview';

const preview: Preview = {
const preview = definePreview({
decorators: [
(Story) => (
<View style={{ padding: 8, flex: 1 }}>
Expand Down Expand Up @@ -38,6 +38,6 @@ const preview: Preview = {
],
},
},
};
});

export default preview;
10 changes: 4 additions & 6 deletions examples/expo-example/components/ControlExamples/ControlExample/ControlExample.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import preview from '../../../.storybook/preview';
import { ControlExample } from './ControlExample';

const meta = {
const meta = preview.meta({
component: ControlExample,
args: {
name: 'Storyteller',
Expand Down Expand Up @@ -74,10 +74,8 @@ const meta = {
control: { type: 'nonexistent_type' },
},
},
} satisfies Meta<typeof ControlExample>;
});

export default meta;

type ControlExampleStory = StoryObj<typeof meta>;

export const Example: ControlExampleStory = {};
export const Example = meta.story({});
16 changes: 9 additions & 7 deletions examples/expo-example/components/ControlExamples/Date/Date.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import type { StoryObj, Meta } from '@storybook/react';
import { DateString } from './Date';
import preview from '../../../.storybook/preview';

const date = new Date(1983, 1, 25);

const meta = {
const meta = preview.meta({
component: DateString,
args: { date: date },

argTypes: { date: { control: { type: 'date' } } },
} satisfies Meta<typeof DateString>;
});

export default meta;

type DateStory = StoryObj<typeof meta>;

export const Basic: DateStory = {};
export const Basic = meta.story({
args: {
date,
},
});
9 changes: 4 additions & 5 deletions examples/expo-example/components/ControlExamples/Date/Date.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { render, screen } from '@testing-library/react-native';
import { composeStories } from '@storybook/react';
import * as DateStories from './Date.stories';

const { Basic } = composeStories(DateStories);
import * as stories from './Date.stories';

const { Basic } = stories;
test('date story renders', () => {
render(<Basic />);
// @ts-ignore
render(<Basic.Component />);

const date = new Date(1983, 1, 25);

Expand Down
22 changes: 10 additions & 12 deletions examples/expo-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,21 @@
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-community/datetimepicker": "8.2.0",
"@react-native-community/slider": "4.5.5",
"@storybook/addon-essentials": "^8.5.1",
"@storybook/addon-interactions": "^8.5.1",
"@storybook/addon-links": "^8.5.1",
"@storybook/addon-essentials": "8.6.0-beta.0",
"@storybook/addon-interactions": "8.6.0-beta.0",
"@storybook/addon-links": "8.6.0-beta.0",
"@storybook/addon-ondevice-actions": "^8.5.5-alpha.3",
"@storybook/addon-ondevice-backgrounds": "^8.5.5-alpha.3",
"@storybook/addon-ondevice-controls": "^8.5.5-alpha.3",
"@storybook/addon-ondevice-notes": "^8.5.5-alpha.3",
"@storybook/addon-react-native-server": "0.0.6",
"@storybook/addon-react-native-web": "^0.0.26",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.5.1",
"@storybook/builder-webpack5": "^8.5.1",
"@storybook/addon-react-native-server": "^0.0.6",
"@storybook/blocks": "8.6.0-beta.0",
"@storybook/global": "^5.0.0",
"@storybook/react": "^8.5.1",
"@storybook/react": "8.6.0-beta.0",
"@storybook/react-native": "^8.5.5-alpha.3",
"@storybook/react-native-theming": "^8.5.5-alpha.3",
"@storybook/react-webpack5": "^8.5.1",
"@storybook/test": "^8.5.1",
"@storybook/react-native-web-vite": "^8.5.5-alpha.3",
"@storybook/test": "8.6.0-beta.0",
"expo": "~52.0.11",
"history": "^5.3.0",
"querystring": "^0.2.1",
Expand All @@ -55,8 +52,9 @@
"react-native-svg": "15.8.0",
"react-native-web": "~0.19.13",
"react-router": "^6.26.2",
"storybook": "^8.5.1",
"storybook": "8.6.0-beta.0",
"storybook-addon-deep-controls": "^0.9.2",
"vite": "^6.1.0",
"ws": "^8.18.0"
},
"devDependencies": {
Expand Down
8 changes: 5 additions & 3 deletions examples/expo-example/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"compilerOptions": {
"skipLibCheck": true,
"lib": ["es6"],
"baseUrl": "./",
"strict": true
"baseUrl": ".",
"strict": true,
"paths": {
"#/storybook/*": ["./.storybook/*"]
}
},
"extends": "expo/tsconfig.base",
"include": ["./.storybook/", "./.storybook-web/", "./*"]
Expand Down
4 changes: 2 additions & 2 deletions packages/ondevice-actions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"prepare": "tsc"
},
"dependencies": {
"@storybook/addon-actions": "^8.5.1",
"@storybook/core": "^8.5.1",
"@storybook/addon-actions": "8.6.0-beta.0",
"@storybook/core": "8.6.0-beta.0",
"@storybook/global": "^5.0.0",
"fast-deep-equal": "^2.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ondevice-backgrounds/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dev": "tsc --watch"
},
"dependencies": {
"@storybook/core": "^8.5.1",
"@storybook/core": "8.6.0-beta.0",
"@storybook/react-native-theming": "^8.5.5-alpha.3"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/ondevice-controls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"copyimages": "cross-env-shell cp -r src/components/color-picker/resources dist/components/color-picker/resources"
},
"dependencies": {
"@storybook/addon-controls": "^8.5.1",
"@storybook/core": "^8.5.1",
"@storybook/addon-controls": "8.6.0-beta.0",
"@storybook/core": "8.6.0-beta.0",
"@storybook/react-native-theming": "^8.5.5-alpha.3",
"@storybook/react-native-ui": "^8.5.5-alpha.3",
"deep-equal": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ondevice-notes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dev": "tsc --watch"
},
"dependencies": {
"@storybook/core": "^8.5.1",
"@storybook/core": "8.6.0-beta.0",
"@storybook/react-native-theming": "^8.5.5-alpha.3",
"react-native-markdown-display": "^7.0.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@storybook/core": "^8.5.1",
"@storybook/react": "^8.5.1",
"@storybook/core": "8.6.0-beta.0",
"@storybook/react": "8.6.0-beta.0",
"@storybook/react-native-theming": "^8.5.5-alpha.3",
"fuse.js": "^7.0.0",
"memoizerific": "^1.11.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"test:update": "jest --updateSnapshot"
},
"dependencies": {
"@storybook/core": "^8.5.1",
"@storybook/core": "8.6.0-beta.0",
"@storybook/csf": "^0.1.13",
"@storybook/global": "^5.0.0",
"@storybook/react": "^8.5.1",
"@storybook/react": "8.6.0-beta.0",
"@storybook/react-native-theming": "^8.5.5-alpha.3",
"@storybook/react-native-ui": "^8.5.5-alpha.3",
"commander": "^8.2.0",
Expand All @@ -57,7 +57,7 @@
"prettier": "^2.4.1",
"react-native-url-polyfill": "^2.0.0",
"setimmediate": "^1.0.5",
"storybook": "^8.5.1",
"storybook": "8.6.0-beta.0",
"type-fest": "~2.19",
"util": "^0.12.4",
"ws": "^8.18.0"
Expand Down
Loading
Loading