framework7 7.1.1 → 7.1.3

package/modules/router/back.js

@@ -132,11 +132,13 @@ function backward(router, el, backwardOptions) {
       if (router.history.indexOf(options.route.url) >= 0) {
         backIndex = router.history.length - router.history.indexOf(options.route.url) - 1;
         router.history = router.history.slice(0, router.history.indexOf(options.route.url) + 2);
+        router.propsHistory = router.propsHistory.slice(0, router.history.indexOf(options.route.url) + 2);
         view.history = router.history;
       } else if (router.history[[router.history.length - 2]]) {
-        router.history[router.history.length - 2] = options.route.url;
+        router.propsHistory[router.propsHistory.length - 2] = options.props || {};
       } else {
         router.history.unshift(router.url);
+        router.propsHistory.unshift(options.props || {});
       }
 
       if (backIndex && router.params.stackPages) {
@@ -339,12 +341,15 @@ function backward(router, el, backwardOptions) {
 
   if (options.replaceState) {
     router.history[router.history.length - 1] = options.route.url;
+    router.propsHistory[router.propsHistory.length - 1] = options.props || {};
   } else {
     if (router.history.length === 1) {
       router.history.unshift(router.url);
+      router.propsHistory.unshift(options.props || {});
     }
 
     router.history.pop();
+    router.propsHistory.pop();
   }
 
   router.saveHistory(); // Current Page & Navbar
@@ -434,7 +439,8 @@ function backward(router, el, backwardOptions) {
 
     if (preloadPreviousPage && router.history[router.history.length - 2] && !isMaster) {
       router.back(router.history[router.history.length - 2], {
-        preload: true
+        preload: true,
+        props: router.propsHistory[router.propsHistory.length - 2] || {}
       });
     }
 
@@ -565,6 +571,7 @@ function back() {
   if (router.swipeBackActive) return router;
   let navigateUrl;
   let navigateOptions;
+  let navigateProps;
   let route;
 
   if (typeof (arguments.length <= 0 ? undefined : arguments[0]) === 'object') {
@@ -664,6 +671,7 @@ function back() {
 
       router.currentRoute = previousRoute;
       router.history.pop();
+      router.propsHistory.pop();
       router.saveHistory();
 
       if (needHistoryBack && isBrokenBrowserHistory && !currentRouteWithoutBrowserHistory) {
@@ -717,7 +725,8 @@ function back() {
   if (!navigateOptions.force && $previousPage.length && !skipMaster) {
     if (router.params.browserHistory && $previousPage[0].f7Page && router.history[router.history.length - 2] !== $previousPage[0].f7Page.route.url) {
       router.back(router.history[router.history.length - 2], extend(navigateOptions, {
-        force: true
+        force: true,
+        props: router.propsHistory[router.propsHistory.length - 2] || {}
       }));
       return router;
     }
@@ -754,12 +763,14 @@ function back() {
 
   if (!navigateUrl && router.history.length > 1) {
     navigateUrl = router.history[router.history.length - 2];
+    navigateProps = router.propsHistory[router.propsHistory.length - 2] || {};
   }
 
   if (skipMaster && !navigateOptions.force && router.history[router.history.length - 3]) {
     return router.back(router.history[router.history.length - 3], extend({}, navigateOptions || {}, {
       force: true,
-      animate: false
+      animate: false,
+      props: router.propsHistory[router.propsHistory.length - 3] || {}
     }));
   }
 
@@ -795,9 +806,13 @@ function back() {
   const options = {};
 
   if (route.route.options) {
-    extend(options, route.route.options, navigateOptions);
+    extend(options, route.route.options, navigateOptions, {
+      props: navigateProps || {}
+    });
   } else {
-    extend(options, navigateOptions);
+    extend(options, navigateOptions, {
+      props: navigateProps || {}
+    });
   }
 
   options.route = route;

package/modules/router/navigate.js

@@ -339,15 +339,20 @@ function forward(router, el, forwardOptions) {
     if (((options.reloadCurrent || reloadDetail && otherDetailPageEl) && router.history.length) > 0 || options.replaceState) {
       if (reloadDetail && detailsInBetweenRemoved > 0) {
         router.history = router.history.slice(0, router.history.length - detailsInBetweenRemoved);
+        router.propsHistory = router.propsHistory.slice(0, router.propsHistory.length - detailsInBetweenRemoved);
       }
 
       router.history[router.history.length - (options.reloadPrevious ? 2 : 1)] = url;
+      router.propsHistory[router.propsHistory.length - (options.reloadPrevious ? 2 : 1)] = options.props || {};
     } else if (options.reloadPrevious) {
       router.history[router.history.length - 2] = url;
+      router.propsHistory[router.propsHistory.length - 2] = options.props || {};
     } else if (options.reloadAll) {
       router.history = [url];
+      router.propsHistory = [options.props || {}];
     } else {
       router.history.push(url);
+      router.propsHistory.push(options.props || {});
     }
   }
 

package/modules/router/router-class.js

@@ -37,6 +37,7 @@ class Router extends Framework7Class {
         params: view.params,
         routes: view.routes,
         history: view.history,
+        propsHistory: [],
         scrollHistory: view.scrollHistory,
         cache: app.cache,
         dynamicNavbar: app.theme === 'ios' && view.params.iosDynamicNavbar,
@@ -1201,12 +1202,12 @@ class Router extends Framework7Class {
       }
     } else {
       if (browserHistoryRoot && documentUrl.indexOf(browserHistoryRoot) >= 0) {
-        documentUrl = documentUrl.split(browserHistoryRoot)[1];
+        documentUrl = documentUrl.substring(documentUrl.indexOf(browserHistoryRoot) + browserHistoryRoot.length);
         if (documentUrl === '') documentUrl = '/';
       }
 
       if (browserHistorySeparator.length > 0 && documentUrl.indexOf(browserHistorySeparator) >= 0) {
-        initialUrl = documentUrl.split(browserHistorySeparator)[1];
+        initialUrl = documentUrl.substring(documentUrl.indexOf(browserHistorySeparator) + browserHistorySeparator.length);
       } else {
         initialUrl = documentUrl;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework7",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "description": "Full featured mobile HTML framework for building iOS & Android apps",
   "type": "module",
   "exports": {

package/framework7-lite.js

@@ -1,26 +0,0 @@
-import $ from './shared/dom7.js';
-import Framework7 from './components/app/app-class.js'; //IMPORT_HELPERS
-
-import DeviceModule from './modules/device/device.js';
-import SupportModule from './modules/support/support.js';
-import UtilsModule from './modules/utils/utils.js';
-import ResizeModule from './modules/resize/resize.js';
-import RequestModule from './modules/request/request.js';
-import TouchModule from './modules/touch/touch.js';
-import ClicksModule from './modules/clicks/clicks.js';
-import RouterModule from './modules/router/router.js';
-import HistoryModule from './modules/history/history.js';
-import ServiceWorkerModule from './modules/service-worker/service-worker.js';
-import StoreModule, { createStore } from './modules/store/store.js';
-import Statusbar from './components/statusbar/statusbar.js';
-import View from './components/view/view.js';
-import Navbar from './components/navbar/navbar.js';
-import Toolbar from './components/toolbar/toolbar.js';
-import Subnavbar from './components/subnavbar/subnavbar.js';
-import TouchRipple from './components/touch-ripple/touch-ripple.js';
-import Modal from './components/modal/modal.js'; //IMPORT_COMPONENTS
-
-Framework7.use([DeviceModule, SupportModule, UtilsModule, ResizeModule, RequestModule, TouchModule, ClicksModule, RouterModule, HistoryModule, ServiceWorkerModule, StoreModule, Statusbar, View, Navbar, Toolbar, Subnavbar, TouchRipple, Modal //INSTALL_COMPONENTS
-]); //NAMED_EXPORT
-
-export default Framework7;

package/less/plugin.js

@@ -1,18 +0,0 @@
-const fs = require('fs');
-
-function base64Encode(file) {
-  // read binary data
-  const bitmap = fs.readFileSync(file); // convert binary data to base64 encoded string
-
-  return Buffer.from(bitmap).toString('base64');
-}
-
-module.exports = {
-  install(less, pluginManager, functions) {
-    functions.add('framework7_coreIconsFont', () => {
-      const iconsFontBase64 = base64Encode('./src/core/icons/font/framework7-core-icons.woff');
-      return iconsFontBase64;
-    });
-  }
-
-};