trotl-table 1.0.21 → 1.0.23

package/dist/index.cjs.js

@@ -9771,6 +9771,8 @@ function TableInner({
 
   // Option to read search param from URL
   const [searchTerm, setSearchTerm] = React.useState(extraSearchTerm);
+  // Track current URL search so date filters rerun when params change
+  const [urlSearchString, setUrlSearchString] = React.useState(() => window.location.search);
 
   // Listen to URL changes via popstate (back/forward) and custom events
   React.useEffect(() => {
@@ -9843,15 +9845,88 @@ function TableInner({
   const normalizedGroups = React.useMemo(() => {
     return normalizeData(isGrouped ? localData : [], isGrouped ? [] : localData);
   }, [localData, isGrouped]);
+
+  // Listen for changes to date-related URL params and update searchTerm to trigger re-filter
+  React.useEffect(() => {
+    const handleDateParamChange = () => {
+      setUrlSearchString(window.location.search);
+    };
+
+    // Listen for popstate (back/forward navigation)
+    window.addEventListener('popstate', handleDateParamChange);
+
+    // Listen for programmatic URL changes
+    const originalPushState = window.history.pushState;
+    const originalReplaceState = window.history.replaceState;
+    window.history.pushState = function (...args) {
+      originalPushState.apply(this, args);
+      handleDateParamChange();
+    };
+    window.history.replaceState = function (...args) {
+      originalReplaceState.apply(this, args);
+      handleDateParamChange();
+    };
+
+    // Listen for hashchange (in case date params are in hash)
+    window.addEventListener('hashchange', handleDateParamChange);
+    return () => {
+      window.removeEventListener('popstate', handleDateParamChange);
+      window.removeEventListener('hashchange', handleDateParamChange);
+      window.history.pushState = originalPushState;
+      window.history.replaceState = originalReplaceState;
+    };
+  }, []);
   const filterRows = React.useCallback(rows => {
-    if (!searchTerm) return rows;
+    console.log(urlSearchString);
+    // Check for date-related URL params first
+    const urlParams = new URLSearchParams(urlSearchString);
+    const dateParams = ['startDate', 'endDate', 'date'];
+    let dateFiltered = rows;
+    for (const paramKey of dateParams) {
+      const paramValue = urlParams.get(paramKey);
+      if (!paramValue) continue;
+
+      // Check if it's a range (contains ~)
+      if (paramValue.includes('~')) {
+        const [startTs, endTs] = paramValue.split('~').map(Number);
+        if (isNaN(startTs) || isNaN(endTs)) continue;
+        dateFiltered = dateFiltered.filter(row => {
+          // Check if any date field in the row falls within the range
+          const itemStartDate = row.startDate ? new Date(row.startDate).getTime() : null;
+          const itemEndDate = row.endDate ? new Date(row.endDate).getTime() : null;
+          const itemDate = row.date ? new Date(row.date).getTime() : null;
+
+          // Match if any date field overlaps with the range
+          return itemStartDate && itemStartDate >= startTs && itemStartDate <= endTs || itemEndDate && itemEndDate >= startTs && itemEndDate <= endTs || itemDate && itemDate >= startTs && itemDate <= endTs ||
+          // Check if event spans the entire range
+          itemStartDate && itemEndDate && itemStartDate <= startTs && itemEndDate >= endTs;
+        });
+      } else {
+        // Single timestamp
+        const timestamp = Number(paramValue);
+        if (isNaN(timestamp)) continue;
+        dateFiltered = dateFiltered.filter(row => {
+          const itemStartDate = row.startDate ? new Date(row.startDate).getTime() : null;
+          const itemEndDate = row.endDate ? new Date(row.endDate).getTime() : null;
+          const itemDate = row.date ? new Date(row.date).getTime() : null;
+
+          // Match if the timestamp falls within the event's date range or matches the date
+          return itemDate && Math.abs(itemDate - timestamp) < 86400000 ||
+          // Same day (within 24h)
+          itemStartDate && itemEndDate && itemStartDate <= timestamp && itemEndDate >= timestamp || itemStartDate && Math.abs(itemStartDate - timestamp) < 86400000 || itemEndDate && Math.abs(itemEndDate - timestamp) < 86400000;
+        });
+      }
+    }
+
+    // Then apply text search filter
+    if (!searchTerm) return dateFiltered;
     const query = searchTerm.toLowerCase();
-    return rows.filter(row => columns.some(col => {
+    return dateFiltered.filter(row => columns.some(col => {
       const val = row[col.accessor];
       if (val == null) return false;
       return String(val).toLowerCase().includes(query);
     }));
-  }, [searchTerm, columns]);
+  }, [searchTerm, columns, urlSearchString]);
 
   // Natural-ish comparator: handles nulls, numbers, strings, ISO dates
   const compare = (x, y, dir = "asc") => {