@xenknight/framework7 0.0.7 → 0.0.9

package/components/subnavbar-new/subnavbar-new-ios.less

@@ -0,0 +1,67 @@
+.ios {
+  .subnavbar-new {
+    height: calc(var(--f7-subnavbar-new-height) + 1px);
+    margin-top: -1px;
+    padding-top: 1px;
+    border-radius: var(--f7-subnavbar-new-height);
+    box-shadow: var(--f7-glass-shadow);
+    .ios-glass-backdrop();
+    --f7-segmented-strong-bg-color: transparent;
+
+    &:has(> .searchbar-new) {
+      background: transparent;
+      backdrop-filter: none;
+      box-shadow: none;
+    }
+
+    .subnavbar-new-inner {
+      border-radius: inherit;
+    }
+
+    .title {
+      align-self: flex-start;
+      flex-shrink: 10;
+    }
+    .ltr({
+      .left, .right {
+        a + a {
+          margin-left: 16px;
+        }
+      }
+      .left {
+        margin-right: 10px;
+      }
+      .right {
+        margin-left: 10px;
+      }
+      .right:first-child {
+        right: 8px;
+      }
+    });
+    .rtl({
+      .left, .right {
+        a + a {
+          margin-right: 16px;
+        }
+      }
+      .left {
+        margin-left: 10px;
+      }
+      .right {
+        margin-right: 10px;
+      }
+      .right:first-child {
+        left: 8px;
+      }
+    });
+
+    a.link {
+      justify-content: flex-start;
+    }
+    a.icon-only {
+      justify-content: center;
+      margin: 0;
+    }
+  }
+}
+

package/components/subnavbar-new/subnavbar-new-md.less

@@ -0,0 +1,48 @@
+.md {
+  .subnavbar-new {
+    height: var(--f7-subnavbar-new-height);
+    .ltr({
+      .right {
+        margin-left: auto;
+      }
+      .right:first-child {
+        right: 16px;
+      }
+    });
+    .rtl({
+      .right {
+        margin-right: auto;
+      }
+      .right:first-child {
+        left: 16px;
+      }
+    });
+    a.link {
+      justify-content: center;
+      padding: 0 12px;
+    }
+    a.icon-only {
+      flex-shrink: 0;
+      padding: 0 12px;
+    }
+  }
+  .subnavbar-new-inner {
+    .ltr({
+      > a.link:first-child {
+        margin-left: calc(-1 * var(--f7-subnavbar-new-inner-padding-left));
+      }
+      > a.link:last-child {
+        margin-right: calc(-1 * var(--f7-subnavbar-new-inner-padding-right));
+      }
+    });
+    .rtl({
+      > a.link:first-child {
+        margin-right: calc(-1 * var(--f7-subnavbar-new-inner-padding-right));
+      }
+      > a.link:last-child {
+        margin-left: calc(-1 * var(--f7-subnavbar-new-inner-padding-left));
+      }
+    });
+  }
+}
+

package/components/subnavbar-new/subnavbar-new-vars.less

