framework7 7.0.9 → 8.0.0-beta.1

package/components/grid/grid.js

@@ -1,227 +1,3 @@
-import { getDocument } from 'ssr-window';
-import $ from '../../shared/dom7.js';
-import { extend } from '../../shared/utils.js';
-
-function getElMinSize(dimension, $el) {
-  let minSize = $el.css(`min-${dimension}`);
-
-  if (minSize === 'auto' || minSize === 'none') {
-    minSize = 0;
-  } else if (minSize.indexOf('px') >= 0) {
-    minSize = parseFloat(minSize);
-  } else if (minSize.indexOf('%') >= 0) {
-    minSize = $el.parent()[0][dimension === 'height' ? 'offsetHeight' : 'offsetWidth'] * parseFloat(minSize) / 100;
-  }
-
-  return minSize;
-}
-
-function getElMaxSize(dimension, $el) {
-  let maxSize = $el.css(`max-${dimension}`);
-
-  if (maxSize === 'auto' || maxSize === 'none') {
-    maxSize = null;
-  } else if (maxSize.indexOf('px') >= 0) {
-    maxSize = parseFloat(maxSize);
-  } else if (maxSize.indexOf('%') >= 0) {
-    maxSize = $el.parent()[0][dimension === 'height' ? 'offsetHeight' : 'offsetWidth'] * parseFloat(maxSize) / 100;
-  }
-
-  return maxSize;
-}
-
-const Grid = {
-  init() {
-    const app = this;
-    let isTouched;
-    let isMoved;
-    let touchStartX;
-    let touchStartY;
-    let $resizeHandlerEl;
-    let $prevResizableEl;
-    let $nextResizableEl;
-    let prevElSize;
-    let prevElMinSize;
-    let prevElMaxSize;
-    let nextElSize;
-    let nextElMinSize;
-    let nextElMaxSize;
-    let parentSize;
-    let itemsInFlow;
-    let gapSize;
-    let isScrolling;
-
-    function handleTouchStart(e) {
-      if (isTouched || isMoved) return;
-      $resizeHandlerEl = $(e.target).closest('.resize-handler');
-      touchStartX = e.type === 'touchstart' ? e.targetTouches[0].pageX : e.pageX;
-      touchStartY = e.type === 'touchstart' ? e.targetTouches[0].pageY : e.pageY;
-      isTouched = true;
-      $prevResizableEl = undefined;
-      $nextResizableEl = undefined;
-      isScrolling = undefined;
-    }
-
-    function handleTouchMove(e) {
-      if (!isTouched) return;
-      const isRow = $resizeHandlerEl.parent('.row').length === 1;
-      const sizeProp = isRow ? 'height' : 'width';
-      const getSizeProp = isRow ? 'offsetHeight' : 'offsetWidth';
-
-      if (!isMoved) {
-        $prevResizableEl = $resizeHandlerEl.parent(isRow ? '.row' : '.col');
-
-        if ($prevResizableEl.length && (!$prevResizableEl.hasClass('resizable') || $prevResizableEl.hasClass('resizable-fixed'))) {
-          $prevResizableEl = $prevResizableEl.prevAll('.resizable:not(.resizable-fixed)').eq(0);
-        }
-
-        $nextResizableEl = $prevResizableEl.next(isRow ? '.row' : '.col');
-
-        if ($nextResizableEl.length && (!$nextResizableEl.hasClass('resizable') || $nextResizableEl.hasClass('resizable-fixed'))) {
-          $nextResizableEl = $nextResizableEl.nextAll('.resizable:not(.resizable-fixed)').eq(0);
-        }
-
-        if ($prevResizableEl.length) {
-          prevElSize = $prevResizableEl[0][getSizeProp];
-          prevElMinSize = getElMinSize(sizeProp, $prevResizableEl);
-          prevElMaxSize = getElMaxSize(sizeProp, $prevResizableEl);
-          parentSize = $prevResizableEl.parent()[0][getSizeProp];
-          itemsInFlow = $prevResizableEl.parent().children(isRow ? '.row' : '[class*="col-"], .col').length;
-          gapSize = parseFloat($prevResizableEl.css(isRow ? '--f7-grid-row-gap' : '--f7-grid-gap'));
-        }
-
-        if ($nextResizableEl.length) {
-          nextElSize = $nextResizableEl[0][getSizeProp];
-          nextElMinSize = getElMinSize(sizeProp, $nextResizableEl);
-          nextElMaxSize = getElMaxSize(sizeProp, $nextResizableEl);
-
-          if (!$prevResizableEl.length) {
-            parentSize = $nextResizableEl.parent()[0][getSizeProp];
-            itemsInFlow = $nextResizableEl.parent().children(isRow ? '.row' : '[class*="col-"], .col').length;
-            gapSize = parseFloat($nextResizableEl.css(isRow ? '--f7-grid-row-gap' : '--f7-grid-gap'));
-          }
-        }
-      }
-
-      isMoved = true;
-      const touchCurrentX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX;
-      const touchCurrentY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY;
-
-      if (typeof isScrolling === 'undefined' && !isRow) {
-        isScrolling = !!(isScrolling || Math.abs(touchCurrentY - touchStartY) > Math.abs(touchCurrentX - touchStartX));
-      }
-
-      if (isScrolling) {
-        isTouched = false;
-        isMoved = false;
-        return;
-      }
-
-      const isAbsolute = $prevResizableEl.hasClass('resizable-absolute') || $nextResizableEl.hasClass('resizable-absolute');
-      const resizeNextEl = !isRow || isRow && !isAbsolute;
-
-      if (resizeNextEl && !$nextResizableEl.length || !$prevResizableEl.length) {
-        isTouched = false;
-        isMoved = false;
-        return;
-      }
-
-      e.preventDefault();
-      let diff = isRow ? touchCurrentY - touchStartY : touchCurrentX - touchStartX;
-      let prevElNewSize;
-      let nextElNewSize;
-
-      if ($prevResizableEl.length) {
-        prevElNewSize = prevElSize + diff;
-
-        if (prevElNewSize < prevElMinSize) {
-          prevElNewSize = prevElMinSize;
-          diff = prevElNewSize - prevElSize;
-        }
-
-        if (prevElMaxSize && prevElNewSize > prevElMaxSize) {
-          prevElNewSize = prevElMaxSize;
-          diff = prevElNewSize - prevElSize;
-        }
-      }
-
-      if ($nextResizableEl.length && resizeNextEl) {
-        nextElNewSize = nextElSize - diff;
-
-        if (nextElNewSize < nextElMinSize) {
-          nextElNewSize = nextElMinSize;
-          diff = nextElSize - nextElNewSize;
-          prevElNewSize = prevElSize + diff;
-        }
-
-        if (nextElMaxSize && nextElNewSize > nextElMaxSize) {
-          nextElNewSize = nextElMaxSize;
-          diff = nextElSize - nextElNewSize;
-          prevElNewSize = prevElSize + diff;
-        }
-      }
-
-      if (isAbsolute) {
-        $prevResizableEl[0].style[sizeProp] = `${prevElNewSize}px`;
-
-        if (resizeNextEl) {
-          $nextResizableEl[0].style[sizeProp] = `${nextElNewSize}px`;
-        }
-
-        $prevResizableEl.trigger('grid:resize');
-        $nextResizableEl.trigger('grid:resize');
-        app.emit('gridResize', $prevResizableEl[0]);
-        app.emit('gridResize', $nextResizableEl[0]);
-        return;
-      }
-
-      const gapAddSize = (itemsInFlow - 1) * gapSize / itemsInFlow;
-      const gapAddSizeCSS = isRow ? `${itemsInFlow - 1} * var(--f7-grid-row-gap) / ${itemsInFlow}` : '(var(--f7-cols-per-row) - 1) * var(--f7-grid-gap) / var(--f7-cols-per-row)';
-      const prevElNewSizeNormalized = prevElNewSize + gapAddSize;
-      const nextElNewSizeNormalized = nextElNewSize + gapAddSize;
-      $prevResizableEl[0].style[sizeProp] = `calc(${prevElNewSizeNormalized / parentSize * 100}% - ${gapAddSizeCSS})`;
-      $nextResizableEl[0].style[sizeProp] = `calc(${nextElNewSizeNormalized / parentSize * 100}% - ${gapAddSizeCSS})`;
-      $prevResizableEl.trigger('grid:resize');
-      $nextResizableEl.trigger('grid:resize');
-      app.emit('gridResize', $prevResizableEl[0]);
-      app.emit('gridResize', $nextResizableEl[0]);
-    }
-
-    function handleTouchEnd() {
-      if (!isTouched) return;
-
-      if (!isMoved) {
-        isTouched = false;
-      }
-
-      isTouched = false;
-      isMoved = false;
-    }
-
-    const document = getDocument();
-    $(document).on(app.touchEvents.start, '.col > .resize-handler, .row > .resize-handler', handleTouchStart);
-    app.on('touchmove', handleTouchMove);
-    app.on('touchend', handleTouchEnd);
-  }
-
-};
 export default {
-  name: 'grid',
-
-  create() {
-    const app = this;
-    extend(app, {
-      grid: {
-        init: Grid.init.bind(app)
-      }
-    });
-  },
-
-  on: {
-    init() {
-      const app = this;
-      app.grid.init();
-    }
-
-  }
+  name: 'grid'
 };

