framework7 8.3.4 → 9.0.0-beta.1

package/modules/router/clear-previous-history.js

@@ -2,21 +2,15 @@ import $ from '../../shared/dom7.js';
 import appRouterCheck from './app-router-check.js';
 function clearPreviousPages(router) {
   appRouterCheck(router, 'clearPreviousPages');
-  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(pageEl => {
     const $oldPageEl = $(pageEl);
-    const $oldNavbarEl = $(app.navbar.getElByPage($oldPageEl));
     // Page remove event
-    router.pageCallback('beforeRemove', $oldPageEl, $oldNavbarEl, 'previous', undefined, {});
+    router.pageCallback('beforeRemove', $oldPageEl, 'previous', undefined, {});
     router.removePage($oldPageEl);
-    if (dynamicNavbar && $oldNavbarEl.length) {
-      router.removeNavbar($oldNavbarEl);
-    }
   });
 }
 function clearPreviousHistory() {

package/modules/router/component-loader.js

@@ -77,10 +77,7 @@ export default {
       params.component = component;
       return router.navigate(navigateOptions);
     },
-    componentLoader(component, componentUrl, options, resolve, reject) {
-      if (options === void 0) {
-        options = {};
-      }
+    componentLoader(component, componentUrl, options = {}, resolve, reject) {
       const router = this;
       const {
         app
@@ -154,45 +151,39 @@ export default {
         compile(component);
       }
     },
-    modalComponentLoader(_temp) {
-      let {
-        component,
-        componentUrl,
-        options,
-        resolve,
-        reject
-      } = _temp === void 0 ? {} : _temp;
+    modalComponentLoader({
+      component,
+      componentUrl,
+      options,
+      resolve,
+      reject
+    } = {}) {
       const router = this;
       router.componentLoader(component, componentUrl, options, el => {
         resolve(el);
       }, reject);
     },
-    tabComponentLoader(_temp2) {
-      let {
-        component,
-        componentUrl,
-        options,
-        resolve,
-        reject
-      } = _temp2 === void 0 ? {} : _temp2;
+    tabComponentLoader({
+      component,
+      componentUrl,
+      options,
+      resolve,
+      reject
+    } = {}) {
       const router = this;
       router.componentLoader(component, componentUrl, options, el => {
         resolve(el);
       }, reject);
     },
-    pageComponentLoader(_temp3) {
-      let {
-        component,
-        componentUrl,
-        options,
-        resolve,
-        reject
-      } = _temp3 === void 0 ? {} : _temp3;
+    pageComponentLoader({
+      component,
+      componentUrl,
+      options,
+      resolve,
+      reject
+    } = {}) {
       const router = this;
-      router.componentLoader(component, componentUrl, options, function (el, newOptions) {
-        if (newOptions === void 0) {
-          newOptions = {};
-        }
+      router.componentLoader(component, componentUrl, options, (el, newOptions = {}) => {
         resolve(el, newOptions);
       }, reject);
     }

package/modules/router/modal.js

@@ -1,10 +1,7 @@
 import { extend, nextTick } from '../../shared/utils.js';
 import History from '../../shared/history.js';
 import asyncComponent from './async-component.js';
-function modalLoad(modalType, route, loadOptions, direction) {
-  if (loadOptions === void 0) {
-    loadOptions = {};
-  }
+function modalLoad(modalType, route, loadOptions = {}, direction) {
   const router = this;
   const app = router.app;
   const isPanel = modalType === 'panel';

package/modules/router/navigate.js

@@ -6,10 +6,7 @@ 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 refreshPage(props) {
-  if (props === void 0) {
-    props = {};
-  }
+function refreshPage(props = {}) {
   const router = this;
   appRouterCheck(router, 'refreshPage');
   return router.navigate(router.currentRoute.url, {
@@ -18,10 +15,7 @@ function refreshPage(props) {
     props
   });
 }
-function forward(router, el, forwardOptions) {
-  if (forwardOptions === void 0) {
-    forwardOptions = {};
-  }
+function forward(router, el, forwardOptions = {}) {
   const document = getDocument();
   const $el = $(el);
   const app = router.app;
@@ -70,14 +64,10 @@ function forward(router, el, forwardOptions) {
     }
     router.modalRemove(modalToClose);
   }
-  const dynamicNavbar = router.dynamicNavbar;
   const $viewEl = router.$el;
   const $newPage = $el;
   const reload = options.reloadPrevious || options.reloadCurrent || options.reloadAll;
   let $oldPage;
-  let $navbarsEl;
-  let $newNavbarEl;
-  let $oldNavbarEl;
   router.allowPageChange = false;
   if ($newPage.length === 0) {
     router.allowPageChange = true;
@@ -87,14 +77,6 @@ function forward(router, el, forwardOptions) {
     // Remove theme elements
     router.removeThemeElements($newPage);
   }
-  if (dynamicNavbar) {
-    $newNavbarEl = $newPage.children('.navbar');
-    $navbarsEl = router.$navbarsEl;
-    if ($newNavbarEl.length === 0 && $newPage[0] && $newPage[0].f7Page) {
-      // Try from pageData
-      $newNavbarEl = $newPage[0].f7Page.$navbarEl;
-    }
-  }
 
   // Save Keep Alive Cache
   if (options.route && options.route.route && options.route.route.keepAlive && !options.route.route.keepAliveData) {
@@ -106,12 +88,6 @@ function forward(router, el, forwardOptions) {
   // Pages In View
   const $pagesInView = $viewEl.children('.page').filter(pageInView => pageInView !== $newPage[0]);
 
-  // Navbars In View
-  let $navbarsInView;
-  if (dynamicNavbar) {
-    $navbarsInView = $navbarsEl.children('.navbar').filter(navbarInView => navbarInView !== $newNavbarEl[0]);
-  }
-
   // Exit when reload previous and only 1 page in view so nothing ro reload
   if (options.reloadPrevious && $pagesInView.length < 2) {
     router.allowPageChange = true;
@@ -129,7 +105,6 @@ function forward(router, el, forwardOptions) {
         continue; // eslint-disable-line
       }
     }
-
     isDetail = !isMaster && masterPageEl;
     if (isDetail) {
       // Find Other Detail
@@ -142,7 +117,6 @@ function forward(router, el, forwardOptions) {
         }
       }
     }
-
     reloadDetail = isDetail && options.reloadDetail && app.width >= router.params.masterDetailBreakpoint && masterPageEl;
   }
   if (isDetail) {
@@ -171,56 +145,25 @@ function forward(router, el, forwardOptions) {
       detailRoot: !!isDetailRoot
     });
   }
-  if (dynamicNavbar && $newNavbarEl.length) {
-    $newNavbarEl.removeClass('navbar-previous navbar-current navbar-next').addClass(`navbar-${newPagePosition}${isMaster ? ' navbar-master' : ''}${isDetail ? ' navbar-master-detail' : ''}${isDetailRoot ? ' navbar-master-detail-root' : ''}`);
-    $newNavbarEl.trigger('navbar:position', {
-      position: newPagePosition
-    });
-    router.emit('navbarPosition', $newNavbarEl[0], newPagePosition);
-    if (isMaster || isDetail) {
-      router.emit('navbarRole', $newNavbarEl[0], {
-        role: isMaster ? 'master' : 'detail',
-        detailRoot: !!isDetailRoot
-      });
-    }
-  }
 
   // Find Old Page
   if (options.reloadCurrent || reloadDetail) {
     if (reloadDetail) {
       $oldPage = $pagesInView.filter(pageEl => !pageEl.classList.contains('page-master'));
-      if (dynamicNavbar) {
-        $oldNavbarEl = $($oldPage.map(pageEl => app.navbar.getElByPage(pageEl)));
-      }
       if ($oldPage.length > 1 && masterPageEl) {
         detailsInBetweenRemoved = $oldPage.length - 1;
         $(masterPageEl).removeClass('page-master-stacked').trigger('page:masterunstack');
         router.emit('pageMasterUnstack', masterPageEl);
-        if (dynamicNavbar) {
-          $(app.navbar.getElByPage(masterPageEl)).removeClass('navbar-master-stacked');
-          router.emit('navbarMasterUnstack', app.navbar.getElByPage(masterPageEl));
-        }
       }
     } else {
       $oldPage = $pagesInView.eq($pagesInView.length - 1);
-      if (dynamicNavbar) {
-        $oldNavbarEl = $(app.navbar.getElByPage($oldPage));
-      }
     }
   } else if (options.reloadPrevious) {
     $oldPage = $pagesInView.eq($pagesInView.length - 2);
-    if (dynamicNavbar) {
-      // $oldNavbarEl = $navbarsInView.eq($pagesInView.length - 2);
-      $oldNavbarEl = $(app.navbar.getElByPage($oldPage));
-    }
   } else if (options.reloadAll) {
     $oldPage = $pagesInView.filter(pageEl => pageEl !== $newPage[0]);
-    if (dynamicNavbar) {
-      $oldNavbarEl = $navbarsInView.filter(navbarEl => navbarEl !== $newNavbarEl[0]);
-    }
   } else {
-    let removedPageEls = [];
-    let removedNavbarEls = [];
+    const removedPageEls = [];
     if ($pagesInView.length > 1) {
       let i = 0;
       for (i = 0; i < $pagesInView.length - 1; i += 1) {
@@ -228,39 +171,21 @@ function forward(router, el, forwardOptions) {
           $pagesInView.eq(i).addClass('page-master-stacked');
           $pagesInView.eq(i).trigger('page:masterstack');
           router.emit('pageMasterStack', $pagesInView[i]);
-          if (dynamicNavbar) {
-            $(app.navbar.getElByPage(masterPageEl)).addClass('navbar-master-stacked');
-            router.emit('navbarMasterStack', app.navbar.getElByPage(masterPageEl));
-          }
           continue; // eslint-disable-line
         }
 
-        const oldNavbarEl = app.navbar.getElByPage($pagesInView.eq(i));
-
         // Page remove event
         removedPageEls.push($pagesInView[i]);
-        router.pageCallback('beforeRemove', $pagesInView[i], $navbarsInView && $navbarsInView[i], 'previous', undefined, options);
+        router.pageCallback('beforeRemove', $pagesInView[i], 'previous', undefined, options);
         router.removePage($pagesInView[i]);
-        if (dynamicNavbar && oldNavbarEl) {
-          removedNavbarEls.push(oldNavbarEl);
-          router.removeNavbar(oldNavbarEl);
-        }
       }
     }
     $oldPage = $viewEl.children('.page').filter(pageEl => pageEl !== $newPage[0] && removedPageEls.indexOf(pageEl) < 0);
-    if (dynamicNavbar) {
-      $oldNavbarEl = $navbarsEl.children('.navbar').filter(navbarEl => navbarEl !== $newNavbarEl[0] && removedNavbarEls.indexOf(removedNavbarEls) < 0);
-    }
-    removedPageEls = [];
-    removedNavbarEls = [];
   }
   if (isDetail && !options.reloadAll) {
     if ($oldPage.length > 1 || reloadDetail) {
       $oldPage = $oldPage.filter(pageEl => !pageEl.classList.contains('page-master'));
     }
-    if ($oldNavbarEl && ($oldNavbarEl.length > 1 || reloadDetail)) {
-      $oldNavbarEl = $oldNavbarEl.filter(navbarEl => !navbarEl.classList.contains('navbar-master'));
-    }
   }
 
   // Push State
@@ -271,14 +196,8 @@ function forward(router, el, forwardOptions) {
     }, browserHistoryRoot + router.params.browserHistorySeparator + options.route.url);
   }
   if (!options.reloadPrevious) {
-    // Current Page & Navbar
+    // Current Page
     router.currentPageEl = $newPage[0];
-    if (dynamicNavbar && $newNavbarEl.length) {
-      router.currentNavbarEl = $newNavbarEl[0];
-    } else {
-      delete router.currentNavbarEl;
-    }
-
     // Current Route
     router.currentRoute = options.route;
   }
@@ -306,7 +225,7 @@ function forward(router, el, forwardOptions) {
   }
   router.saveHistory();
 
-  // Insert new page and navbar
+  // Insert new page
   const newPageInDom = $newPage.parents(document).length > 0;
   const f7Component = $newPage[0].f7Component;
   if (options.reloadPrevious) {
@@ -317,19 +236,6 @@ function forward(router, el, forwardOptions) {
     } else {
       $newPage.insertBefore($oldPage);
     }
-    if (dynamicNavbar && $newNavbarEl.length) {
-      if ($newNavbarEl.find('.title-large').length) {
-        $newNavbarEl.addClass('navbar-large');
-      }
-      if ($oldNavbarEl.length) {
-        $newNavbarEl.insertBefore($oldNavbarEl);
-      } else {
-        if (!router.$navbarsEl.parents(document).length) {
-          router.$el.prepend(router.$navbarsEl);
-        }
-        $navbarsEl.append($newNavbarEl);
-      }
-    }
   } else {
     if ($oldPage.next('.page')[0] !== $newPage[0]) {
       if (f7Component && !newPageInDom) {
@@ -340,56 +246,37 @@ function forward(router, el, forwardOptions) {
         $viewEl.append($newPage[0]);
       }
     }
-    if (dynamicNavbar && $newNavbarEl.length) {
-      if ($newNavbarEl.find('.title-large').length) {
-        $newNavbarEl.addClass('navbar-large');
-      }
-      if (!router.$navbarsEl.parents(document).length) {
-        router.$el.prepend(router.$navbarsEl);
-      }
-      $navbarsEl.append($newNavbarEl[0]);
-    }
   }
   if (!newPageInDom) {
-    router.pageCallback('mounted', $newPage, $newNavbarEl, newPagePosition, reload ? newPagePosition : 'current', options, $oldPage);
+    router.pageCallback('mounted', $newPage, newPagePosition, reload ? newPagePosition : 'current', options, $oldPage);
   } else if (options.route && options.route.route && options.route.route.keepAlive && !$newPage[0].f7PageMounted) {
     $newPage[0].f7PageMounted = true;
-    router.pageCallback('mounted', $newPage, $newNavbarEl, newPagePosition, reload ? newPagePosition : 'current', options, $oldPage);
+    router.pageCallback('mounted', $newPage, newPagePosition, reload ? newPagePosition : 'current', options, $oldPage);
   }
 
   // Remove old page
   if ((options.reloadCurrent || reloadDetail) && $oldPage.length > 0) {
     // Page remove event
-    router.pageCallback('beforeOut', $oldPage, $oldNavbarEl, 'current', undefined, options);
-    router.pageCallback('afterOut', $oldPage, $oldNavbarEl, 'current', undefined, options);
-    router.pageCallback('beforeRemove', $oldPage, $oldNavbarEl, 'current', undefined, options);
+    router.pageCallback('beforeOut', $oldPage, 'current', undefined, options);
+    router.pageCallback('afterOut', $oldPage, 'current', undefined, options);
+    router.pageCallback('beforeRemove', $oldPage, 'current', undefined, options);
     router.removePage($oldPage);
-    if (dynamicNavbar && $oldNavbarEl && $oldNavbarEl.length) {
-      router.removeNavbar($oldNavbarEl);
-    }
   } else if (options.reloadAll) {
-    $oldPage.each((pageEl, index) => {
+    $oldPage.each(pageEl => {
       const $oldPageEl = $(pageEl);
-      const $oldNavbarElEl = $(app.navbar.getElByPage($oldPageEl));
 
       // Page remove event
       if ($oldPageEl.hasClass('page-current')) {
-        router.pageCallback('beforeOut', $oldPage, $oldNavbarEl, 'current', undefined, options);
-        router.pageCallback('afterOut', $oldPage, $oldNavbarEl, 'current', undefined, options);
+        router.pageCallback('beforeOut', $oldPage, 'current', undefined, options);
+        router.pageCallback('afterOut', $oldPage, 'current', undefined, options);
       }
-      router.pageCallback('beforeRemove', $oldPageEl, $oldNavbarEl && $oldNavbarEl.eq(index), 'previous', undefined, options);
+      router.pageCallback('beforeRemove', $oldPageEl, 'previous', undefined, options);
       router.removePage($oldPageEl);
-      if (dynamicNavbar && $oldNavbarElEl.length) {
-        router.removeNavbar($oldNavbarElEl);
-      }
     });
   } else if (options.reloadPrevious) {
     // Page remove event
-    router.pageCallback('beforeRemove', $oldPage, $oldNavbarEl, 'previous', undefined, options);
+    router.pageCallback('beforeRemove', $oldPage, 'previous', undefined, options);
     router.removePage($oldPage);
-    if (dynamicNavbar && $oldNavbarEl && $oldNavbarEl.length) {
-      router.removeNavbar($oldNavbarEl);
-    }
   }
 
   // Load Tab
@@ -406,21 +293,15 @@ function forward(router, el, forwardOptions) {
   }
 
   // Page init and before init events
-  router.pageCallback('init', $newPage, $newNavbarEl, newPagePosition, reload ? newPagePosition : 'current', options, $oldPage);
+  router.pageCallback('init', $newPage, newPagePosition, reload ? newPagePosition : 'current', options, $oldPage);
   if (options.reloadCurrent || options.reloadAll || reloadDetail) {
     router.allowPageChange = true;
-    router.pageCallback('beforeIn', $newPage, $newNavbarEl, newPagePosition, 'current', options);
+    router.pageCallback('beforeIn', $newPage, newPagePosition, 'current', options);
     $newPage.removeAttr('aria-hidden');
-    if (dynamicNavbar && $newNavbarEl) {
-      $newNavbarEl.removeAttr('aria-hidden');
-    }
-    router.pageCallback('afterIn', $newPage, $newNavbarEl, newPagePosition, 'current', options);
+    router.pageCallback('afterIn', $newPage, newPagePosition, 'current', options);
     if (options.reloadCurrent && options.clearPreviousHistory) router.clearPreviousHistory();
     if (reloadDetail) {
       router.setPagePosition($(masterPageEl), 'previous');
-      if (masterPageEl.f7Page && masterPageEl.f7Page.navbarEl) {
-        router.setNavbarPosition($(masterPageEl.f7Page.navbarEl), 'previous');
-      }
     }
     return router;
   }
@@ -430,21 +311,17 @@ function forward(router, el, forwardOptions) {
   }
 
   // Before animation event
-  router.pageCallback('beforeOut', $oldPage, $oldNavbarEl, 'current', 'previous', options);
-  router.pageCallback('beforeIn', $newPage, $newNavbarEl, 'next', 'current', options);
+  router.pageCallback('beforeOut', $oldPage, 'current', 'previous', options);
+  router.pageCallback('beforeIn', $newPage, 'next', 'current', options);
 
   // Animation
   function afterAnimation() {
     router.setPagePosition($newPage, 'current', false);
     router.setPagePosition($oldPage, 'previous', !$oldPage.hasClass('page-master'));
-    if (dynamicNavbar) {
-      router.setNavbarPosition($newNavbarEl, 'current', false);
-      router.setNavbarPosition($oldNavbarEl, 'previous', !$oldNavbarEl.hasClass('navbar-master'));
-    }
     // After animation event
     router.allowPageChange = true;
-    router.pageCallback('afterOut', $oldPage, $oldNavbarEl, 'current', 'previous', options);
-    router.pageCallback('afterIn', $newPage, $newNavbarEl, 'next', 'current', options);
+    router.pageCallback('afterOut', $oldPage, 'current', 'previous', options);
+    router.pageCallback('afterIn', $newPage, 'next', 'current', options);
     let keepOldPage = (router.params.preloadPreviousPage || router.params[`${app.theme}SwipeBack`]) && !isMaster;
     if (!keepOldPage) {
       if ($newPage.hasClass('smart-select-page') || $newPage.hasClass('photo-browser-page') || $newPage.hasClass('autocomplete-page') || $newPage.hasClass('color-picker-page')) {
@@ -454,11 +331,8 @@ function forward(router, el, forwardOptions) {
     if (!keepOldPage) {
       if (!($newPage.attr('data-name') && $newPage.attr('data-name') === 'smart-select-page')) {
         // Remove event
-        router.pageCallback('beforeRemove', $oldPage, $oldNavbarEl, 'previous', undefined, options);
+        router.pageCallback('beforeRemove', $oldPage, 'previous', undefined, options);
         router.removePage($oldPage);
-        if (dynamicNavbar && $oldNavbarEl.length) {
-          router.removeNavbar($oldNavbarEl);
-        }
       }
     }
     if (options.clearPreviousHistory) router.clearPreviousHistory();
@@ -470,10 +344,6 @@ function forward(router, el, forwardOptions) {
   function setPositionClasses() {
     router.setPagePosition($oldPage, 'current', false);
     router.setPagePosition($newPage, 'next', false);
-    if (dynamicNavbar) {
-      router.setNavbarPosition($oldNavbarEl, 'current', false);
-      router.setNavbarPosition($newNavbarEl, 'next', false);
-    }
   }
   if (options.animate && !(isMaster && app.width >= router.params.masterDetailBreakpoint)) {
     const delay = router.params[`${router.app.theme}PageLoadDelay`];
@@ -491,13 +361,13 @@ function forward(router, el, forwardOptions) {
     if (delay) {
       setTimeout(() => {
         setPositionClasses();
-        router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'forward', transition, () => {
+        router.animate($oldPage, $newPage, 'forward', transition, () => {
           afterAnimation();
         });
       }, delay);
     } else {
       setPositionClasses();
-      router.animate($oldPage, $newPage, $oldNavbarEl, $newNavbarEl, 'forward', transition, () => {
+      router.animate($oldPage, $newPage, 'forward', transition, () => {
         afterAnimation();
       });
     }
@@ -506,13 +376,7 @@ function forward(router, el, forwardOptions) {
   }
   return router;
 }
-function load(router, loadParams, loadOptions, ignorePageChange) {
-  if (loadParams === void 0) {
-    loadParams = {};
-  }
-  if (loadOptions === void 0) {
-    loadOptions = {};
-  }
+function load(router, loadParams = {}, loadOptions = {}, ignorePageChange) {
   if (!router.allowPageChange && !ignorePageChange) return router;
   const params = loadParams;
   const options = loadOptions;
@@ -614,10 +478,7 @@ function load(router, loadParams, loadOptions, ignorePageChange) {
   }
   return router;
 }
-function navigate(navigateParams, navigateOptions) {
-  if (navigateOptions === void 0) {
-    navigateOptions = {};
-  }
+function navigate(navigateParams, navigateOptions = {}) {
   const router = this;
   if (router.swipeBackActive) return router;
   let url;

package/modules/router/redirect.js

@@ -7,11 +7,7 @@ export default function redirect(direction, route, options) {
     options.replaceState = true; // eslint-disable-line
     options.history = true; // eslint-disable-line
   }
-
-  function redirectResolve(redirectUrl, redirectOptions) {
-    if (redirectOptions === void 0) {
-      redirectOptions = {};
-    }
+  function redirectResolve(redirectUrl, redirectOptions = {}) {
     router.allowPageChange = true;
     router[method](redirectUrl, extend({}, options, redirectOptions));
   }