framework7 8.3.4 → 9.0.0

package/modules/router/router-class.js

@@ -2,7 +2,7 @@ import { getWindow, getDocument } from 'ssr-window';
 import { pathToRegexp, compile } from 'path-to-regexp';
 import $ from '../../shared/dom7.js';
 import Framework7Class from '../../shared/class.js';
-import { extend, nextFrame, parseUrlQuery, serializeObject, now, eventNameToColonCase } from '../../shared/utils.js';
+import { extend, parseUrlQuery, serializeObject, now, eventNameToColonCase } from '../../shared/utils.js';
 import History from '../../shared/history.js';
 import SwipeBack from './swipe-back.js';
 import { refreshPage, navigate } from './navigate.js';
@@ -39,9 +39,7 @@ class Router extends Framework7Class {
         propsHistory: [],
         scrollHistory: view.scrollHistory,
         cache: app.cache,
-        dynamicNavbar: app.theme === 'ios' && view.params.iosDynamicNavbar,
-        initialPages: [],
-        initialNavbars: []
+        initialPages: []
       });
     }
 
@@ -57,10 +55,7 @@ class Router extends Framework7Class {
     Object.defineProperty(router, 'currentRoute', {
       enumerable: true,
       configurable: true,
-      set(newRoute) {
-        if (newRoute === void 0) {
-          newRoute = {};
-        }
+      set(newRoute = {}) {
         previousRoute = extend({}, currentRoute);
         currentRoute = newRoute;
         if (!currentRoute) return;
@@ -90,204 +85,34 @@ class Router extends Framework7Class {
     extend(false, router, {
       tempDom: document.createElement('div'),
       $el: view.$el,
-      el: view.el,
-      $navbarsEl: view.$navbarsEl,
-      navbarsEl: view.navbarsEl
+      el: view.el
     });
     router.emit('local::mount routerMount', router);
   }
-  animatableNavElements($newNavbarEl, $oldNavbarEl, toLarge, fromLarge, direction) {
-    const router = this;
-    const dynamicNavbar = router.dynamicNavbar;
-    const animateIcon = router.params.iosAnimateNavbarBackIcon;
-    let newNavEls;
-    let oldNavEls;
-    function animatableNavEl($el, $navbarInner) {
-      const isSliding = $el.hasClass('sliding') || $navbarInner.hasClass('sliding');
-      const isSubnavbar = $el.hasClass('subnavbar');
-      const needsOpacityTransition = isSliding ? !isSubnavbar : true;
-      const $iconEl = $el.find('.back .icon');
-      let isIconLabel;
-      if (isSliding && animateIcon && $el.hasClass('left') && $iconEl.length > 0 && $iconEl.next('span').length) {
-        $el = $iconEl.next('span'); // eslint-disable-line
-        isIconLabel = true;
-      }
-      return {
-        $el,
-        isIconLabel,
-        leftOffset: $el[0].f7NavbarLeftOffset,
-        rightOffset: $el[0].f7NavbarRightOffset,
-        isSliding,
-        isSubnavbar,
-        needsOpacityTransition
-      };
-    }
-    if (dynamicNavbar) {
-      newNavEls = [];
-      oldNavEls = [];
-      $newNavbarEl.children('.navbar-inner').children('.left, .right, .title, .subnavbar').each(navEl => {
-        const $navEl = $(navEl);
-        if ($navEl.hasClass('left') && fromLarge && direction === 'forward') return;
-        if ($navEl.hasClass('title') && toLarge) return;
-        newNavEls.push(animatableNavEl($navEl, $newNavbarEl.children('.navbar-inner')));
-      });
-      if (!($oldNavbarEl.hasClass('navbar-master') && router.params.masterDetailBreakpoint > 0 && router.app.width >= router.params.masterDetailBreakpoint)) {
-        $oldNavbarEl.children('.navbar-inner').children('.left, .right, .title, .subnavbar').each(navEl => {
-          const $navEl = $(navEl);
-          if ($navEl.hasClass('left') && toLarge && !fromLarge && direction === 'forward') return;
-          if ($navEl.hasClass('left') && toLarge && direction === 'backward') return;
-          if ($navEl.hasClass('title') && fromLarge) {
-            return;
-          }
-          oldNavEls.push(animatableNavEl($navEl, $oldNavbarEl.children('.navbar-inner')));
-        });
-      }
-      [oldNavEls, newNavEls].forEach(navEls => {
-        navEls.forEach(navEl => {
-          const n = navEl;
-          const {
-            isSliding,
-            $el
-          } = navEl;
-          const otherEls = navEls === oldNavEls ? newNavEls : oldNavEls;
-          if (!(isSliding && $el.hasClass('title') && otherEls)) return;
-          otherEls.forEach(otherNavEl => {
-            if (otherNavEl.isIconLabel) {
-              const iconTextEl = otherNavEl.$el[0];
-              n.leftOffset += iconTextEl ? iconTextEl.offsetLeft || 0 : 0;
-            }
-          });
-        });
-      });
-    }
-    return {
-      newNavEls,
-      oldNavEls
-    };
-  }
-  animate($oldPageEl, $newPageEl, $oldNavbarEl, $newNavbarEl, direction, transition, callback) {
+  animate($oldPageEl, $newPageEl, direction, transition, callback) {
     const router = this;
     if (router.params.animateCustom) {
-      router.params.animateCustom.apply(router, [$oldPageEl, $newPageEl, $oldNavbarEl, $newNavbarEl, direction, callback]);
+      router.params.animateCustom.apply(router, [$oldPageEl, $newPageEl, direction, callback]);
       return;
     }
-    const dynamicNavbar = router.dynamicNavbar;
     const ios = router.app.theme === 'ios';
     if (transition) {
       const routerCustomTransitionClass = `router-transition-custom router-transition-${transition}-${direction}`;
       // Animate
       const onCustomTransitionDone = () => {
         router.$el.removeClass(routerCustomTransitionClass);
-        if (dynamicNavbar && router.$navbarsEl.length) {
-          if ($newNavbarEl) {
-            router.$navbarsEl.prepend($newNavbarEl);
-          }
-          if ($oldNavbarEl) {
-            router.$navbarsEl.prepend($oldNavbarEl);
-          }
-        }
         if (callback) callback();
       };
       (direction === 'forward' ? $newPageEl : $oldPageEl).animationEnd(onCustomTransitionDone);
-      if (dynamicNavbar) {
-        if ($newNavbarEl && $newPageEl) {
-          router.setNavbarPosition($newNavbarEl, '');
-          $newNavbarEl.removeClass('navbar-next navbar-previous navbar-current');
-          $newPageEl.prepend($newNavbarEl);
-        }
-        if ($oldNavbarEl && $oldPageEl) {
-          router.setNavbarPosition($oldNavbarEl, '');
-          $oldNavbarEl.removeClass('navbar-next navbar-previous navbar-current');
-          $oldPageEl.prepend($oldNavbarEl);
-        }
-      }
       router.$el.addClass(routerCustomTransitionClass);
       return;
     }
 
     // Router Animation class
     const routerTransitionClass = `router-transition-${direction} router-transition`;
-    let newNavEls;
-    let oldNavEls;
-    let fromLarge;
-    let toLarge;
-    let toDifferent;
-    let oldIsLarge;
-    let newIsLarge;
-    if (ios && dynamicNavbar) {
-      const betweenMasterAndDetail = router.params.masterDetailBreakpoint > 0 && router.app.width >= router.params.masterDetailBreakpoint && ($oldNavbarEl.hasClass('navbar-master') && $newNavbarEl.hasClass('navbar-master-detail') || $oldNavbarEl.hasClass('navbar-master-detail') && $newNavbarEl.hasClass('navbar-master'));
-      if (!betweenMasterAndDetail) {
-        oldIsLarge = $oldNavbarEl && $oldNavbarEl.hasClass('navbar-large');
-        newIsLarge = $newNavbarEl && $newNavbarEl.hasClass('navbar-large');
-        fromLarge = oldIsLarge && !$oldNavbarEl.hasClass('navbar-large-collapsed');
-        toLarge = newIsLarge && !$newNavbarEl.hasClass('navbar-large-collapsed');
-        toDifferent = fromLarge && !toLarge || toLarge && !fromLarge;
-      }
-      const navEls = router.animatableNavElements($newNavbarEl, $oldNavbarEl, toLarge, fromLarge, direction);
-      newNavEls = navEls.newNavEls;
-      oldNavEls = navEls.oldNavEls;
-    }
-    function animateNavbars(progress) {
-      if (!(ios && dynamicNavbar)) return;
-      if (progress === 1) {
-        if (toLarge) {
-          $newNavbarEl.addClass('router-navbar-transition-to-large');
-          $oldNavbarEl.addClass('router-navbar-transition-to-large');
-        }
-        if (fromLarge) {
-          $newNavbarEl.addClass('router-navbar-transition-from-large');
-          $oldNavbarEl.addClass('router-navbar-transition-from-large');
-        }
-      }
-      newNavEls.forEach(navEl => {
-        const $el = navEl.$el;
-        const offset = direction === 'forward' ? navEl.rightOffset : navEl.leftOffset;
-        if (navEl.isSliding) {
-          if (navEl.isSubnavbar && newIsLarge) {
-            // prettier-ignore
-            $el[0].style.setProperty('transform', `translate3d(${offset * (1 - progress)}px, calc(-1 * var(--f7-navbar-large-collapse-progress) * var(--f7-navbar-large-title-height)), 0)`, 'important');
-          } else {
-            $el.transform(`translate3d(${offset * (1 - progress)}px,0,0)`);
-          }
-        }
-      });
-      oldNavEls.forEach(navEl => {
-        const $el = navEl.$el;
-        const offset = direction === 'forward' ? navEl.leftOffset : navEl.rightOffset;
-        if (navEl.isSliding) {
-          if (navEl.isSubnavbar && oldIsLarge) {
-            $el.transform(`translate3d(${offset * progress}px, calc(-1 * var(--f7-navbar-large-collapse-progress) * var(--f7-navbar-large-title-height)), 0)`);
-          } else {
-            $el.transform(`translate3d(${offset * progress}px,0,0)`);
-          }
-        }
-      });
-    }
 
     // AnimationEnd Callback
     function onDone() {
-      if (router.dynamicNavbar) {
-        if ($newNavbarEl) {
-          $newNavbarEl.removeClass('router-navbar-transition-to-large router-navbar-transition-from-large');
-          $newNavbarEl.addClass('navbar-no-title-large-transition');
-          nextFrame(() => {
-            $newNavbarEl.removeClass('navbar-no-title-large-transition');
-          });
-        }
-        if ($oldNavbarEl) {
-          $oldNavbarEl.removeClass('router-navbar-transition-to-large router-navbar-transition-from-large');
-        }
-        if ($newNavbarEl.hasClass('sliding') || $newNavbarEl.children('.navbar-inner.sliding').length) {
-          $newNavbarEl.find('.title, .left, .right, .left .icon, .subnavbar').transform('');
-        } else {
-          $newNavbarEl.find('.sliding').transform('');
-        }
-        if ($oldNavbarEl.hasClass('sliding') || $oldNavbarEl.children('.navbar-inner.sliding').length) {
-          $oldNavbarEl.find('.title, .left, .right, .left .icon, .subnavbar').transform('');
-        } else {
-          $oldNavbarEl.find('.sliding').transform('');
-        }
-      }
       router.$el.removeClass(routerTransitionClass);
       if (callback) callback();
     }
@@ -297,23 +122,8 @@ class Router extends Framework7Class {
       onDone();
     });
 
-    // Animate
-    if (dynamicNavbar) {
-      // Prepare Navbars
-      animateNavbars(0);
-      nextFrame(() => {
-        // Add class, start animation
-        router.$el.addClass(routerTransitionClass);
-        if (toDifferent) {
-          // eslint-disable-next-line
-          router.el._clientLeft = router.el.clientLeft;
-        }
-        animateNavbars(1);
-      });
-    } else {
-      // Add class, start animation
-      router.$el.addClass(routerTransitionClass);
-    }
+    // Add class, start animation
+    router.$el.addClass(routerTransitionClass);
   }
   removeModal(modalEl) {
     const router = this;
@@ -324,10 +134,6 @@ class Router extends Framework7Class {
     const $tabEl = $(tabEl);
     $tabEl.html('');
   }
-  removeNavbar(el) {
-    const router = this;
-    router.removeEl(el);
-  }
   removePage(el) {
     const $el = $(el);
     const f7Page = $el && $el[0] && $el[0].f7Page;
@@ -404,10 +210,7 @@ class Router extends Framework7Class {
     if (found && found.length > 1) return $(found[0]);
     return undefined;
   }
-  flattenRoutes(routes) {
-    if (routes === void 0) {
-      routes = this.routes;
-    }
+  flattenRoutes(routes = this.routes) {
     const router = this;
     let flattenedRoutes = [];
     routes.forEach(route => {
@@ -469,10 +272,7 @@ class Router extends Framework7Class {
       path
     };
   }
-  generateUrl(parameters) {
-    if (parameters === void 0) {
-      parameters = {};
-    }
+  generateUrl(parameters = {}) {
     if (typeof parameters === 'string') {
       return parameters;
     }
@@ -508,11 +308,10 @@ class Router extends Framework7Class {
   }
 
   // eslint-disable-next-line
-  constructRouteUrl(route, _temp) {
-    let {
-      params,
-      query
-    } = _temp === void 0 ? {} : _temp;
+  constructRouteUrl(route, {
+    params,
+    query
+  } = {}) {
     const {
       path
     } = route;
@@ -620,13 +419,7 @@ class Router extends Framework7Class {
   }
 
   // eslint-disable-next-line
-  replaceRequestUrlParams(url, options) {
-    if (url === void 0) {
-      url = '';
-    }
-    if (options === void 0) {
-      options = {};
-    }
+  replaceRequestUrlParams(url = '', options = {}) {
     let compiledUrl = url;
     if (typeof compiledUrl === 'string' && compiledUrl.indexOf('{{') >= 0 && options && options.route && options.route.params && Object.keys(options.route.params).length) {
       Object.keys(options.route.params).forEach(paramName => {
@@ -683,11 +476,13 @@ class Router extends Framework7Class {
         }
       }
       router.xhrAbortController = new AbortController();
+      const fetchOptions = {
+        method: 'GET',
+        signal: router.xhrAbortController.signal
+      };
+      router.emit('routerAjaxStart', options, fetchOptions);
       let fetchRes;
-      fetch(url, {
-        signal: router.xhrAbortController.signal,
-        method: 'GET'
-      }).then(res => {
+      fetch(url, fetchOptions).then(res => {
         fetchRes = res;
         return res.text();
       }).then(responseText => {
@@ -715,22 +510,6 @@ class Router extends Framework7Class {
       });
     });
   }
-  setNavbarPosition($el, position, ariaHidden) {
-    const router = this;
-    $el.removeClass('navbar-previous navbar-current navbar-next');
-    if (position) {
-      $el.addClass(`navbar-${position}`);
-    }
-    if (ariaHidden === false) {
-      $el.removeAttr('aria-hidden');
-    } else if (ariaHidden === true) {
-      $el.attr('aria-hidden', 'true');
-    }
-    $el.trigger('navbar:position', {
-      position
-    });
-    router.emit('navbarPosition', $el[0], position);
-  }
   setPagePosition($el, position, ariaHidden) {
     const router = this;
     $el.removeClass('page-previous page-current page-next');
@@ -758,13 +537,9 @@ class Router extends Framework7Class {
     }
     $(el).find(toRemove).remove();
   }
-  getPageData(pageEl, navbarEl, from, to, route, pageFromEl) {
-    if (route === void 0) {
-      route = {};
-    }
+  getPageData(pageEl, from, to, route = {}, pageFromEl) {
     const router = this;
     const $pageEl = $(pageEl).eq(0);
-    const $navbarEl = $(navbarEl).eq(0);
     const currentPage = $pageEl[0].f7Page || {};
     let direction;
     let pageFrom;
@@ -788,8 +563,6 @@ class Router extends Framework7Class {
       el: $pageEl[0],
       $pageEl,
       pageEl: $pageEl[0],
-      $navbarEl,
-      navbarEl: $navbarEl[0],
       name: $pageEl.attr('data-name'),
       position: from,
       from,
@@ -803,15 +576,11 @@ class Router extends Framework7Class {
   }
 
   // Callbacks
-  pageCallback(callback, pageEl, navbarEl, from, to, options, pageFromEl) {
-    if (options === void 0) {
-      options = {};
-    }
+  pageCallback(callback, pageEl, from, to, options = {}, pageFromEl) {
     if (!pageEl) return;
     const router = this;
     const $pageEl = $(pageEl);
     if (!$pageEl.length) return;
-    const $navbarEl = $(navbarEl);
     const {
       route
     } = options;
@@ -820,7 +589,6 @@ class Router extends Framework7Class {
     if (callback === 'beforeRemove' && keepAlive) {
       callback = 'beforeUnmount'; // eslint-disable-line
     }
-
     const camelName = `page${callback[0].toUpperCase() + callback.slice(1, callback.length)}`;
     const colonName = `page:${callback.toLowerCase()}`;
     let page = {};
@@ -831,7 +599,7 @@ class Router extends Framework7Class {
         position: from
       });
     } else {
-      page = router.getPageData($pageEl[0], $navbarEl[0], from, to, route, pageFromEl);
+      page = router.getPageData($pageEl[0], from, to, route, pageFromEl);
     }
     page.swipeBack = !!options.swipeBack;
     const {
@@ -923,9 +691,6 @@ class Router extends Framework7Class {
     if (callback === 'beforeRemove' || callback === 'beforeUnmount') {
       detachEvents();
       if (!keepAlive) {
-        if ($pageEl[0].f7Page && $pageEl[0].f7Page.navbarEl) {
-          delete $pageEl[0].f7Page.navbarEl.f7Page;
-        }
         $pageEl[0].f7Page = null;
       }
     }
@@ -1016,7 +781,7 @@ class Router extends Framework7Class {
     let {
       browserHistoryRoot
     } = router.params;
-    if ((window.cordova || window.Capacitor && window.Capacitor.isNative) && browserHistory && !browserHistorySeparator && !browserHistoryRoot && location.pathname.indexOf('index.html')) {
+    if ((window.cordova || window.Capacitor && (window.Capacitor.isNative || window.Capacitor.isNativePlatform && window.Capacitor.isNativePlatform())) && browserHistory && !browserHistorySeparator && !browserHistoryRoot && location.pathname.indexOf('index.html')) {
       // eslint-disable-next-line
       console.warn('Framework7: wrong or not complete browserHistory configuration, trying to guess browserHistoryRoot');
       browserHistoryRoot = location.pathname.split('index.html')[0];
@@ -1071,7 +836,6 @@ class Router extends Framework7Class {
       app,
       view
     } = router;
-    const document = getDocument();
     router.mount();
     const {
       initialUrl,
@@ -1147,35 +911,12 @@ class Router extends Framework7Class {
       router.currentRoute = currentRoute;
       router.$el.children('.page').each(pageEl => {
         const $pageEl = $(pageEl);
-        let $navbarEl;
         router.setPagePosition($pageEl, 'current');
-        if (router.dynamicNavbar) {
-          $navbarEl = $pageEl.children('.navbar');
-          if ($navbarEl.length > 0) {
-            if (!router.$navbarsEl.parents(document).length) {
-              router.$el.prepend(router.$navbarsEl);
-            }
-            router.setNavbarPosition($navbarEl, 'current');
-            router.$navbarsEl.append($navbarEl);
-            if ($navbarEl.children('.title-large').length) {
-              $navbarEl.addClass('navbar-large');
-            }
-            $pageEl.children('.navbar').remove();
-          } else {
-            router.$navbarsEl.addClass('navbar-hidden');
-            if ($navbarEl.children('.title-large').length) {
-              router.$navbarsEl.addClass('navbar-hidden navbar-large-hidden');
-            }
-          }
-        }
         if (router.currentRoute && router.currentRoute.route && (router.currentRoute.route.master === true || typeof router.currentRoute.route.master === 'function' && router.currentRoute.route.master(app, router)) && router.params.masterDetailBreakpoint > 0) {
           $pageEl.addClass('page-master');
           $pageEl.trigger('page:role', {
             role: 'master'
           });
-          if ($navbarEl && $navbarEl.length) {
-            $navbarEl.addClass('navbar-master');
-          }
           view.checkMasterDetailBreakpoint();
         }
         const initOptions = {
@@ -1185,20 +926,14 @@ class Router extends Framework7Class {
           extend(initOptions, router.currentRoute.route.options);
         }
         router.currentPageEl = $pageEl[0];
-        if (router.dynamicNavbar && $navbarEl.length) {
-          router.currentNavbarEl = $navbarEl[0];
-        }
         router.removeThemeElements($pageEl);
-        if (router.dynamicNavbar && $navbarEl.length) {
-          router.removeThemeElements($navbarEl);
-        }
         if (initOptions.route.route.tab) {
           hasTabRoute = true;
           router.tabLoad(initOptions.route.route.tab, extend({}, initOptions));
         }
-        router.pageCallback('init', $pageEl, $navbarEl, 'current', undefined, initOptions);
-        router.pageCallback('beforeIn', $pageEl, $navbarEl, 'current', undefined, initOptions);
-        router.pageCallback('afterIn', $pageEl, $navbarEl, 'current', undefined, initOptions);
+        router.pageCallback('init', $pageEl, 'current', undefined, initOptions);
+        router.pageCallback('beforeIn', $pageEl, 'current', undefined, initOptions);
+        router.pageCallback('afterIn', $pageEl, 'current', undefined, initOptions);
       });
       if (historyRestored) {
         if (browserHistoryInitialMatch) {

package/modules/router/router.d.ts

@@ -247,6 +247,8 @@ export namespace Router {
     /** Event will be fired when router.updateCurrentUrl method called */
     routeUrlUpdate(newRoute: Route, router: Router): void;
 
+    /** Event will be fired when the request starts. As an arguments receives navigating options object and request init object */
+    routerAjaxStart(options: RouteOptions, requestInit: RequestInit): void;
     /** Event will be fired when the request succeeds. As an arguments receives XHR object and navigating options object */
     routerAjaxSuccess(response: Response, options: RouteOptions): void;
     /** Event will be fired if the request fails. As an arguments receives XHR object and navigating options object */