fix: check for null options

ccontrols · Jul 11, 2020 · 468cae6 · 468cae6
1 parent 24e92ba
commit 468cae6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ui/blocks/src/context/block/BlockContext.tsx b/ui/blocks/src/context/block/BlockContext.tsx
@@ -82,7 +82,9 @@ export const BlockContextProvider: React.FC<BlockContextInputProps> = ({
               storyId,
               docId: propsDocId,
               storeProvider: store,
-              options: deepMerge(options, store.config),
+              options: store.config
+                ? deepMerge(options, store.config)
+                : options,
             }}
           >
             <BlockDataContextProvider