Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-07-25 15:50:49 +08:00
109 changed files with 1699 additions and 744 deletions
+4 -1
View File
@@ -40,7 +40,10 @@ export function getScroller(el: HTMLElement, root: ScrollElement = window) {
}
export function getScrollTop(el: ScrollElement): number {
return 'scrollTop' in el ? el.scrollTop : el.pageYOffset;
const top = 'scrollTop' in el ? el.scrollTop : el.pageYOffset;
// iOS scroll bounce cause minus scrollTop
return Math.max(top, 0);
}
export function setScrollTop(el: ScrollElement, value: number) {
+14 -3
View File
@@ -1,4 +1,4 @@
import { isDef } from '..';
import { isDef, inBrowser } from '..';
import { isNumeric } from '../validate/number';
export function addUnit(value?: string | number): string | undefined {
@@ -30,13 +30,24 @@ function convertRem(value: string) {
return +value * getRootFontSize();
}
function convertVw(value: string) {
value = value.replace(/vw/g, '');
return (+value * window.innerWidth) / 100;
}
export function unitToPx(value: string | number): number {
if (typeof value === 'number') {
return value;
}
if (value.indexOf('rem') !== -1) {
return convertRem(value);
if (inBrowser) {
if (value.indexOf('rem') !== -1) {
return convertRem(value);
}
if (value.indexOf('vw') !== -1) {
return convertVw(value);
}
}
return parseFloat(value);