fix: empty decorator array not rendering component properly. fix args…

… inheritance. closes #76
itsjavi · Nov 24, 2023 · 7d3836a · 7d3836a
1 parent d636fe3
commit 7d3836a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 3 deletions.
diff --git a/packages/docs/stories/buttons.stories.tsx b/packages/docs/stories/buttons.stories.tsx
@@ -22,7 +22,7 @@ export default {
   ],
   args: {
     // default args
-    children: 'My Button',
+    children: 'Default Button children',
   },
   parameters: {
     // overriden addon parameters
@@ -34,8 +34,27 @@ export default {
   },
 } satisfies StoryType
 
+export const WithInheritedDefaultArgs: StoryType = {
+  title: 'With Inherited Defaults',
+  args: {
+    hoverable: true,
+    primary: true,
+    // children is inherited from the default export args
+  },
+  decorators: [
+    (Story, context) => {
+      return (
+        <div style={{ padding: '16px', borderRadius: '8px', border: '1px solid #888' }}>
+          <p>This story inherits the default args from the default export.</p>
+          <Story {...context?.args} />
+        </div>
+      )
+    },
+  ],
+}
+
 export const WithComponentProps: StoryType = {
-  title: 'This title is overriden by "name"',
+  title: '---This title is overriden by "name"---',
   name: 'With Args',
   args: {
     hoverable: true,

diff --git a/packages/storylite/src/services/renderer/react.tsx b/packages/storylite/src/services/renderer/react.tsx
@@ -41,7 +41,8 @@ export function renderStory(storyComponent: SLFunctionComponent, story: StoryWit
     loaded: loadedData,
   }
 
-  const storyDecorators = story.decorators ?? [defaultDecorator]
+  const storyDecorators =
+    story.decorators && story.decorators.length > 0 ? story.decorators : [defaultDecorator]
   const DecoratedStory = applyDecorators(storyComponent, storyDecorators, decoratorContext)
 
   if (story.render) {

diff --git a/packages/storylite/src/types/story.ts b/packages/storylite/src/types/story.ts
@@ -66,6 +66,20 @@ export interface BaseStory<P extends SLFunctionComponent = SLFunctionComponent<{
    *
    */
   component?: P
+
+  /**
+   * If true, represents the default export of the story file.
+   *
+   * This value should not be set manually, it is set by StoryLite's story collector.
+   */
+  readonly _isDefault?: boolean
+
+  /**
+   * The module ID of the story file.
+   *
+   * This value should not be set manually, it is set by StoryLite's story collector.
+   */
+  readonly _moduleId?: string
 }
 
 /**

diff --git a/packages/vite-plugin/src/story-collector.ts b/packages/vite-plugin/src/story-collector.ts
@@ -125,7 +125,18 @@ function modulesToStories(
           navigation: {
             ...inheritedNavigation,
           },
+          name: exportName,
+          _moduleId: storyIdPrefix,
+          _isDefault: exportName === 'default',
           ...story,
+          args: {
+            ..._resolvedDefaultStory.args,
+            ...story.args,
+          },
+          parameters: {
+            ..._resolvedDefaultStory.parameters,
+            ...story.parameters,
+          },
           title: camelToTitleCase(titleizeFilename(storyTitle)),
           decorators: mergedDecorators,
         }

diff --git a/packages/vite-plugin/src/types.ts b/packages/vite-plugin/src/types.ts
@@ -2,6 +2,8 @@ export type BaseStory = {
   title?: string
   name?: string
   component?: { (props?: any): any; displayName?: string }
+  _isDefault?: boolean
+  _moduleId?: string
   [key: string]: any
 }