@homebound/beam 3.1.0-alpha.1 → 3.1.0

package/dist/index.js

@@ -4902,7 +4902,7 @@ function Chips(props) {
 // src/components/Table/GridTable.tsx
 import memoizeOne from "memoize-one";
 import { runInAction } from "mobx";
-import React13, { useEffect as useEffect19, useMemo as useMemo24, useRef as useRef39, useState as useState29 } from "react";
+import React13, { useEffect as useEffect19, useMemo as useMemo24, useRef as useRef38, useState as useState29 } from "react";
 import { Virtuoso as Virtuoso2 } from "react-virtuoso";
 
 // src/components/Layout/ScrollableContent.tsx
@@ -5482,50 +5482,27 @@ function useHover2(props) {
 }
 
 // src/hooks/usePersistedFilter.ts
-import { useEffect as useEffect6, useMemo as useMemo8, useRef as useRef6 } from "react";
+import { useEffect as useEffect6, useMemo as useMemo8 } from "react";
 import { JsonParam, useQueryParams as useQueryParams2 } from "use-query-params";
 function usePersistedFilter({ storageKey, filterDefs }) {
-  const filterImpls = useMemo8(
-    () => Object.fromEntries(safeEntries(filterDefs).map(([key, def]) => [key, def(key)])),
-    [filterDefs]
-  );
-  const filterKeys = useMemo8(() => Object.keys(filterImpls), [filterImpls]);
+  const filterKeys = Object.keys(filterDefs);
   const defaultFilter = useMemo8(
     () => Object.fromEntries(
-      safeEntries(filterImpls).filter(([, def]) => def.defaultValue !== void 0).map(([key, def]) => [key, def.defaultValue])
+      safeEntries(filterDefs).filter(([key, def]) => def(key).defaultValue !== void 0).map(([key, def]) => [key, def(key).defaultValue])
     ),
-    [filterImpls]
+    [filterDefs]
   );
   const [{ filter: queryParamsFilter }, setQueryParams] = useQueryParams2({ filter: JsonParam });
-  const [storedFilter, setStoredFilter] = useSessionStorage(
-    storageKey,
-    dehydrateFilter(filterImpls, defaultFilter) ?? defaultFilter
-  );
+  const [storedFilter, setStoredFilter] = useSessionStorage(storageKey, queryParamsFilter ?? defaultFilter);
   const isQueryParamFilterValid = hasValidFilterKeys(queryParamsFilter, filterKeys);
-  const serializedQueryParamsFilter = useMemo8(() => JSON.stringify(queryParamsFilter), [queryParamsFilter]);
-  const serializedStoredFilter = useMemo8(() => JSON.stringify(storedFilter), [storedFilter]);
-  const queryParamsFilterSnapshot = useMemo8(
-    () => parseSerializedValue(serializedQueryParamsFilter),
-    [serializedQueryParamsFilter]
-  );
-  const storedFilterSnapshot = useMemo8(() => parseSerializedValue(serializedStoredFilter), [serializedStoredFilter]);
-  const hydratedQueryParamsFilter = useMemo8(
-    () => isQueryParamFilterValid ? hydrateFilter(filterImpls, queryParamsFilterSnapshot) : void 0,
-    [filterImpls, isQueryParamFilterValid, queryParamsFilterSnapshot]
-  );
-  const hydratedStoredFilter = useMemo8(
-    () => hasValidFilterKeys(storedFilterSnapshot, filterKeys) ? hydrateFilter(filterImpls, storedFilterSnapshot) : void 0,
-    [filterImpls, filterKeys, storedFilterSnapshot]
-  );
-  const rawFilter = hydratedQueryParamsFilter ?? hydratedStoredFilter ?? defaultFilter;
-  const filter = useStableValue(rawFilter);
-  const setFilter = (filter2) => setQueryParams({ filter: dehydrateFilter(filterImpls, filter2) });
+  const filter = isQueryParamFilterValid ? queryParamsFilter : storedFilter ?? defaultFilter;
+  const setFilter = (filter2) => setQueryParams({ filter: filter2 });
   useEffect6(
     () => {
       if (queryParamsFilter === void 0) {
         setQueryParams({ filter: storedFilter }, "replaceIn");
       } else if (!isQueryParamFilterValid) {
-        setQueryParams({ filter: dehydrateFilter(filterImpls, defaultFilter) }, "replaceIn");
+        setQueryParams({ filter: defaultFilter }, "replaceIn");
       } else if (JSON.stringify(queryParamsFilter) !== JSON.stringify(storedFilter)) {
         setStoredFilter(queryParamsFilter);
       }
@@ -5537,45 +5514,7 @@ function usePersistedFilter({ storageKey, filterDefs }) {
   return { setFilter, filter };
 }
 function hasValidFilterKeys(queryParamsFilter, definedKeys) {
-  return !!queryParamsFilter && safeKeys(queryParamsFilter).every((key) => definedKeys.includes(key));
-}
-function hydrateFilter(filterImpls, value) {
-  if (typeof value !== "object" || value === null) return void 0;
-  const hydratedEntries = [];
-  safeEntries(value).forEach(([key, rawValue]) => {
-    const filter = filterImpls[key];
-    if (!filter) return;
-    const hydratedValue = filter.hydrate ? filter.hydrate(rawValue) : rawValue;
-    if (hydratedValue !== void 0) {
-      hydratedEntries.push([key, hydratedValue]);
-    }
-  });
-  return Object.fromEntries(hydratedEntries);
-}
-function dehydrateFilter(filterImpls, value) {
-  if (!value) return value;
-  return Object.fromEntries(
-    safeEntries(value).map(([key, rawValue]) => {
-      const filter = filterImpls[key];
-      return [
-        key,
-        filter?.dehydrate ? filter.dehydrate(rawValue) : rawValue
-      ];
-    })
-  );
-}
-function parseSerializedValue(value) {
-  return value === void 0 ? void 0 : JSON.parse(value);
-}
-function useStableValue(value) {
-  const stableValue = useRef6(value);
-  const stableKey = useRef6(JSON.stringify(value));
-  const nextKey = JSON.stringify(value);
-  if (stableKey.current !== nextKey) {
-    stableValue.current = value;
-    stableKey.current = nextKey;
-  }
-  return stableValue.current;
+  return queryParamsFilter && safeKeys(queryParamsFilter).every((key) => definedKeys.includes(key));
 }
 
 // src/hooks/useSessionStorage.ts
@@ -5998,7 +5937,7 @@ function CollapseToggle(props) {
 import { useContext as useContext12 } from "react";
 
 // src/inputs/Autocomplete.tsx
-import { useCallback as useCallback10, useRef as useRef24 } from "react";
+import { useCallback as useCallback10, useRef as useRef23 } from "react";
 import { useComboBox as useComboBox3, useOverlayPosition as useOverlayPosition5 } from "react-aria";
 import { Item as Item5, useComboBoxState as useComboBoxState3 } from "react-stately";
 
@@ -6006,13 +5945,13 @@ import { Item as Item5, useComboBoxState as useComboBoxState3 } from "react-stat
 import { DayPicker } from "react-day-picker";
 
 // src/components/internal/DatePicker/Day.tsx
-import { useRef as useRef7 } from "react";
+import { useRef as useRef6 } from "react";
 import { useDayRender } from "react-day-picker";
 import { trussProps as trussProps12, mergeProps as mergeProps3 } from "@homebound/truss/runtime";
 import { Fragment as Fragment5, jsx as jsx16, jsxs as jsxs9 } from "react/jsx-runtime";
 function Day(props) {
   const tid = useTestIds(props, "datePickerDay");
-  const buttonRef = useRef7(null);
+  const buttonRef = useRef6(null);
   const {
     isHidden,
     isButton,
@@ -6193,61 +6132,6 @@ function WeekHeader() {
   ] }, format2(day, "EEEE"))) }) });
 }
 
-// src/utils/plainDate.ts
-import { Temporal } from "temporal-polyfill";
-function plainDateToJsDate(date) {
-  return new Date(date.year, date.month - 1, date.day, 12);
-}
-function jsDateToPlainDate(date) {
-  return new Temporal.PlainDate(date.getFullYear(), date.getMonth() + 1, date.getDate());
-}
-function dateRangeToJsDateRange(range) {
-  if (!range) return void 0;
-  return {
-    from: range.from ? plainDateToJsDate(range.from) : void 0,
-    to: range.to ? plainDateToJsDate(range.to) : void 0
-  };
-}
-function jsDateRangeToDateRange(range) {
-  if (!range) return void 0;
-  return {
-    from: range.from ? jsDateToPlainDate(range.from) : void 0,
-    to: range.to ? jsDateToPlainDate(range.to) : void 0
-  };
-}
-function dayMatcherToDayPickerMatcher(matcher) {
-  return (date) => matcher(jsDateToPlainDate(date));
-}
-function dayMatchersToDayPickerMatchers(matchers) {
-  if (matchers === void 0) return void 0;
-  return Array.isArray(matchers) ? matchers.map(dayMatcherToDayPickerMatcher) : dayMatcherToDayPickerMatcher(matchers);
-}
-function todayPlainDate() {
-  return Temporal.Now.plainDateISO();
-}
-function isPlainDate(value) {
-  return value instanceof Temporal.PlainDate;
-}
-function parsePersistedPlainDate(value) {
-  if (isPlainDate(value)) return value;
-  if (value instanceof Date && !Number.isNaN(value.getTime())) {
-    return jsDateToPlainDate(value);
-  }
-  if (typeof value !== "string") return void 0;
-  try {
-    if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
-      return Temporal.PlainDate.from(value);
-    }
-  } catch {
-    return void 0;
-  }
-  const date = new Date(value);
-  return Number.isNaN(date.getTime()) ? void 0 : jsDateToPlainDate(date);
-}
-function dehydratePlainDate(value) {
-  return value?.toString();
-}
-
 // src/components/internal/DatePicker/DatePicker.tsx
 import { jsx as jsx19 } from "react/jsx-runtime";
 function DatePicker(props) {
@@ -6267,15 +6151,15 @@ function DatePicker(props) {
         Head: WeekHeader,
         Day
       },
-      selected: value ? [plainDateToJsDate(value)] : [],
-      defaultMonth: plainDateToJsDate(value ?? todayPlainDate()),
+      selected: value ? [value] : [],
+      defaultMonth: value ?? /* @__PURE__ */ new Date(),
       onDayClick: (day, modifiers) => {
         if (modifiers.disabled) return;
-        onSelect(jsDateToPlainDate(day));
+        onSelect(day);
       },
-      disabled: dayMatchersToDayPickerMatchers(disabledDays),
+      disabled: disabledDays,
       modifiers: {
-        indicatorDot: dayMatchersToDayPickerMatchers(dottedDays) ?? []
+        indicatorDot: dottedDays ?? []
       }
     }
   ) });
@@ -6302,21 +6186,21 @@ function DateRangePicker(props) {
     useYearPicker
   } = props;
   const tid = useTestIds(props, "datePicker");
