fix(comp:date-picker): fix panel view display error when type changes

packages/components/date-picker/demo/OverlayRender.md

@@ -0,0 +1,14 @@
+---
+title:
+  zh: 自定义面板
+  en: Custom Panel
+order: 7
+---
+
+## zh
+
+使用 `overlayRender` 自定义面板渲染
+
+## en
+
+Customize overlay panel with `overlayRender` prop。

packages/components/date-picker/demo/OverlayRender.vue

@@ -0,0 +1,89 @@
+<template>
+  <IxSpace vertical>
+    <IxDateRangePicker
+      v-model:value="rangeValue"
+      :type="pickerType"
+      :overlayRender="customOverlayRender"
+    ></IxDateRangePicker>
+  </IxSpace>
+</template>
+
+<script setup lang="ts">
+import type { DatePickerType } from '@idux/components/date-picker'
+
+import { type VNodeChild, h, ref } from 'vue'
+
+import { addDays, addHours, addMonths } from 'date-fns'
+
+const rangeValue = ref<[Date, Date] | undefined>()
+const now = new Date()
+const pickerType = ref<DatePickerType>('datetime')
+
+const renderShortcut = (label: string, value: [Date, Date] | undefined, type?: DatePickerType) =>
+  h(
+    'li',
+    {
+      class: 'demo-custom-panel__overlay__shortcut',
+      onClick() {
+        if (value) {
+          rangeValue.value = value
+        }
+
+        if (type) {
+          pickerType.value = type
+        }
+      },
+    },
+    label,
+  )
+const customOverlayRender = (children: VNodeChild) => {
+  return h(
+    'div',
+    {
+      class: 'demo-custom-panel__overlay',
+    },
+    [
+      h(
+        'ul',
+        {
+          class: 'demo-custom-panel__overlay__shortcuts',
+        },
+        [
+          renderShortcut('Last 7days', [addDays(now, -7), now]),
+          renderShortcut('Last 1month', [addMonths(now, -1), now]),
+          renderShortcut('Last 24hours', [addHours(now, -24), now]),
+          renderShortcut('Pick Weeks', undefined, 'week'),
+          renderShortcut('Pick Months', undefined, 'month'),
+          renderShortcut('Pick Datetime', undefined, 'datetime'),
+        ],
+      ),
+      h('div', [children]),
+    ],
+  )
+}
+</script>
+<style lang="less">
+.demo-custom-panel__overlay {
+  display: flex;
+
+  &__shortcuts {
+    width: 120px;
+    padding: 8px 0;
+    margin-right: 16px;
+    margin-left: -16px;
+    margin-top: -16px;
+    border-right: 1px solid #e1e5eb;
+  }
+  &__shortcut {
+    width: 100%;
+    list-style: none;
+    padding: 8px 16px;
+    cursor: pointer;
+
+    &:hover {
+      background: #f7f9fc;
+      color: #1c6eff;
+    }
+  }
+}
+</style>

packages/components/date-picker/index.ts

@@ -37,4 +37,5 @@ export type {
   DateRangePanelInstance,
   DateRangePanelComponent,
   DateRangePanelPublicProps as DateRangePanelProps,
+  DatePickerType,
 } from './src/types'

packages/components/date-picker/src/composables/useActiveValue.ts

