@storybook/react-native 7.6.10-alpha.1 → 7.6.10-alpha.3

package/dist/V6.d.ts

@@ -1,7 +1,7 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { P as Params } from './View-3a0f8584.js';
+import { P as Params } from './View-090d9c8b.js';
 import { ClientApi } from '@storybook/preview-api';
-import { L as LoaderFunction, A as Addon_StoryApi } from './index.d-cff8c6fa.js';
+import { L as LoaderFunction, A as Addon_StoryApi } from './index.d-48fbc63a.js';
 import { ReactNode } from 'react';
 import { ReactRenderer } from '@storybook/react';
 export { Theme, darkTheme, theme } from '@storybook/react-native-theming';

package/dist/V6.js

@@ -2014,6 +2014,7 @@ var View10 = class {
   _webUrl;
   _storage;
   _channel;
+  _idToPrepared = {};
   constructor(preview, channel) {
     this._preview = preview;
     this._channel = channel;
@@ -2062,6 +2063,14 @@ var View10 = class {
       }
     });
   };
+  createPreparedStoryMapping = async () => {
+    await Promise.all(
+      Object.keys(this._storyIndex.entries).map(async (storyId) => {
+        this._idToPrepared[storyId] = await this._preview.storyStore.loadStory({ storyId });
+      })
+    );
+    console.log("Storybook: Finished building story index");
+  };
   getStorybookUI = (params = {}) => {
     const {
       shouldPersistSelection = true,
@@ -2072,7 +2081,6 @@ var View10 = class {
     this._storage = storage;
     const initialStory = this._getInitialStory(params);
     if (enableWebsockets) {
-      console.log("websockets enabled");
       const channel = this._getServerChannel(params);
       import_manager_api2.addons.setChannel(channel);
       import_preview_api2.addons.setChannel(channel);
@@ -2084,13 +2092,15 @@ var View10 = class {
     }
     import_manager_api2.addons.loadAddons({
       store: () => ({
-        fromId: (id) => this._preview.storyStore.getStoryContext(this._preview.storyStore.fromId(id)),
+        fromId: (id) => {
+          if (!this._ready) {
+            throw new Error("Storybook is not ready yet");
+          }
+          return this._preview.storyStore.getStoryContext(this._idToPrepared[id]);
+        },
         getSelection: () => {
           return this._preview.currentSelection;
         },
-        // @ts-ignore :) FIXME
-        // _channel: this._preview.channel,
-        // global.__STORYBOOK_ADDONS_CHANNEL__,
         _channel: this._channel
       })
     });
@@ -2103,11 +2113,16 @@ var View10 = class {
       const setContext = useSetStoryContext();
       const colorScheme = (0, import_react_native16.useColorScheme)();
       const [, forceUpdate] = (0, import_react16.useReducer)((x) => x + 1, 0);
+      const [ready, setReady] = (0, import_react16.useState)(false);
       const appliedTheme = (0, import_react16.useMemo)(
         () => (0, import_deepmerge.default)(colorScheme === "dark" ? import_react_native_theming12.darkTheme : import_react_native_theming12.theme, params.theme ?? {}),
         [colorScheme]
       );
       (0, import_react16.useEffect)(() => {
+        this.createPreparedStoryMapping().then(() => {
+          this._ready = true;
+          setReady(true);
+        }).catch((e) => console.error(e));
         self._setStory = (newStory) => {
           setContext(newStory);
           if (shouldPersistSelection && !storage) {
@@ -2132,6 +2147,19 @@ var View10 = class {
           self._preview.selectSpecifiedStory();
         });
       }, []);
+      if (!ready) {
+        return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+          import_react_native16.View,
+          {
+            style: {
+              ...import_react_native16.StyleSheet.absoluteFillObject,
+              alignItems: "center",
+              justifyContent: "center"
+            },
+            children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_native16.ActivityIndicator, { animating: true, size: "large" })
+          }
+        );
+      }
       if (onDeviceUI) {
         return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_native_safe_area_context3.SafeAreaProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_native_theming12.ThemeProvider, { theme: appliedTheme, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           OnDeviceUI_default,

package/dist/{View-3a0f8584.d.ts → View-090d9c8b.d.ts}

@@ -3,7 +3,7 @@ import { StoryContext } from '@storybook/csf';
 import { PreviewWithSelection } from '@storybook/preview-web';
 import { ReactRenderer } from '@storybook/react';
 import { Theme } from '@storybook/react-native-theming';
-import { S as StoryIndex } from './index.d-cff8c6fa.js';
+import { S as StoryIndex, P as PreparedStory } from './index.d-48fbc63a.js';
 import { Channel } from '@storybook/channels';
 
 interface Storage {
@@ -52,12 +52,14 @@ declare class View {
     _webUrl: string;
     _storage: Storage;
     _channel: Channel;
+    _idToPrepared: Record<string, PreparedStory<ReactRenderer>>;
     constructor(preview: PreviewWithSelection<ReactRenderer>, channel: Channel);
     _getInitialStory: ({ initialSelection, shouldPersistSelection, }?: Partial<Params>) => Promise<{
         storySpecifier: string;
         viewMode: string;
     }>;
     _getServerChannel: (params?: Partial<Params>) => Channel;
+    createPreparedStoryMapping: () => Promise<void>;
     getStorybookUI: (params?: Partial<Params>) => () => react_jsx_runtime.JSX.Element;
 }
 

package/dist/{index.d-cff8c6fa.d.ts → index.d-48fbc63a.d.ts}

@@ -194,5 +194,16 @@ interface Addon_StoryApi<StoryFnReturnType = unknown> {
     [k: string]: string | Addon_ClientApiReturnFn<StoryFnReturnType>;
 }
 type Path = string;
+type ModuleExport = any;
+type PreparedStory<TRenderer extends Renderer = Renderer> = StoryContextForEnhancers<TRenderer> & {
+    moduleExport: ModuleExport;
+    originalStoryFn: StoryFn<TRenderer>;
+    undecoratedStoryFn: LegacyStoryFn<TRenderer>;
+    unboundStoryFn: LegacyStoryFn<TRenderer>;
+    applyLoaders: (context: StoryContextForLoaders<TRenderer>) => Promise<StoryContextForLoaders<TRenderer> & {
+        loaded: StoryContext<TRenderer>['loaded'];
+    }>;
+    playFunction?: (context: StoryContext<TRenderer>) => Promise<void> | void;
+};
 
-export { Addon_StoryApi as A, LoaderFunction as L, NormalizedStoriesSpecifier as N, Renderer as R, StoryIndex as S, StoryContextForEnhancers as a, Args as b, StrictArgTypes as c };
+export { Addon_StoryApi as A, LoaderFunction as L, NormalizedStoriesSpecifier as N, PreparedStory as P, Renderer as R, StoryIndex as S, StoryContextForEnhancers as a, Args as b, StrictArgTypes as c };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { Theme, darkTheme, theme } from '@storybook/react-native-theming';
-import { V as View } from './View-3a0f8584.js';
-import { N as NormalizedStoriesSpecifier } from './index.d-cff8c6fa.js';
+import { V as View } from './View-090d9c8b.js';
+import { N as NormalizedStoriesSpecifier } from './index.d-48fbc63a.js';
 import 'react/jsx-runtime';
 import '@storybook/csf';
 import '@storybook/preview-web';

package/dist/index.js

@@ -2007,6 +2007,7 @@ var View10 = class {
   _webUrl;
   _storage;
   _channel;
+  _idToPrepared = {};
   constructor(preview, channel) {
     this._preview = preview;
     this._channel = channel;
@@ -2055,6 +2056,14 @@ var View10 = class {
       }
     });
   };
+  createPreparedStoryMapping = async () => {
+    await Promise.all(
+      Object.keys(this._storyIndex.entries).map(async (storyId) => {
+        this._idToPrepared[storyId] = await this._preview.storyStore.loadStory({ storyId });
+      })
+    );
+    console.log("Storybook: Finished building story index");
+  };
   getStorybookUI = (params = {}) => {
     const {
       shouldPersistSelection = true,
@@ -2065,7 +2074,6 @@ var View10 = class {
     this._storage = storage;
     const initialStory = this._getInitialStory(params);
     if (enableWebsockets) {
-      console.log("websockets enabled");
       const channel = this._getServerChannel(params);
       import_manager_api2.addons.setChannel(channel);
       import_preview_api2.addons.setChannel(channel);
@@ -2077,13 +2085,15 @@ var View10 = class {
     }
     import_manager_api2.addons.loadAddons({
       store: () => ({
-        fromId: (id) => this._preview.storyStore.getStoryContext(this._preview.storyStore.fromId(id)),
+        fromId: (id) => {
+          if (!this._ready) {
+            throw new Error("Storybook is not ready yet");
+          }
+          return this._preview.storyStore.getStoryContext(this._idToPrepared[id]);
+        },
         getSelection: () => {
           return this._preview.currentSelection;
         },
-        // @ts-ignore :) FIXME
-        // _channel: this._preview.channel,
-        // global.__STORYBOOK_ADDONS_CHANNEL__,
         _channel: this._channel
       })
     });
@@ -2096,11 +2106,16 @@ var View10 = class {
       const setContext = useSetStoryContext();
       const colorScheme = (0, import_react_native16.useColorScheme)();
       const [, forceUpdate] = (0, import_react16.useReducer)((x) => x + 1, 0);
+      const [ready, setReady] = (0, import_react16.useState)(false);
       const appliedTheme = (0, import_react16.useMemo)(
         () => (0, import_deepmerge.default)(colorScheme === "dark" ? import_react_native_theming12.darkTheme : import_react_native_theming12.theme, params.theme ?? {}),
         [colorScheme]
       );
       (0, import_react16.useEffect)(() => {
+        this.createPreparedStoryMapping().then(() => {
+          this._ready = true;
+          setReady(true);
+        }).catch((e) => console.error(e));
         self._setStory = (newStory) => {
           setContext(newStory);
           if (shouldPersistSelection && !storage) {
@@ -2125,6 +2140,19 @@ var View10 = class {
           self._preview.selectSpecifiedStory();
         });
       }, []);
+      if (!ready) {
+        return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+          import_react_native16.View,
+          {
+            style: {
+              ...import_react_native16.StyleSheet.absoluteFillObject,
+              alignItems: "center",
+              justifyContent: "center"
+            },
+            children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_native16.ActivityIndicator, { animating: true, size: "large" })
+          }
+        );
+      }
       if (onDeviceUI) {
         return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_native_safe_area_context3.SafeAreaProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_native_theming12.ThemeProvider, { theme: appliedTheme, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           OnDeviceUI_default,
@@ -2152,8 +2180,8 @@ function prepareStories({
     entries: {}
   };
   let importMap = {};
-  const makeTitle = (fileName, userTitle) => {
-    const title = (0, import_preview_api3.userOrAutoTitle)(fileName, storyEntries, userTitle);
+  const makeTitle = (fileName, specifier, userTitle) => {
+    const title = (0, import_preview_api3.userOrAutoTitleFromSpecifier)(fileName, specifier, userTitle);
     if (title) {
       return title.replace("./", "");
     } else {
@@ -2168,7 +2196,8 @@ function prepareStories({
       throw new Error("Could not generate title");
     }
   };
-  storyEntries.forEach(({ req, directory: root }) => {
+  storyEntries.forEach((specifier) => {
+    const { req, directory: root } = specifier;
     req.keys().forEach((filename) => {
       try {
         const fileExports = req(filename);
@@ -2182,7 +2211,7 @@ function prepareStories({
           if (!exportValue)
             return;
           const name = (0, import_csf2.storyNameFromExport)(key);
-          const title = makeTitle(filename, meta.title);
+          const title = makeTitle(filename, specifier, meta.title);
           if (title) {
             const id = (0, import_csf2.toId)(title, name);
             index.entries[id] = {

package/dist/preview.d.ts

@@ -1,5 +1,5 @@
 import * as _storybook_docs_tools from '@storybook/docs-tools';
-import { R as Renderer, a as StoryContextForEnhancers, b as Args, c as StrictArgTypes } from './index.d-cff8c6fa.js';
+import { R as Renderer, a as StoryContextForEnhancers, b as Args, c as StrictArgTypes } from './index.d-48fbc63a.js';
 
 declare const _default: {
     argTypesEnhancers: (<TRenderer extends Renderer>(context: StoryContextForEnhancers<TRenderer, Args>) => StrictArgTypes<Args>)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native",
-  "version": "7.6.10-alpha.1",
+  "version": "7.6.10-alpha.3",
   "description": "A better way to develop React Native Components for your app",
   "keywords": [
     "react",
@@ -51,7 +51,6 @@
     "preset": "react-native"
   },
   "dependencies": {
-    "@storybook/channel-websocket": "^7.6.10",
     "@storybook/channels": "^7.6.10",
     "@storybook/client-logger": "^7.6.10",
     "@storybook/core-client": "^7.6.10",
@@ -64,7 +63,7 @@
     "@storybook/preview-api": "^7.6.10",
     "@storybook/preview-web": "^7.6.10",
     "@storybook/react": "^7.6.10",
-    "@storybook/react-native-theming": "^7.6.10-alpha.1",
+    "@storybook/react-native-theming": "^7.6.10-alpha.3",
     "chokidar": "^3.5.1",
     "commander": "^8.2.0",
     "dedent": "^1.5.1",
@@ -98,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8b2e96767cc361ae5382c5ba0ba9d6ea6112634f"
+  "gitHead": "d0c275a9a09187b5f04e60c4d9170d7eae3a5437"
 }

package/scripts/__snapshots__/loader.test.js.snap

@@ -4,7 +4,7 @@ exports[`loader writeRequires when there are different file extensions writes th
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native/V6';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/file-extensions","files":"FakeStory.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/file-extensions\\\\/FakeStory\\\\.stories\\\\.tsx)$"}]
 
@@ -48,7 +48,7 @@ exports[`loader writeRequires when there is a configuration object writes the st
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native/V6';
 
       global.STORIES = [{"titlePrefix":"ComponentsPrefix","files":"**/*.stories.tsx","directory":"./scripts/mocks/configuration-objects/components","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/configuration-objects\\\\/components(?:\\\\/(?!\\\\.)(?:(?:(?!(?:^|\\\\/)\\\\.).)*?)\\\\/|\\\\/|$)(?!\\\\.)(?=.)[^/]*?\\\\.stories\\\\.tsx)$"}]
 
@@ -92,7 +92,7 @@ exports[`loader writeRequires when there is a story glob and exclude paths globs
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native/V6';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/exclude-config-files","files":"**/*.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/exclude-config-files(?:\\\\/(?!\\\\.)(?:(?:(?!(?:^|\\\\/)\\\\.).)*?)\\\\/|\\\\/|$)(?!\\\\.)(?=.)[^/]*?\\\\.stories\\\\.tsx)$"}]
 
@@ -136,7 +136,7 @@ exports[`loader writeRequires when there is a story glob writes the story import
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native/V6';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/all-config-files","files":"FakeStory.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/all-config-files\\\\/FakeStory\\\\.stories\\\\.tsx)$"}]
 
@@ -180,7 +180,7 @@ exports[`loader writeRequires when there is no preview does not add preview rela
 "
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native/V6';
 
       global.STORIES = [{"titlePrefix":"","directory":"./scripts/mocks/no-preview","files":"FakeStory.stories.tsx","importPathMatcher":"^\\\\.[\\\\\\\\/](?:scripts\\\\/mocks\\\\/no-preview\\\\/FakeStory\\\\.stories\\\\.tsx)$"}]
 

package/scripts/loader.js

@@ -153,7 +153,7 @@ function writeRequires({ configPath, absolute = false, v6RequireContext = false
   const fileContent = `
       /* do not change this file, it is auto generated by storybook. */
 
-      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native';
+      import { configure, addDecorator, addParameters, addArgsEnhancer } from '@storybook/react-native/V6';
 
       ${globalStories}