@@ -0,0 +1,42 @@
+:root {
+  /*
+  --f7-subnavbar-new-bg-color: var(--f7-bars-bg-color);
+  --f7-subnavbar-new-bg-color-rgb: var(--f7-bars-bg-color-rgb);
+  --f7-subnavbar-new-border-color: var(--f7-bars-border-color);
+  --f7-subnavbar-new-link-color: var(--f7-bars-link-color);
+  --f7-subnavbar-new-text-color: var(--f7-bars-text-color);
+  */
+  --f7-subnavbar-new-title-line-height: 1.2;
+}
+.ios-vars({
+  --f7-subnavbar-new-height: 44px;
+  --f7-subnavbar-new-offset-left: calc(16px + var(--f7-safe-area-left));
+  --f7-subnavbar-new-offset-right: calc(16px + var(--f7-safe-area-right));
+  --f7-subnavbar-new-inner-padding-left: 5px;
+  --f7-subnavbar-new-inner-padding-right: 5px;
+  --f7-subnavbar-new-title-font-size: 24px;
+  --f7-subnavbar-new-title-font-weight: 700;
+  --f7-subnavbar-new-title-letter-spacing: -0.03em;
+  --f7-subnavbar-new-title-margin-left: 8px;
+  --f7-subnavbar-new-bg-color: var(--f7-glass-bg-color);
+  /*
+  --f7-subnavbar-new-link-height: var(--f7-subnavbar-new-height);
+  --f7-subnavbar-new-link-line-height: var(--f7-subnavbar-new-height);
+  */
+});
+.md-vars({
+  --f7-subnavbar-new-height: 64px;
+  --f7-subnavbar-new-offset-left: 0;
+  --f7-subnavbar-new-offset-right: 0;
+  --f7-subnavbar-new-inner-padding-left: calc(16px + var(--f7-safe-area-left));
+  --f7-subnavbar-new-inner-padding-right: calc(16px + var(--f7-safe-area-right));
+  --f7-subnavbar-new-title-font-size: 22px;
+  --f7-subnavbar-new-title-font-weight: 400;
+  --f7-subnavbar-new-title-letter-spacing: 0;
+  --f7-subnavbar-new-title-margin-left: 0px;
+  /*
+  --f7-subnavbar-new-link-height: var(--f7-subnavbar-new-height);
+  --f7-subnavbar-new-link-line-height: var(--f7-subnavbar-new-height);
+  */
+});
+

package/components/subnavbar-new/subnavbar-new.d.ts

@@ -0,0 +1,12 @@
+import { Framework7Plugin } from '../app/app-class.js';
+
+export namespace SubnavbarNew {
+  interface AppMethods {}
+  interface AppParams {}
+  interface AppEvents {}
+}
+
+declare const SubnavbarNewComponent: Framework7Plugin;
+
+export default SubnavbarNewComponent;
+

package/components/subnavbar-new/subnavbar-new.js

@@ -0,0 +1,20 @@
+import $ from '../../shared/dom7.js';
+export default {
+  name: 'subnavbar-new',
+  on: {
+    pageInit(page) {
+      if (page.$navbarEl && page.$navbarEl.length && page.$navbarEl.find('.subnavbar-new').length) {
+        page.$el.addClass('page-with-subnavbar-new');
+      }
+      if (page.$navbarNewEl && page.$navbarNewEl.length && page.$navbarNewEl.find('.subnavbar-new').length) {
+        page.$el.addClass('page-with-subnavbar-new');
+      }
+      const $innerSubnavbars = page.$el.find('.subnavbar-new').filter(subnavbarEl => {
+        return $(subnavbarEl).parents('.page')[0] === page.$el[0];
+      });
+      if ($innerSubnavbars.length) {
+        page.$el.addClass('page-with-subnavbar-new');
+      }
+    }
+  }
+};

package/components/subnavbar-new/subnavbar-new.less

