framework7 6.3.15 → 7.0.0-beta.11

package/{esm/modules → modules}/router/back.js

@@ -1,42 +1,42 @@
 import { getDocument } from 'ssr-window';
-import $ from '../../shared/dom7';
-import { extend, parseUrlQuery } from '../../shared/utils';
-import { getDevice } from '../../shared/get-device';
-import History from '../../shared/history';
-import redirect from './redirect';
-import processRouteQueue from './process-route-queue';
-import appRouterCheck from './app-router-check';
-import asyncComponent from './async-component';
+import $ from '../../shared/dom7.js';
+import { extend, parseUrlQuery } from '../../shared/utils.js';
+import { getDevice } from '../../shared/get-device.js';
+import History from '../../shared/history.js';
+import redirect from './redirect.js';
+import processRouteQueue from './process-route-queue.js';
+import appRouterCheck from './app-router-check.js';
+import asyncComponent from './async-component.js';
 
 function backward(router, el, backwardOptions) {
-  var device = getDevice();
-  var document = getDocument();
-  var $el = $(el);
-  var app = router.app;
-  var view = router.view;
-  var options = extend({
+  const device = getDevice();
+  const document = getDocument();
+  const $el = $(el);
+  const app = router.app;
+  const view = router.view;
+  const options = extend(false, {
     animate: router.params.animate,
     browserHistory: true,
     replaceState: false
   }, backwardOptions);
-  var masterDetailEnabled = router.params.masterDetailBreakpoint > 0;
-  var isMaster = masterDetailEnabled && options.route && options.route.route && (options.route.route.master === true || typeof options.route.route.master === 'function' && options.route.route.master(app, router));
-  var masterPageEl;
-  var masterPageRemoved;
-  var dynamicNavbar = router.dynamicNavbar;
-  var $newPage = $el;
-  var $oldPage = router.$el.children('.page-current');
-  var initialPreload = $oldPage.length === 0 && options.preload;
-  var currentIsMaster = masterDetailEnabled && $oldPage.hasClass('page-master');
+  const masterDetailEnabled = router.params.masterDetailBreakpoint > 0;
+  const isMaster = masterDetailEnabled && options.route && options.route.route && (options.route.route.master === true || typeof options.route.route.master === 'function' && options.route.route.master(app, router));
+  let masterPageEl;
+  let masterPageRemoved;
+  const dynamicNavbar = router.dynamicNavbar;
+  const $newPage = $el;
+  const $oldPage = router.$el.children('.page-current');
+  const initialPreload = $oldPage.length === 0 && options.preload;
+  const currentIsMaster = masterDetailEnabled && $oldPage.hasClass('page-master');
 
   if ($newPage.length) {
     // Remove theme elements
     router.removeThemeElements($newPage);
   }
 
-  var $navbarsEl;
-  var $newNavbarEl;
-  var $oldNavbarEl;
+  let $navbarsEl;
+  let $newNavbarEl;
+  let $oldNavbarEl;
 
   if (dynamicNavbar) {
     $newNavbarEl = $newPage.children('.navbar');
@@ -67,15 +67,13 @@ function backward(router, el, backwardOptions) {
   } // Pages In View
 
 
-  var isDetail;
-  var isDetailRoot;
+  let isDetail;
+  let isDetailRoot;
 
   if (masterDetailEnabled) {
-    var $pagesInView = router.$el.children('.page:not(.stacked)').filter(function (pageInView) {
-      return pageInView !== $newPage[0];
-    }); // Find Detail' master page
+    const $pagesInView = router.$el.children('.page:not(.stacked)').filter(pageInView => pageInView !== $newPage[0]); // Find Detail' master page
 
-    for (var i = 0; i < $pagesInView.length; i += 1) {
+    for (let i = 0; i < $pagesInView.length; i += 1) {
       if (!masterPageEl && $pagesInView[i].classList.contains('page-master')) {
         masterPageEl = $pagesInView[i];
         continue; // eslint-disable-line
@@ -94,7 +92,7 @@ function backward(router, el, backwardOptions) {
   } // New Page
 
 
-  $newPage.addClass("page-" + (initialPreload ? 'current' : 'previous') + (isMaster ? ' page-master' : '') + (isDetail ? ' page-master-detail' : '') + (isDetailRoot ? ' page-master-detail-root' : '')).removeClass('stacked').removeAttr('aria-hidden').trigger('page:unstack').trigger('page:position', {
+  $newPage.addClass(`page-${initialPreload ? 'current' : 'previous'}${isMaster ? ' page-master' : ''}${isDetail ? ' page-master-detail' : ''}${isDetailRoot ? ' page-master-detail-root' : ''}`).removeClass('stacked').removeAttr('aria-hidden').trigger('page:unstack').trigger('page:position', {
     position: initialPreload ? 'current' : 'previous'
   });
   router.emit('pageUnstack', $newPage[0]);
@@ -112,7 +110,7 @@ function backward(router, el, backwardOptions) {
   }
 
   if (dynamicNavbar && $newNavbarEl.length > 0) {
-    $newNavbarEl.addClass("navbar-" + (initialPreload ? 'current' : 'previous') + (isMaster ? ' navbar-master' : '') + (isDetail ? ' navbar-master-detail' : '') + (isDetailRoot ? ' navbar-master-detail-root' : '')).removeClass('stacked').removeAttr('aria-hidden');
+    $newNavbarEl.addClass(`navbar-${initialPreload ? 'current' : 'previous'}${isMaster ? ' navbar-master' : ''}${isDetail ? ' navbar-master-detail' : ''}${isDetailRoot ? ' navbar-master-detail-root' : ''}`).removeClass('stacked').removeAttr('aria-hidden');
     $newNavbarEl.trigger('navbar:position', {
       position: initialPreload ? 'current' : 'previous'
     });
@@ -127,7 +125,7 @@ function backward(router, el, backwardOptions) {
   } // Remove previous page in case of "forced"
 
 
-  var backIndex;
+  let backIndex;
 
   if (options.force) {
     if ($oldPage.prev('.page-previous:not(.stacked)').length > 0 || $oldPage.prev('.page-previous').length === 0) {
@@ -142,9 +140,9 @@ function backward(router, el, backwardOptions) {
       }
 
       if (backIndex && router.params.stackPages) {
-        $oldPage.prevAll('.page-previous').each(function (pageToRemove) {
-          var $pageToRemove = $(pageToRemove);
-          var $navbarToRemove;
+        $oldPage.prevAll('.page-previous').each(pageToRemove => {
+          const $pageToRemove = $(pageToRemove);
+          let $navbarToRemove;
 
           if (dynamicNavbar) {
             // $navbarToRemove = $oldNavbarEl.prevAll('.navbar-previous').eq(index);
@@ -176,8 +174,8 @@ function backward(router, el, backwardOptions) {
           }
         });
       } else {
-        var $pageToRemove = $oldPage.prev('.page-previous:not(.stacked)');
-        var $navbarToRemove;
+        const $pageToRemove = $oldPage.prev('.page-previous:not(.stacked)');
+        let $navbarToRemove;
 
         if (dynamicNavbar) {
           // $navbarToRemove = $oldNavbarEl.prev('.navbar-inner:not(.stacked)');
@@ -207,13 +205,13 @@ function backward(router, el, backwardOptions) {
   } // Insert new page
 
 
-  var newPageInDom = $newPage.parents(document).length > 0;
-  var f7Component = $newPage[0].f7Component;
+  const newPageInDom = $newPage.parents(document).length > 0;
+  const f7Component = $newPage[0].f7Component;
 
   function insertPage() {
     if (initialPreload) {
       if (!newPageInDom && f7Component) {
-        f7Component.mount(function (componentEl) {
+        f7Component.mount(componentEl => {
           router.$el.append(componentEl);
         });
       } else {
@@ -223,7 +221,7 @@ function backward(router, el, backwardOptions) {
 
     if ($newPage.next($oldPage).length === 0) {
       if (!newPageInDom && f7Component) {
-        f7Component.mount(function (componentEl) {
+        f7Component.mount(componentEl => {
           $(componentEl).insertBefore($oldPage);
         });
       } else {
@@ -287,12 +285,12 @@ function backward(router, el, backwardOptions) {
       router.pageCallback('afterIn', $newPage, $newNavbarEl, 'current', undefined, options);
     }
 
-    var $previousPages = $newPage.prevAll('.page-previous:not(.stacked):not(.page-master)');
+    const $previousPages = $newPage.prevAll('.page-previous:not(.stacked):not(.page-master)');
 
     if ($previousPages.length > 0) {
-      $previousPages.each(function (pageToRemove) {
-        var $pageToRemove = $(pageToRemove);
-        var $navbarToRemove;
+      $previousPages.each(pageToRemove => {
+        const $pageToRemove = $(pageToRemove);
+        let $navbarToRemove;
 
         if (dynamicNavbar) {
           // $navbarToRemove = $newNavbarEl.prevAll('.navbar-previous:not(.stacked)').eq(index);
@@ -326,7 +324,7 @@ function backward(router, el, backwardOptions) {
   if (!(device.ie || device.edge || device.firefox && !device.ios)) {
     if (router.params.browserHistory && options.browserHistory) {
       if (options.replaceState) {
-        var browserHistoryRoot = router.params.browserHistoryRoot || '';
+        const browserHistoryRoot = router.params.browserHistoryRoot || '';
         History.replace(view.id, {
           url: options.route.url
         }, browserHistoryRoot + router.params.browserHistorySeparator + options.route.url);
@@ -365,11 +363,10 @@ function backward(router, el, backwardOptions) {
   if (device.ie || device.edge || device.firefox && !device.ios) {
     if (router.params.browserHistory && options.browserHistory) {
       if (options.replaceState) {
-        var _browserHistoryRoot = router.params.browserHistoryRoot || '';
-
+        const browserHistoryRoot = router.params.browserHistoryRoot || '';
         History.replace(view.id, {
           url: options.route.url
-        }, _browserHistoryRoot + router.params.browserHistorySeparator + options.route.url);
+        }, browserHistoryRoot + router.params.browserHistorySeparator + options.route.url);
       } else if (backIndex) {
         History.go(-backIndex);
       } else {
@@ -433,7 +430,7 @@ function backward(router, el, backwardOptions) {
     router.allowPageChange = true;
     router.emit('routeChanged', router.currentRoute, router.previousRoute, router); // Preload previous page
 
-    var preloadPreviousPage = router.params.preloadPreviousPage || router.params[app.theme + "SwipeBack"];
+    const preloadPreviousPage = router.params.preloadPreviousPage || router.params[`${app.theme}SwipeBack`];
 
     if (preloadPreviousPage && router.history[router.history.length - 2] && !isMaster) {
       router.back(router.history[router.history.length - 2], {
@@ -457,7 +454,7 @@ function backward(router, el, backwardOptions) {
   }
 
   if (options.animate && !(currentIsMaster && app.width >= router.params.masterDetailBreakpoint)) {
-    var transition = router.params.transition;
+    let transition = router.params.transition;
 
     if ($oldPage[0] && $oldPage[0].f7PageTransition) {
       transition = $oldPage[0].f7PageTransition;
@@ -475,7 +472,7 @@ function backward(router, el, backwardOptions) {
     }
 
     setPositionClasses();
-    router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'backward', transition, function () {
+    router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'backward', transition, () => {
       afterAnimation();
     });
   } else {
@@ -487,14 +484,16 @@ function backward(router, el, backwardOptions) {
 
 function loadBack(router, backParams, backOptions, ignorePageChange) {
   if (!router.allowPageChange && !ignorePageChange) return router;
-  var params = backParams;
-  var options = backOptions;
-  var url = params.url,
-      content = params.content,
-      el = params.el,
-      pageName = params.pageName,
-      component = params.component,
-      componentUrl = params.componentUrl;
+  const params = backParams;
+  const options = backOptions;
+  const {
+    url,
+    content,
+    el,
+    pageName,
+    component,
+    componentUrl
+  } = params;
 
   if (options.route.url && router.url === options.route.url && !(options.reloadCurrent || options.reloadPrevious) && !router.params.allowDuplicateUrls) {
     return false;
@@ -526,17 +525,17 @@ function loadBack(router, backParams, backOptions, ignorePageChange) {
     backward(router, router.getPageEl(el), options);
   } else if (pageName) {
     // Load page by page name in pages container
-    backward(router, router.$el.children(".page[data-name=\"" + pageName + "\"]").eq(0), options);
+    backward(router, router.$el.children(`.page[data-name="${pageName}"]`).eq(0), options);
   } else if (component || componentUrl) {
     // Load from component (F7/Vue/React/...)
     try {
       router.pageComponentLoader({
         routerEl: router.el,
-        component: component,
-        componentUrl: componentUrl,
-        options: options,
-        resolve: resolve,
-        reject: reject
+        component,
+        componentUrl,
+        options,
+        resolve,
+        reject
       });
     } catch (err) {
       router.allowPageChange = true;
@@ -549,9 +548,9 @@ function loadBack(router, backParams, backOptions, ignorePageChange) {
       router.xhrAbortController = false;
     }
 
-    router.xhrRequest(url, options).then(function (pageContent) {
+    router.xhrRequest(url, options).then(pageContent => {
       backward(router, router.getPageEl(pageContent), options);
-    }).catch(function () {
+    }).catch(() => {
       router.allowPageChange = true;
     });
   }
@@ -559,31 +558,32 @@ function loadBack(router, backParams, backOptions, ignorePageChange) {
   return router;
 }
 
-function back() {
-  var router = this;
-  var device = getDevice();
+function back(...args) {
+  const router = this;
+  const device = getDevice();
   if (router.swipeBackActive) return router;
-  var navigateUrl;
-  var navigateOptions;
-  var route;
+  let navigateUrl;
+  let navigateOptions;
+  let route;
 
-  if (typeof (arguments.length <= 0 ? undefined : arguments[0]) === 'object') {
-    navigateOptions = (arguments.length <= 0 ? undefined : arguments[0]) || {};
+  if (typeof args[0] === 'object') {
+    navigateOptions = args[0] || {};
   } else {
-    navigateUrl = arguments.length <= 0 ? undefined : arguments[0];
-    navigateOptions = (arguments.length <= 1 ? undefined : arguments[1]) || {};
+    navigateUrl = args[0];
+    navigateOptions = args[1] || {};
   }
 
-  var _navigateOptions = navigateOptions,
-      name = _navigateOptions.name,
-      params = _navigateOptions.params,
-      query = _navigateOptions.query;
+  const {
+    name,
+    params,
+    query
+  } = navigateOptions;
 
   if (name) {
     navigateUrl = router.generateUrl({
-      name: name,
-      params: params,
-      query: query
+      name,
+      params,
+      query
     });
 
     if (navigateUrl) {
@@ -597,13 +597,13 @@ function back() {
     return router;
   }
 
-  var app = router.app;
+  const app = router.app;
   appRouterCheck(router, 'back');
-  var currentRouteIsModal = router.currentRoute.modal;
-  var modalType;
+  let currentRouteIsModal = router.currentRoute.modal;
+  let modalType;
 
   if (!currentRouteIsModal) {
-    'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(function (modalLoadProp) {
+    'popup popover sheet loginScreen actions customModal panel'.split(' ').forEach(modalLoadProp => {
       if (router.currentRoute.route[modalLoadProp]) {
         currentRouteIsModal = true;
         modalType = modalLoadProp;
@@ -612,15 +612,15 @@ function back() {
   }
 
   if (currentRouteIsModal && !navigateOptions.preload) {
-    var modalToClose = router.currentRoute.modal || router.currentRoute.route.modalInstance || app[modalType].get();
-    var previousUrl = router.history[router.history.length - 2];
-    var previousRoute; // check if previous route is modal too
+    const modalToClose = router.currentRoute.modal || router.currentRoute.route.modalInstance || app[modalType].get();
+    const previousUrl = router.history[router.history.length - 2];
+    let previousRoute; // check if previous route is modal too
 
     if (modalToClose && modalToClose.$el) {
-      var prevOpenedModals = modalToClose.$el.prevAll('.modal-in');
+      const prevOpenedModals = modalToClose.$el.prevAll('.modal-in');
 
       if (prevOpenedModals.length && prevOpenedModals[0].f7Modal) {
-        var modalEl = prevOpenedModals[0]; // check if current router not inside of the modalEl
+        const modalEl = prevOpenedModals[0]; // check if current router not inside of the modalEl
 
         if (!router.$el.parents(modalEl).length) {
           previousRoute = modalEl.f7Modal.route;
@@ -650,12 +650,12 @@ function back() {
       }
     }
 
-    var forceOtherUrl = navigateOptions.force && previousRoute && navigateUrl;
+    const forceOtherUrl = navigateOptions.force && previousRoute && navigateUrl;
 
     if (previousRoute && modalToClose) {
-      var isBrokenBrowserHistory = device.ie || device.edge || device.firefox && !device.ios;
-      var needHistoryBack = router.params.browserHistory && navigateOptions.browserHistory !== false;
-      var currentRouteWithoutBrowserHistory = router.currentRoute && router.currentRoute.route && router.currentRoute.route.options && router.currentRoute.route.options.browserHistory === false;
+      const isBrokenBrowserHistory = device.ie || device.edge || device.firefox && !device.ios;
+      const needHistoryBack = router.params.browserHistory && navigateOptions.browserHistory !== false;
+      const currentRouteWithoutBrowserHistory = router.currentRoute && router.currentRoute.route && router.currentRoute.route.options && router.currentRoute.route.options.browserHistory === false;
 
       if (needHistoryBack && !isBrokenBrowserHistory && !currentRouteWithoutBrowserHistory) {
         History.back();
@@ -689,19 +689,19 @@ function back() {
     return router;
   }
 
-  var $previousPage = router.$el.children('.page-current').prevAll('.page-previous:not(.page-master)').eq(0);
-  var skipMaster;
+  let $previousPage = router.$el.children('.page-current').prevAll('.page-previous:not(.page-master)').eq(0);
+  let skipMaster;
 
   if (router.params.masterDetailBreakpoint > 0) {
-    var classes = [];
-    router.$el.children('.page').each(function (pageEl) {
+    const classes = [];
+    router.$el.children('.page').each(pageEl => {
       classes.push(pageEl.className);
     });
-    var $previousMaster = router.$el.children('.page-current').prevAll('.page-master').eq(0);
+    const $previousMaster = router.$el.children('.page-current').prevAll('.page-master').eq(0);
 
     if ($previousMaster.length) {
-      var expectedPreviousPageUrl = router.history[router.history.length - 2];
-      var expectedPreviousPageRoute = router.findMatchingRoute(expectedPreviousPageUrl);
+      const expectedPreviousPageUrl = router.history[router.history.length - 2];
+      const expectedPreviousPageRoute = router.findMatchingRoute(expectedPreviousPageUrl);
 
       if (expectedPreviousPageRoute && $previousMaster[0].f7Page && expectedPreviousPageRoute.route === $previousMaster[0].f7Page.route.route) {
         $previousPage = $previousMaster;
@@ -721,14 +721,24 @@ function back() {
       return router;
     }
 
-    var previousPageRoute = $previousPage[0].f7Page.route;
-    processRouteQueue.call(router, previousPageRoute, router.currentRoute, function () {
+    const previousPageRoute = $previousPage[0].f7Page.route;
+
+    if (navigateOptions.preload && $previousPage.hasClass('stacked')) {
+      loadBack(router, {
+        el: $previousPage
+      }, extend(navigateOptions, {
+        route: previousPageRoute
+      }));
+      return router;
+    }
+
+    processRouteQueue.call(router, previousPageRoute, router.currentRoute, () => {
       loadBack(router, {
         el: $previousPage
       }, extend(navigateOptions, {
         route: previousPageRoute
       }));
-    }, function () {}, 'backward');
+    }, () => {}, 'backward');
     return router;
   } // Navigate URL
 
@@ -781,7 +791,7 @@ function back() {
     return redirect.call(router, 'backward', route, navigateOptions);
   }
 
-  var options = {};
+  const options = {};
 
   if (route.route.options) {
     extend(options, route.route.options, navigateOptions);
@@ -790,10 +800,10 @@ function back() {
   }
 
   options.route = route;
-  var backForceLoaded;
+  let backForceLoaded;
 
   if (options.force && router.params.stackPages) {
-    router.$el.children('.page-previous.stacked').each(function (pageEl) {
+    router.$el.children('.page-previous.stacked').each(pageEl => {
       if (pageEl.f7Page && pageEl.f7Page.route && pageEl.f7Page.route.url === route.url) {
         backForceLoaded = true;
         loadBack(router, {
@@ -808,7 +818,7 @@ function back() {
   }
 
   function resolve() {
-    var routerLoaded = false;
+    let routerLoaded = false;
 
     if (route.route.keepAlive && route.route.keepAliveData) {
       loadBack(router, {
@@ -817,12 +827,12 @@ function back() {
       routerLoaded = true;
     }
 
-    'url content component pageName el componentUrl'.split(' ').forEach(function (pageLoadProp) {
+    'url content component pageName el componentUrl'.split(' ').forEach(pageLoadProp => {
       if (route.route[pageLoadProp] && !routerLoaded) {
-        var _loadBack;
-
         routerLoaded = true;
-        loadBack(router, (_loadBack = {}, _loadBack[pageLoadProp] = route.route[pageLoadProp], _loadBack), options);
+        loadBack(router, {
+          [pageLoadProp]: route.route[pageLoadProp]
+        }, options);
       }
     });
     if (routerLoaded) return; // Async
@@ -839,13 +849,13 @@ function back() {
     if (route.route.async) {
       router.allowPageChange = false;
       route.route.async.call(router, {
-        router: router,
+        router,
         to: route,
         from: router.currentRoute,
         resolve: asyncResolve,
         reject: asyncReject,
         direction: 'backward',
-        app: app
+        app
       });
     }
 
@@ -861,17 +871,17 @@ function back() {
   if (options.preload) {
     resolve();
   } else {
-    processRouteQueue.call(router, route, router.currentRoute, function () {
+    processRouteQueue.call(router, route, router.currentRoute, () => {
       if (route.route.modules) {
-        app.loadModules(Array.isArray(route.route.modules) ? route.route.modules : [route.route.modules]).then(function () {
+        app.loadModules(Array.isArray(route.route.modules) ? route.route.modules : [route.route.modules]).then(() => {
           resolve();
-        }).catch(function () {
+        }).catch(() => {
           reject();
         });
       } else {
         resolve();
       }
-    }, function () {
+    }, () => {
       reject();
     }, 'backward');
   } // Return Router

package/{esm/modules → modules}/router/clear-previous-history.js

@@ -1,17 +1,17 @@
-import $ from '../../shared/dom7';
-import appRouterCheck from './app-router-check';
+import $ from '../../shared/dom7.js';
+import appRouterCheck from './app-router-check.js';
 
 function clearPreviousPages(router) {
   appRouterCheck(router, 'clearPreviousPages');
-  var app = router.app;
-  var dynamicNavbar = router.dynamicNavbar;
-  var $pagesToRemove = router.$el.children('.page').filter(function (pageInView) {
+  const app = router.app;
+  const dynamicNavbar = router.dynamicNavbar;
+  const $pagesToRemove = router.$el.children('.page').filter(pageInView => {
     if (router.currentRoute && (router.currentRoute.modal || router.currentRoute.panel)) return true;
     return pageInView !== router.currentPageEl;
   });
-  $pagesToRemove.each(function (pageEl) {
-    var $oldPageEl = $(pageEl);
-    var $oldNavbarEl = $(app.navbar.getElByPage($oldPageEl));
+  $pagesToRemove.each(pageEl => {
+    const $oldPageEl = $(pageEl);
+    const $oldNavbarEl = $(app.navbar.getElByPage($oldPageEl));
 
     if (router.params.stackPages && router.initialPages.indexOf($oldPageEl[0]) >= 0) {
       $oldPageEl.addClass('stacked');
@@ -32,9 +32,9 @@ function clearPreviousPages(router) {
 }
 
 function clearPreviousHistory() {
-  var router = this;
+  const router = this;
   appRouterCheck(router, 'clearPreviousHistory');
-  var url = router.history[router.history.length - 1];
+  const url = router.history[router.history.length - 1];
   clearPreviousPages(router);
   router.history = [url];
   router.view.history = [url];