From 35647969f5feca62062f1f55740dcfa0cf4aa4ab Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Fri, 27 Aug 2021 11:48:23 +0800
Subject: [PATCH] fix(Sticky): Cannot read property 'top' of null (#4433)

* 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
---
 packages/calendar/index.ts | 4 ++--
 packages/sticky/index.ts   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/calendar/index.ts b/packages/calendar/index.ts
index 3f2f63d4..a041daab 100644
--- a/packages/calendar/index.ts
+++ b/packages/calendar/index.ts
@@ -201,11 +201,11 @@ VantComponent({
         const start = this.limitDateRange(
           startDay || now,
           minDate,
-          getPrevDay(maxDate).getTime()
+          getPrevDay(new Date(maxDate)).getTime()
         );
         const end = this.limitDateRange(
           endDay || now,
-          getNextDay(minDate).getTime()
+          getNextDay(new Date(minDate)).getTime()
         );
         return [start, end];
       }
diff --git a/packages/sticky/index.ts b/packages/sticky/index.ts
index f4406408..b433e281 100644
--- a/packages/sticky/index.ts
+++ b/packages/sticky/index.ts
@@ -1,5 +1,6 @@
 import { getRect } from '../common/utils';
 import { VantComponent } from '../common/component';
+import { isDef } from '../common/validator';
 import { pageScrollMixin } from '../mixins/page-scroll';
 
 const ROOT_ELEMENT = '.van-sticky';
@@ -89,6 +90,9 @@ VantComponent({
       }
 
       getRect(this, ROOT_ELEMENT).then((root) => {
+        if (!isDef(root)) {
+          return;
+        }
         if (offsetTop >= root.top) {
           this.setDataAfterDiff({ fixed: true, height: root.height });
           this.transform = 0;