framework7-svelte 7.0.0-beta.11 → 7.0.0-beta.16

package/components/view.d.ts

@@ -5,6 +5,7 @@ import { SvelteComponentTyped } from 'svelte';
 
 
 interface ViewProps extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap['div']> {
+  initRouterOnTabShow?: boolean;
   tab ?: boolean;
   tabActive ?: boolean;
   name ?: string;

package/components/view.svelte

@@ -18,7 +18,9 @@
 
   const emit = createEmitter(createEventDispatcher, $$props);
 
-  const { main, tab, tabActive, browserHistoryInitialMatch = true } = $$props;
+  const { main, tab, tabActive, browserHistoryInitialMatch = true, initRouterOnTabShow } = $$props;
+
+  const shouldInitRouter = !(initRouterOnTabShow && tab && !tabActive);
 
   let initialPage;
   let initialRoute;
@@ -54,7 +56,7 @@
       instance: f7View,
     };
     app.f7routers.views.push(routerData);
-    if (f7View && f7View.router && (url || main)) {
+    if (shouldInitRouter && f7View && f7View.router && (url || main)) {
       const initialData = getRouterInitialComponent(f7View.router);
       initialPage = initialData.initialPage;
       initialRoute = initialData.initialRoute;

package/framework7-svelte.js

@@ -1,5 +1,5 @@
 /**
- * Framework7 Svelte 7.0.0-beta.11
+ * Framework7 Svelte 7.0.0-beta.16
  * Build full featured iOS & Android apps using Framework7 & Svelte
  * https://framework7.io/svelte/
  *
@@ -7,7 +7,7 @@
  *
  * Released under the MIT License
  *
- * Released on: February 17, 2022
+ * Released on: April 12, 2022
  */
 import Framework7Svelte from './shared/plugin.js';
 import { f7, f7ready, theme, app } from './shared/f7.js';

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "framework7-svelte",
-  "version": "7.0.0-beta.11",
+  "version": "7.0.0-beta.16",
   "description": "Build full featured iOS & Android apps using Framework7 & Svelte",
   "type": "module",
+  "svelte": "./framework7-svelte.js",
   "exports": {
     ".": "./framework7-svelte.js",
     "./components/*": "./components/*"
@@ -23,6 +24,7 @@
     "ipad",
     "apple",
     "phonegap",
+    "capacitor",
     "native",
     "touch",
     "appstore",

package/shared/f7.js

@@ -1,27 +1,27 @@
 /* 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
+const theme = {};
+/* eslint-disable no-restricted-globals */
 
-if (!Framework7.__app__) {
-  // eslint-disable-next-line
-  Framework7.__app__ = {
-    f7: undefined,
-    f7events: undefined,
-    theme: {},
-    f7routers: {
-      views: [],
-      tabs: [],
-      modals: null
-    }
-  };
+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;
 }
+/* eslint-enable no-restricted-globals */
 
-const {
-  __app__: app
-} = Framework7;
 
 app.setInstance = instance => {
   f7 = instance;
@@ -51,7 +51,7 @@ const cleanup = () => {
 };
 
 const f7initEvents = () => {
-  app.f7events = new Framework7.Events();
+  app.f7events = new app.Framework7.Events();
 };
 
 const f7init = (rootEl, params = {}, init = true) => {
@@ -63,7 +63,7 @@ const f7init = (rootEl, params = {}, init = true) => {
   if (!f7Params.routes) f7Params.routes = [];
 
   if (f7Params.userAgent && (f7Params.theme === 'auto' || !f7Params.theme)) {
-    const device = Framework7.getDevice({
+    const device = app.Framework7.getDevice({
       userAgent: f7Params.userAgent
     }, true);
     app.theme.ios = !!device.ios;
@@ -75,7 +75,7 @@ const f7init = (rootEl, params = {}, init = true) => {
   if (app.f7 && typeof window !== 'undefined') return; // 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);

package/shared/plugin.js

@@ -1,5 +1,4 @@
 // 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 = {
@@ -7,6 +6,8 @@ const Framework7Svelte = {
   installed: false,
 
   install(params = {}) {
+    const Framework7 = this;
+    app.Framework7 = Framework7;
     if (Framework7Svelte.installed) return;
     Framework7Svelte.installed = true;
     f7initEvents();