From cad9d537a93561777d0fa1cb7d27b3a2f308b6cd Mon Sep 17 00:00:00 2001
From: Leo Y Li <leo.li@imagia.com>
Date: Wed, 17 Apr 2019 15:19:33 -0400
Subject: [PATCH] FIX bugfix: normalizeation bugs

---
 .../src/preview/libs/getContextNodes.ts       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/contexts/src/preview/libs/getContextNodes.ts b/addons/contexts/src/preview/libs/getContextNodes.ts
index f0792c97757..57b4c4cb72d 100644
--- a/addons/contexts/src/preview/libs/getContextNodes.ts
+++ b/addons/contexts/src/preview/libs/getContextNodes.ts
@@ -2,27 +2,27 @@ import { GetContextNodes, GetMergedSettings } from '../../@types';
 
 /**
  * @private
- * Merges the global (options) and the story (parameters) from a pair of setting;
+ * Merges the top-level (global options) and the story-level (parameters) from a pair of setting;
  *
  * @return the normalized definition for a contextual environment (-> node).
  */
-export const _getMergedSettings: GetMergedSettings = (
-  { icon, title, components = [], params = [], options = {} },
-  { params: storyParams = [], options: storyOptions = {}, ...story }
-) => ({
-  nodeId: title || story.title || '',
-  icon: icon || story.icon || '',
-  title: title || story.title || '',
-  components,
-  params: !!(params.length || storyParams.length)
-    ? params.concat(storyParams)
-    : [{ name: '', props: {} }],
+export const _getMergedSettings: GetMergedSettings = (topLevel, storyLevel) => ({
+  nodeId: topLevel.title || storyLevel.title || '',
+  icon: topLevel.icon || storyLevel.icon || '',
+  title: topLevel.title || storyLevel.title || '',
+  components: topLevel.components || storyLevel.components || [],
+  params:
+    topLevel.params || storyLevel.params
+      ? Array()
+          .concat(topLevel.params, storyLevel.params)
+          .filter(Boolean)
+      : [{ name: '', props: {} }],
   options: {
     deep: false,
     disable: false,
     cancelable: false,
-    ...options,
-    ...storyOptions,
+    ...topLevel.options,
+    ...storyLevel.options,
   },
 });