package/components/grid/grid.lazy.js

@@ -1 +1 @@
-(function framework7ComponentLoader(e,t){void 0===t&&(t=!0);var r=e.$,s=e.utils,i=(e.getDevice,e.getSupport,e.Class,e.Modal,e.ConstructorMethods,e.ModalMethods,e.$jsx,s.extend);function a(e,t){let r=t.css(`min-${e}`);return"auto"===r||"none"===r?r=0:r.indexOf("px")>=0?r=parseFloat(r):r.indexOf("%")>=0&&(r=t.parent()[0]["height"===e?"offsetHeight":"offsetWidth"]*parseFloat(r)/100),r}function o(e,t){let r=t.css(`max-${e}`);return"auto"===r||"none"===r?r=null:r.indexOf("px")>=0?r=parseFloat(r):r.indexOf("%")>=0&&(r=t.parent()[0]["height"===e?"offsetHeight":"offsetWidth"]*parseFloat(r)/100),r}const n={init(){const e=this;let t,s,i,n,l,g,d,h,c,p,f,u,v,z,m,x,b;r(document).on(e.touchEvents.start,".col > .resize-handler, .row > .resize-handler",(function(e){t||s||(l=r(e.target).closest(".resize-handler"),i="touchstart"===e.type?e.targetTouches[0].pageX:e.pageX,n="touchstart"===e.type?e.targetTouches[0].pageY:e.pageY,t=!0,g=void 0,d=void 0,b=void 0)})),e.on("touchmove",(function(r){if(!t)return;const w=1===l.parent(".row").length,$=w?"height":"width",y=w?"offsetHeight":"offsetWidth";s||(g=l.parent(w?".row":".col"),!g.length||g.hasClass("resizable")&&!g.hasClass("resizable-fixed")||(g=g.prevAll(".resizable:not(.resizable-fixed)").eq(0)),d=g.next(w?".row":".col"),!d.length||d.hasClass("resizable")&&!d.hasClass("resizable-fixed")||(d=d.nextAll(".resizable:not(.resizable-fixed)").eq(0)),g.length&&(h=g[0][y],c=a($,g),p=o($,g),z=g.parent()[0][y],m=g.parent().children(w?".row":'[class*="col-"], .col').length,x=parseFloat(g.css(w?"--f7-grid-row-gap":"--f7-grid-gap"))),d.length&&(f=d[0][y],u=a($,d),v=o($,d),g.length||(z=d.parent()[0][y],m=d.parent().children(w?".row":'[class*="col-"], .col').length,x=parseFloat(d.css(w?"--f7-grid-row-gap":"--f7-grid-gap"))))),s=!0;const C="touchmove"===r.type?r.targetTouches[0].pageX:r.pageX,M="touchmove"===r.type?r.targetTouches[0].pageY:r.pageY;if(void 0!==b||w||(b=!!(b||Math.abs(M-n)>Math.abs(C-i))),b)return t=!1,void(s=!1);const F=g.hasClass("resizable-absolute")||d.hasClass("resizable-absolute"),O=!w||w&&!F;if(O&&!d.length||!g.length)return t=!1,void(s=!1);r.preventDefault();let R,T,X=w?M-n:C-i;if(g.length&&(R=h+X,R<c&&(R=c,X=R-h),p&&R>p&&(R=p,X=R-h)),d.length&&O&&(T=f-X,T<u&&(T=u,X=f-T,R=h+X),v&&T>v&&(T=v,X=f-T,R=h+X)),F)return g[0].style[$]=`${R}px`,O&&(d[0].style[$]=`${T}px`),g.trigger("grid:resize"),d.trigger("grid:resize"),e.emit("gridResize",g[0]),void e.emit("gridResize",d[0]);const Y=(m-1)*x/m,H=w?`${m-1} * var(--f7-grid-row-gap) / ${m}`:"(var(--f7-cols-per-row) - 1) * var(--f7-grid-gap) / var(--f7-cols-per-row)",W=R+Y,q=T+Y;g[0].style[$]=`calc(${W/z*100}% - ${H})`,d[0].style[$]=`calc(${q/z*100}% - ${H})`,g.trigger("grid:resize"),d.trigger("grid:resize"),e.emit("gridResize",g[0]),e.emit("gridResize",d[0])})),e.on("touchend",(function(){t&&(s||(t=!1),t=!1,s=!1)}))}};var l={name:"grid",create(){i(this,{grid:{init:n.init.bind(this)}})},on:{init(){this.grid.init()}}};if(t){if(e.prototype.modules&&e.prototype.modules[l.name])return;e.use(l),e.instance&&(e.instance.useModuleParams(l,e.instance.params),e.instance.useModule(l))}return l}(Framework7, typeof Framework7AutoInstallComponent === 'undefined' ? undefined : Framework7AutoInstallComponent))
+(function framework7ComponentLoader(e,o){void 0===o&&(o=!0);e.$,e.utils,e.getDevice,e.getSupport,e.Class,e.Modal,e.ConstructorMethods,e.ModalMethods,e.$jsx;var t={name:"grid"};if(o){if(e.prototype.modules&&e.prototype.modules[t.name])return;e.use(t),e.instance&&(e.instance.useModuleParams(t,e.instance.params),e.instance.useModule(t))}return t}(Framework7, typeof Framework7AutoInstallComponent === 'undefined' ? undefined : Framework7AutoInstallComponent))