-  return /* @__PURE__ */ jsx21("div", { className: "dib bgWhite fw4 fz_12px lh_16px", ...tid, children: /* @__PURE__ */ jsx21(DayPicker2, { mode: "range", selected: dateRangeToJsDateRange(range), components: {
+  return /* @__PURE__ */ jsx21("div", { className: "dib bgWhite fw4 fz_12px lh_16px", ...tid, children: /* @__PURE__ */ jsx21(DayPicker2, { mode: "range", selected: range, components: {
     Caption: useYearPicker ? YearSkipHeader : Header,
     Head: WeekHeader,
     Day
-  }, defaultMonth: plainDateToJsDate(range?.to ?? range?.from ?? todayPlainDate()), onSelect: (selection, day, activeModifiers) => {
+  }, defaultMonth: range?.to ?? /* @__PURE__ */ new Date(), onSelect: (selection, day, activeModifiers) => {
     if (activeModifiers.disabled) return;
-    onSelect(jsDateRangeToDateRange(selection));
-  }, disabled: dayMatchersToDayPickerMatchers(disabledDays), modifiers: {
-    indicatorDot: dayMatchersToDayPickerMatchers(dottedDays) ?? []
+    onSelect(selection);
+  }, disabled: disabledDays, modifiers: {
+    indicatorDot: dottedDays ?? []
   } }) });
 }
 
 // src/components/internal/Menu.tsx
 import { camelCase } from "change-case";
-import { useEffect as useEffect8, useMemo as useMemo9, useRef as useRef11, useState as useState11 } from "react";
+import { useEffect as useEffect8, useMemo as useMemo9, useRef as useRef10, useState as useState11 } from "react";
 import { FocusScope, useFilter as useFilter2, useMenu } from "react-aria";
 import { Item, Section, useTreeData, useTreeState } from "react-stately";
 
@@ -6361,7 +6245,7 @@ import { trussProps as trussProps21 } from "@homebound/truss/runtime";
 
 // src/inputs/internal/MenuSearchField.tsx
 import { useTextField } from "@react-aria/textfield";
-import { useRef as useRef10 } from "react";
+import { useRef as useRef9 } from "react";
 
 // src/inputs/TextFieldBase.tsx
 import { useState as useState10 } from "react";
@@ -6460,7 +6344,7 @@ function InlineLabel({
 
 // src/components/Table/components/Row.tsx
 import { observer } from "mobx-react";
-import React6, { useCallback as useCallback6, useContext as useContext10, useRef as useRef9 } from "react";
+import React6, { useCallback as useCallback6, useContext as useContext10, useRef as useRef8 } from "react";
 import { mergeProps as mergeProps5 } from "react-aria";
 
 // src/components/Table/components/cell.tsx
@@ -6526,7 +6410,7 @@ var rowClickRenderFn = (as, api, colSpan) => (key, css2, content, row, rowStyle,
 };
 
 // src/components/Table/components/ColumnResizeHandle.tsx
-import { useCallback as useCallback5, useContext as useContext8, useEffect as useEffect7, useRef as useRef8, useState as useState9 } from "react";
+import { useCallback as useCallback5, useContext as useContext8, useEffect as useEffect7, useRef as useRef7, useState as useState9 } from "react";
 import { trussProps as trussProps16 } from "@homebound/truss/runtime";
 import { Fragment as Fragment7, jsx as jsx26, jsxs as jsxs14 } from "react/jsx-runtime";
 function findScrollableParent(element) {
@@ -6564,13 +6448,13 @@ function ColumnResizeHandle({
   const [guideLineX, setGuideLineX] = useState9(null);
   const [guideLineTop, setGuideLineTop] = useState9(0);
   const [guideLineHeight, setGuideLineHeight] = useState9(0);
-  const startXRef = useRef8(0);
-  const startWidthRef = useRef8(0);
-  const startHandleRightRef = useRef8(0);
-  const handleRef = useRef8(null);
-  const rafRef = useRef8(null);
-  const pendingMouseXRef = useRef8(null);
-  const scrollableParentRef = useRef8(null);
+  const startXRef = useRef7(0);
+  const startWidthRef = useRef7(0);
+  const startHandleRightRef = useRef7(0);
+  const handleRef = useRef7(null);
+  const rafRef = useRef7(null);
+  const pendingMouseXRef = useRef7(null);
+  const scrollableParentRef = useRef7(null);
   const tid = useTestIds({}, "columnResizeHandle");
   const handleMouseDown = useCallback5((e) => {
     e.preventDefault();
@@ -7712,7 +7596,7 @@ function RowImpl(props) {
   let foundFirstContentColumn = false;
   let minStickyLeftOffset = 0;
   let expandColumnHidden = false;
-  const ref = useRef9(null);
+  const ref = useRef8(null);
   const dragOverCallback = useCallback6((row2, evt) => onDragOver?.(row2, evt), [onDragOver]);
   const onDragOverDebounced = useDebouncedCallback2(dragOverCallback, 100);
   const RowContent = () => /* @__PURE__ */ jsx28(RowTag, { ...mergeProps_12(BorderHoverParent, void 0, rowCss), ...others, "data-gridrow": true, ...getCount(row.id), ref, children: isKeptGroupRow ? /* @__PURE__ */ jsx28(KeptGroupRow, { as, style, columnSizes, row, colSpan: columns.length, isLastBodyRow }) : columns.map((column2, columnIndex) => {
@@ -8478,7 +8362,7 @@ var textFieldBaseMultilineTopPadding = 11;
 import { jsx as jsx31 } from "react/jsx-runtime";
 function MenuSearchField(props) {
   const tid = useTestIds(props);
-  const inputRef = useRef10(null);
+  const inputRef = useRef9(null);
   const { labelProps, inputProps } = useTextField({ ...props }, inputRef);
   return /* @__PURE__ */ jsx31(
     TextFieldBase,
@@ -8562,7 +8446,7 @@ function Menu(props) {
       keys !== "all" && onChange && onChange([...keys.values()].map((k) => k.toString())[0]);
     }
   });
-  const menuRef = useRef11(null);
+  const menuRef = useRef10(null);
   const {
     menuProps
   } = useMenu({
@@ -8604,7 +8488,7 @@ function Menu(props) {
 }
 
 // src/components/internal/MenuItem.tsx
-import { useRef as useRef14 } from "react";
+import { useRef as useRef13 } from "react";
 import { useHover as useHover7, useMenuItem } from "react-aria";
 import { useHistory } from "react-router";
 import { Link as Link3 } from "react-router-dom";
@@ -8859,12 +8743,12 @@ var pressedOverlayCss = {
 };
 
 // src/components/ButtonModal.tsx
-import { useRef as useRef13 } from "react";
+import { useRef as useRef12 } from "react";
 import { useMenuTrigger } from "react-aria";
 import { useMenuTriggerState } from "react-stately";
 
 // src/components/internal/OverlayTrigger.tsx
-import { useMemo as useMemo13, useRef as useRef12 } from "react";
+import { useMemo as useMemo13, useRef as useRef11 } from "react";
 import { useOverlayPosition } from "react-aria";
 
 // src/components/Button.tsx
@@ -9554,7 +9438,7 @@ function OverlayTrigger(props) {
       }
     }
   }), [menuTriggerProps, state]);
-  const popoverRef = useRef12(null);
+  const popoverRef = useRef11(null);
   const {
     overlayProps: positionProps
   } = useOverlayPosition({
@@ -9616,7 +9500,7 @@ import { jsx as jsx39 } from "react/jsx-runtime";
 function ButtonModal(props) {
   const { storybookDefaultOpen, trigger, disabled, content, title } = props;
   const state = useMenuTriggerState({ isOpen: storybookDefaultOpen });
-  const buttonRef = useRef13(null);
+  const buttonRef = useRef12(null);
   const { menuTriggerProps } = useMenuTrigger({ isDisabled: !!disabled }, state, buttonRef);
   const tid = useTestIds(
     props,
@@ -9700,7 +9584,7 @@ function MenuItemImpl(props) {
   const isDisabled = Boolean(disabled);
   const isSelected = state.selectionManager.selectedKeys.has(label);
   const isFocused = state.selectionManager.focusedKey === item.key;
-  const ref = useRef14(null);
+  const ref = useRef13(null);
   const history = useHistory();
   const {
     hoverProps,
@@ -9847,7 +9731,7 @@ function Popover(props) {
 }
 
 // src/inputs/internal/ComboBoxBase.tsx
-import { useCallback as useCallback9, useEffect as useEffect14, useMemo as useMemo16, useRef as useRef23, useState as useState19 } from "react";
+import { useCallback as useCallback9, useEffect as useEffect14, useMemo as useMemo16, useRef as useRef22, useState as useState19 } from "react";
 import { useButton as useButton7, useComboBox as useComboBox2, useFilter as useFilter4, useOverlayPosition as useOverlayPosition4 } from "react-aria";
 import { Item as Item4, useComboBoxState as useComboBoxState2 } from "react-stately";
 import { trussProps as trussProps39 } from "@homebound/truss/runtime";
@@ -9918,13 +9802,13 @@ function useGrowingTextField({ inputRef, inputWrapRef, value, disabled, maxLines
 }
 
 // src/inputs/TreeSelectField/TreeSelectField.tsx
-import React9, { useCallback as useCallback8, useContext as useContext11, useEffect as useEffect13, useMemo as useMemo15, useRef as useRef22, useState as useState17 } from "react";
+import React9, { useCallback as useCallback8, useContext as useContext11, useEffect as useEffect13, useMemo as useMemo15, useRef as useRef21, useState as useState17 } from "react";
 import { useButton as useButton6, useComboBox, useFilter as useFilter3, useOverlayPosition as useOverlayPosition3 } from "react-aria";
 import { Item as Item3, useComboBoxState } from "react-stately";
 import { trussProps as trussProps37 } from "@homebound/truss/runtime";
 
 // src/inputs/internal/ListBox.tsx
-import { useEffect as useEffect12, useRef as useRef21, useState as useState16 } from "react";
+import { useEffect as useEffect12, useRef as useRef20, useState as useState16 } from "react";
 import { useListBox } from "react-aria";
 import { trussProps as trussProps36 } from "@homebound/truss/runtime";
 
@@ -9937,17 +9821,17 @@ import { useListBoxSection, useSeparator as useSeparator2 } from "react-aria";
 import { trussProps as trussProps35 } from "@homebound/truss/runtime";
 
 // src/inputs/internal/Option.tsx
-import { useRef as useRef17 } from "react";
+import { useRef as useRef16 } from "react";
 import { mergeProps as mergeProps12, useHover as useHover8, useOption } from "react-aria";
 
 // src/inputs/ChipSelectField.tsx
 import { camelCase as camelCase2 } from "change-case";
-import { useEffect as useEffect10, useMemo as useMemo14, useRef as useRef16, useState as useState15 } from "react";
+import { useEffect as useEffect10, useMemo as useMemo14, useRef as useRef15, useState as useState15 } from "react";
 import { mergeProps as mergeProps11, useButton as useButton5, useFocus as useFocus2, useOverlayPosition as useOverlayPosition2, useSelect } from "react-aria";
 import { Item as Item2, Section as Section2, useListData, useSelectState } from "react-stately";
 
 // src/inputs/ChipTextField.tsx
-import { useEffect as useEffect9, useRef as useRef15, useState as useState14 } from "react";
+import { useEffect as useEffect9, useRef as useRef14, useState as useState14 } from "react";
 import { useFocus } from "react-aria";
 import { trussProps as trussProps28 } from "@homebound/truss/runtime";
 import { jsx as jsx43 } from "react/jsx-runtime";
@@ -9966,7 +9850,7 @@ function ChipTextField(props) {
   const {
     fieldProps
   } = usePresentationContext();
-  const valueRef = useRef15(value);
+  const valueRef = useRef14(value);
   const tid = useTestIds(props, "chipField");
   const [isFocused, setIsFocused] = useState14(false);
   const {
@@ -9987,7 +9871,7 @@ function ChipTextField(props) {
     onBlur: () => maybeCall(onBlur),
     onFocusChange: setIsFocused
   });
-  const fieldRef = useRef15(null);
+  const fieldRef = useRef14(null);
   useEffect9(
     () => {
       autoFocus && fieldRef.current?.focus();
@@ -10094,7 +9978,7 @@ function defaultOptionLabel(opt) {
 import { trussProps as trussProps30 } from "@homebound/truss/runtime";
 import { Fragment as Fragment15, jsx as jsx45, jsxs as jsxs29 } from "react/jsx-runtime";
 function ChipSelectField(props) {
-  const firstRender = useRef16(true);
+  const firstRender = useRef15(true);
   const {
     fieldProps
   } = usePresentationContext();
@@ -10152,10 +10036,10 @@ function ChipSelectField(props) {
   } = useFocus2({
     onFocusChange: setIsClearFocused
   });
-  const buttonRef = useRef16(null);
-  const popoverRef = useRef16(null);
-  const listBoxRef = useRef16(null);
-  const wrapperRef = useRef16(null);
+  const buttonRef = useRef15(null);
+  const popoverRef = useRef15(null);
+  const listBoxRef = useRef15(null);
+  const wrapperRef = useRef15(null);
   const listData = useListData({
     initialItems: !onCreateNew ? options : [{
       title: "Options",
@@ -10359,7 +10243,7 @@ function Option(props) {
     scrollToIndex,
     disabledReason
   } = props;
-  const ref = useRef17(null);
+  const ref = useRef16(null);
   const {
     hoverProps,
     isHovered
@@ -10438,7 +10322,7 @@ function Option(props) {
 
 // src/inputs/internal/VirtualizedOptions.tsx
 import { getInteractionModality } from "@react-aria/interactions";
-import { useEffect as useEffect11, useRef as useRef20 } from "react";
+import { useEffect as useEffect11, useRef as useRef19 } from "react";
 import { Virtuoso } from "react-virtuoso";
 
 // src/inputs/internal/LoadingDots.tsx
@@ -10486,11 +10370,11 @@ function LoadingDots({
 }
 
 // src/inputs/TreeSelectField/TreeOption.tsx
-import { useRef as useRef19 } from "react";
+import { useRef as useRef18 } from "react";
 import { useHover as useHover10, useOption as useOption2 } from "react-aria";
 
 // src/inputs/CheckboxBase.tsx
-import { useRef as useRef18 } from "react";
+import { useRef as useRef17 } from "react";
 import { mergeProps as mergeProps13, useFocusRing as useFocusRing5, useHover as useHover9, VisuallyHidden as VisuallyHidden3 } from "react-aria";
 import { trussProps as trussProps33 } from "@homebound/truss/runtime";
 import { jsx as jsx48, jsxs as jsxs32 } from "react/jsx-runtime";
@@ -10509,7 +10393,7 @@ function CheckboxBase(props) {
     tooltip,
     fullWidth = false
   } = props;
-  const ref = useRef18(null);
+  const ref = useRef17(null);
   const {
     isFocusVisible,
     focusProps
@@ -10654,7 +10538,7 @@ function TreeOption(props) {
   const leveledOption = item.value;
   if (!leveledOption) return null;
   const [option, level] = leveledOption;
-  const ref = useRef19(null);
+  const ref = useRef18(null);
   const {
     hoverProps,
     isHovered
@@ -10663,7 +10547,8 @@ function TreeOption(props) {
   const {
     collapsedKeys,
     setCollapsedKeys,
-    getOptionValue
+    getOptionValue,
+    groupKeys
   } = useTreeSelectFieldProvider();
   const {
     optionProps,
@@ -10675,6 +10560,12 @@ function TreeOption(props) {
     shouldSelectOnPressUp: true,
     shouldFocusOnHover: false
   }, state, ref);
+  const isGroup = groupKeys.includes(item.key);
+  const canCollapse = allowCollapsing && !!option.children?.length;
+  function toggleCollapsed() {
+    if (!canCollapse) return;
+    setCollapsedKeys((prevKeys) => collapsedKeys.includes(item.key) ? prevKeys.filter((k) => k !== item.key) : [...prevKeys, item.key]);
+  }
   const isIndeterminate = !isSelected && option.children?.some((o) => hasSelectedChildren(o, state, getOptionValue));
   const listItemStyles = {
     item: {
@@ -10702,7 +10593,12 @@ function TreeOption(props) {
       }]
     }
   };
-  return /* @__PURE__ */ jsxs33("li", { ...hoverProps, ...trussProps34({
+  return /* @__PURE__ */ jsxs33("li", { ...hoverProps, onClick: (e) => {
+    if (!isGroup) return;
+    e.preventDefault();
+    e.stopPropagation();
+    toggleCollapsed();
+  }, ...trussProps34({
     ...{
       display: "df",
       alignItems: "aic",
@@ -10719,18 +10615,18 @@ function TreeOption(props) {
       lineHeight: "lh_20px"
     },
     ...listItemStyles.item,
-    ...isHovered && !isDisabled ? listItemStyles.hover : {},
-    ...isFocused ? listItemStyles.focus : {},
-    ...isDisabled ? listItemStyles.disabled : {}
+    ...isHovered && (!isDisabled || isGroup) ? listItemStyles.hover : {},
+    ...isFocused && !isGroup ? listItemStyles.focus : {},
+    ...isDisabled && !isGroup ? listItemStyles.disabled : {}
   }), children: [
-    allowCollapsing && /* @__PURE__ */ jsx49("span", { className: "w_18px fs0 df aic", children: option.children && option.children?.length > 0 && /* @__PURE__ */ jsx49("button", { onClick: (e) => {
+    allowCollapsing && /* @__PURE__ */ jsx49("span", { className: "w_18px fs0 df aic", children: canCollapse && /* @__PURE__ */ jsx49("button", { onClick: (e) => {
       e.preventDefault();
       e.stopPropagation();
-      setCollapsedKeys((prevKeys) => collapsedKeys.includes(item.key) ? prevKeys.filter((k) => k !== item.key) : [...prevKeys, item.key]);
+      toggleCollapsed();
       return false;
     }, className: "br4 h_16px w_16px bgTransparent h_bgGray300", ...tid[`collapseToggle_${item.key}`], children: /* @__PURE__ */ jsx49(Icon, { icon: collapsedKeys.includes(item.key) ? "triangleRight" : "triangleDown", inc: 2 }) }) }),
     /* @__PURE__ */ jsxs33("span", { className: "df aic gap1 h100 fg1 pt1 pb1 pr2", ref, ...optionProps, "data-label": item.textValue, children: [
-      /* @__PURE__ */ jsx49(StyledCheckbox, { isDisabled, isSelected, isIndeterminate, ...tid[item.key.toString()] }),
+      !isGroup && /* @__PURE__ */ jsx49(StyledCheckbox, { isDisabled, isSelected, isIndeterminate, ...tid[item.key.toString()] }),
       /* @__PURE__ */ jsx49("div", { className: "pl1", children: item.rendered })
     ] })
   ] });
@@ -10792,7 +10688,7 @@ function VirtualizedOptions(props) {
     isTree,
     allowCollapsing
   } = props;
-  const virtuosoRef = useRef20(null);
+  const virtuosoRef = useRef19(null);
   const focusedKey = state.selectionManager.focusedKey;
   const focusedItem = focusedKey != null ? state.collection.getItem(focusedKey) : null;
   const selectedItem = state.selectionManager.selectedKeys.size > 0 ? state.collection.getItem([...state.selectionManager.selectedKeys.values()][0]) : void 0;
@@ -10813,9 +10709,14 @@ function VirtualizedOptions(props) {
       totalListHeightChanged: onListHeightChange,
       totalCount: items.length,
       ...process.env.NODE_ENV === "test" ? {
-        // We don't really need to set this, but it's handy for tests, which would
-        // otherwise render just 1 row. A better way to do this would be to jest.mock
-        // out Virtuoso with an impl that just rendered everything, but doing this for now.
+        // In tests, we render all rows so assertions can see expands/async-loaded items. However,
+        // the `initialItemCount` (next prop) is only applied on amount, so we set `key={items.length}`
+        // to force a remount when our list changes -- and we only want/need this in tests, b/c otherwise
+        // in production a Virtuoso remount causes visible flashing.
+        key: items.length,
+        // We don't really need to set this, but it's handy for tests, which would otherwise render
+        // just 1 row. A better way to do this would be to jest.mock out Virtuoso with an impl that
+        // just rendered everything, but doing this for now.
         initialItemCount: items.length
       } : {
         // Ensure the selected item is visible when the list renders
@@ -10855,8 +10756,7 @@ function VirtualizedOptions(props) {
       components: !loading ? {} : {
         Footer: typeof loading === "function" ? loading : () => /* @__PURE__ */ jsx50(LoadingDots, { contrast })
       }
-    },
-    items.length
+    }
   );
 }
 
@@ -10946,9 +10846,9 @@ function ListBox(props) {
   const isMultiSelect = state.selectionManager.selectionMode === "multiple";
   const firstItem = state.collection.at(0);
   const hasSections = firstItem && firstItem.type === "section";
-  const selectedList = useRef21(null);
-  const firstRender = useRef21(true);
-  const virtuosoListHeight = useRef21(0);
+  const selectedList = useRef20(null);
+  const firstRender = useRef20(true);
+  const virtuosoListHeight = useRef20(0);
   const onListHeightChange = (listHeight) => {
     virtuosoListHeight.current = listHeight;
     const height = (selectedList.current?.offsetHeight || 0) + listHeight;
@@ -11029,6 +10929,7 @@ function TreeSelectField(props) {
     ...otherProps
   } = props;
   const [collapsedKeys, setCollapsedKeys] = useState17([]);
+  const groupKeys = useMemo15(() => props.groupOptions?.map((option) => valueToKey(option)) ?? [], [props.groupOptions]);
   useEffect13(() => {
     setCollapsedKeys(!Array.isArray(options) ? [] : defaultCollapsed ? options.map((o) => getOptionValue(o)) : options.flatMap(flattenOptions).filter((o) => o.defaultCollapsed).map((o) => getOptionValue(o)));
   }, [options, defaultCollapsed]);
@@ -11036,11 +10937,12 @@ function TreeSelectField(props) {
     () => ({
       collapsedKeys,
       setCollapsedKeys,
-      getOptionValue
+      getOptionValue,
+      groupKeys
     }),
     // TODO: validate this eslint-disable. It was automatically ignored as part of https://app.shortcut.com/homebound-team/story/40033/enable-react-hooks-exhaustive-deps-for-react-projects
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [collapsedKeys, setCollapsedKeys]
+    [collapsedKeys, setCollapsedKeys, groupKeys]
   );
   return /* @__PURE__ */ jsx54(CollapsedContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx54(TreeSelectFieldBase, { ...otherProps, options, getOptionLabel, getOptionValue, values, onSelect: ({
     all,
@@ -11061,7 +10963,8 @@ var CollapsedContext = React9.createContext({
   collapsedKeys: [],
   setCollapsedKeys: () => {
   },
-  getOptionValue: () => ({})
+  getOptionValue: () => ({}),
+  groupKeys: []
 });
 function TreeSelectFieldBase(props) {
   const {
@@ -11080,13 +10983,15 @@ function TreeSelectFieldBase(props) {
     contrast = false,
     nothingSelectedText = "",
     onSelect,
-    defaultCollapsed = false,
+    defaultCollapsed: _defaultCollapsed = false,
     placeholder,
     fullWidth = fieldProps?.fullWidth ?? false,
     chipDisplay = "root",
     disabledOptions,
+    groupOptions: _groupOptions,
     ...otherProps
   } = props;
+  void _defaultCollapsed;
   const isDisabled = !!disabled;
   const isReadOnly = !!readOnly;
   const initialOptions = Array.isArray(options) ? options : options.current;
@@ -11098,7 +11003,10 @@ function TreeSelectFieldBase(props) {
   const {
     collapsedKeys
   } = useTreeSelectFieldProvider();
+  const groupKeys = useMemo15(() => _groupOptions?.map((option) => valueToKey(option)) ?? [], [_groupOptions]);
+  const groupKeySet = useMemo15(() => new Set(groupKeys), [groupKeys]);
   const disabledOptionsWithReasons = Object.fromEntries(disabledOptions?.map(disabledOptionToKeyedTuple) ?? []);
+  const disabledKeys = [.../* @__PURE__ */ new Set([...Object.keys(disabledOptionsWithReasons), ...groupKeys])];
   const initTreeFieldState = useCallback8(() => {
     const selectedKeys = new Set(values?.flatMap((v) => {
       const foundOptions = findOptions(initialOptions, valueToKey(v), getOptionValue);
@@ -11107,14 +11015,16 @@ function TreeSelectFieldBase(props) {
       }) => selectOptionAndAllChildren(option));
     }));
     function selectOptionAndAllChildren(maybeParent) {
-      return [valueToKey(getOptionValue(maybeParent)), ...maybeParent.children?.flatMap(selectOptionAndAllChildren) ?? []];
+      const key = valueToKey(getOptionValue(maybeParent));
+      return [...groupKeySet.has(key) ? [] : [key], ...maybeParent.children?.flatMap(selectOptionAndAllChildren) ?? []];
     }
     function areAllChildrenSelected(maybeParent) {
-      const isSelected = selectedKeys.has(valueToKey(getOptionValue(maybeParent)));
+      const key = valueToKey(getOptionValue(maybeParent));
+      const isSelected = selectedKeys.has(key);
       if (isSelected || !maybeParent.children || maybeParent.children.length === 0) return isSelected;
       const areAllSelected = maybeParent.children.every(areAllChildrenSelected);
-      if (areAllSelected) {
-        selectedKeys.add(valueToKey(getOptionValue(maybeParent)));
+      if (areAllSelected && !groupKeySet.has(key)) {
+        selectedKeys.add(key);
       }
       return areAllSelected;
     }
@@ -11125,18 +11035,17 @@ function TreeSelectFieldBase(props) {
       return [maybeOption.option];
     });
     const selectedOptionsLabels = chipDisplay === "root" ? initialOptions.flatMap((o) => getTopLevelSelections(o, selectedKeys, getOptionValue)).map(getOptionLabel) : chipDisplay === "leaf" ? selectedOptions.filter((o) => !o.children || o.children.length === 0).map(getOptionLabel) : selectedOptions.map(getOptionLabel);
-    const filteredOptions = initialOptions.flatMap((o) => levelOptions(o, 0, false, collapsedKeys, getOptionValue));
     return {
       selectedKeys: [...selectedKeys],
+      searchValue: void 0,
       inputValue: selectedOptions.length === 1 ? getOptionLabel([...selectedOptions][0]) : isReadOnly && selectedOptions.length > 0 ? selectedOptionsLabels.join(", ") : selectedOptions.length === 0 ? nothingSelectedText : "",
-      filteredOptions,
       selectedOptions,
       allOptions: initialOptions,
       selectedOptionsLabels,
       optionsLoading: false,
       allowCollapsing: true
     };
-  }, [initialOptions, values, chipDisplay, getOptionLabel, isReadOnly, nothingSelectedText, getOptionValue, collapsedKeys]);
+  }, [initialOptions, values, chipDisplay, getOptionLabel, isReadOnly, nothingSelectedText, getOptionValue, groupKeySet]);
   const [fieldState, setFieldState] = useState17(() => initTreeFieldState());
   useEffect13(() => {
     if (Array.isArray(options)) {
@@ -11156,75 +11065,54 @@ function TreeSelectFieldBase(props) {
       setFieldState(initTreeFieldState());
     }
   }, [getOptionValue, initTreeFieldState, values]);
-  const reactToCollapse = useRef22(false);
-  useEffect13(
-    () => {
-      if (reactToCollapse.current) {
-        setFieldState(({
-          allOptions,
-          inputValue,
-          ...others
-        }) => ({
-          allOptions,
-          inputValue,
-          ...others,
-          filteredOptions: allOptions.flatMap((o) => levelOptions(o, 0, inputValue.length > 0, collapsedKeys, getOptionValue).filter(([option]) => contains(getOptionLabel(option), inputValue)))
-        }));
-      }
-      reactToCollapse.current = true;
-    },
-    // Only react to collapseKey changes. Other deps should be stable (`contains`, `getOptionLabel`, `getOptionValue`).
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [collapsedKeys]
-  );
+  const filteredOptions = useMemo15(() => getFilteredOptions(fieldState.allOptions, fieldState.searchValue, collapsedKeys, contains, getOptionLabel, getOptionValue), [fieldState.allOptions, fieldState.searchValue, collapsedKeys, contains, getOptionLabel, getOptionValue]);
   const onInputChange = useCallback8((inputValue) => {
     setFieldState((prevState) => {
       return {
         ...prevState,
         inputValue,
-        allowCollapsing: inputValue.length === 0,
-        filteredOptions: prevState.allOptions.flatMap((o) => levelOptions(o, 0, inputValue.length > 0, collapsedKeys, getOptionValue).filter(([option]) => contains(getOptionLabel(option), inputValue)))
+        searchValue: inputValue.length === 0 ? void 0 : inputValue,
+        allowCollapsing: inputValue.length === 0
       };
     });
-  }, [collapsedKeys, contains, getOptionLabel, getOptionValue]);
-  const maybeInitLoad = useCallback8(async (options2, fieldState2, setFieldState2) => {
+  }, []);
+  const maybeInitLoad = useCallback8(async (options2, setFieldState2) => {
     if (!Array.isArray(options2)) {
       setFieldState2((prevState) => ({
         ...prevState,
         optionsLoading: true
       }));
       const loadedOptions = (await options2.load()).options;
-      const filteredOptions = loadedOptions.flatMap((o) => levelOptions(o, 0, fieldState2.inputValue.length > 0, collapsedKeys, getOptionValue).filter(([option]) => contains(getOptionLabel(option), fieldState2.inputValue)));
       setFieldState2((prevState) => ({
         ...prevState,
-        filteredOptions,
         allOptions: loadedOptions,
         optionsLoading: false
       }));
     }
-  }, [collapsedKeys, contains, getOptionLabel, getOptionValue]);
-  const firstOpen = useRef22(true);
+  }, []);
+  const firstOpen = useRef21(true);
   function onOpenChange(isOpen) {
     if (firstOpen.current && isOpen) {
-      maybeInitLoad(options, fieldState, setFieldState);
+      maybeInitLoad(options, setFieldState);
       firstOpen.current = false;
     }
     if (isOpen) {
       setFieldState((prevState) => ({
         ...prevState,
         inputValue: "",
-        filteredOptions: prevState.allOptions.flatMap((o) => levelOptions(o, 0, false, collapsedKeys, getOptionValue))
+        searchValue: void 0,
+        allowCollapsing: true
       }));
     }
   }
   const comboBoxChildren = useCallback8(([item]) => /* @__PURE__ */ jsx54(Item3, { textValue: getOptionLabel(item), children: getOptionMenuLabel(item) }, valueToKey(getOptionValue(item))), [getOptionValue, getOptionLabel, getOptionMenuLabel]);
   const comboBoxProps = {
     ...otherProps,
-    disabledKeys: Object.keys(disabledOptionsWithReasons),
+    disabledKeys,
     placeholder: !values || values.length === 0 ? placeholder : "",
     label: props.label,
     inputValue: fieldState.inputValue,
-    items: fieldState.filteredOptions,
+    items: filteredOptions,
     isDisabled,
     isReadOnly,
     onInputChange,
@@ -11249,6 +11137,8 @@ function TreeSelectFieldBase(props) {
           setFieldState((prevState) => ({
             ...prevState,
             inputValue: nothingSelectedText,
+            searchValue: void 0,
+            allowCollapsing: true,
             selectedKeys: [],
             selectedOptions: []
           }));
@@ -11279,15 +11169,16 @@ function TreeSelectFieldBase(props) {
               const childrenKeys = option.children.flatMap(flattenOptions).map((o) => valueToKey(getOptionValue(o))).filter((childKey) => {
                 return !state.disabledKeys.has(childKey);
               });
-              [key, ...childrenKeys].forEach(addedKeys.add, addedKeys);
+              [...groupKeySet.has(key) ? [] : [key], ...childrenKeys].forEach(addedKeys.add, addedKeys);
             }
-            for (const parent of parents.reverse()) {
-              const allChecked = parent.children?.every((child) => {
-                const childKey = valueToKey(getOptionValue(child));
-                return addedKeys.has(childKey) || existingKeys.has(childKey) || state.disabledKeys.has(childKey);
-              });
-              if (allChecked) {
-                addedKeys.add(valueToKey(getOptionValue(parent)));
+            const selectionKeys = /* @__PURE__ */ new Set([...existingKeys, ...addedKeys]);
+            for (const parent of [...parents].reverse()) {
+              const parentKey = valueToKey(getOptionValue(parent));
+              if (isOptionFullySelected(parent, selectionKeys, state.disabledKeys, groupKeySet, getOptionValue)) {
+                if (!groupKeySet.has(parentKey)) {
+                  addedKeys.add(parentKey);
+                  selectionKeys.add(parentKey);
+                }
               }
             }
           }
@@ -11320,7 +11211,7 @@ function TreeSelectFieldBase(props) {
           ...prevState,
           // Since we reset the list of options upon selection changes, then set the `inputValue` to empty string to reflect that.
           inputValue: "",
-          filteredOptions: initialOptions.flatMap((o) => levelOptions(o, 0, false, collapsedKeys, getOptionValue)),
+          searchValue: void 0,
           selectedKeys: [...selectedKeys],
           selectedOptions,
           selectedOptionsLabels: chipDisplay === "root" ? rootOptions.map(getOptionLabel) : chipDisplay === "leaf" ? leafOptions.map(getOptionLabel) : selectedOptions.map(getOptionLabel)
@@ -11351,17 +11242,17 @@ function TreeSelectFieldBase(props) {
       setFieldState((prevState) => ({
         ...prevState,
         inputValue: selectedOptions.length === 1 ? getOptionLabel(selectedOptions[0]) : selectedOptions.length === 0 ? nothingSelectedText : "",
-        filteredOptions: initialOptions.flatMap((o) => levelOptions(o, 0, false, collapsedKeys, getOptionValue)),
+        searchValue: void 0,
         allowCollapsing: true
       }));
     }
   }
-  const comboBoxRef = useRef22(null);
-  const triggerRef = useRef22(null);
-  const inputRef = useRef22(null);
-  const inputWrapRef = useRef22(null);
-  const listBoxRef = useRef22(null);
-  const popoverRef = useRef22(null);
+  const comboBoxRef = useRef21(null);
+  const triggerRef = useRef21(null);
+  const inputRef = useRef21(null);
+  const inputWrapRef = useRef21(null);
+  const listBoxRef = useRef21(null);
+  const popoverRef = useRef21(null);
   const {
     buttonProps: triggerProps,
     inputProps,
@@ -11440,6 +11331,18 @@ function getTopLevelSelections(o, selectedKeys, getOptionValue) {
   if (o.children) return [...o.children.flatMap((c) => getTopLevelSelections(c, selectedKeys, getOptionValue))];
   return [];
 }
+function getFilteredOptions(allOptions, searchValue, collapsedKeys, contains, getOptionLabel, getOptionValue) {
+  return allOptions.flatMap((option) => levelOptions(option, 0, !!searchValue, collapsedKeys, getOptionValue).filter(([nestedOption]) => searchValue ? contains(getOptionLabel(nestedOption), searchValue) : true));
+}
+function isOptionFullySelected(option, selectedKeys, disabledKeys, groupKeys, getOptionValue) {
+  const key = valueToKey(getOptionValue(option));
+  if (groupKeys.has(key)) {
+    return option.children?.length ? option.children.every((child) => isOptionFullySelected(child, selectedKeys, disabledKeys, groupKeys, getOptionValue)) : false;
+  }
+  if (selectedKeys.has(key) || disabledKeys.has(key)) return true;
+  if (!option.children || option.children.length === 0) return false;
+  return option.children.every((child) => isOptionFullySelected(child, selectedKeys, disabledKeys, groupKeys, getOptionValue));
+}
 
 // src/inputs/internal/ComboBoxInput.tsx
 import { jsx as jsx55 } from "react/jsx-runtime";
@@ -11700,7 +11603,7 @@ function ComboBoxBase(props) {
       }));
     }
   }
-  const firstOpen = useRef23(true);
+  const firstOpen = useRef22(true);
   function onOpenChange(isOpen) {
     if (firstOpen.current && isOpen) {
       maybeInitLoad();
@@ -11713,12 +11616,12 @@ function ComboBoxBase(props) {
       }));
     }
   }
-  const comboBoxRef = useRef23(null);
-  const triggerRef = useRef23(null);
-  const inputRef = useRef23(null);
-  const inputWrapRef = useRef23(null);
-  const listBoxRef = useRef23(null);
-  const popoverRef = useRef23(null);
+  const comboBoxRef = useRef22(null);
+  const triggerRef = useRef22(null);
+  const inputRef = useRef22(null);
+  const inputWrapRef = useRef22(null);
+  const listBoxRef = useRef22(null);
+  const popoverRef = useRef22(null);
   const disabledOptionsWithReasons = Object.fromEntries(disabledOptions?.map(disabledOptionToKeyedTuple) ?? []);
   const comboBoxChildren = useCallback9((item) => /* @__PURE__ */ jsx56(Item4, { textValue: getOptionLabel(item), children: getOptionMenuLabel(item) }, valueToKey(getOptionValue(item))), [getOptionValue, getOptionLabel, getOptionMenuLabel]);
   const selectedKeys = useMemo16(() => {
@@ -11952,10 +11855,10 @@ function Autocomplete(props) {
     ...others
   };
   const state = useComboBoxState3(comboBoxProps);
-  const inputWrapRef = useRef24(null);
-  const inputRef = useRef24(null);
-  const listBoxRef = useRef24(null);
-  const popoverRef = useRef24(null);
+  const inputWrapRef = useRef23(null);
+  const inputRef = useRef23(null);
+  const listBoxRef = useRef23(null);
+  const popoverRef = useRef23(null);
   const { inputProps, listBoxProps, labelProps } = useComboBox3(
     {
       ...comboBoxProps,
@@ -12022,7 +11925,7 @@ function Autocomplete(props) {
 }
 
 // src/inputs/Checkbox.tsx
-import { useRef as useRef25 } from "react";
+import { useRef as useRef24 } from "react";
 import { useCheckbox } from "react-aria";
 import { useToggleState } from "react-stately";
 import { jsx as jsx58 } from "react/jsx-runtime";
@@ -12032,7 +11935,7 @@ function Checkbox(props) {
   const isIndeterminate = selected === "indeterminate";
   const ariaProps = { isSelected, isDisabled: !!disabled, isIndeterminate, ...otherProps };
   const checkboxProps = { ...ariaProps, "aria-label": label };
-  const ref = useRef25(null);
+  const ref = useRef24(null);
   const toggleState = useToggleState(ariaProps);
   const { inputProps } = useCheckbox(checkboxProps, toggleState, ref);
   return /* @__PURE__ */ jsx58(
@@ -12051,7 +11954,7 @@ function Checkbox(props) {
 }
 
 // src/inputs/CheckboxGroup.tsx
-import { useRef as useRef26 } from "react";
+import { useRef as useRef25 } from "react";
 import { useCheckboxGroup, useCheckboxGroupItem } from "react-aria";
 import { useCheckboxGroupState } from "react-stately";
 import { trussProps as trussProps40 } from "@homebound/truss/runtime";
@@ -12126,7 +12029,7 @@ function CheckboxGroupItem(props) {
     ...ariaProps,
     "aria-label": label
   };
-  const ref = useRef26(null);
+  const ref = useRef25(null);
   const {
     inputProps
   } = useCheckboxGroupItem(checkboxProps, groupState, ref);
@@ -12140,7 +12043,7 @@ import { jsx as jsx60 } from "react/jsx-runtime";
 function DateFieldMock(props) {
   const { onChange = () => {
   }, errorMsg, onBlur, onFocus } = props;
-  const [value, setValue] = useState20(props.value ? format3(plainDateToJsDate(props.value), "MM/dd/yy") : "");
+  const [value, setValue] = useState20(props.value ? format3(props.value, "MM/dd/yy") : "");
   const tid = useTestIds(props, "date");
   return /* @__PURE__ */ jsx60(
     "input",
@@ -12151,8 +12054,7 @@ function DateFieldMock(props) {
       onChange: (e) => {
         const { value: value2 } = e.target;
         setValue(value2);
-        const parsed = parse(value2, "MM/dd/yy", plainDateToJsDate(todayPlainDate()));
-        onChange(Number.isNaN(parsed.getTime()) ? void 0 : jsDateToPlainDate(parsed));
+        onChange(parse(value2, "MM/dd/yy", /* @__PURE__ */ new Date()));
       },
       onBlur: () => maybeCall(onBlur),
       onFocus: () => maybeCall(onFocus),
@@ -12164,13 +12066,13 @@ function DateFieldMock(props) {
 }
 
 // src/inputs/DateFields/DateFieldBase.tsx
-import { useCallback as useCallback11, useEffect as useEffect15, useRef as useRef27, useState as useState21 } from "react";
+import { useCallback as useCallback11, useEffect as useEffect15, useRef as useRef26, useState as useState21 } from "react";
 import { FocusScope as FocusScope3, useButton as useButton8, useOverlayPosition as useOverlayPosition6, useOverlayTrigger, useTextField as useTextField2 } from "react-aria";
+import { isDateRange } from "react-day-picker";
 import { useOverlayTriggerState } from "react-stately";
 
 // src/inputs/DateFields/utils.ts
 import { format as dateFnsFormat, parse as dateFnsParse, isDate } from "date-fns";
-import { Temporal as Temporal2 } from "temporal-polyfill";
 var dateFormats = {
   short: "MM/dd/yy",
   medium: "EEE, MMM d",
@@ -12181,13 +12083,13 @@ function getDateFormat(format4) {
 }
 function formatDate(date, format4) {
   if (!date) return "";
-  return dateFnsFormat(plainDateToJsDate(date), format4);
+  return dateFnsFormat(date, format4);
 }
 function formatDateRange(date, format4) {
   if (!date) return "";
   const { from, to } = date;
-  const fromFormatted = from ? dateFnsFormat(plainDateToJsDate(from), format4) : "";
-  const toFormatted = to ? dateFnsFormat(plainDateToJsDate(to), format4) : "";
+  const fromFormatted = from ? dateFnsFormat(from, format4) : "";
+  const toFormatted = to ? dateFnsFormat(to, format4) : "";
   return !fromFormatted && !toFormatted ? void 0 : `${fromFormatted} - ${toFormatted}`;
 }
 function parseDate(str, format4) {
@@ -12197,7 +12099,7 @@ function parseDateRange(str, format4) {
   const [from = "", to = ""] = str.split("-");
   const fromDate = parseDateString(from.trim(), format4);
   const toDate = parseDateString(to.trim(), format4);
-  if (toDate && fromDate && Temporal2.PlainDate.compare(toDate, fromDate) < 0) {
+  if (toDate && fromDate && toDate < fromDate) {
     return { from: toDate, to: fromDate };
   }
   if (toDate === void 0 && fromDate === void 0) {
@@ -12219,16 +12121,13 @@ function parseDateString(str, format4) {
   if (isNaN(year) || String(year).length > 4 || isNaN(month) || isNaN(day) || day <= 0 || day > 31 || month < 0 || month >= 12) {
     return void 0;
   }
-  const parsed = dateFnsParse(str, format4, plainDateToJsDate(todayPlainDate()));
-  if (!isValidJsDate(parsed)) {
+  const parsed = dateFnsParse(str, format4, /* @__PURE__ */ new Date());
+  if (!isValidDate(parsed)) {
     return void 0;
   }
-  return jsDateToPlainDate(parsed);
+  return parsed;
 }
 function isValidDate(d) {
-  return d !== void 0 && isPlainDate(d);
-}
-function isValidJsDate(d) {
   return d !== void 0 && isDate(d) && d.toString() !== "Invalid Date";
 }
 
@@ -12260,11 +12159,11 @@ function DateFieldBase(props) {
     ...others
   } = props;
   const isRangeMode = mode === "range";
-  const inputRef = useRef27(null);
-  const inputWrapRef = useRef27(null);
-  const buttonRef = useRef27(null);
-  const overlayRef = useRef27(null);
-  const isFocused = useRef27(false);
+  const inputRef = useRef26(null);
+  const inputWrapRef = useRef26(null);
+  const buttonRef = useRef26(null);
+  const overlayRef = useRef26(null);
+  const isFocused = useRef26(false);
   const dateFormat = getDateFormat(format4);
   const [wipValue, setWipValue] = useState21(value);
   const [inputValue, setInputValue] = useState21((isRangeMode ? formatDateRange(props.value, dateFormat) : formatDate(props.value, dateFormat)) ?? "");
@@ -12354,11 +12253,11 @@ function DateFieldBase(props) {
     (d) => {
       setWipValue(d);
       if (d && isParsedDateValid(d)) {
-        if (isRangeMode && isDateRangeValue(d)) {
+        if (isRangeMode && isDateRange(d)) {
           props.onChange(d);
           return;
         }
-        if (!isRangeMode && !isDateRangeValue(d)) {
+        if (!isRangeMode && !isDateRange(d)) {
           props.onChange(d);
           return;
         }
@@ -12433,10 +12332,7 @@ function DateFieldBase(props) {
   ] });
 }
 function isParsedDateValid(d) {
-  return d !== void 0 && (!isDateRangeValue(d) || isValidDate(d.from) && isValidDate(d.to));
-}
-function isDateRangeValue(value) {
-  return typeof value === "object" && value !== null && ("from" in value || "to" in value);
+  return d !== void 0 && (!isDateRange(d) || isDateRange(d) && isValidDate(d.from) && isValidDate(d.to));
 }
 
 // src/utils/withTestMock.tsx
@@ -12623,7 +12519,7 @@ function MultiSelectField(props) {
 
 // src/inputs/NumberField.tsx
 import { NumberParser } from "@internationalized/number";
-import { useMemo as useMemo18, useRef as useRef28, useState as useState23 } from "react";
+import { useMemo as useMemo18, useRef as useRef27, useState as useState23 } from "react";
 import { mergeProps as mergeProps15, useLocale, useNumberField } from "react-aria";
 import { useNumberFieldState } from "react-stately";
 import { jsx as jsx68 } from "react/jsx-runtime";
@@ -12710,11 +12606,11 @@ function NumberField(props) {
     };
   }, [type, numberFormatOptions, defaultFormatOptions, numFractionDigits]);
   const numberParser = useMemo18(() => new NumberParser(locale, formatOptions), [locale, formatOptions]);
-  const valueRef = useRef28({
+  const valueRef = useRef27({
     wip: false
   });
-  const lastSentRef = useRef28(void 0);
-  const focusValueRef = useRef28(void 0);
+  const lastSentRef = useRef27(void 0);
+  const focusValueRef = useRef27(void 0);
   const [, forceRender] = useState23(0);
   const propValue = value === void 0 ? Number.NaN : value / factor;
   if (valueRef.current.wip && !Object.is(valueRef.current.value, propValue)) {
@@ -12762,7 +12658,7 @@ function NumberField(props) {
     ...otherProps
   };
   const state = useNumberFieldState(useProps);
-  const inputRef = useRef28(null);
+  const inputRef = useRef27(null);
   const {
     labelProps,
     inputProps,
@@ -12814,7 +12710,7 @@ function formatValue(value, factor, numFractionDigits, numIntegerDigits, positiv
 }
 
 // src/inputs/RadioGroupField.tsx
-import { Fragment as Fragment19, useMemo as useMemo19, useRef as useRef29 } from "react";
+import { Fragment as Fragment19, useMemo as useMemo19, useRef as useRef28 } from "react";
 import { useFocusRing as useFocusRing6, useHover as useHover12, useRadio, useRadioGroup } from "react-aria";
 import { useRadioGroupState } from "react-stately";
 import { trussProps as trussProps44 } from "@homebound/truss/runtime";
@@ -12890,7 +12786,7 @@ function Radio(props) {
   } = props;
   const labelId = `${parentId}-${value}-label`;
   const descriptionId = `${parentId}-${value}-description`;
-  const ref = useRef29(null);
+  const ref = useRef28(null);
   const {
     inputProps,
     isDisabled
@@ -13060,7 +12956,7 @@ var radioDisabled = {
 
 // src/inputs/RichTextField.tsx
 import DOMPurify from "dompurify";
-import { createElement, useEffect as useEffect16, useMemo as useMemo20, useRef as useRef30, useState as useState25 } from "react";
+import { createElement, useEffect as useEffect16, useMemo as useMemo20, useRef as useRef29, useState as useState25 } from "react";
 
 // src/inputs/RichTextField.mock.tsx
 import { camelCase as camelCase3 } from "change-case";
@@ -13116,13 +13012,13 @@ function RichTextFieldImpl(props) {
     fullWidth = fieldProps?.fullWidth ?? false
   } = props;
   const [editor, setEditor] = useState25();
-  const editorElement = useRef30();
-  const currentHtml = useRef30(void 0);
-  const onChangeRef = useRef30(onChange);
+  const editorElement = useRef29();
+  const currentHtml = useRef29(void 0);
+  const onChangeRef = useRef29(onChange);
   onChangeRef.current = onChange;
-  const onBlurRef = useRef30(onBlur);
+  const onBlurRef = useRef29(onBlur);
   onBlurRef.current = onBlur;
-  const onFocusRef = useRef30(onFocus);
+  const onFocusRef = useRef29(onFocus);
   onFocusRef.current = onFocus;
   const id = useMemo20(() => {
     if (readOnly) return;
@@ -13273,7 +13169,7 @@ function SelectField(props) {
 }
 
 // src/inputs/Switch.tsx
-import { useRef as useRef31 } from "react";
+import { useRef as useRef30 } from "react";
 import { useFocusRing as useFocusRing7, useHover as useHover13, useSwitch, VisuallyHidden as VisuallyHidden5 } from "react-aria";
 import { trussProps as trussProps46 } from "@homebound/truss/runtime";
 import { jsx as jsx73, jsxs as jsxs45 } from "react/jsx-runtime";
@@ -13306,7 +13202,7 @@ function Switch(props) {
     ...otherProps
   };
   const state = toToggleState(isSelected, onChange);
-  const ref = useRef31(null);
+  const ref = useRef30(null);
   const {
     inputProps
   } = useSwitch({
@@ -13458,7 +13354,7 @@ function switchCircleSelectedStyles(isCompact) {
 }
 
 // src/inputs/TextAreaField.tsx
-import { useRef as useRef32 } from "react";
+import { useRef as useRef31 } from "react";
 import { mergeProps as mergeProps16, useTextField as useTextField3 } from "react-aria";
 import { jsx as jsx74 } from "react/jsx-runtime";
 function TextAreaField(props) {
@@ -13476,8 +13372,8 @@ function TextAreaField(props) {
   const isDisabled = !!disabled;
   const isReadOnly = !!readOnly;
   const textFieldProps = { ...otherProps, value, isDisabled, isReadOnly };
-  const inputRef = useRef32(null);
-  const inputWrapRef = useRef32(null);
+  const inputRef = useRef31(null);
+  const inputWrapRef = useRef31(null);
   useGrowingTextField({ inputRef, inputWrapRef, value, maxLines });
   const { labelProps, inputProps } = useTextField3(
     {
@@ -13515,7 +13411,7 @@ function TextAreaField(props) {
 }
 
 // src/inputs/TextField.tsx
-import { useRef as useRef33 } from "react";
+import { useRef as useRef32 } from "react";
 import { mergeProps as mergeProps17, useTextField as useTextField4 } from "react-aria";
 import { jsx as jsx75 } from "react/jsx-runtime";
 function TextField(props) {
@@ -13543,7 +13439,7 @@ function TextField(props) {
     validationState: errorMsg ? "invalid" : "valid",
     value
   };
-  const inputRef = useRef33(null);
+  const inputRef = useRef32(null);
   const { labelProps, inputProps } = useTextField4(
     {
       ...textFieldProps,
@@ -13579,7 +13475,7 @@ function TextField(props) {
 }
 
 // src/inputs/ToggleButton.tsx
-import { useRef as useRef34, useState as useState26 } from "react";
+import { useRef as useRef33, useState as useState26 } from "react";
 import { useFocusRing as useFocusRing8, useHover as useHover14, usePress, useSwitch as useSwitch2, VisuallyHidden as VisuallyHidden6 } from "react-aria";
 import { useToggleState as useToggleState3 } from "react-stately";
 import { trussProps as trussProps47 } from "@homebound/truss/runtime";
@@ -13613,8 +13509,8 @@ function ToggleButton(props) {
       return result;
     }
   });
-  const labelRef = useRef34(null);
-  const ref = useRef34(null);
+  const labelRef = useRef33(null);
+  const ref = useRef33(null);
   const tid = useTestIds(otherProps, label);
   const {
     isPressed: isPressedFromEvents,
@@ -13700,7 +13596,7 @@ var togglePressStyles = {
 };
 
 // src/inputs/ToggleChipGroup.tsx
-import { useRef as useRef35 } from "react";
+import { useRef as useRef34 } from "react";
 import { useCheckboxGroup as useCheckboxGroup2, useCheckboxGroupItem as useCheckboxGroupItem2, useFocusRing as useFocusRing9, VisuallyHidden as VisuallyHidden7 } from "react-aria";
 import { useCheckboxGroupState as useCheckboxGroupState2 } from "react-stately";
 import { trussProps as trussProps48 } from "@homebound/truss/runtime";
@@ -13773,7 +13669,7 @@ function ToggleChip2(props) {
   } = props;
   const isDisabled = !!disabled;
   const isReadOnly = !!readonly;
-  const ref = useRef35(null);
+  const ref = useRef34(null);
   const {
     inputProps
   } = useCheckboxGroupItem2({
@@ -14823,9 +14719,9 @@ function maybeApply(maybeFn) {
 }
 
 // src/components/Table/hooks/useColumnResizeHandlers.ts
-import { useCallback as useCallback12, useRef as useRef36 } from "react";
+import { useCallback as useCallback12, useRef as useRef35 } from "react";
 function useColumnResizeHandlers(columns, columnSizes, tableWidth, setResizedWidth, setResizedWidths) {
-  const hasLockedColumnsRef = useRef36(false);
+  const hasLockedColumnsRef = useRef35(false);
   const distributeAdjustment = useCallback12(
     (rightColumns, totalRightWidth, adjustment) => {
       const updates = {};
@@ -14954,7 +14850,7 @@ function useScrollStorage(tableId, enabled = true) {
 
 // src/components/Table/hooks/useSetupColumnSizes.ts
 import { useResizeObserver } from "@react-aria/utils";
-import { useCallback as useCallback14, useEffect as useEffect18, useRef as useRef37, useState as useState28 } from "react";
+import { useCallback as useCallback14, useEffect as useEffect18, useRef as useRef36, useState as useState28 } from "react";
 
 // src/components/Table/hooks/useColumnResizing.ts
 import { useCallback as useCallback13, useEffect as useEffect17, useState as useState27 } from "react";
@@ -15013,9 +14909,9 @@ function useSetupColumnSizes(style, columns, resizeRef, expandedColumnIds, visib
   const { resizedWidths, setResizedWidth, setResizedWidths, resetColumnWidths } = useColumnResizing(
     disableColumnResizing ? void 0 : visibleColumnsStorageKey
   );
-  const calculateImmediately = useRef37(true);
+  const calculateImmediately = useRef36(true);
   const [tableWidth, setTableWidth] = useState28();
-  const prevTableWidthRef = useRef37(tableWidth);
+  const prevTableWidthRef = useRef36(tableWidth);
   const [columnSizes, setColumnSizes] = useState28(
     calcColumnSizes(columns, tableWidth, style.minWidthPx, expandedColumnIds, resizedWidths)
   );
@@ -15082,9 +14978,9 @@ function useSetupColumnSizes(style, columns, resizeRef, expandedColumnIds, visib
 }
 
 // src/hooks/useRenderCount.ts
-import { useCallback as useCallback15, useRef as useRef38 } from "react";
+import { useCallback as useCallback15, useRef as useRef37 } from "react";
 function useRenderCount() {
-  const ref = useRef38(/* @__PURE__ */ new Map());
+  const ref = useRef37(/* @__PURE__ */ new Map());
   const getCount = useCallback15((id) => {
     const count = ref.current.get(id) || 1;
     ref.current.set(id, count + 1);
@@ -15141,10 +15037,10 @@ function GridTable(props) {
     disableColumnResizing = false
   } = props;
   const columnsWithIds = useMemo24(() => assignDefaultColumnIds(_columns), [_columns]);
-  const virtuosoRef = useRef39(null);
-  const virtuosoRangeRef = useRef39(null);
-  const resizeRef = useRef39(null);
-  const tableContainerRef = useRef39(null);
+  const virtuosoRef = useRef38(null);
+  const virtuosoRangeRef = useRef38(null);
+  const resizeRef = useRef38(null);
+  const tableContainerRef = useRef38(null);
   const api = useMemo24(
     () => {
       const api2 = props.api ?? new GridTableApiImpl();
@@ -15159,7 +15055,7 @@ function GridTable(props) {
     [props.api]
   );
   const [draggedRow, _setDraggedRow] = useState29(void 0);
-  const draggedRowRef = useRef39(draggedRow);
+  const draggedRowRef = useRef38(draggedRow);
   const setDraggedRow = (row) => {
     draggedRowRef.current = row;
     _setDraggedRow(row);
@@ -16005,17 +15901,17 @@ var variantStyles2 = {
 };
 
 // src/components/BeamContext.tsx
-import { createContext as createContext7, useContext as useContext17, useMemo as useMemo40, useReducer, useRef as useRef46 } from "react";
+import { createContext as createContext7, useContext as useContext17, useMemo as useMemo40, useReducer, useRef as useRef45 } from "react";
 import { OverlayProvider } from "react-aria";
 
 // src/components/Modal/Modal.tsx
 import { useResizeObserver as useResizeObserver3 } from "@react-aria/utils";
-import { useCallback as useCallback17, useEffect as useEffect23, useRef as useRef41, useState as useState32 } from "react";
+import { useCallback as useCallback17, useEffect as useEffect23, useRef as useRef40, useState as useState32 } from "react";
 import { FocusScope as FocusScope4, OverlayContainer as OverlayContainer2, useDialog, useModal as useModal2, useOverlay as useOverlay2, usePreventScroll } from "react-aria";
 import { createPortal as createPortal3 } from "react-dom";
 
 // src/components/Modal/useModal.tsx
-import { useEffect as useEffect22, useMemo as useMemo27, useRef as useRef40 } from "react";
+import { useEffect as useEffect22, useMemo as useMemo27, useRef as useRef39 } from "react";
 
 // src/components/Modal/ModalContext.tsx
 import { createContext as createContext4, useContext as useContext13, useMemo as useMemo26 } from "react";
@@ -16033,8 +15929,8 @@ function useModalContext() {
 function useModal() {
   const { modalState, modalCanCloseChecks } = useBeamContext();
   const { inModal } = useModalContext();
-  const lastCanClose = useRef40();
-  const api = useRef40();
+  const lastCanClose = useRef39();
+  const api = useRef39();
   useEffect22(() => {
     return () => {
       modalCanCloseChecks.current = modalCanCloseChecks.current.filter((c) => c !== lastCanClose.current);
@@ -16087,7 +15983,7 @@ function Modal(props) {
     allowClosing = true
   } = props;
   const isFixedHeight = typeof size !== "string";
-  const ref = useRef41(null);
+  const ref = useRef40(null);
   const {
     modalBodyDiv,
     modalFooterDiv,
@@ -16118,9 +16014,9 @@ function Modal(props) {
     role: "dialog"
   }, ref);
   const [[width2, height], setSize] = useState32(getSize(size));
-  const modalBodyRef = useRef41(null);
-  const modalFooterRef = useRef41(null);
-  const modalHeaderRef = useRef41(null);
+  const modalBodyRef = useRef40(null);
+  const modalFooterRef = useRef40(null);
+  const modalHeaderRef = useRef40(null);
   const testId = useTestIds({}, testIdPrefix);
   usePreventScroll();
   const {
@@ -16416,7 +16312,7 @@ function useSnackbarContext() {
 
 // src/components/SuperDrawer/SuperDrawer.tsx
 import { AnimatePresence, motion } from "framer-motion";
-import { useEffect as useEffect24, useRef as useRef42 } from "react";
+import { useEffect as useEffect24, useRef as useRef41 } from "react";
 import { createPortal as createPortal4 } from "react-dom";
 
 // src/components/SuperDrawer/utils.ts
@@ -16438,7 +16334,7 @@ function SuperDrawer() {
   const {
     closeDrawer
   } = useSuperDrawer();
-  const headerRef = useRef42(null);
+  const headerRef = useRef41(null);
   const testId = useTestIds({}, "superDrawer");
   const currentContent = contentStack.current[contentStack.current.length - 1]?.opts;
   const {
@@ -16533,7 +16429,7 @@ function SuperDrawer() {
 }
 
 // src/components/Layout/FormPageLayout.tsx
-import React16, { createRef, useCallback as useCallback21, useEffect as useEffect25, useMemo as useMemo33, useRef as useRef43, useState as useState39 } from "react";
+import React16, { createRef, useCallback as useCallback21, useEffect as useEffect25, useMemo as useMemo33, useRef as useRef42, useState as useState39 } from "react";
 import { useButton as useButton9, useFocusRing as useFocusRing11 } from "react-aria";
 
 // src/forms/BoundCheckboxField.tsx
@@ -18201,7 +18097,7 @@ function SectionNavLink(props) {
     });
   }, [sectionRef]);
   const tids = useTestIds(props);
-  const buttonRef = useRef43(null);
+  const buttonRef = useRef42(null);
   const {
     buttonProps,
     isPressed
@@ -18351,7 +18247,7 @@ function invertSpacing(value) {
 import React17, { useEffect as useEffect27, useMemo as useMemo38, useState as useState42 } from "react";
 
 // src/components/ButtonMenu.tsx
-import { useRef as useRef44 } from "react";
+import { useRef as useRef43 } from "react";
 import { useMenuTrigger as useMenuTrigger2 } from "react-aria";
 import { useMenuTriggerState as useMenuTriggerState2 } from "react-stately";
 import { jsx as jsx125 } from "react/jsx-runtime";
@@ -18363,7 +18259,7 @@ function ButtonMenu(props) {
     onChange = props.onChange;
   }
   const state = useMenuTriggerState2({ isOpen: defaultOpen });
-  const buttonRef = useRef44(null);
+  const buttonRef = useRef43(null);
   const { menuTriggerProps, menuProps } = useMenuTrigger2({ isDisabled: !!disabled }, state, buttonRef);
   const tid = useTestIds(
     props,
@@ -18470,14 +18366,6 @@ function dateFilter(props) {
 }
 var anyOption = {};
 var DateFilter = class extends BaseFilter {
-  hydrate(value) {
-    if (!isDateFilterValue(value)) return void 0;
-    const hydratedValue = parsePersistedPlainDate(value.value);
-    return hydratedValue ? { op: value.op, value: hydratedValue } : void 0;
-  }
-  dehydrate(value) {
-    return value ? { op: value.op, value: dehydratePlainDate(value.value) } : void 0;
-  }
   render(value, setValue, tid, inModal, vertical) {
     const { label, operations, getOperationValue, getOperationLabel } = this.props;
     return /* @__PURE__ */ jsxs65(Fragment28, { children: [
@@ -18497,7 +18385,7 @@ var DateFilter = class extends BaseFilter {
             value: value?.op,
             onSelect: (op) => (
               // default the selected date to today if it doesn't exist in the filter's value
-              setValue(op ? { op, value: value?.value ?? todayPlainDate() } : void 0)
+              setValue(op ? { op, value: value?.value ? new Date(value.value) : /* @__PURE__ */ new Date() } : void 0)
             ),
             label: inModal ? `${label} date filter operation` : label,
             labelStyle: !inModal && !vertical ? "inline" : inModal || vertical ? "hidden" : "above",
@@ -18509,13 +18397,9 @@ var DateFilter = class extends BaseFilter {
           DateField,
           {
             labelStyle: "inline",
-            value: value?.value ?? todayPlainDate(),
+            value: value?.value ? new Date(value.value) : /* @__PURE__ */ new Date(),
             label: "Date",
-            onChange: (d) => {
-              if (d && value) {
-                setValue({ ...value, value: d });
-              }
-            },
+            onChange: (d) => setValue({ ...value, value: d }),
             disabled: !value,
             ...tid[`${defaultTestId(this.label)}_dateField`]
           }
@@ -18524,9 +18408,6 @@ var DateFilter = class extends BaseFilter {
     ] });
   }
 };
-function isDateFilterValue(value) {
-  return typeof value === "object" && value !== null && "op" in value && "value" in value;
-}
 
 // src/components/Filters/DateRangeFilter.tsx
 import { Fragment as Fragment29, jsx as jsx128, jsxs as jsxs66 } from "react/jsx-runtime";
@@ -18534,17 +18415,6 @@ function dateRangeFilter(props) {
   return (key) => new DateRangeFilter(key, props);
 }
 var DateRangeFilter = class extends BaseFilter {
-  hydrate(value) {
-    if (!isDateRangeFilterValue(value)) return void 0;
-    const hydratedValue = hydrateDateRange(value.value);
-    return hydratedValue ? { op: value.op, value: hydratedValue } : void 0;
-  }
-  dehydrate(value) {
-    return value ? {
-      op: value.op,
-      value: value.value ? { from: dehydratePlainDate(value.value.from), to: dehydratePlainDate(value.value.to) } : void 0
-    } : void 0;
-  }
   render(value, setValue, tid, inModal, vertical) {
     const { label, placeholderText, disabledDays, testFieldLabel, defaultValue } = this.props;
     return /* @__PURE__ */ jsxs66(Fragment29, { children: [
@@ -18556,17 +18426,8 @@ var DateRangeFilter = class extends BaseFilter {
           isRangeFilterField: true,
           placeholder: placeholderText,
           label: testFieldLabel ?? "Date",
-          value: value?.value,
-          onChange: (d) => {
-            if (!d) {
-              setValue(void 0);
-              return;
-            }
-            const op = value?.op ?? defaultValue?.op;
-            if (op !== void 0) {
-              setValue({ op, value: d });
-            }
-          },
+          value: value?.value ? { from: new Date(value.value.from), to: new Date(value.value.to) } : void 0,
+          onChange: (d) => d ? setValue({ op: defaultValue?.op, value: d }) : setValue(void 0),
           disabledDays,
           ...tid[`${defaultTestId(this.label)}_dateField`]
         }
@@ -18574,17 +18435,6 @@ var DateRangeFilter = class extends BaseFilter {
     ] });
   }
 };
-function isDateRangeFilterValue(value) {
-  return typeof value === "object" && value !== null && "op" in value && "value" in value;
-}
-function hydrateDateRange(value) {
-  if (typeof value !== "object" || value === null) return void 0;
-  const { from, to } = value;
-  const hydratedFrom = parsePersistedPlainDate(from);
-  const hydratedTo = parsePersistedPlainDate(to);
-  if (hydratedFrom === void 0 && hydratedTo === void 0) return void 0;
-  return { from: hydratedFrom, to: hydratedTo };
-}
 
 // src/components/Filters/MultiFilter.tsx
 import { jsx as jsx129 } from "react/jsx-runtime";
@@ -19146,7 +18996,7 @@ function toPageNumberSize(page) {
 }
 
 // src/components/Table/components/EditColumnsButton.tsx
-import { Fragment as Fragment33, useCallback as useCallback22, useMemo as useMemo36, useRef as useRef45 } from "react";
+import { Fragment as Fragment33, useCallback as useCallback22, useMemo as useMemo36, useRef as useRef44 } from "react";
 import { useMenuTrigger as useMenuTrigger3 } from "react-aria";
 import { useMenuTriggerState as useMenuTriggerState3 } from "react-stately";
 import { jsx as jsx141, jsxs as jsxs72 } from "react/jsx-runtime";
@@ -19161,7 +19011,7 @@ function EditColumnsButton(props) {
   const state = useMenuTriggerState3({
     isOpen: defaultOpen
   });
-  const buttonRef = useRef45(null);
+  const buttonRef = useRef44(null);
   const {
     menuTriggerProps
   } = useMenuTrigger3({
@@ -19390,10 +19240,10 @@ function useGridTableLayoutState({
   });
   useEffect27(() => {
     if (page.limit !== persistedPageSize) setPersistedPageSize(page.limit);
-    setPage((prev) => prev.offset === 0 ? prev : {
+    setPage((prev) => ({
       ...prev,
       offset: 0
-    });
+    }));
   }, [page.limit, persistedPageSize, setPersistedPageSize, filter, searchString]);
   return {
     filter,
@@ -19654,18 +19504,18 @@ var BeamContext = createContext7({
 });
 function BeamProvider({ children, ...presentationProps }) {
   const [, tick] = useReducer((prev) => prev + 1, 0);
-  const modalRef = useRef46();
+  const modalRef = useRef45();
   const modalHeaderDiv = useMemo40(() => document.createElement("div"), []);
   const modalBodyDiv = useMemo40(() => {
     const el = document.createElement("div");
     el.style.height = "100%";
     return el;
   }, []);
-  const modalCanCloseChecksRef = useRef46([]);
+  const modalCanCloseChecksRef = useRef45([]);
   const modalFooterDiv = useMemo40(() => document.createElement("div"), []);
-  const drawerContentStackRef = useRef46([]);
-  const drawerCanCloseChecks = useRef46([]);
-  const drawerCanCloseDetailsChecks = useRef46([]);
+  const drawerContentStackRef = useRef45([]);
+  const drawerCanCloseChecks = useRef45([]);
+  const drawerCanCloseDetailsChecks = useRef45([]);
   const sdHeaderDiv = useMemo40(() => document.createElement("div"), []);
   const context = useMemo40(() => {
     return {
@@ -19708,14 +19558,14 @@ function useBeamContext() {
 }
 
 // src/components/ButtonDatePicker.tsx
-import { useRef as useRef47 } from "react";
+import { useRef as useRef46 } from "react";
 import { useMenuTrigger as useMenuTrigger4 } from "react-aria";
 import { useMenuTriggerState as useMenuTriggerState4 } from "react-stately";
 import { jsx as jsx150 } from "react/jsx-runtime";
 function ButtonDatePicker(props) {
   const { defaultOpen, disabled, trigger, onSelect, ...datePickerProps } = props;
   const state = useMenuTriggerState4({ isOpen: defaultOpen });
-  const buttonRef = useRef47(null);
+  const buttonRef = useRef46(null);
   const {
     menuTriggerProps,
     menuProps: { autoFocus: _af, ...menuProps }
@@ -19738,7 +19588,7 @@ function ButtonDatePicker(props) {
 }
 
 // src/components/ButtonGroup.tsx
-import { useRef as useRef48 } from "react";
+import { useRef as useRef47 } from "react";
 import { useButton as useButton10, useFocusRing as useFocusRing12, useHover as useHover15 } from "react-aria";
 import { trussProps as trussProps73 } from "@homebound/truss/runtime";
 import { jsx as jsx151, jsxs as jsxs78 } from "react/jsx-runtime";
@@ -19786,7 +19636,7 @@ function GroupButton(props) {
     isDisabled: !!disabled,
     ...otherProps
   };
-  const ref = useRef48(null);
+  const ref = useRef47(null);
   const {
     buttonProps,
     isPressed
@@ -19909,7 +19759,7 @@ import { useHover as useHover16 } from "react-aria";
 
 // src/components/Tag.tsx
 import { useResizeObserver as useResizeObserver4 } from "@react-aria/utils";
-import { useRef as useRef49, useState as useState44 } from "react";
+import { useRef as useRef48, useState as useState44 } from "react";
 import { trussProps as trussProps74 } from "@homebound/truss/runtime";
 import { jsx as jsx152, jsxs as jsxs79 } from "react/jsx-runtime";
 function Tag(props) {
@@ -19923,7 +19773,7 @@ function Tag(props) {
   const typeStyles2 = getStyles(type);
   const tid = useTestIds(otherProps);
   const [showTooltip, setShowTooltip] = useState44(false);
-  const ref = useRef49(null);
+  const ref = useRef48(null);
   useResizeObserver4({
     ref,
     onResize: () => {
@@ -20132,7 +19982,7 @@ function Copy(props) {
 
 // src/components/DnDGrid/DnDGrid.tsx
 import equal2 from "fast-deep-equal";
-import { useCallback as useCallback24, useRef as useRef50 } from "react";
+import { useCallback as useCallback24, useRef as useRef49 } from "react";
 
 // src/components/DnDGrid/DnDGridContext.tsx
 import { createContext as createContext8, useContext as useContext18 } from "react";
@@ -20155,12 +20005,12 @@ function DnDGrid(props) {
     onReorder,
     activeItemStyles
   } = props;
-  const gridEl = useRef50(null);
-  const dragEl = useRef50();
-  const cloneEl = useRef50();
-  const initialOrder = useRef50();
-  const reorderViaKeyboard = useRef50(false);
-  const transformFrom = useRef50({
+  const gridEl = useRef49(null);
+  const dragEl = useRef49();
+  const cloneEl = useRef49();
+  const initialOrder = useRef49();
+  const reorderViaKeyboard = useRef49(false);
+  const transformFrom = useRef49({
     x: 0,
     y: 0
   });
@@ -20622,14 +20472,14 @@ function HbSpinnerProvider({
 
 // src/components/MaxLines.tsx
 import { useLayoutEffect as useLayoutEffect2, useResizeObserver as useResizeObserver5 } from "@react-aria/utils";
-import { useCallback as useCallback25, useEffect as useEffect30, useRef as useRef51, useState as useState45 } from "react";
+import { useCallback as useCallback25, useEffect as useEffect30, useRef as useRef50, useState as useState45 } from "react";
 import { trussProps as trussProps80 } from "@homebound/truss/runtime";
 import { jsx as jsx160, jsxs as jsxs82 } from "react/jsx-runtime";
 function MaxLines({
   maxLines,
   children
 }) {
-  const elRef = useRef51(null);
+  const elRef = useRef50(null);
   const [hasMore, setHasMore] = useState45(false);
   const [expanded, setExpanded] = useState45(false);
   useLayoutEffect2(() => {
@@ -20665,7 +20515,7 @@ function MaxLines({
 
 // src/components/ScrollShadows.tsx
 import { useResizeObserver as useResizeObserver6 } from "@react-aria/utils";
-import { useCallback as useCallback26, useMemo as useMemo47, useRef as useRef52, useState as useState46 } from "react";
+import { useCallback as useCallback26, useMemo as useMemo47, useRef as useRef51, useState as useState46 } from "react";
 import { trussProps as trussProps81 } from "@homebound/truss/runtime";
 import { jsx as jsx161, jsxs as jsxs83 } from "react/jsx-runtime";
 function ScrollShadows(props) {
@@ -20685,7 +20535,7 @@ function ScrollShadows(props) {
   }
   const [showStartShadow, setShowStartShadow] = useState46(false);
   const [showEndShadow, setShowEndShadow] = useState46(false);
-  const scrollRef = useRef52(null);
+  const scrollRef = useRef51(null);
   const [startShadowStyles, endShadowStyles] = useMemo47(() => {
     const transparentBgColor = bgColor.replace(/,1\)$/, ",0)");
     const commonStyles = {
@@ -20858,7 +20708,7 @@ function useSnackbar() {
 var snackbarId = 1;
 
 // src/components/Stepper.tsx
-import { useRef as useRef53 } from "react";
+import { useRef as useRef52 } from "react";
 import { useButton as useButton11, useFocusRing as useFocusRing14, useHover as useHover18 } from "react-aria";
 import { trussProps as trussProps82 } from "@homebound/truss/runtime";
 import { jsx as jsx162, jsxs as jsxs84 } from "react/jsx-runtime";
@@ -20936,7 +20786,7 @@ function StepButton(props) {
     onPress: onClick,
     isDisabled: disabled
   };
-  const ref = useRef53(null);
+  const ref = useRef52(null);
   const {
     buttonProps,
     isPressed
@@ -21330,7 +21180,7 @@ function visit(rows, fn) {
 
 // src/components/Tabs.tsx
 import { camelCase as camelCase5 } from "change-case";
-import { useEffect as useEffect32, useMemo as useMemo49, useRef as useRef54, useState as useState47 } from "react";
+import { useEffect as useEffect32, useMemo as useMemo49, useRef as useRef53, useState as useState47 } from "react";
 import { mergeProps as mergeProps26, useFocusRing as useFocusRing15, useHover as useHover19 } from "react-aria";
 import { matchPath, Route } from "react-router";
 import { Link as Link5, useLocation } from "react-router-dom";
@@ -21389,7 +21239,7 @@ function Tabs(props) {
   } = useFocusRing15();
   const tid = useTestIds(others, "tabs");
   const [active, setActive] = useState47(selected);
-  const ref = useRef54(null);
+  const ref = useRef53(null);
   useEffect32(() => setActive(selected), [selected]);
   function onKeyUp(e) {
     if (e.key === "ArrowLeft" || e.key === "ArrowRight") {