fix(svelte): reuse original Framework7 instance

nolimits4web · nolimits4web · commit feda228523ba · 2022-04-12T12:28:13.000+03:00
fixes #3993 fixes #3992
diff --git a/src/svelte/shared/f7.js b/src/svelte/shared/f7.js
@@ -1,27 +1,29 @@
 /* eslint-disable import/no-mutable-exports */
 // eslint-disable-next-line
-import Framework7 from 'framework7/lite';
 import { extend, unsetRouterIds } from './utils.js';
 
 let f7;
 const theme = {};
 
-// eslint-disable-next-line
-if (!Framework7.__app__) {
-  // eslint-disable-next-line
-  Framework7.__app__ = {
-    f7: undefined,
-    f7events: undefined,
-    theme: {},
-    f7routers: {
-      views: [],
-      tabs: [],
-      modals: null,
-    },
-  };
+/* eslint-disable no-restricted-globals */
+const app =
+  typeof window !== 'undefined' && window.Framework7ComponentsApp
+    ? window.Framework7ComponentsApp
+    : {
+        Framework7: undefined,
+        f7: undefined,
+        f7events: undefined,
+        theme: {},
+        f7routers: {
+          views: [],
+          tabs: [],
+          modals: null,
+        },
+      };
+if (typeof window !== 'undefined') {
+  window.Framework7ComponentsApp = app;
 }
-
-const { __app__: app } = Framework7;
+/* eslint-enable no-restricted-globals */
 
 app.setInstance = (instance) => {
   f7 = instance;
@@ -51,7 +53,7 @@ const cleanup = () => {
 };
 
 const f7initEvents = () => {
-  app.f7events = new Framework7.Events();
+  app.f7events = new app.Framework7.Events();
 };
 
 const f7init = (rootEl, params = {}, init = true) => {
@@ -63,7 +65,7 @@ const f7init = (rootEl, params = {}, init = true) => {
   if (!f7Params.routes) f7Params.routes = [];
 
   if (f7Params.userAgent && (f7Params.theme === 'auto' || !f7Params.theme)) {
-    const device = Framework7.getDevice({ userAgent: f7Params.userAgent }, true);
+    const device = app.Framework7.getDevice({ userAgent: f7Params.userAgent }, true);
     app.theme.ios = !!device.ios;
     app.theme.aurora = device.desktop && device.electron;
     app.theme.md = !app.theme.ios && !app.theme.aurora;
@@ -74,7 +76,7 @@ const f7init = (rootEl, params = {}, init = true) => {
   // eslint-disable-next-line
   if (typeof window === 'undefined') cleanup();
 
-  const instance = new Framework7(f7Params);
+  const instance = new app.Framework7(f7Params);
   app.f7 = instance;
   f7 = instance;
   app.setInstance(instance);
diff --git a/src/svelte/shared/plugin.js b/src/svelte/shared/plugin.js
@@ -1,12 +1,14 @@
 // eslint-disable-next-line
-import Framework7 from 'framework7/lite';
 import componentsRouter from './components-router.js';
 import { f7ready, theme, app, f7initEvents, setTheme } from './f7.js';
 
 const Framework7Svelte = {
   name: 'sveltePlugin',
   installed: false,
   install(params = {}) {
+    const Framework7 = this;
+    app.Framework7 = Framework7;
+
     if (Framework7Svelte.installed) return;
     Framework7Svelte.installed = true;
 
