Merge branch 'next' into next

examples/expo-example/.storybook/index.tsx

@@ -7,7 +7,7 @@ const StorybookUIRoot = view.getStorybookUI({
     getItem: AsyncStorage.getItem,
     setItem: AsyncStorage.setItem,
   },
-  enableWebsockets: true,
+  enableWebsockets: false,
   // host: '192.x.x.x',
   // port: 7007,
 

examples/expo-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-example",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "private": true,
   "main": "index.js",
   "scripts": {
@@ -21,28 +21,28 @@
   "dependencies": {
     "@babel/preset-env": "^7.25.4",
     "@expo/metro-runtime": "~3.2.3",
-    "@gorhom/bottom-sheet": "^4",
+    "@gorhom/bottom-sheet": "^5.0.2",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-community/datetimepicker": "8.0.1",
     "@react-native-community/slider": "4.5.2",
-    "@storybook/addon-essentials": "^8.3.1",
-    "@storybook/addon-interactions": "^8.3.1",
-    "@storybook/addon-links": "^8.3.1",
-    "@storybook/addon-ondevice-actions": "^8.3.5",
-    "@storybook/addon-ondevice-backgrounds": "^8.3.5",
-    "@storybook/addon-ondevice-controls": "^8.3.5",
-    "@storybook/addon-ondevice-notes": "^8.3.5",
+    "@storybook/addon-essentials": "^8.3.5",
+    "@storybook/addon-interactions": "^8.3.5",
+    "@storybook/addon-links": "^8.3.5",
+    "@storybook/addon-ondevice-actions": "^8.3.8",
+    "@storybook/addon-ondevice-backgrounds": "^8.3.8",
+    "@storybook/addon-ondevice-controls": "^8.3.8",
+    "@storybook/addon-ondevice-notes": "^8.3.8",
     "@storybook/addon-react-native-server": "0.0.6",
     "@storybook/addon-react-native-web": "^0.0.22",
     "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-    "@storybook/blocks": "^8.3.1",
-    "@storybook/builder-webpack5": "^8.3.1",
+    "@storybook/blocks": "^8.3.5",
+    "@storybook/builder-webpack5": "^8.3.5",
     "@storybook/global": "^5.0.0",
-    "@storybook/react": "^8.3.1",
-    "@storybook/react-native": "^8.3.5",
-    "@storybook/react-native-theming": "^8.3.5",
-    "@storybook/react-webpack5": "^8.3.1",
-    "@storybook/test": "^8.3.1",
+    "@storybook/react": "^8.3.5",
+    "@storybook/react-native": "^8.3.8",
+    "@storybook/react-native-theming": "^8.3.8",
+    "@storybook/react-webpack5": "^8.3.5",
+    "@storybook/test": "^8.3.5",
     "expo": "^51.0.34",
     "history": "^5.3.0",
     "querystring": "^0.2.1",
@@ -55,7 +55,7 @@
     "react-native-svg": "15.2.0",
     "react-native-web": "~0.19.10",
     "react-router": "^6.26.2",
-    "storybook": "^8.3.1",
+    "storybook": "^8.3.5",
     "ws": "^8.18.0"
   },
   "devDependencies": {

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "registry": "https://registry.npmjs.org",
-  "version": "8.3.5"
+  "version": "8.3.8"
 }

packages/ondevice-actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-actions",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "description": "Action Logger addon for react-native storybook",
   "keywords": [
     "storybook"
@@ -27,8 +27,8 @@
     "prepare": "tsc"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^8.3.1",
-    "@storybook/core": "^8.3.1",
+    "@storybook/addon-actions": "^8.3.5",
+    "@storybook/core": "^8.3.5",
     "@storybook/global": "^5.0.0",
     "fast-deep-equal": "^2.0.1"
   },

packages/ondevice-backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-backgrounds",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "description": "A react-native storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -32,8 +32,8 @@
     "dev": "tsc --watch"
   },
   "dependencies": {
-    "@storybook/core": "^8.3.1",
-    "@storybook/react-native-theming": "^8.3.5"
+    "@storybook/core": "^8.3.5",
+    "@storybook/react-native-theming": "^8.3.8"
   },
   "devDependencies": {
     "typescript": "^5.3.3"

packages/ondevice-controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-controls",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "description": "Display storybook controls on your device.",
   "keywords": [
     "addon",
@@ -30,10 +30,10 @@
     "copyimages": "cross-env-shell cp -r src/components/color-picker/resources dist/components/color-picker/resources"
   },
   "dependencies": {
-    "@storybook/addon-controls": "^8.3.1",
-    "@storybook/core": "^8.3.1",
-    "@storybook/react-native-theming": "^8.3.5",
-    "@storybook/react-native-ui": "^8.3.5",
+    "@storybook/addon-controls": "^8.3.5",
+    "@storybook/core": "^8.3.5",
+    "@storybook/react-native-theming": "^8.3.8",
+    "@storybook/react-native-ui": "^8.3.8",
     "deep-equal": "^1.0.1",
     "prop-types": "^15.7.2",
     "react-native-modal-datetime-picker": "^14.0.0",

packages/ondevice-notes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-notes",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "description": "Write notes for your react-native Storybook stories.",
   "keywords": [
     "addon",
@@ -29,8 +29,8 @@
     "dev": "tsc --watch"
   },
   "dependencies": {
-    "@storybook/core": "^8.3.1",
-    "@storybook/react-native-theming": "^8.3.5",
+    "@storybook/core": "^8.3.5",
+    "@storybook/react-native-theming": "^8.3.8",
     "react-native-markdown-display": "^7.0.2"
   },
   "devDependencies": {

packages/react-native-theming/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native-theming",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "description": "A wrapper library around emotion 11 to provide theming support for react-native storybook",
   "keywords": [
     "react",

packages/react-native-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native-ui",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "description": "ui components for react native storybook",
   "keywords": [
     "react",
@@ -57,9 +57,9 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@storybook/core": "^8.3.1",
-    "@storybook/react": "^8.3.1",
-    "@storybook/react-native-theming": "^8.3.5",
+    "@storybook/core": "^8.3.5",
+    "@storybook/react": "^8.3.5",
+    "@storybook/react-native-theming": "^8.3.8",
     "fuse.js": "^7.0.0",
     "memoizerific": "^1.11.3",
     "polished": "^4.3.1",

packages/react-native-ui/src/MobileAddonsPanel.tsx

@@ -83,6 +83,7 @@ export const MobileAddonsPanel = forwardRef<
       enableHandlePanningGesture={true}
       // enableContentPanningGesture={true}
       stackBehavior="replace"
+      enableDynamicSizing={false}
     >
       <Animated.View style={[{ flex: 1 }, adjustedBottomSheetSize]}>
         <AddonsTabs

packages/react-native-ui/src/MobileMenuDrawer.tsx

@@ -63,6 +63,7 @@ export const MobileMenuDrawer = forwardRef<MobileMenuDrawerRef, MobileMenuDrawer
         enableDismissOnClose
         enableHandlePanningGesture
         enableContentPanningGesture
+        enableDynamicSizing={false}
         keyboardBehavior="extend"
         keyboardBlurBehavior="restore"
         stackBehavior="replace"

packages/react-native/metro/withStorybook.js

@@ -48,20 +48,29 @@ module.exports = (
     },
     resolver: {
       ...config.resolver,
-      unstable_enablePackageExports: true,
       resolveRequest: (context, moduleName, platform) => {
-        const defaultResolveResult = config?.resolver?.resolveRequest
-          ? config?.resolver?.resolveRequest?.(context, moduleName, platform)
-          : context.resolveRequest(context, moduleName, platform);
+        const resolveFunction = config?.resolver?.resolveRequest
+          ? config?.resolver?.resolveRequest
+          : context.resolveRequest;
+
+        const isStorybookModule =
+          moduleName.startsWith('storybook') || moduleName.startsWith('@storybook');
+
+        if (isStorybookModule) {
+          context.unstable_enablePackageExports = true;
+          context.unstable_conditionNames = ['import'];
+        }
+
+        const resolveResult = resolveFunction(context, moduleName, platform);
 
         // workaround for template files with invalid imports
-        if (defaultResolveResult?.filePath?.includes?.('@storybook/react/template/cli')) {
+        if (resolveResult?.filePath?.includes?.('@storybook/react/template/cli')) {
           return {
             type: 'empty',
           };
         }
 
-        return defaultResolveResult;
+        return resolveResult;
       },
     },
   };

packages/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native",
-  "version": "8.3.5",
+  "version": "8.3.8",
   "description": "A better way to develop React Native Components for your app",
   "keywords": [
     "react",
@@ -39,12 +39,12 @@
     "test:ci": "jest"
   },
   "dependencies": {
-    "@storybook/core": "^8.3.1",
+    "@storybook/core": "^8.3.5",
     "@storybook/csf": "^0.1.1",
     "@storybook/global": "^5.0.0",
-    "@storybook/react": "^8.3.1",
-    "@storybook/react-native-theming": "^8.3.5",
-    "@storybook/react-native-ui": "^8.3.5",
+    "@storybook/react": "^8.3.5",
+    "@storybook/react-native-theming": "^8.3.8",
+    "@storybook/react-native-ui": "^8.3.8",
     "chokidar": "^3.5.1",
     "commander": "^8.2.0",
     "dedent": "^1.5.1",
@@ -54,7 +54,7 @@
     "react-native-swipe-gestures": "^1.0.5",
     "react-native-url-polyfill": "^2.0.0",
     "setimmediate": "^1.0.5",
-    "storybook": "^8.3.1",
+    "storybook": "^8.3.5",
     "type-fest": "~2.19",
     "util": "^0.12.4",
     "ws": "^8.18.0"

packages/react-native/src/View.tsx

@@ -214,6 +214,11 @@ export class View {
           .then(() => {
             this._ready = true;
             setReady(true);
+            initialStory.then((st) => {
+              self._preview.selectionStore.selectionSpecifier = st;
+
+              self._preview.selectSpecifiedStory();
+            });
           })
           .catch((e) => console.error(e));
 
@@ -240,12 +245,6 @@ export class View {
 
         self._forceRerender = () => forceUpdate();
 
-        initialStory.then((st) => {
-          self._preview.selectionStore.selectionSpecifier = st;
-
-          self._preview.selectSpecifiedStory();
-        });
-
         // eslint-disable-next-line react-hooks/exhaustive-deps
       }, []);