From 05eb5a39610b9ef67d5a55a3c4d8700a171f0b0e Mon Sep 17 00:00:00 2001
From: zernonia <zernonia@gmail.com>
Date: Thu, 20 Feb 2025 13:13:45 +0800
Subject: [PATCH] fix: similar fix for DateRangeField

---
 .../radix-vue/src/DateRangeField/DateRangeFieldRoot.vue     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/radix-vue/src/DateRangeField/DateRangeFieldRoot.vue b/packages/radix-vue/src/DateRangeField/DateRangeFieldRoot.vue
index 95cf54c8a..972d328af 100644
--- a/packages/radix-vue/src/DateRangeField/DateRangeFieldRoot.vue
+++ b/packages/radix-vue/src/DateRangeField/DateRangeFieldRoot.vue
@@ -251,7 +251,8 @@ watch([startValue, locale], ([_startValue]) => {
   if (_startValue !== undefined) {
     startSegmentValues.value = { ...syncSegmentValues({ value: _startValue, formatter }) }
   }
-  else if (Object.values(startSegmentValues.value).every(value => value === null) || _startValue === undefined) {
+  // If segment has null value, means that user modified it, thus do not reset the segmentValues
+  else if (Object.values(startSegmentValues.value).every(value => value !== null) && _startValue === undefined) {
     startSegmentValues.value = { ...initialSegments }
   }
 })
@@ -277,7 +278,8 @@ watch([endValue, locale], ([_endValue]) => {
   if (_endValue !== undefined) {
     endSegmentValues.value = { ...syncSegmentValues({ value: _endValue, formatter }) }
   }
-  else if (Object.values(endSegmentValues.value).every(value => value === null) || _endValue === undefined) {
+  // If segment has null value, means that user modified it, thus do not reset the segmentValues
+  else if (Object.values(endSegmentValues.value).every(value => value !== null) && _endValue === undefined) {
     endSegmentValues.value = { ...initialSegments }
   }
 })