@@ -0,0 +1,151 @@
+/* === Subnavbar New === */
+@import './subnavbar-new-vars.less';
+.subnavbar-new {
+  position: absolute;
+  left: var(--f7-subnavbar-new-offset-left);
+  right: var(--f7-subnavbar-new-offset-right);
+  top: 0;
+  z-index: 600;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: var(--f7-subnavbar-new-bg-color, var(--f7-bars-bg-color));
+  color: var(--f7-subnavbar-new-text-color, var(--f7-bars-text-color));
+  .ios-translucent-bars(var(--f7-subnavbar-new-bg-color-rgb, var(--f7-bars-bg-color-rgb)));
+  .subnavbar-new-title {
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellpsis;
+    white-space: nowrap;
+    font-size: var(--f7-subnavbar-new-title-font-size);
+    font-weight: var(--f7-subnavbar-new-title-font-weight);
+    text-align: left;
+    display: inline-block;
+    line-height: var(--f7-subnavbar-new-title-line-height);
+    letter-spacing: var(--f7-subnavbar-new-title-letter-spacing);
+    .ltr({
+      margin-left: var(--f7-subnavbar-new-title-margin-left);
+    });
+    .rtl({
+      margin-right: var(--f7-subnavbar-new-title-margin-left);
+    });
+  }
+  .left,
+  .right {
+    flex-shrink: 0;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  .right:first-child {
+    position: absolute;
+    height: 100%;
+  }
+  a {
+    color: var(--f7-subnavbar-new-link-color, var(--f7-bars-link-color, var(--f7-theme-color)));
+  }
+  a.link {
+    line-height: var(--f7-subnavbar-new-link-line-height, var(--f7-subnavbar-new-height));
+    height: var(--f7-subnavbar-new-link-height, var(--f7-subnavbar-new-height));
+  }
+  a.icon-only {
+    min-width: var(--f7-subnavbar-new-height);
+  }
+  &.no-outline {
+    &:after {
+      display: none !important;
+    }
+  }
+  &.navbar-hidden {
+    &:before {
+      display: none !important;
+    }
+  }
+  &:after,
+  &:before {
+    backface-visibility: hidden;
+  }
+  .hairline(bottom, var(--f7-subnavbar-new-border-color, transparent));
+}
+.subnavbar-new-inner {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  justify-content: space-between;
+  overflow: hidden;
+  padding: 0 var(--f7-subnavbar-new-inner-padding-left) 0
+    var(--f7-subnavbar-new-inner-padding-right);
+}
+.navbar .subnavbar-new,
+.navbar-new .subnavbar-new {
+  top: 100%;
+}
+
+.views,
+.view,
+.page {
+  > .subnavbar-new {
+    position: absolute;
+  }
+}
+.navbar-new ~ * .subnavbar-new,
+.navbars-new ~ * .subnavbar-new,
+.page-with-subnavbar-new .navbar-new ~ .subnavbar-new,
+.page-with-subnavbar-new .navbar-new ~ * .subnavbar-new,
+.navbar-new ~ .page-with-subnavbar-new:not(.no-navbar) .subnavbar-new,
+.navbar-new ~ .subnavbar-new,
+.navbars-new ~ .page-with-subnavbar-new:not(.no-navbar) .subnavbar-new,
+.navbars-new ~ .subnavbar-new {
+  top: calc(var(--f7-navbar-height) + var(--f7-safe-area-top));
+}
+
+.navbar ~ .page-with-navbar-large:not(.no-navbar) .subnavbar-new,
+.navbars ~ .page-with-navbar-large:not(.no-navbar) .subnavbar-new,
+.navbar-new ~ .page-with-navbar-new-large:not(.no-navbar) .subnavbar-new,
+.navbars-new ~ .page-with-navbar-new-large:not(.no-navbar) .subnavbar-new,
+.page-with-subnavbar-new.page-with-navbar-large .navbar ~ .subnavbar-new,
+.page-with-subnavbar-new.page-with-navbar-large .navbar ~ * .subnavbar-new,
+.page-with-subnavbar-new.page-with-navbar-new-large .navbar-new ~ .subnavbar-new,
+.page-with-subnavbar-new.page-with-navbar-new-large .navbar-new ~ * .subnavbar-new,
+.navbar .title-large ~ .subnavbar-new,
+.navbar-new .title-large ~ .subnavbar-new {
+  top: calc(
+    var(--f7-navbar-height) + var(--f7-navbar-large-title-height) + var(--f7-safe-area-top)
+  );
+  transform: translate3d(
+    0,
+    calc(-1 * var(--f7-navbar-large-collapse-progress) * var(--f7-navbar-large-title-height)),
+    0
+  );
+}
+
+.navbar-new ~ .page-with-navbar-new-large:not(.no-navbar) .subnavbar-new,
+.navbars-new ~ .page-with-navbar-new-large:not(.no-navbar) .subnavbar-new,
+.page-with-subnavbar-new.page-with-navbar-new-large .navbar-new ~ .subnavbar-new,
+.page-with-subnavbar-new.page-with-navbar-new-large .navbar-new ~ * .subnavbar-new,
+.navbar-new .title-large ~ .subnavbar-new {
+  top: calc(
+    var(--f7-navbar-new-height) + var(--f7-navbar-new-large-title-height) + var(--f7-safe-area-top)
+  );
+  transform: translate3d(
+    0,
+    calc(
+      -1 * var(--f7-navbar-new-large-collapse-progress) * var(--f7-navbar-new-large-title-height)
+    ),
+    0
+  );
+}
+.page-with-subnavbar-new,
+.subnavbar-new ~ * {
+  --f7-page-subnavbar-new-offset: var(--f7-subnavbar-new-height);
+}
+
+.if-ios-theme({
+  @import './subnavbar-new-ios.less';
+});
+.if-md-theme({
+  @import './subnavbar-new-md.less';
+});

package/components/toolbar-new/tabbar-highlight.js

@@ -51,9 +51,10 @@ const unsetHighlightOnTouch = data => {
   const {
     activeIndex,
     newActiveIndex,
-    linkEls
+    linkEls,
+    isMouse
   } = data;
-  if (activeIndex !== newActiveIndex) {
+  if (activeIndex !== newActiveIndex && !isMouse) {
     linkEls[newActiveIndex].click();
   }
   highlightEl.style.transform = `translateX(${newActiveIndex * 100}%)`;
@@ -83,12 +84,13 @@ export const initTabbarNewHighlight = el => {
     if (e.type === 'touchstart') {
       e.preventDefault();
     }
-    if (e.pointerType !== 'touch') return;
+    if (e.pointerType !== 'touch' && e.pointerType !== 'mouse') return;
     if (!el) return;
     if (e.type === 'pointerdown') {
       data.linkEls = el.querySelectorAll('.tab-link');
       data.rect = toolbarPaneEl.getBoundingClientRect();
       data.touched = true;
+      data.isMouse = e.pointerType === 'mouse';
       setHighlightOnTouch(data, e);
       startAnimation(data);
     }
@@ -105,17 +107,29 @@ export const initTabbarNewHighlight = el => {
       stopAnimation(data);
     }
   };
+  el.f7ToolbarNewOnPointerMove = e => {
+    const highlightData = el.f7ToolbarNewHighlightData;
+    if (e.pointerType === 'mouse' && highlightData && highlightData.touched) {
+      el.f7ToolbarNewOnPointer(e);
+    }
+  };
+  el.f7ToolbarNewOnPointerUp = e => {
+    const highlightData = el.f7ToolbarNewHighlightData;
+    if (e.pointerType === 'mouse' && highlightData && highlightData.touched) {
+      el.f7ToolbarNewOnPointer(e);
+    }
+  };
   el.addEventListener('touchstart', el.f7ToolbarNewOnPointer, {
     passive: false
   });
   el.addEventListener('pointerdown', el.f7ToolbarNewOnPointer, {
     passive: false
   });
-  document.addEventListener('pointermove', el.f7ToolbarNewOnPointer, {
-    passive: false
+  document.addEventListener('pointermove', el.f7ToolbarNewOnPointerMove, {
+    passive: true
   });
-  document.addEventListener('pointerup', el.f7ToolbarNewOnPointer, {
-    passive: false
+  document.addEventListener('pointerup', el.f7ToolbarNewOnPointerUp, {
+    passive: true
   });
   document.addEventListener('pointercancel', el.f7ToolbarNewOnPointer, {
     passive: false
@@ -126,9 +140,15 @@ export const destroyTabbarNewHighlight = el => {
   const document = getDocument();
   el.removeEventListener('touchstart', el.f7ToolbarNewOnPointer);
   el.removeEventListener('pointerdown', el.f7ToolbarNewOnPointer);
-  document.removeEventListener('pointermove', el.f7ToolbarNewOnPointer);
-  document.removeEventListener('pointerup', el.f7ToolbarNewOnPointer);
+  if (el.f7ToolbarNewOnPointerMove) {
+    document.removeEventListener('pointermove', el.f7ToolbarNewOnPointerMove);
+  }
+  if (el.f7ToolbarNewOnPointerUp) {
+    document.removeEventListener('pointerup', el.f7ToolbarNewOnPointerUp);
+  }
   document.removeEventListener('pointercancel', el.f7ToolbarNewOnPointer);
   el.f7ToolbarNewOnPointer = null;
+  el.f7ToolbarNewOnPointerMove = null;
+  el.f7ToolbarNewOnPointerUp = null;
   el.f7ToolbarNewHighlightData = null;
 };