@hero-design/rn 8.92.1-alpha.0 → 8.92.1-alpha.2

package/es/index.js

@@ -13205,13 +13205,7 @@ var setStartOrEndDate = function setStartOrEndDate(_ref2) {
     startDate = _ref2.startDate,
     endDate = _ref2.endDate;
   // If both dates are set, selecting start or end date will set the same date
-  if (startDate && endDate && isEqDate(date, startDate)) {
-    return {
-      startDate: date,
-      endDate: date
-    };
-  }
-  if (startDate && endDate && isEqDate(date, endDate)) {
+  if (startDate && endDate && (isEqDate(date, startDate) || isEqDate(date, endDate))) {
     return {
       startDate: date,
       endDate: date

package/lib/index.js

@@ -13233,13 +13233,7 @@ var setStartOrEndDate = function setStartOrEndDate(_ref2) {
     startDate = _ref2.startDate,
     endDate = _ref2.endDate;
   // If both dates are set, selecting start or end date will set the same date
-  if (startDate && endDate && isEqDate(date, startDate)) {
-    return {
-      startDate: date,
-      endDate: date
-    };
-  }
-  if (startDate && endDate && isEqDate(date, endDate)) {
+  if (startDate && endDate && (isEqDate(date, startDate) || isEqDate(date, endDate))) {
     return {
       startDate: date,
       endDate: date

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hero-design/rn",
-  "version": "8.92.1-alpha.0",
+  "version": "8.92.1-alpha.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/src/components/Calendar/__tests__/CalendarRange.spec.tsx

@@ -47,17 +47,32 @@ describe('CalendarRange', () => {
     expect(queryAllByTestId('calendar-disabled-cell')).toHaveLength(0);
     expect(queryAllByTestId('calendar-date-mark')).toHaveLength(5);
 
-    // Test range selection
-    fireEvent.press(queryAllByText('11')[0]); // Select start date
+    // Select outside range
+    fireEvent.press(queryAllByText('11')[0]);
     expect(onChange).toHaveBeenCalledWith({
       startDate: new Date('2022-10-11'),
-      endDate: new Date('2022-10-15'),
+      endDate: undefined,
     });
 
-    fireEvent.press(queryAllByText('20')[0]); // Select end date
+    // Select start date
+    fireEvent.press(queryAllByText('12')[0]);
     expect(onChange).toHaveBeenCalledWith({
       startDate: new Date('2022-10-12'),
-      endDate: new Date('2022-10-20'),
+      endDate: new Date('2022-10-12'),
+    });
+
+    // Select end date
+    fireEvent.press(queryAllByText('15')[0]);
+    expect(onChange).toHaveBeenCalledWith({
+      startDate: new Date('2022-10-15'),
+      endDate: new Date('2022-10-15'),
+    });
+
+    // Select inside range
+    fireEvent.press(queryAllByText('13')[0]);
+    expect(onChange).toHaveBeenCalledWith({
+      startDate: new Date('2022-10-13'),
+      endDate: undefined,
     });
 
     fireEvent.press(queryByTestId('previous-icon-button'));
@@ -129,14 +144,14 @@ describe('CalendarRange', () => {
     // Test range selection within constraints
     fireEvent.press(getByText('17')); // Select start date
     expect(onChange).toHaveBeenCalledWith({
-      startDate: new Date('2022-10-12'),
-      endDate: new Date('2022-10-17'),
+      startDate: new Date('2022-10-17'),
+      endDate: undefined,
     });
 
     fireEvent.press(getByText('11')); // Select end date
     expect(onChange).toHaveBeenCalledWith({
       startDate: new Date('2022-10-11'),
-      endDate: new Date('2022-10-15'),
+      endDate: undefined,
     });
   });
 
@@ -156,14 +171,14 @@ describe('CalendarRange', () => {
     fireEvent.press(getByText('11'));
     expect(onChange).toHaveBeenCalledWith({
       startDate: new Date('2022-10-11'),
-      endDate: new Date('2022-10-15'),
+      endDate: undefined,
     });
 
     // Select end date
     fireEvent.press(getByText('20'));
     expect(onChange).toHaveBeenCalledWith({
-      startDate: new Date('2022-10-12'),
-      endDate: new Date('2022-10-20'),
+      startDate: new Date('2022-10-20'),
+      endDate: undefined,
     });
 
     // Select new start date (should clear end date)

package/src/components/Calendar/__tests__/helper.spec.ts

@@ -73,99 +73,106 @@ describe('isDateInRange', () => {
 });
 
 describe('setStartOrEndDate', () => {
-  // Test case 1: Prevent selecting same date when both dates are set
-  it('should not change dates when selecting same date as start date and both dates are set', () => {
-    const date = new Date('2024-03-15');
-    const startDate = new Date('2024-03-15');
-    const endDate = new Date('2024-03-20');
-
-    const result = setStartOrEndDate({ date, startDate, endDate });
-    expect(result).toEqual({ startDate, endDate });
+  const today = new Date('2024-01-01');
+  const tomorrow = new Date('2024-01-02');
+  const nextWeek = new Date('2024-01-08');
+
+  it('should set start date when no dates are selected', () => {
+    const result = setStartOrEndDate({
+      date: today,
+    });
+
+    expect(result).toEqual({
+      startDate: today,
+      endDate: undefined,
+    });
   });
 
-  // Test case 2: Allow selecting same date as start date when only start date is set
-  it('should allow selecting same date as start date when only start date is set', () => {
-    const date = new Date('2024-03-15');
-    const startDate = new Date('2024-03-15');
+  it('should set end date when only start date is selected', () => {
+    const result = setStartOrEndDate({
+      date: tomorrow,
+      startDate: today,
+    });
 
-    const result = setStartOrEndDate({ date, startDate });
     expect(result).toEqual({
-      startDate: new Date('2024-03-15'),
-      endDate: new Date('2024-03-15'),
+      startDate: today,
+      endDate: tomorrow,
     });
   });
 
-  // Test case 3: Initial selection (no start date)
-  it('should set start date when no dates are selected', () => {
-    const date = new Date('2024-03-15');
+  it('should set start date when date is before current start date', () => {
+    const result = setStartOrEndDate({
+      date: today,
+      startDate: tomorrow,
+    });
 
-    const result = setStartOrEndDate({ date });
     expect(result).toEqual({
-      startDate: new Date('2024-03-15'),
-      endDate: undefined,
+      startDate: today,
+      endDate: tomorrow,
     });
   });
 
-  // Test case 4: Setting end date after start date
-  it('should set end date when start date exists and selected date is after', () => {
-    const date = new Date('2024-03-20');
-    const startDate = new Date('2024-03-15');
+  it('should set end date when date is after current start date', () => {
+    const result = setStartOrEndDate({
+      date: tomorrow,
+      startDate: today,
+    });
 
-    const result = setStartOrEndDate({ date, startDate });
     expect(result).toEqual({
-      startDate: new Date('2024-03-15'),
-      endDate: new Date('2024-03-20'),
+      startDate: today,
+      endDate: tomorrow,
     });
   });
 
-  // Test case 5: Setting end date before start date (should reorder)
-  it('should reorder dates when end date is selected before start date', () => {
-    const date = new Date('2024-03-10');
-    const startDate = new Date('2024-03-15');
+  it('should reset selection when clicking within range', () => {
+    const result = setStartOrEndDate({
+      date: tomorrow,
+      startDate: today,
+      endDate: nextWeek,
+    });
 
-    const result = setStartOrEndDate({ date, startDate });
     expect(result).toEqual({
-      startDate: new Date('2024-03-10'),
-      endDate: new Date('2024-03-15'),
+      startDate: tomorrow,
+      endDate: undefined,
     });
   });
 
-  // Test case 6: Clicking within existing range
-  it('should start new selection when clicking within existing range', () => {
-    const date = new Date('2024-03-17');
-    const startDate = new Date('2024-03-15');
-    const endDate = new Date('2024-03-20');
+  it('should reset selection when clicking outside range', () => {
+    const result = setStartOrEndDate({
+      date: nextWeek,
+      startDate: today,
+      endDate: tomorrow,
+    });
 
-    const result = setStartOrEndDate({ date, startDate, endDate });
     expect(result).toEqual({
-      startDate: new Date('2024-03-17'),
+      startDate: nextWeek,
       endDate: undefined,
     });
   });
 
-  // Test case 7: Extending range before start date
-  it('should extend range when clicking before start date', () => {
-    const date = new Date('2024-03-10');
-    const startDate = new Date('2024-03-15');
-    const endDate = new Date('2024-03-20');
+  it('should set same date for both start and end when clicking start date', () => {
+    const result = setStartOrEndDate({
+      date: today,
+      startDate: today,
+      endDate: tomorrow,
+    });
 
-    const result = setStartOrEndDate({ date, startDate, endDate });
     expect(result).toEqual({
-      startDate: new Date('2024-03-10'),
-      endDate: new Date('2024-03-20'),
+      startDate: today,
+      endDate: today,
     });
   });
 
-  // Test case 8: Extending range after end date
-  it('should extend range when clicking after end date', () => {
-    const date = new Date('2024-03-25');
-    const startDate = new Date('2024-03-15');
-    const endDate = new Date('2024-03-20');
+  it('should set same date for both start and end when clicking end date', () => {
+    const result = setStartOrEndDate({
+      date: tomorrow,
+      startDate: today,
+      endDate: tomorrow,
+    });
 
-    const result = setStartOrEndDate({ date, startDate, endDate });
     expect(result).toEqual({
-      startDate: new Date('2024-03-15'),
-      endDate: new Date('2024-03-25'),
+      startDate: tomorrow,
+      endDate: tomorrow,
     });
   });
 });

package/src/components/Calendar/helpers.ts

@@ -55,14 +55,11 @@ export const setStartOrEndDate = ({
   endDate?: Date;
 }) => {
   // If both dates are set, selecting start or end date will set the same date
-  if (startDate && endDate && isEqDate(date, startDate)) {
-    return {
-      startDate: date,
-      endDate: date,
-    };
-  }
-
-  if (startDate && endDate && isEqDate(date, endDate)) {
+  if (
+    startDate &&
+    endDate &&
+    (isEqDate(date, startDate) || isEqDate(date, endDate))
+  ) {
     return {
       startDate: date,
       endDate: date,