Skip to content

Commit 233e340

Browse files
dannyhwdannyhw
authored
Merge branch 'next' into feat/hide-ui-buttons
2 parents 37d275c + 32574a4 commit 233e340

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2795
-3427
lines changed

‎MANUAL_SETUP.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const withStorybook = require('@storybook/react-native/metro/withStorybook');
143143

144144
const defaultConfig = getDefaultConfig(__dirname);
145145

146-
module.exports = withStorybook(finalConfig);
146+
module.exports = withStorybook(defaultConfig);
147147
```
148148

149149
**Add a stories file**

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,6 @@ You can pass these parameters to getStorybookUI call in your storybook entry poi
385385
storage?: Object (undefined)
386386
-- {getItem: (key: string) => Promise<string | null>;setItem: (key: string, value: string) => Promise<void>;}
387387
-- Custom storage to be used instead of AsyncStorage
388-
shouldPersistSelection: Boolean (true)
389-
-- Stores last selected story in your devices storage.
390388
onDeviceUI?: boolean;
391389
-- show the ondevice ui
392390
enableWebsockets?: boolean;

‎examples/expo-example/.storybook-web/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const main: ServerStorybookConfig = {
2121
'@storybook/addon-react-native-web',
2222
// note why does this break with get absolute?
2323
'@storybook/addon-react-native-server',
24+
'storybook-addon-deep-controls',
2425
],
2526
// logLevel: 'debug',
2627
framework: getAbsolutePath('@storybook/react-webpack5'),

‎examples/expo-example/.storybook/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const main: StorybookConfig = {
2121
'@storybook/addon-ondevice-backgrounds',
2222
'@storybook/addon-ondevice-actions',
2323
'@storybook/addon-ondevice-notes',
24+
'storybook-addon-deep-controls',
2425
],
2526
reactNative: {
2627
playFn: false,

‎examples/expo-example/.storybook/storybook.requires.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import "@storybook/addon-ondevice-controls/register";
66
import "@storybook/addon-ondevice-backgrounds/register";
77
import "@storybook/addon-ondevice-actions/register";
88
import "@storybook/addon-ondevice-notes/register";
9+
import "storybook-addon-deep-controls/register";
910

1011
const normalizedStories = [
1112
{
@@ -56,8 +57,9 @@ declare global {
5657

5758
const annotations = [
5859
require("./preview"),
59-
require("@storybook/react-native/dist/preview"),
60-
require("@storybook/addon-actions/preview"),
60+
require("@storybook/react-native/preview"),
61+
require("@storybook/addon-ondevice-actions/preview"),
62+
require("storybook-addon-deep-controls/preview"),
6163
];
6264

6365
global.STORIES = normalizedStories;

‎examples/expo-example/App.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Text, View } from 'react-native';
2-
import Constants from 'expo-constants';
32

43
function App() {
54
return (
@@ -18,7 +17,7 @@ function App() {
1817

1918
let AppEntryPoint = App;
2019

21-
if (Constants.expoConfig?.extra?.storybookEnabled === 'true') {
20+
if (process.env.EXPO_PUBLIC_STORYBOOK_ENABLED === 'true') {
2221
AppEntryPoint = require('./.storybook').default;
2322
}
2423

‎examples/expo-example/app.config.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎examples/expo-example/app.config.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import type { ExpoConfig } from 'expo/config';
2+
3+
export default {
4+
name: 'Expo Example',
5+
slug: 'expo-example',
6+
web: {
7+
bundler: 'metro',
8+
},
9+
userInterfaceStyle: 'automatic',
10+
newArchEnabled: true,
11+
} satisfies ExpoConfig;

‎examples/expo-example/other_components/DeepControls/DeepControls.stories.tsx

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
import { Meta, StoryObj } from '@storybook/react';
2+
import { Text, View } from 'react-native';
3+
4+
const DeepControls = ({
5+
objectArg,
6+
}: {
7+
objectArg: {
8+
string: string;
9+
number: number;
10+
boolean: boolean;
11+
enumString: string;
12+
nested: { number: number; boolean: boolean };
13+
};
14+
}) => {
15+
return (
16+
<View style={{ gap: 10 }}>
17+
<Text>Testing story with deep controls (storybook-addon-deep-controls)</Text>
18+
<Text>{JSON.stringify(objectArg, null, 2)}</Text>
19+
</View>
20+
);
21+
};
22+
23+
export default {
24+
title: 'DeepControls',
25+
component: DeepControls,
26+
} satisfies Meta<typeof DeepControls>;
27+
28+
export const Basic: StoryObj<typeof DeepControls> = {
29+
parameters: {
30+
deepControls: { enabled: true },
31+
},
32+
args: {
33+
objectArg: {
34+
string: 'foo',
35+
number: 42,
36+
boolean: true,
37+
enumString: 'value2', // we only want specific values for this
38+
nested: {
39+
number: 222,
40+
boolean: false,
41+
},
42+
},
43+
},
44+
argTypes: {
45+
// so we define an argType for the property to use a radio control with specific values
46+
// @ts-expect-error
47+
'objectArg.enumString': {
48+
control: 'radio',
49+
options: ['value1', 'value2', 'value3'],
50+
},
51+
52+
'objectArg.boolean': {
53+
control: 'boolean',
54+
},
55+
56+
'objectArg.number': {
57+
control: 'number',
58+
},
59+
60+
'objectArg.string': {
61+
control: 'text',
62+
},
63+
64+
'objectArg.nested.boolean': {
65+
control: 'boolean',
66+
},
67+
68+
'objectArg.nested.number': {
69+
control: 'number',
70+
},
71+
},
72+
};

‎examples/expo-example/package.json

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "expo-example",
3-
"version": "8.3.10",
3+
"version": "8.4.3-alpha.1",
44
"private": true,
55
"main": "index.js",
66
"scripts": {
7-
"android": "STORYBOOK_ENABLED=true expo start --android",
8-
"ios": "STORYBOOK_ENABLED=true expo start --ios",
9-
"web": "STORYBOOK_ENABLED=true expo start --web",
10-
"storybook": "STORYBOOK_ENABLED=true expo start -c",
7+
"android": "EXPO_PUBLIC_STORYBOOK_ENABLED=true expo start --android",
8+
"ios": "EXPO_PUBLIC_STORYBOOK_ENABLED=true expo start --ios",
9+
"web": "EXPO_PUBLIC_STORYBOOK_ENABLED=true expo start --web",
10+
"storybook": "EXPO_PUBLIC_STORYBOOK_ENABLED=true expo start -c",
1111
"storybook:web": "storybook dev -p 6006 -c ./.storybook-web",
1212
"build-web-storybook": "storybook build -c ./.storybook-web",
1313
"storybook-generate": "sb-rn-get-stories --config-path=./.storybook",
@@ -20,56 +20,57 @@
2020
},
2121
"dependencies": {
2222
"@babel/preset-env": "^7.25.4",
23-
"@expo/metro-runtime": "~3.2.3",
24-
"@gorhom/bottom-sheet": "^5.0.2",
23+
"@expo/metro-runtime": "~4.0.0",
24+
"@gorhom/bottom-sheet": "^5.0.5",
2525
"@react-native-async-storage/async-storage": "1.23.1",
26-
"@react-native-community/datetimepicker": "8.0.1",
27-
"@react-native-community/slider": "4.5.2",
28-
"@storybook/addon-essentials": "^8.3.5",
29-
"@storybook/addon-interactions": "^8.3.5",
30-
"@storybook/addon-links": "^8.3.5",
31-
"@storybook/addon-ondevice-actions": "^8.3.10",
32-
"@storybook/addon-ondevice-backgrounds": "^8.3.10",
33-
"@storybook/addon-ondevice-controls": "^8.3.10",
34-
"@storybook/addon-ondevice-notes": "^8.3.10",
26+
"@react-native-community/datetimepicker": "8.2.0",
27+
"@react-native-community/slider": "4.5.5",
28+
"@storybook/addon-essentials": "^8.4.2",
29+
"@storybook/addon-interactions": "^8.4.2",
30+
"@storybook/addon-links": "^8.4.2",
31+
"@storybook/addon-ondevice-actions": "^8.4.3-alpha.1",
32+
"@storybook/addon-ondevice-backgrounds": "^8.4.3-alpha.1",
33+
"@storybook/addon-ondevice-controls": "^8.4.3-alpha.1",
34+
"@storybook/addon-ondevice-notes": "^8.4.3-alpha.1",
3535
"@storybook/addon-react-native-server": "0.0.6",
3636
"@storybook/addon-react-native-web": "^0.0.22",
3737
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
38-
"@storybook/blocks": "^8.3.5",
39-
"@storybook/builder-webpack5": "^8.3.5",
38+
"@storybook/blocks": "^8.4.2",
39+
"@storybook/builder-webpack5": "^8.4.2",
4040
"@storybook/global": "^5.0.0",
41-
"@storybook/react": "^8.3.5",
42-
"@storybook/react-native": "^8.3.10",
43-
"@storybook/react-native-theming": "^8.3.10",
44-
"@storybook/react-webpack5": "^8.3.5",
45-
"@storybook/test": "^8.3.5",
46-
"expo": "^51.0.34",
41+
"@storybook/react": "^8.4.2",
42+
"@storybook/react-native": "^8.4.3-alpha.1",
43+
"@storybook/react-native-theming": "^8.4.3-alpha.1",
44+
"@storybook/react-webpack5": "^8.4.2",
45+
"@storybook/test": "^8.4.2",
46+
"expo": "~52.0.5",
4747
"history": "^5.3.0",
4848
"querystring": "^0.2.1",
49-
"react": "18.2.0",
50-
"react-dom": "18.2.0",
51-
"react-native": "0.74.5",
52-
"react-native-gesture-handler": "~2.16.1",
53-
"react-native-reanimated": "~3.10.1",
54-
"react-native-safe-area-context": "4.10.5",
55-
"react-native-svg": "15.2.0",
56-
"react-native-web": "~0.19.10",
49+
"react": "18.3.1",
50+
"react-dom": "18.3.1",
51+
"react-native": "0.76.1",
52+
"react-native-gesture-handler": "~2.20.2",
53+
"react-native-reanimated": "~3.16.1",
54+
"react-native-safe-area-context": "4.12.0",
55+
"react-native-svg": "15.8.0",
56+
"react-native-web": "~0.19.13",
5757
"react-router": "^6.26.2",
58-
"storybook": "^8.3.5",
58+
"storybook": "^8.4.2",
59+
"storybook-addon-deep-controls": "^0.9.2",
5960
"ws": "^8.18.0"
6061
},
6162
"devDependencies": {
6263
"@babel/core": "^7.24.0",
6364
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
6465
"@react-native/babel-preset": "^0.74.0",
6566
"@testing-library/react-native": "12.4.3",
66-
"@types/react": "~18.2.79",
67-
"@types/react-test-renderer": "18.0.7",
67+
"@types/react": "~18.3.12",
68+
"@types/react-test-renderer": "^18.3.0",
6869
"@types/ws": "^8.5.10",
6970
"babel-loader": "^9.1.3",
7071
"babel-plugin-react-docgen-typescript": "^1.5.1",
71-
"jest": "29.7.0",
72-
"jest-expo": "~51.0.4",
72+
"jest": "^29.7.0",
73+
"jest-expo": "~52.0.0",
7374
"metro-react-native-babel-preset": "^0.77.0",
7475
"typescript": "^5.3.3"
7576
}

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"npmClient": "yarn",
33
"registry": "https://registry.npmjs.org",
4-
"version": "8.3.10"
4+
"version": "8.4.3-alpha.1"
55
}

‎packages/ondevice-actions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-ondevice-actions",
3-
"version": "8.3.10",
3+
"version": "8.4.3-alpha.1",
44
"description": "Action Logger addon for react-native storybook",
55
"keywords": [
66
"storybook"
@@ -27,8 +27,8 @@
2727
"prepare": "tsc"
2828
},
2929
"dependencies": {
30-
"@storybook/addon-actions": "^8.3.5",
31-
"@storybook/core": "^8.3.5",
30+
"@storybook/addon-actions": "^8.4.2",
31+
"@storybook/core": "^8.4.2",
3232
"@storybook/global": "^5.0.0",
3333
"fast-deep-equal": "^2.0.1"
3434
},

‎packages/ondevice-actions/preview.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from '@storybook/addon-actions/preview';

‎packages/ondevice-actions/src/preview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from '@storybook/addon-actions/preview';

‎packages/ondevice-backgrounds/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-ondevice-backgrounds",
3-
"version": "8.3.10",
3+
"version": "8.4.3-alpha.1",
44
"description": "A react-native storybook addon to show different backgrounds for your preview",
55
"keywords": [
66
"addon",
@@ -32,8 +32,8 @@
3232
"dev": "tsc --watch"
3333
},
3434
"dependencies": {
35-
"@storybook/core": "^8.3.5",
36-
"@storybook/react-native-theming": "^8.3.10"
35+
"@storybook/core": "^8.4.2",
36+
"@storybook/react-native-theming": "^8.4.3-alpha.1"
3737
},
3838
"devDependencies": {
3939
"typescript": "^5.3.3"

‎packages/ondevice-controls/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-ondevice-controls",
3-
"version": "8.3.10",
3+
"version": "8.4.3-alpha.1",
44
"description": "Display storybook controls on your device.",
55
"keywords": [
66
"addon",
@@ -30,10 +30,10 @@
3030
"copyimages": "cross-env-shell cp -r src/components/color-picker/resources dist/components/color-picker/resources"
3131
},
3232
"dependencies": {
33-
"@storybook/addon-controls": "^8.3.5",
34-
"@storybook/core": "^8.3.5",
35-
"@storybook/react-native-theming": "^8.3.10",
36-
"@storybook/react-native-ui": "^8.3.10",
33+
"@storybook/addon-controls": "^8.4.2",
34+
"@storybook/core": "^8.4.2",
35+
"@storybook/react-native-theming": "^8.4.3-alpha.1",
36+
"@storybook/react-native-ui": "^8.4.3-alpha.1",
3737
"deep-equal": "^1.0.1",
3838
"prop-types": "^15.7.2",
3939
"react-native-modal-datetime-picker": "^14.0.0",

‎packages/ondevice-notes/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-ondevice-notes",
3-
"version": "8.3.10",
3+
"version": "8.4.3-alpha.1",
44
"description": "Write notes for your react-native Storybook stories.",
55
"keywords": [
66
"addon",
@@ -29,8 +29,8 @@
2929
"dev": "tsc --watch"
3030
},
3131
"dependencies": {
32-
"@storybook/core": "^8.3.5",
33-
"@storybook/react-native-theming": "^8.3.10",
32+
"@storybook/core": "^8.4.2",
33+
"@storybook/react-native-theming": "^8.4.3-alpha.1",
3434
"react-native-markdown-display": "^7.0.2"
3535
},
3636
"devDependencies": {

‎packages/react-native-theming/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/react-native-theming",
3-
"version": "8.3.10",
3+
"version": "8.4.3-alpha.1",
44
"description": "A wrapper library around emotion 11 to provide theming support for react-native storybook",
55
"keywords": [
66
"react",

0 commit comments

Comments
 (0)