merge conflict

vogtn · vogtn · commit 31467e042018 · 2022-03-07T08:22:50.000-08:00
diff --git a/.storybook/addons/codeEditorAddon/codeAddon.js b/.storybook/addons/codeEditorAddon/codeAddon.js
@@ -154,6 +154,7 @@ export const withCodeEditor = makeDecorator({
                 }
             }
 
+<<<<<<< HEAD
         }
 
         const loadEditorContent = () => {
@@ -166,6 +167,10 @@ export const withCodeEditor = makeDecorator({
 
             storyElement.addEventListener('load', () => {
                 let doc = storyElement.contentDocument;
+=======
+    editor.addEventListener('fileUpdated', () => {
+      const storyElement = document.createElement('iframe');
+>>>>>>> release/latest
 
                 let { html, css, js } = editor.files;
                 js = js.replace(
@@ -178,7 +183,8 @@ export const withCodeEditor = makeDecorator({
             <head>
               <script type="module" src="${mgtScriptName}"></script>
               <script type="module">
-                ${providerInitCode}
+                import {Providers, MockProvider} from "${mgtScriptName}";
+                Providers.globalProvider = new MockProvider(true);
               </script>
               <style>
                 html, body {
@@ -201,6 +207,7 @@ export const withCodeEditor = makeDecorator({
                 doc.close();
             });
 
+<<<<<<< HEAD
             storyElement.className = 'story-mgt-preview';
             storyElementWrapper.innerHTML = '';
             storyElementWrapper.appendChild(storyElement);
@@ -209,6 +216,13 @@ export const withCodeEditor = makeDecorator({
         editor.addEventListener('fileUpdated', loadEditorContent);
 
         const separator = document.createElement('div');
+=======
+      storyElement.className = 'story-mgt-preview';
+      storyElement.title = 'story-mgt-preview';
+      storyElementWrapper.innerHTML = '';
+      storyElementWrapper.appendChild(storyElement);
+    });
+>>>>>>> release/latest
 
         setupEditorResize(storyElementWrapper, separator, editor, () => editor.layout());
 
