From 04494a450d41ae7c68a2ecbc61b218c2fb574e26 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Sat, 13 Aug 2022 13:24:12 +0800
Subject: [PATCH] fix(Calendar): content disappeared when hiding (#10910)

* fix(Calendar): content disappeared when hiding

* chore: add comment

* chore: upd
---
 packages/vant/src/calendar/Calendar.tsx     | 4 ----
 packages/vant/src/composables/use-height.ts | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/vant/src/calendar/Calendar.tsx b/packages/vant/src/calendar/Calendar.tsx
index b7f727e38..ae45dd1b0 100644
--- a/packages/vant/src/calendar/Calendar.tsx
+++ b/packages/vant/src/calendar/Calendar.tsx
@@ -185,10 +185,6 @@ export default defineComponent({
       const months: Date[] = [];
       const cursor = new Date(props.minDate);
 
-      if (props.lazyRender && !props.show && props.poppable) {
-        return months;
-      }
-
       cursor.setDate(1);
 
       do {
diff --git a/packages/vant/src/composables/use-height.ts b/packages/vant/src/composables/use-height.ts
index dfdce08a3..083deccf2 100644
--- a/packages/vant/src/composables/use-height.ts
+++ b/packages/vant/src/composables/use-height.ts
@@ -1,5 +1,6 @@
 import { useRect } from '@vant/use';
 import { Ref, ref, onMounted, nextTick } from 'vue';
+import { onPopupReopen } from './on-popup-reopen';
 
 export const useHeight = (
   element: Element | Ref<Element | undefined>,
@@ -25,5 +26,11 @@ export const useHeight = (
     }
   });
 
+  // The result of useHeight might be 0 when the popup is hidden,
+  // so we need to reset the height when the popup is reopened.
+  // IntersectionObserver is a better solution, but it is not supported by legacy browsers.
+  // https://github.com/vant-ui/vant/issues/10628
+  onPopupReopen(() => nextTick(setHeight));
+
   return height;
 };