From e20427c999534e3a32efbeb64ea030ceb85bce70 Mon Sep 17 00:00:00 2001
From: Gert Hengeveld <info@ghengeveld.nl>
Date: Mon, 25 Oct 2021 21:23:29 +0200
Subject: [PATCH] Use existing globals storage

---
 lib/api/src/modules/globals.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/api/src/modules/globals.ts b/lib/api/src/modules/globals.ts
index b13ede27949..4d11ed0cb9e 100644
--- a/lib/api/src/modules/globals.ts
+++ b/lib/api/src/modules/globals.ts
@@ -54,14 +54,11 @@ export const init: ModuleFn = ({ store, fullAPI }) => {
   };
 
   const initModule = () => {
-    let storedGlobals: Globals;
-
     fullAPI.on(GLOBALS_UPDATED, function handleGlobalsUpdated({ globals }: { globals: Globals }) {
       const { ref } = getEventMetadata(this, fullAPI);
 
       if (!ref) {
         updateGlobals(globals);
-        storedGlobals = globals;
       } else {
         logger.warn(
           'received a GLOBALS_UPDATED from a non-local ref. This is not currently supported.'
@@ -72,6 +69,7 @@ export const init: ModuleFn = ({ store, fullAPI }) => {
     // Emitted by the preview on initialization
     fullAPI.on(SET_GLOBALS, function handleSetStories({ globals, globalTypes }: SetGlobalsPayload) {
       const { ref } = getEventMetadata(this, fullAPI);
+      const currentGlobals = store.getState()?.globals;
 
       if (!ref) {
         store.setState({ globals, globalTypes });
@@ -79,8 +77,8 @@ export const init: ModuleFn = ({ store, fullAPI }) => {
         logger.warn('received globals from a non-local ref. This is not currently supported.');
       }
 
-      if (storedGlobals) {
-        api.updateGlobals(storedGlobals);
+      if (currentGlobals) {
+        api.updateGlobals(currentGlobals);
       }
     });
   };