Fix #5970: Calendar hideOnRangeSelection (#5971)

primefaces · Feb 15, 2024 · 25cdec3 · 25cdec3
1 parent 67117a2
commit 25cdec3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/components/doc/calendar/rangedoc.js b/components/doc/calendar/rangedoc.js
@@ -8,7 +8,7 @@ export function RangeDoc(props) {
 
     const code = {
         basic: `
-<Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput />
+<Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput hideOnRangeSelection />
         `,
         javascript: `
 import React, { useState } from "react";
@@ -19,7 +19,7 @@ export default function RangeDemo() {
 
     return (
         <div className="card flex justify-content-center">
-            <Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput />
+            <Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput hideOnRangeSelection />
         </div>
     )
 }
@@ -34,7 +34,7 @@ export default function RangeDemo() {
 
     return (
         <div className="card flex justify-content-center">
-            <Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput />
+            <Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput hideOnRangeSelection />
         </div>
 
     )
@@ -50,7 +50,7 @@ export default function RangeDemo() {
                 </p>
             </DocSectionText>
             <div className="card flex justify-content-center">
-                <Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput />
+                <Calendar value={dates} onChange={(e) => setDates(e.value)} selectionMode="range" readOnlyInput hideOnRangeSelection />
             </div>
             <DocSectionCode code={code} />
         </>

diff --git a/components/lib/calendar/Calendar.js b/components/lib/calendar/Calendar.js
@@ -1630,6 +1630,12 @@ export const Calendar = React.memo(
 
                     selectedValues = [startDate, endDate];
                     updateModel(event, selectedValues);
+
+                    if (props.hideOnRangeSelection && endDate !== null) {
+                        setTimeout(() => {
+                            setOverlayVisibleState(false);
+                        }, 150);
+                    }
                 } else {
                     selectedValues = [date, null];
                     updateModel(event, selectedValues);

diff --git a/components/lib/calendar/CalendarBase.js b/components/lib/calendar/CalendarBase.js
@@ -249,6 +249,7 @@ export const CalendarBase = ComponentBase.extend({
         formatDateTime: null,
         headerTemplate: null,
         hideOnDateTimeSelect: false,
+        hideOnRangeSelection: false,
         hourFormat: '24',
         icon: null,
         iconPos: 'right',

diff --git a/components/lib/calendar/calendar.d.ts b/components/lib/calendar/calendar.d.ts
@@ -587,6 +587,10 @@ interface CalendarBaseProps {
      * @defaultValue false
      */
     hideOnDateTimeSelect?: boolean | undefined;
+    /**
+     * Whether to hide the overlay on date selection is completed when selectionMode is range.
+     */
+    hideOnRangeSelection?: boolean | undefined;
     /**
      * Specifies 12 or 24 hour format.
      * @defaultValue 24