@snapdragonsnursery/react-components 1.19.4 → 1.19.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapdragonsnursery/react-components",
-  "version": "1.19.4",
+  "version": "1.19.6",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/ChildSearchModal.jsx

@@ -1,4 +1,10 @@
-import React, { useState, useEffect, useRef, useCallback } from "react";
+import React, {
+  useState,
+  useEffect,
+  useRef,
+  useCallback,
+  useMemo,
+} from "react";
 import { useMsal } from "@azure/msal-react";
 import { trackEvent } from "./telemetry";
 
@@ -25,7 +31,7 @@ const ChildSearchModal = ({
   showSiteFilter = true, // Whether to show site filter dropdown
   multiSelect = false, // Enable multiple child selection
   maxSelections = null, // Maximum number of children that can be selected (null = unlimited)
-  selectedChildren = [], // Array of already selected children (for multi-select mode)
+  selectedChildren, // Array of already selected children (for multi-select mode)
   // Auth options: provide token directly or a function to fetch it
   authToken = null,
   getAccessToken = null,
@@ -60,8 +66,12 @@ const ChildSearchModal = ({
   });
 
   // State for multi-select mode
+  const initialSelectedChildren = useMemo(
+    () => selectedChildren ?? [],
+    [selectedChildren]
+  );
   const [selectedChildrenState, setSelectedChildrenState] = useState(
-    selectedChildren || []
+    initialSelectedChildren
   );
 
   const { instance, accounts } = useMsal();
@@ -281,9 +291,9 @@ const ChildSearchModal = ({
   // Reset selection when modal opens (for multi-select mode)
   useEffect(() => {
     if (isOpen && multiSelect) {
-      setSelectedChildrenState(selectedChildren || []);
+      setSelectedChildrenState(initialSelectedChildren);
     }
-  }, [isOpen, multiSelect, selectedChildren]);
+  }, [isOpen, multiSelect, initialSelectedChildren]);
 
   const handleChildSelect = (child) => {
     if (multiSelect) {

package/src/components/ui/date-range-picker.jsx

@@ -92,48 +92,47 @@ export function DateRangePicker({
     const hasCompleteCurrentRange = Boolean(
       internalRange?.from && internalRange?.to
     );
+    const isInProgressRange = Boolean(
+      internalRange?.from && !internalRange?.to
+    );
 
-    let newRange = normalizedRange;
-
-    if (normalizedRange.from && normalizedRange.to) {
-      if (hasCompleteCurrentRange && !isSelectingRange.current) {
-        const sameStart = datesEqual(normalizedRange.from, internalRange.from);
+    let newRange;
 
-        if (sameStart) {
-          // Adjusting end date on an existing range
-          newRange = {
-            from: internalRange.from,
-            to: normalizedRange.to,
-          };
-        } else {
-          // Starting a new range selection cycle
-          newRange = {
-            from: normalizedSelectedDay ?? normalizedRange.from,
-            to: null,
-          };
-        }
-      } else if (internalRange?.from && !internalRange?.to) {
-        // Completing an in-progress range
+    // If we're in the middle of selecting a range (start date set, end date not set)
+    if (isInProgressRange) {
+      // Completing an in-progress range - set the clicked date as the end date
+      if (normalizedRange.to) {
         newRange = {
           from: internalRange.from,
           to: normalizedRange.to,
         };
-      }
-    } else if (normalizedRange.from && !normalizedRange.to) {
-      if (hasCompleteCurrentRange && !isSelectingRange.current) {
-        // New cycle starting from the selected day
+      } else if (normalizedRange.from) {
+        // Use the clicked date as end date
         newRange = {
-          from: normalizedSelectedDay ?? normalizedRange.from,
-          to: null,
+          from: internalRange.from,
+          to: normalizedSelectedDay ?? normalizedRange.from,
         };
       } else {
+        newRange = internalRange; // Keep current state
+      }
+    } else if (hasCompleteCurrentRange) {
+      // We have a complete range - clicking ANY date should start a new range
+      // Use the clicked date as the new start date
+      newRange = {
+        from:
+          normalizedSelectedDay ?? normalizedRange.from ?? normalizedRange.to,
+        to: null,
+      };
+    } else {
+      // No range selected or only partial - start a new range
+      if (normalizedRange.from) {
         newRange = {
           from: normalizedRange.from,
-          to: null,
+          to: normalizedRange.to || null,
         };
+      } else {
+        newRange = null;
       }
-    } else {
-      newRange = null;
     }
 
     setInternalRange(newRange);