blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(Sticky): Cannot read property 'top' of null (#4433)

Browse Source 
* fix(Sticky): Cannot read property 'top' of null

* retry build

* fix: build

* fix: retry

* fix(Sticky): return if root is null

* fix(Calendar): wrapper Date type

- to fixed build failed

* fix(Sticky): use isDef
This commit is contained in:
nemo-shen 2021-08-27 11:48:23 +08:00 committed by GitHub
parent c044f7534f
commit 35647969f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/calendar/index.ts
View File

@ -201,11 +201,11 @@ VantComponent({
const start = this.limitDateRange( const start = this.limitDateRange(
startDay || now, startDay || now,
minDate, minDate,
getPrevDay(maxDate).getTime() getPrevDay(new Date(maxDate)).getTime()
); );
const end = this.limitDateRange( const end = this.limitDateRange(
endDay || now, endDay || now,
getNextDay(minDate).getTime() getNextDay(new Date(minDate)).getTime()
); );
return [start, end]; return [start, end];
} }

4
packages/sticky/index.ts
View File

@ -1,5 +1,6 @@
import { getRect } from '../common/utils'; import { getRect } from '../common/utils';
import { VantComponent } from '../common/component'; import { VantComponent } from '../common/component';
import { isDef } from '../common/validator';
import { pageScrollMixin } from '../mixins/page-scroll'; import { pageScrollMixin } from '../mixins/page-scroll';
const ROOT_ELEMENT = '.van-sticky'; const ROOT_ELEMENT = '.van-sticky';
@ -89,6 +90,9 @@ VantComponent({
} }
getRect(this, ROOT_ELEMENT).then((root) => { getRect(this, ROOT_ELEMENT).then((root) => {
if (!isDef(root)) {
return;
}
if (offsetTop >= root.top) { if (offsetTop >= root.top) {
this.setDataAfterDiff({ fixed: true, height: root.height }); this.setDataAfterDiff({ fixed: true, height: root.height });
this.transform = 0; this.transform = 0;