feat: support setting Marko template as a shared parameter

storybookjs · Jul 17, 2019 · 6a428af · 6a428af
1 parent 7a82da8
commit 6a428af
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/app/marko/src/client/preview/render.js b/app/marko/src/client/preview/render.js
@@ -11,11 +11,12 @@ export default function renderMain({
   selectedStory,
   showMain,
   showError,
+  parameters,
   // forceRender,
 }) {
   const config = storyFn();
 
-  if (!config || !(config.appendTo || config.template)) {
+  if (!config || !(config.appendTo || config.template || parameters.template)) {
     showError({
       title: `Expecting an object with a template property to be returned from the story: "${selectedStory}" of "${selectedKind}".`,
       description: stripIndents`
@@ -37,20 +38,24 @@ export default function renderMain({
     }
 
     activeComponent = config.appendTo(rootEl).getComponent();
-  } else if (activeTemplate === config.template) {
-    // When rendering the same template with new input, we reuse the same instance.
-    activeComponent.input = config.input;
-    activeComponent.update();
   } else {
-    if (activeComponent) {
-      activeComponent.destroy();
+    const template = config.template || parameters.template;
+
+    if (activeTemplate === template) {
+      // When rendering the same template with new input, we reuse the same instance.
+      activeComponent.input = config.input;
+      activeComponent.update();
+    } else {
+      if (activeComponent) {
+        activeComponent.destroy();
+      }
+
+      activeTemplate = template;
+      activeComponent = activeTemplate
+        .renderSync(config.input)
+        .appendTo(rootEl)
+        .getComponent();
     }
-
-    activeTemplate = config.template;
-    activeComponent = activeTemplate
-      .renderSync(config.input)
-      .appendTo(rootEl)
-      .getComponent();
   }
 
   showMain();

diff --git a/examples/marko-cli/src/stories/addon-knobs.stories.js b/examples/marko-cli/src/stories/addon-knobs.stories.js
@@ -5,12 +5,12 @@ export default {
   title: 'Addons|Knobs/Hello',
   decorators: [withKnobs],
   parameters: {
+    template: Hello,
     options: { panelPosition: 'right' },
   },
 };
 
 export const Simple = () => ({
-  template: Hello,
   input: {
     name: text('Name', 'John Doe'),
     age: number('Age', 44),