framework7 7.0.0-beta.2 → 7.0.0-beta.3

package/less/mixins.less

@@ -53,8 +53,8 @@
 }
 .dark-vars(@ruleset) {
   & when (@includeDarkTheme) {
-    .theme-dark,
-    &.theme-dark {
+    .dark,
+    &.dark {
       @ruleset();
     }
   }

package/modules/router/component-loader.js

@@ -2,6 +2,52 @@ import { merge } from '../../shared/utils';
 export default {
   name: 'routerComponentLoader',
   proto: {
+    openIn(router, url, options) {
+      const navigateOptions = {
+        url,
+        route: {
+          path: url,
+          options: { ...options,
+            openIn: undefined
+          }
+        }
+      };
+      const params = { ...options
+      };
+
+      if (options.openIn === 'popup') {
+        params.content = `<div class="popup popup-router-open-in" data-url="${url}"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div>`;
+        navigateOptions.route.popup = params;
+      }
+
+      if (options.openIn === 'loginScreen') {
+        params.content = `<div class="login-screen login-screen-router-open-in" data-url="${url}"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div>`;
+        navigateOptions.route.loginScreen = params;
+      }
+
+      if (options.openIn === 'sheet') {
+        params.content = `<div class="sheet-modal sheet-modal-router-open-in" data-url="${url}"><div class="sheet-modal-inner"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div></div>`;
+        navigateOptions.route.sheet = params;
+      }
+
+      if (options.openIn === 'popover') {
+        params.targetEl = options.clickedEl || options.targetEl;
+        params.content = `<div class="popover popover-router-open-in" data-url="${url}"><div class="popover-inner"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div></div>`;
+        navigateOptions.route.popover = params;
+      }
+
+      if (options.openIn.indexOf('panel') >= 0) {
+        const parts = options.openIn.split(':');
+        const side = parts[1] || 'left';
+        const effect = parts[2] || 'cover';
+        params.targetEl = options.clickedEl || options.targetEl;
+        params.content = `<div class="panel panel-router-open-in panel-${side} panel-${effect}" data-url="${url}"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div>`;
+        navigateOptions.route.panel = params;
+      }
+
+      return router.navigate(navigateOptions);
+    },
+
     componentLoader(component, componentUrl, options = {}, resolve, reject) {
       const router = this;
       const {

package/modules/router/navigate.js

@@ -730,52 +730,6 @@ function load(router, loadParams = {}, loadOptions = {}, ignorePageChange) {
   return router;
 }
 
-function openIn(router, url, options) {
-  const navigateOptions = {
-    url,
-    route: {
-      path: url,
-      options: { ...options,
-        openIn: undefined
-      }
-    }
-  };
-  const params = { ...options
-  };
-
-  if (options.openIn === 'popup') {
-    params.content = `<div class="popup popup-router-open-in" data-url="${url}"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div>`;
-    navigateOptions.route.popup = params;
-  }
-
-  if (options.openIn === 'loginScreen') {
-    params.content = `<div class="login-screen login-screen-router-open-in" data-url="${url}"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div>`;
-    navigateOptions.route.loginScreen = params;
-  }
-
-  if (options.openIn === 'sheet') {
-    params.content = `<div class="sheet-modal sheet-modal-router-open-in" data-url="${url}"><div class="sheet-modal-inner"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div></div>`;
-    navigateOptions.route.sheet = params;
-  }
-
-  if (options.openIn === 'popover') {
-    params.targetEl = options.clickedEl || options.targetEl;
-    params.content = `<div class="popover popover-router-open-in" data-url="${url}"><div class="popover-inner"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div></div>`;
-    navigateOptions.route.popover = params;
-  }
-
-  if (options.openIn.indexOf('panel') >= 0) {
-    const parts = options.openIn.split(':');
-    const side = parts[1] || 'left';
-    const effect = parts[2] || 'cover';
-    params.targetEl = options.clickedEl || options.targetEl;
-    params.content = `<div class="panel panel-router-open-in panel-${side} panel-${effect}" data-url="${url}"><div class="view view-init" data-links-view="${router.view.selector}" data-url="${url}" data-ignore-open-in="true"></div></div>`;
-    navigateOptions.route.panel = params;
-  }
-
-  return router.navigate(navigateOptions);
-}
-
 function navigate(navigateParams, navigateOptions = {}) {
   const router = this;
   if (router.swipeBackActive) return router;
@@ -865,7 +819,7 @@ function navigate(navigateParams, navigateOptions = {}) {
   }
 
   if (options.openIn && (!router.params.ignoreOpenIn || router.params.ignoreOpenIn && router.history.length > 0)) {
-    return openIn(router, navigateUrl, options);
+    return router.openIn(router, navigateUrl, options);
   }
 
   options.route = route;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework7",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.3",
   "description": "Full featured mobile HTML framework for building iOS & Android apps",
   "type": "module",
   "exports": {