Merge remote-tracking branch 'origin/main' into v2

unovue · Feb 18, 2025 · 9d9582b · 9d9582b
2 parents 3e7fee0 + 03826eb
commit 9d9582b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/packages/core/src/DateField/DateFieldRoot.vue b/packages/core/src/DateField/DateFieldRoot.vue
@@ -189,7 +189,7 @@ watch(locale, (value) => {
 })
 
 watch(modelValue, (_modelValue) => {
-  if (!isNullish(_modelValue) || placeholder.value.compare(_modelValue) !== 0) {
+  if (!isNullish(_modelValue) && placeholder.value.compare(_modelValue) !== 0) {
     placeholder.value = _modelValue.copy()
   }
 })

diff --git a/packages/core/src/DatePicker/DatePicker.test.ts b/packages/core/src/DatePicker/DatePicker.test.ts
@@ -236,4 +236,17 @@ describe('datePicker', async () => {
     expect(month).not.toHaveAttribute('tabindex')
     expect(year).not.toHaveAttribute('tabindex')
   })
+
+  it('should select and deselect a date', async () => {
+    const { user, trigger, getByTestId } = setup()
+
+    await user.click(trigger)
+    const calendar = getByTestId('calendar')
+    const targetCell = calendar.querySelector('div[data-radix-vue-calendar-cell-trigger]:not([data-outside-view])')!
+
+    await user.click(targetCell)
+    expect(calendar.querySelector('[data-selected]')).toBeInTheDocument()
+    await user.click(targetCell)
+    expect(calendar.querySelector('[data-selected]')).not.toBeInTheDocument()
+  })
 })
diff --git a/packages/core/src/Presence/usePresence.ts b/packages/core/src/Presence/usePresence.ts
@@ -138,7 +138,8 @@ export function usePresence(
         // We avoid doing so during cleanup as the node may change but still exist.
         dispatch('ANIMATION_END')
 
-        ownerWindow?.clearTimeout(timeoutId)
+        if (timeoutId !== undefined)
+          ownerWindow?.clearTimeout(timeoutId)
         oldNode?.removeEventListener('animationstart', handleAnimationStart)
         oldNode?.removeEventListener('animationcancel', handleAnimationEnd)
         oldNode?.removeEventListener('animationend', handleAnimationEnd)