@@ -56,14 +56,37 @@ export function useRangeActiveValue(
   const { set, get } = dateConfig
   const now = dateConfig.now()
 
+  const viewType = computed(() => viewTypeMap[props.type])
+  const viewSpan = computed(() => (props.type === 'year' ? 12 : 1))
+
   const fromPanelValue = computed(() => panelValue.value?.[0])
   const toPanelValue = computed(() => panelValue.value?.[1])
 
+  // check if the panel view value provided by params is valid
+  const checkActiveDateValid = (from: Date | undefined, to: Date | undefined) => {
+    if (!from || !to) {
+      return false
+    }
+
+    const fromViewValue = get(from, viewType.value)
+    const toViewValue = get(to, viewType.value)
+
+    /* eslint-disable indent */
+    return props.type === 'year'
+      ? fromViewValue < toViewValue - viewSpan.value
+      : (() => {
+          const fromViewYearValue = get(from, 'year')
+          const toViewYearValue = get(to, 'year')
+
+          return fromViewValue < toViewValue && fromViewYearValue <= toViewYearValue
+        })()
+    /* eslint-enable indent */
+  }
+
+  // calculate valid active date based on given `from` and `to` active panel view value
   const calcValidActiveDate = (from: Date | undefined, to: Date | undefined, type: 'from' | 'to') => {
-    const viewType = viewTypeMap[props.type]
-    const viewSpan = props.type === 'year' ? 12 : 1
     const getViewDate = (value: Date) =>
-      set(value, get(value, viewType) + (type === 'from' ? -viewSpan : viewSpan), viewType)
+      set(value, get(value, viewType.value) + (type === 'from' ? -viewSpan.value : viewSpan.value), viewType.value)
 
     if (!from) {
       return type === 'from' ? now : getViewDate(now)
@@ -73,21 +96,7 @@ export function useRangeActiveValue(
       return type === 'from' ? from : getViewDate(from)
     }
 
-    const fromViewValue = get(from, viewType)
-    const toViewValue = get(to, viewType)
-
-    /* eslint-disable indent */
-    const valid =
-      props.type === 'year'
-        ? fromViewValue < toViewValue - viewSpan
-        : (() => {
-            const fromViewYearValue = get(from, 'year')
-            const toViewYearValue = get(to, 'year')
-
-            return fromViewValue < toViewValue && fromViewYearValue <= toViewYearValue
-          })()
-    /* eslint-disable indent */
-
+    const valid = checkActiveDateValid(from, to)
     if (type === 'from') {
       return valid ? from : getViewDate(to)
     }
@@ -118,7 +127,9 @@ export function useRangeActiveValue(
         activeDate => yearValue === get(activeDate.value, 'year') && monthValue === get(activeDate.value, 'month'),
       )
     })
-    if (valueAlreadyInView) {
+
+    // no need to reset panel view when current range is covered within panel view and panel view is valid
+    if (valueAlreadyInView && checkActiveDateValid(fromActiveValue.value, toActiveValue.value)) {
       return
     }
 
@@ -132,8 +143,8 @@ export function useRangeActiveValue(
   const fromActiveValue = computed(() => activeValue.value[0])
   const toActiveValue = computed(() => activeValue.value[1])
 
-  watch(panelValue, initActiveDate)
-  watch(() => props.visible, initActiveDate)
+  // reset panel active value when value, picker type, or visible state changes
+  watch([panelValue, () => props.visible, () => props.type], initActiveDate)
 
   const handleFromActiveValueUpdate = (value: Date) => {
     setActiveValue([value, calcValidActiveDate(value, toActiveValue.value, 'to')])

packages/components/date-picker/src/composables/usePickerState.ts

@@ -48,8 +48,8 @@ export function usePickerState<T extends DatePickerProps | DateRangePickerProps>
         ? oldValue.map(v => convertToDate(dateConfig, v, formatRef.value))
         : convertToDate(dateConfig, oldValue, formatRef.value)
     ) as StateValueType<T>
-    callEmit(props.onChange as (value: StateValueType<T>, oldValue: StateValueType<T>) => void, newValue, oldValue)
     accessor.setValue(value)
+    callEmit(props.onChange as (value: StateValueType<T>, oldValue: StateValueType<T>) => void, newValue, oldValue)
   }
 
   function handleClear(evt: Event) {
@@ -60,9 +60,9 @@ export function usePickerState<T extends DatePickerProps | DateRangePickerProps>
         : convertToDate(dateConfig, oldValue, formatRef.value)
     ) as StateValueType<T>
 
+    accessor.setValue(undefined)
     callEmit(props.onClear, evt as MouseEvent)
     callEmit(props.onChange as (value: StateValueType<T>, oldValue: StateValueType<T>) => void, undefined, oldValue)
-    accessor.setValue(undefined)
   }
 
   function handleFocus(evt: FocusEvent) {
@@ -71,8 +71,8 @@ export function usePickerState<T extends DatePickerProps | DateRangePickerProps>
   }
 
   function handleBlur(evt: FocusEvent) {
-    callEmit(props.onBlur, evt)
     accessor.markAsBlurred()
+    callEmit(props.onBlur, evt)
     setFocused(false)
   }