chore(Calendar): using compareDay util (#10198 )

fix(Calendar): incorrectly selected when a date is disabled (#10196 )
chore: improve useHeight (#10197 )
2026-07-04 14:01:05 +08:00 · 2022-01-16 16:45:24 +08:00 · 2022-01-16 16:34:32 +08:00 · 2022-01-16 16:33:45 +08:00 · 2022-01-16 16:28:31 +08:00
2 changed files with 15 additions and 6 deletions
--- a/packages/vant/src/calendar/Calendar.tsx
+++ b/packages/vant/src/calendar/Calendar.tsx
@ -406,7 +406,12 @@ export default defineComponent({
            );

            if (disabledDay) {
-              select([startDay, getPrevDay(disabledDay)]);
+              const endDay = getPrevDay(disabledDay);
+              if (compareDay(startDay, endDay) === -1) {
+                select([startDay, endDay]);
+              } else {
+                select([date]);
+              }
            } else {
              select([startDay, date], true);
            }
--- a/packages/vant/src/composables/use-height.ts
+++ b/packages/vant/src/composables/use-height.ts
@ -4,11 +4,15 @@ import { Ref, ref, onMounted, nextTick } from 'vue';
 export const useHeight = (element: Element | Ref<Element | undefined>) => {
  const height = ref<number>();

-  onMounted(() =>
-    nextTick(() => {
-      height.value = useRect(element).height;
-    })
-  );
+  const setHeight = () => {
+    height.value = useRect(element).height;
+  };
+
+  onMounted(() => {
+    nextTick(setHeight);
+    // https://github.com/youzan/vant/issues/10131
+    setTimeout(setHeight, 100);
+  });

  return height;
 };
Author	SHA1	Message	Date
neverland	f50c462978	chore(Calendar): using compareDay util (#10198 )	2022-01-16 16:45:24 +08:00
Ethan	6dbd0caf2b	fix(Calendar): incorrectly selected when a date is disabled (#10196 )	2022-01-16 16:34:32 +08:00
neverland	0de7b9c0b9	chore: improve useHeight (#10197 )	2022-01-16 16:33:45 +08:00
yuhengshen	32aaed02db	fix: useHeight may get the wrong height (#10195 )	2022-01-16 16:28:31 +08:00