alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[improvement] sort out utils (#2672)

Browse Source
This commit is contained in:
neverland
2019-02-02 10:41:01 +08:00
committed by GitHub
parent 0eb06b10a8
commit f0056297c6
9 changed files with 93 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/tabs/index.js
+6 -6
View File
@@ -1,8 +1,8 @@
import { use, isDef } from '../utils';
import Touch from '../mixins/touch';
import { raf } from '../utils/raf';
import { on, off } from '../utils/event';
import scrollUtils from '../utils/scroll';
import Touch from '../mixins/touch';
import { setScrollTop, getScrollTop, getElementTop, getScrollEventTarget } from '../utils/scroll';
const [sfc, bem] = use('tabs');
const tabBem = use('tab')[1];
@@ -128,7 +128,7 @@ export default sfc({
// scroll to correct position
if (this.position === 'top' || this.position === 'bottom') {
scrollUtils.setScrollTop(window, scrollUtils.getElementTop(this.$el));
setScrollTop(window, getElementTop(this.$el));
}
},
@@ -179,7 +179,7 @@ export default sfc({
// listen to scroll event
if (events.sticky !== sticky) {
events.sticky = sticky;
this.scrollEl = this.scrollEl || scrollUtils.getScrollEventTarget(this.$el);
this.scrollEl = this.scrollEl || getScrollEventTarget(this.$el);
(sticky ? on : off)(this.scrollEl, 'scroll', this.onScroll, true);
this.onScroll();
}
@@ -215,8 +215,8 @@ export default sfc({
// adjust tab position
onScroll() {
const scrollTop = scrollUtils.getScrollTop(window) + this.offsetTop;
const elTopToPageTop = scrollUtils.getElementTop(this.$el);
const scrollTop = getScrollTop(window) + this.offsetTop;
const elTopToPageTop = getElementTop(this.$el);
const elBottomToPageTop =
elTopToPageTop + this.$el.offsetHeight - this.$refs.wrap.offsetHeight;
if (scrollTop > elBottomToPageTop) {