package/components/grid/grid.less

@@ -1,200 +1,73 @@
 /* === Grid === */
 @import './grid-vars.less';
 
-@cols: 5, 10, 15, 20, 25, 30, 100/3, 35, 40, 45, 50, 55, 60, 65, 100 * (2/3), 70, 75, 80, 85, 90, 95,
-  100;
+@cols: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20;
 
-.row {
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  align-items: flex-start;
-  --f7-cols-per-row: 1;
-  + .row {
-    margin-top: var(--f7-grid-row-gap);
+.grid {
+  display: grid;
+  &.grid-gap {
+    gap: var(--f7-grid-gap);
   }
-  > [class*='col-'],
-  > .col {
-    box-sizing: border-box;
-    width: calc(
-      (100% - var(--f7-grid-gap) * (var(--f7-cols-per-row) - 1)) / var(--f7-cols-per-row)
-    );
-    &.resizable {
-      position: relative;
-    }
-  }
-  &.resizable {
-    position: relative;
+}
+each(@cols, {
+  .grid-cols-@{value} {
+    grid-template-columns: repeat(@value, minmax(0,1fr));
   }
-  &.no-gap {
-    --f7-grid-gap: 0px;
-    --f7-grid-row-gap: 0px;
+});
+each(@cols, {
+  .grid-rows-@{value} {
+    grid-template-rows: repeat(@value, minmax(0,1fr));
   }
-
+});
+@media (min-width: @breakpoints[xsmall]) {
   each(@cols, {
-    @className: floor((@value));
-    @n: (100 / @value);
-    .col-@{className} {
-      --f7-cols-per-row: @n;
+    .xsmall-grid-cols-@{value} {
+      grid-template-columns: repeat(@value, minmax(0,1fr));
+    }
+    .xsmall-grid-rows-@{value} {
+      grid-template-rows: repeat(@value, minmax(0,1fr));
     }
   });
+}
+@media (min-width: @breakpoints[small]) {
   each(@cols, {
-    .col:nth-last-of-type(@{index}),
-    .col:nth-last-of-type(@{index}) ~ .col {
-      --f7-cols-per-row: @index;
+    .small-grid-cols-@{value} {
+      grid-template-columns: repeat(@value, minmax(0,1fr));
+    }
+    .small-grid-rows-@{value} {
+      grid-template-rows: repeat(@value, minmax(0,1fr));
     }
   });
-
-  @media (min-width: @breakpoints[xsmall]) {
-    each(@cols, {
-      @className: floor((@value));
-      @n: (100 / @value);
-      .xsmall-@{className} {
-        --f7-cols-per-row: @n;
-      }
-    });
-    each(@cols, {
-      .xsmall-auto:nth-last-of-type(@{index}),
-      .xsmall-auto:nth-last-of-type(@{index}) ~ .xsmall-auto {
-        --f7-cols-per-row: @index;
-      }
-    });
-  }
-  @media (min-width: @breakpoints[small]) {
-    each(@cols, {
-      @className: floor((@value));
-      @n: (100 / @value);
-      .small-@{className} {
-        --f7-cols-per-row: @n;
-      }
-    });
-    each(@cols, {
-      .small-auto:nth-last-of-type(@{index}),
-      .small-auto:nth-last-of-type(@{index}) ~ .small-auto {
-        --f7-cols-per-row: @index;
-      }
-    });
-  }
-  @media (min-width: @breakpoints[medium]) {
-    each(@cols, {
-      @className: floor((@value));
-      @n: (100 / @value);
-      .medium-@{className} {
-        --f7-cols-per-row: @n;
-      }
-    });
-    each(@cols, {
-      .medium-auto:nth-last-of-type(@{index}),
-      .medium-auto:nth-last-of-type(@{index}) ~ .medium-auto {
-        --f7-cols-per-row: @index;
-      }
-    });
-  }
-  @media (min-width: @breakpoints[large]) {
-    each(@cols, {
-      @className: floor((@value));
-      @n: (100 / @value);
-      .large-@{className} {
-        --f7-cols-per-row: @n;
-      }
-    });
-    each(@cols, {
-      .large-auto:nth-last-of-type(@{index}),
-      .large-auto:nth-last-of-type(@{index}) ~ .large-auto {
-        --f7-cols-per-row: @index;
-      }
-    });
-  }
-  @media (min-width: @breakpoints[xlarge]) {
-    each(@cols, {
-      @className: floor((@value));
-      @n: (100 / @value);
-      .xlarge-@{className} {
-        --f7-cols-per-row: @n;
-      }
-    });
-    each(@cols, {
-      .xlarge-auto:nth-last-of-type(@{index}),
-      .xlarge-auto:nth-last-of-type(@{index}) ~ .xlarge-auto {
-        --f7-cols-per-row: @index;
-      }
-    });
-  }
-}
-.row .resize-handler {
-  position: absolute;
-  user-select: none;
-  z-index: 100;
-  &:before {
-    content: '';
-    position: absolute;
-  }
-  &:after {
-    content: '';
-    position: absolute;
-    border-radius: 4px;
-    background: var(--f7-grid-resize-handler-bg-color);
-  }
 }
-.row > .resize-handler {
-  width: 100%;
-  height: var(--f7-grid-row-gap);
-  left: 0;
-  top: 100%;
-  cursor: row-resize;
-  &:before {
-    left: 0%;
-    top: 50%;
-    height: 12px;
-    width: 100%;
-    min-height: var(--f7-grid-row-gap);
-    transform: translateY(-50%);
-  }
-  &:after {
-    height: 4px;
-    margin-top: -2px;
-    width: 80%;
-    max-width: 20px;
-    left: 50%;
-    top: 50%;
-    transform: translateX(-50%);
-  }
+@media (min-width: @breakpoints[medium]) {
+  each(@cols, {
+    .medium-grid-cols-@{value} {
+      grid-template-columns: repeat(@value, minmax(0,1fr));
+    }
+    .medium-grid-rows-@{value} {
+      grid-template-rows: repeat(@value, minmax(0,1fr));
+    }
+  });
 }
-[class*='col-'] > .resize-handler,
-.col > .resize-handler {
-  width: var(--f7-grid-gap);
-  left: 100%;
-  top: 0;
-  height: 100%;
-  cursor: col-resize;
-  &:before {
-    left: 50%;
-    top: 0;
-    height: 100%;
-    width: 12px;
-    min-width: var(--f7-grid-gap);
-    transform: translateX(-50%);
-  }
-  &:after {
-    width: 4px;
-    margin-left: -2px;
-    height: 80%;
-    max-height: 20px;
-    border-radius: 4px;
-    left: 50%;
-    top: 50%;
-    transform: translateY(-50%);
-  }
+@media (min-width: @breakpoints[large]) {
+  each(@cols, {
+    .large-grid-cols-@{value} {
+      grid-template-columns: repeat(@value, minmax(0,1fr));
+    }
+    .large-grid-rows-@{value} {
+      grid-template-rows: repeat(@value, minmax(0,1fr));
+    }
+  });
 }
-.row:last-child,
-.row:last-of-type,
-.row [class*='col-']:last-child,
-.row [class*='col-']:last-of-type,
-.row .col:last-child,
-.row .col:last-of-type {
-  > .resize-handler {
-    display: none;
-  }
+@media (min-width: @breakpoints[xlarge]) {
+  each(@cols, {
+    .xlarge-grid-cols-@{value} {
+      grid-template-columns: repeat(@value, minmax(0,1fr));
+    }
+    .xlarge-grid-rows-@{value} {
+      grid-template-rows: repeat(@value, minmax(0,1fr));
+    }
+  });
 }
 
 .if-ios-theme({
@@ -203,6 +76,3 @@
 .if-md-theme({
   @import './grid-md.less';
 });
-.if-aurora-theme({
-  @import './grid-aurora.less';
-});

package/components/icon/icon.less

@@ -31,6 +31,3 @@ i.icon {
 .if-md-theme({
   @import './icon-md.less';
 });
-.if-aurora-theme({
-  @import './icon-aurora.less';
-});

package/components/infinite-scroll/infinite-scroll-rtl.css

@@ -1 +1 @@
-.infinite-scroll-preloader{margin-left:auto;margin-right:auto;text-align:center}.infinite-scroll-preloader.preloader{display:block}.ios .infinite-scroll-preloader{margin-top:35px;margin-bottom:35px}.ios .infinite-scroll-preloader .preloader,.ios .infinite-scroll-preloader.preloader{width:27px;height:27px}.md .infinite-scroll-preloader{margin-top:32px;margin-bottom:32px}.aurora .infinite-scroll-preloader{margin-top:16px;margin-bottom:16px}
+.infinite-scroll-preloader{margin-left:auto;margin-right:auto;text-align:center}.infinite-scroll-preloader.preloader{display:block}.ios .infinite-scroll-preloader{margin-top:35px;margin-bottom:35px}.ios .infinite-scroll-preloader .preloader,.ios .infinite-scroll-preloader.preloader{width:27px;height:27px}.md .infinite-scroll-preloader{margin-top:32px;margin-bottom:32px}

package/components/infinite-scroll/infinite-scroll.css

@@ -1 +1 @@
-.infinite-scroll-preloader{margin-left:auto;margin-right:auto;text-align:center}.infinite-scroll-preloader.preloader{display:block}.ios .infinite-scroll-preloader{margin-top:35px;margin-bottom:35px}.ios .infinite-scroll-preloader .preloader,.ios .infinite-scroll-preloader.preloader{width:27px;height:27px}.md .infinite-scroll-preloader{margin-top:32px;margin-bottom:32px}.aurora .infinite-scroll-preloader{margin-top:16px;margin-bottom:16px}
+.infinite-scroll-preloader{margin-left:auto;margin-right:auto;text-align:center}.infinite-scroll-preloader.preloader{display:block}.ios .infinite-scroll-preloader{margin-top:35px;margin-bottom:35px}.ios .infinite-scroll-preloader .preloader,.ios .infinite-scroll-preloader.preloader{width:27px;height:27px}.md .infinite-scroll-preloader{margin-top:32px;margin-bottom:32px}

package/components/infinite-scroll/infinite-scroll.js

@@ -12,13 +12,10 @@ const InfiniteScroll = {
     let virtualList;
     const onTop = $el.hasClass('infinite-scroll-top');
     if (!distance) distance = 50;
-
     if (typeof distance === 'string' && distance.indexOf('%') >= 0) {
       distance = parseInt(distance, 10) / 100 * height;
     }
-
     if (distance > height) distance = height;
-
     if (onTop) {
       if (scrollTop < distance) {
         $el.trigger('infinite', e);
@@ -27,31 +24,25 @@ const InfiniteScroll = {
     } else if (scrollTop + height >= scrollHeight - distance) {
       if (virtualListContainer.length > 0) {
         virtualList = virtualListContainer.eq(-1)[0].f7VirtualList;
-
         if (virtualList && !virtualList.reachEnd && !virtualList.params.updatableScroll) {
           return;
         }
       }
-
       $el.trigger('infinite', e);
       app.emit('infinite', $el[0], e);
     }
   },
-
   create(el) {
     const $el = $(el);
     const app = this;
-
     function scrollHandler(e) {
       app.infiniteScroll.handle(this, e);
     }
-
     $el.each(element => {
       element.f7InfiniteScrollHandler = scrollHandler;
       element.addEventListener('scroll', element.f7InfiniteScrollHandler);
     });
   },
-
   destroy(el) {
     const $el = $(el);
     $el.each(element => {
@@ -59,18 +50,15 @@ const InfiniteScroll = {
       delete element.f7InfiniteScrollHandler;
     });
   }
-
 };
 export default {
   name: 'infiniteScroll',
-
   create() {
     const app = this;
     bindMethods(app, {
       infiniteScroll: InfiniteScroll
     });
   },
-
   on: {
     tabMounted(tabEl) {
       const app = this;
@@ -81,7 +69,6 @@ export default {
         app.infiniteScroll.create(el);
       });
     },
-
     tabBeforeRemove(tabEl) {
       const $tabEl = $(tabEl);
       const app = this;
@@ -91,20 +78,17 @@ export default {
         app.infiniteScroll.destroy(el);
       });
     },
-
     pageInit(page) {
       const app = this;
       page.$el.find('.infinite-scroll-content').each(el => {
         app.infiniteScroll.create(el);
       });
     },
-
     pageBeforeRemove(page) {
       const app = this;
       page.$el.find('.infinite-scroll-content').each(el => {
         app.infiniteScroll.destroy(el);
       });
     }
-
   }
 };

package/components/infinite-scroll/infinite-scroll.less

@@ -13,6 +13,3 @@
 .if-md-theme({
   @import './infinite-scroll-md.less';
 });
-.if-aurora-theme({
-  @import './infinite-scroll-aurora.less';
-});