@terreno/ui 0.13.0 → 0.13.3

package/dist/useConsentHistory.js

@@ -1,7 +1,22 @@
-export const useConsentHistory = (api, baseUrl) => {
-    var _a;
-    const base = baseUrl || "";
-    const enhancedApi = api.injectEndpoints({
+/**
+ * Cache the enhanced api per (api, baseUrl). `injectEndpoints` logs a console
+ * error in development whenever an endpoint with the same name is re-injected
+ * (with `overrideExisting: false`), so calling it on every render of every
+ * consumer would flood the console. WeakMap-by-api lets the GC reclaim entries
+ * when the api object is unreachable.
+ */
+const enhancedApiCache = new WeakMap();
+const getEnhancedApi = (api, base) => {
+    let byBase = enhancedApiCache.get(api);
+    if (!byBase) {
+        byBase = new Map();
+        enhancedApiCache.set(api, byBase);
+    }
+    const cached = byBase.get(base);
+    if (cached) {
+        return cached;
+    }
+    const enhanced = api.injectEndpoints({
         endpoints: (build) => ({
             getMyConsents: build.query({
                 providesTags: ["MyConsents"],
@@ -10,6 +25,13 @@ export const useConsentHistory = (api, baseUrl) => {
         }),
         overrideExisting: false,
     });
+    byBase.set(base, enhanced);
+    return enhanced;
+};
+export const useConsentHistory = (api, baseUrl) => {
+    var _a;
+    const base = baseUrl || "";
+    const enhancedApi = getEnhancedApi(api, base);
     const { data, isLoading, error, refetch } = enhancedApi.useGetMyConsentsQuery();
     const entries = Array.isArray(data) ? data : ((_a = data === null || data === void 0 ? void 0 : data.data) !== null && _a !== void 0 ? _a : []);
     return { entries, error, isLoading, refetch };

package/dist/useConsentHistory.js.map

@@ -1 +1 @@
-{"version":3,"file":"useConsentHistory.js","sourceRoot":"","sources":["../src/useConsentHistory.ts"],"names":[],"mappings":"AA8CA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAsB,EAAE,OAAgB,EAAE,EAAE;;IAC5E,MAAM,IAAI,GAAG,OAAO,IAAI,EAAE,CAAC;IAE3B,MAAM,WAAW,GAAG,GAAG,CAAC,eAAe,CAAC;QACtC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACrB,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC;gBACzB,YAAY,EAAE,CAAC,YAAY,CAAC;gBAC5B,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,cAAc;aACnC,CAAC;SACH,CAAC;QACF,gBAAgB,EAAE,KAAK;KACxB,CAAC,CAAC;IAEH,MAAM,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAC,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAC9E,MAAM,OAAO,GAA0B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,EAAE,CAAC,CAAC;IAEvF,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC;AAC9C,CAAC,CAAC"}
+{"version":3,"file":"useConsentHistory.js","sourceRoot":"","sources":["../src/useConsentHistory.ts"],"names":[],"mappings":"AAgDA;;;;;;GAMG;AACH,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA6D,CAAC;AAElG,MAAM,cAAc,GAAG,CAAC,GAAsB,EAAE,IAAY,EAA6B,EAAE;IACzF,IAAI,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACnB,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAe,CAAC;QACnC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACrB,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC;gBACzB,YAAY,EAAE,CAAC,YAAY,CAAC;gBAC5B,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,cAAc;aACnC,CAAC;SACH,CAAC;QACF,gBAAgB,EAAE,KAAK;KACxB,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3B,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAsB,EAAE,OAAgB,EAAE,EAAE;;IAC5E,MAAM,IAAI,GAAG,OAAO,IAAI,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAE9C,MAAM,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAC,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAC9E,MAAM,OAAO,GAA0B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,EAAE,CAAC,CAAC;IAEvF,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC;AAC9C,CAAC,CAAC"}

package/dist/useSubmitConsent.d.ts

@@ -22,18 +22,19 @@ interface SubmitConsentMutationBuilder {
         };
     }) => unknown;
 }
+interface SubmitConsentEnhancedApi {
+    useSubmitConsentResponseMutation: () => [
+        (body: SubmitConsentBody) => SubmitConsentMutationResult,
+        SubmitConsentMutationHookState
+    ];
+}
 interface SubmitConsentApiWithTags {
     injectEndpoints: (options: {
         endpoints: (build: SubmitConsentMutationBuilder) => {
             submitConsentResponse: unknown;
         };
         overrideExisting: boolean;
-    }) => {
-        useSubmitConsentResponseMutation: () => [
-            (body: SubmitConsentBody) => SubmitConsentMutationResult,
-            SubmitConsentMutationHookState
-        ];
-    };
+    }) => SubmitConsentEnhancedApi;
 }
 interface SubmitConsentApi {
     enhanceEndpoints: (options: {

package/dist/useSubmitConsent.js

@@ -1,7 +1,23 @@
-export const useSubmitConsent = (api, baseUrl) => {
-    const base = baseUrl || "";
+/**
+ * Cache the enhanced api per (api, baseUrl). `injectEndpoints` logs a console
+ * error in development whenever an endpoint with the same name is re-injected
+ * (with `overrideExisting: false`), so calling it on every render of every
+ * consumer would flood the console. WeakMap-by-api lets the GC reclaim entries
+ * when the api object is unreachable.
+ */
+const enhancedApiCache = new WeakMap();
+const getEnhancedApi = (api, base) => {
+    let byBase = enhancedApiCache.get(api);
+    if (!byBase) {
+        byBase = new Map();
+        enhancedApiCache.set(api, byBase);
+    }
+    const cached = byBase.get(base);
+    if (cached) {
+        return cached;
+    }
     const apiWithConsentTags = api.enhanceEndpoints({ addTagTypes: ["PendingConsents"] });
-    const enhancedApi = apiWithConsentTags.injectEndpoints({
+    const enhanced = apiWithConsentTags.injectEndpoints({
         endpoints: (build) => ({
             submitConsentResponse: build.mutation({
                 invalidatesTags: ["PendingConsents"],
@@ -14,6 +30,12 @@ export const useSubmitConsent = (api, baseUrl) => {
         }),
         overrideExisting: false,
     });
+    byBase.set(base, enhanced);
+    return enhanced;
+};
+export const useSubmitConsent = (api, baseUrl) => {
+    const base = baseUrl || "";
+    const enhancedApi = getEnhancedApi(api, base);
     const [submitMutation, { isLoading: isSubmitting, error }] = enhancedApi.useSubmitConsentResponseMutation();
     const submit = async (body) => {
         return submitMutation(body).unwrap();

package/dist/useSubmitConsent.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSubmitConsent.js","sourceRoot":"","sources":["../src/useSubmitConsent.ts"],"names":[],"mappings":"AA4CA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAqB,EAAE,OAAgB,EAAE,EAAE;IAC1E,MAAM,IAAI,GAAG,OAAO,IAAI,EAAE,CAAC;IAC3B,MAAM,kBAAkB,GAAG,GAAG,CAAC,gBAAgB,CAAC,EAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,EAAC,CAAC,CAAC;IAEpF,MAAM,WAAW,GAAG,kBAAkB,CAAC,eAAe,CAAC;QACrD,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACrB,qBAAqB,EAAE,KAAK,CAAC,QAAQ,CAAC;gBACpC,eAAe,EAAE,CAAC,iBAAiB,CAAC;gBACpC,KAAK,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC,CAAC;oBACnC,IAAI;oBACJ,MAAM,EAAE,MAAM;oBACd,GAAG,EAAE,GAAG,IAAI,mBAAmB;iBAChC,CAAC;aACH,CAAC;SACH,CAAC;QACF,gBAAgB,EAAE,KAAK;KACxB,CAAC,CAAC;IAEH,MAAM,CAAC,cAAc,EAAE,EAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC,GACtD,WAAW,CAAC,gCAAgC,EAAE,CAAC;IAEjD,MAAM,MAAM,GAAG,KAAK,EAAE,IAAuB,EAAE,EAAE;QAC/C,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAC,CAAC;AACvC,CAAC,CAAC"}
+{"version":3,"file":"useSubmitConsent.js","sourceRoot":"","sources":["../src/useSubmitConsent.ts"],"names":[],"mappings":"AA8CA;;;;;;GAMG;AACH,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA2D,CAAC;AAEhG,MAAM,cAAc,GAAG,CAAC,GAAqB,EAAE,IAAY,EAA4B,EAAE;IACvF,IAAI,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACnB,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,kBAAkB,GAAG,GAAG,CAAC,gBAAgB,CAAC,EAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,EAAC,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAG,kBAAkB,CAAC,eAAe,CAAC;QAClD,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACrB,qBAAqB,EAAE,KAAK,CAAC,QAAQ,CAAC;gBACpC,eAAe,EAAE,CAAC,iBAAiB,CAAC;gBACpC,KAAK,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC,CAAC;oBACnC,IAAI;oBACJ,MAAM,EAAE,MAAM;oBACd,GAAG,EAAE,GAAG,IAAI,mBAAmB;iBAChC,CAAC;aACH,CAAC;SACH,CAAC;QACF,gBAAgB,EAAE,KAAK;KACxB,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3B,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAqB,EAAE,OAAgB,EAAE,EAAE;IAC1E,MAAM,IAAI,GAAG,OAAO,IAAI,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAE9C,MAAM,CAAC,cAAc,EAAE,EAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC,GACtD,WAAW,CAAC,gCAAgC,EAAE,CAAC;IAEjD,MAAM,MAAM,GAAG,KAAK,EAAE,IAAuB,EAAE,EAAE;QAC/C,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAC,CAAC;AACvC,CAAC,CAAC"}

package/package.json

@@ -137,5 +137,5 @@
     "test:coverage": "TZ=America/New_York bun run ../scripts/check-coverage.ts",
     "types": "bun typedoc"
   },
-  "version": "0.13.0"
+  "version": "0.13.3"
 }

package/src/ConsentFormScreen.test.tsx

@@ -185,4 +185,51 @@ describe("ConsentFormScreen", () => {
     expect(getByTestId("consent-footer-scroll-hint")).toBeTruthy();
     expect(getByTestId("consent-footer-signature-hint")).toBeTruthy();
   });
+
+  it("shows the required-items legend when any checkbox is required", () => {
+    const form: ConsentFormPublic = {
+      ...baseForm,
+      checkboxes: [{label: "Required box", required: true}],
+    };
+    const {getByTestId} = renderWithTheme(
+      <ConsentFormScreen form={form} locale="en" onAgree={() => {}} />
+    );
+    expect(getByTestId("consent-form-required-legend")).toBeTruthy();
+  });
+
+  it("hides the required-items legend when no checkbox is required", () => {
+    const form: ConsentFormPublic = {
+      ...baseForm,
+      checkboxes: [{label: "Optional box", required: false}],
+    };
+    const {queryByTestId} = renderWithTheme(
+      <ConsentFormScreen form={form} locale="en" onAgree={() => {}} />
+    );
+    expect(queryByTestId("consent-form-required-legend")).toBeNull();
+  });
+
+  it("shows the checkbox footer hint when a required checkbox is unchecked", () => {
+    const form: ConsentFormPublic = {
+      ...baseForm,
+      checkboxes: [{label: "Required box", required: true}],
+    };
+    const {getByTestId} = renderWithTheme(
+      <ConsentFormScreen form={form} locale="en" onAgree={() => {}} />
+    );
+    expect(getByTestId("consent-footer-checkboxes-hint")).toBeTruthy();
+  });
+
+  it("hides the checkbox footer hint once required checkboxes are checked", () => {
+    const form: ConsentFormPublic = {
+      ...baseForm,
+      checkboxes: [{label: "Required box", required: true}],
+    };
+    const {getByTestId, queryByTestId} = renderWithTheme(
+      <ConsentFormScreen form={form} locale="en" onAgree={() => {}} />
+    );
+    act(() => {
+      fireEvent.press(getByTestId("consent-form-checkbox-0"));
+    });
+    expect(queryByTestId("consent-footer-checkboxes-hint")).toBeNull();
+  });
 });

package/src/ConsentFormScreen.tsx

@@ -50,6 +50,7 @@ export const ConsentFormScreen: React.FC<ConsentFormScreenProps> = ({
   });
 
   const signatureProvided = !form.captureSignature || Boolean(signatureValue);
+  const hasRequiredCheckboxes = form.checkboxes.some((checkbox) => checkbox.required);
 
   const canAgree = hasScrolledToBottom && allRequiredCheckboxesChecked && signatureProvided;
 
@@ -145,6 +146,11 @@ export const ConsentFormScreen: React.FC<ConsentFormScreenProps> = ({
           Please scroll to the bottom to continue
         </Text>
       )}
+      {Boolean(hasRequiredCheckboxes && !allRequiredCheckboxesChecked) && (
+        <Text align="center" color="error" size="sm" testID="consent-footer-checkboxes-hint">
+          Please check all required items marked with *
+        </Text>
+      )}
       {Boolean(form.captureSignature && !signatureValue) && (
         <Text align="center" color="error" size="sm" testID="consent-footer-signature-hint">
           Please provide your signature to continue
@@ -169,6 +175,11 @@ export const ConsentFormScreen: React.FC<ConsentFormScreenProps> = ({
 
           {form.checkboxes.length > 0 && (
             <Box direction="column" gap={2} testID="consent-form-checkboxes">
+              {hasRequiredCheckboxes && (
+                <Text color="secondaryDark" size="sm" testID="consent-form-required-legend">
+                  * indicates a required item
+                </Text>
+              )}
               {form.checkboxes.map((checkbox, index) => {
                 const key = index.toString();
                 const isChecked = checkboxValues[key] ?? false;

package/src/HeightField.test.tsx

@@ -206,3 +206,71 @@ describe("HeightField", () => {
     });
   });
 });
+
+describe("HeightField - Android platform", () => {
+  // Toggle Platform.OS to "android" to exercise the Android rendering branch
+  // that uses SelectField pickers instead of the Pressable+ActionSheet path.
+  const {Platform} = require("react-native") as {Platform: {OS: string}};
+  const originalOS = Platform.OS;
+
+  beforeEach(() => {
+    Platform.OS = "android";
+  });
+
+  afterEach(() => {
+    Platform.OS = originalOS;
+  });
+
+  it("renders Android pickers with title, helperText, and errorText", () => {
+    const onChange = mock(() => {});
+    const {getByText, queryByLabelText} = renderWithTheme(
+      <HeightField
+        errorText="Required"
+        helperText="Enter height"
+        onChange={onChange}
+        title="Height"
+        value="70"
+      />
+    );
+    // Title and helper/error rendered
+    expect(getByText("Height")).toBeTruthy();
+    expect(getByText("Enter height")).toBeTruthy();
+    expect(getByText("Required")).toBeTruthy();
+    // The Pressable from the iOS branch should NOT be present.
+    expect(queryByLabelText("Height selector")).toBeNull();
+  });
+
+  it("renders Android pickers in disabled state", () => {
+    const onChange = mock(() => {});
+    const {root} = renderWithTheme(
+      <HeightField disabled onChange={onChange} title="Height" value="60" />
+    );
+    expect(root).toBeTruthy();
+  });
+
+  it("forwards feet picker changes to onChange (Android)", () => {
+    const onChange = mock(() => {});
+    const {SelectField} = require("./SelectField") as {
+      SelectField: React.ComponentType<{onChange?: (v: string) => void}>;
+    };
+    const {UNSAFE_getAllByType} = renderWithTheme(<HeightField onChange={onChange} value="70" />);
+    const selects = UNSAFE_getAllByType(SelectField);
+    expect(selects.length).toBe(2);
+    // First SelectField is feet. value="70" → 5ft 10in. Bumping feet to 6 yields 6*12+10=82.
+    selects[0].props.onChange?.("6");
+    expect(onChange).toHaveBeenCalledWith("82");
+  });
+
+  it("forwards inches picker changes to onChange (Android)", () => {
+    const onChange = mock(() => {});
+    const {SelectField} = require("./SelectField") as {
+      SelectField: React.ComponentType<{onChange?: (v: string) => void}>;
+    };
+    const {UNSAFE_getAllByType} = renderWithTheme(<HeightField onChange={onChange} value="70" />);
+    const selects = UNSAFE_getAllByType(SelectField);
+    expect(selects.length).toBe(2);
+    // Second SelectField is inches. value="70" → 5ft 10in. Changing inches to 3 yields 5*12+3=63.
+    selects[1].props.onChange?.("3");
+    expect(onChange).toHaveBeenCalledWith("63");
+  });
+});

package/src/Modal.tsx

@@ -12,7 +12,7 @@ import {Gesture, GestureDetector} from "react-native-gesture-handler";
 import {runOnJS} from "react-native-reanimated";
 
 import {Button} from "./Button";
-import type {ModalProps} from "./Common";
+import type {ModalProps, TerrenoTheme} from "./Common";
 import {Heading} from "./Heading";
 import {Icon} from "./Icon";
 import {isMobileDevice} from "./MediaQuery";
@@ -45,7 +45,7 @@ const ModalContent: FC<{
   secondaryButtonOnClick?: ModalProps["secondaryButtonOnClick"];
   onDismiss: ModalProps["onDismiss"];
   sizePx: DimensionValue;
-  theme: any;
+  theme: TerrenoTheme;
   isMobile: boolean;
 }> = ({
   children,

package/src/PickerSelect.tsx

@@ -25,15 +25,18 @@
 
 import {Picker} from "@react-native-picker/picker";
 import isEqual from "lodash/isEqual";
-import {useCallback, useEffect, useMemo, useState} from "react";
+import {type ComponentType, type ReactNode, useCallback, useEffect, useMemo, useState} from "react";
 import {
   Keyboard,
   Modal,
+  type ModalProps,
   Platform,
   Pressable,
+  type PressableProps,
   StyleSheet,
   Text,
   TextInput,
+  type TextInputProps,
   TouchableOpacity,
   View,
 } from "react-native";
@@ -67,14 +70,23 @@ export const defaultStyles = StyleSheet.create({
   },
 });
 
+/** A single option for the picker select component. */
+export interface PickerSelectItem {
+  label: string;
+  value: string | number | null;
+  key?: string | number;
+  color?: string;
+  inputLabel?: string;
+}
+
 export interface RNPickerSelectProps {
-  onValueChange: (value: any, index: any) => void;
-  items: any[];
-  value?: any;
-  placeholder?: any;
+  onValueChange: (value: string | number | null, index: number) => void;
+  items: PickerSelectItem[];
+  value?: string | number | null;
+  placeholder?: Partial<PickerSelectItem>;
   disabled?: boolean;
   itemKey?: string | number;
-  children?: any;
+  children?: ReactNode;
   onOpen?: () => void;
   useNativeAndroidPickerStyle?: boolean;
   fixAndroidTouchableBug?: boolean;
@@ -87,18 +99,18 @@ export interface RNPickerSelectProps {
   onClose?: () => void;
 
   // Modal props (iOS only)
-  modalProps?: any;
+  modalProps?: Partial<ModalProps>;
 
   // TextInput props
-  textInputProps?: any;
+  textInputProps?: Partial<TextInputProps>;
 
   // Touchable Done props (iOS only)
-  touchableDoneProps?: any;
+  touchableDoneProps?: Partial<PressableProps>;
 
   // Touchable wrapper props
-  touchableWrapperProps?: any;
+  touchableWrapperProps?: Partial<PressableProps>;
 
-  InputAccessoryView?: any;
+  InputAccessoryView?: ComponentType<{testID?: string}>;
 }
 
 export function RNPickerSelect({
@@ -125,7 +137,9 @@ export function RNPickerSelect({
   InputAccessoryView,
 }: RNPickerSelectProps) {
   const [showPicker, setShowPicker] = useState<boolean>(false);
-  const [animationType, setAnimationType] = useState(undefined);
+  const [animationType, setAnimationType] = useState<"none" | "slide" | "fade" | undefined>(
+    undefined
+  );
   const [orientation, setOrientation] = useState<"portrait" | "landscape">("portrait");
   const [doneDepressed, setDoneDepressed] = useState<boolean>(false);
   const {theme} = useTheme();
@@ -159,12 +173,12 @@ export function RNPickerSelect({
   }, [items, placeholder]);
 
   const getSelectedItem = useCallback(
-    (key: any, val: any) => {
-      let idx = options.findIndex((item: any) => {
-        if (item.key && key) {
+    (key: string | number | undefined, val: string | number | null | undefined) => {
+      let idx = options.findIndex((item) => {
+        if (item?.key && key) {
           return isEqual(item.key, key);
         }
-        return isEqual(item.value, val);
+        return isEqual(item?.value, val);
       });
       if (idx === -1) {
         idx = 0;
@@ -177,7 +191,7 @@ export function RNPickerSelect({
     [options]
   );
 
-  const [selectedItem, setSelectedItem] = useState<any>(() => {
+  const [selectedItem, setSelectedItem] = useState<Partial<PickerSelectItem>>(() => {
     return getSelectedItem(itemKey, value).selectedItem;
   });
 
@@ -195,13 +209,17 @@ export function RNPickerSelect({
     togglePicker(false, onDownArrow);
   };
 
-  const onValueChangeEvent = (val: any, index: any) => {
+  const onValueChangeEvent = (val: string | number | null, index: number) => {
     const item = getSelectedItem(itemKey, val);
     onValueChange(val, index);
     setSelectedItem(item.selectedItem);
   };
 
-  const onOrientationChange = ({nativeEvent}: any) => {
+  const onOrientationChange = ({
+    nativeEvent,
+  }: {
+    nativeEvent: {orientation: "portrait" | "landscape"};
+  }) => {
     setOrientation(nativeEvent.orientation);
   };
 
@@ -215,7 +233,7 @@ export function RNPickerSelect({
     }
   };
 
-  const togglePicker = (animate = false, postToggleCallback?: any) => {
+  const togglePicker = (animate = false, postToggleCallback?: () => void) => {
     if (disabled) {
       return;
     }
@@ -237,13 +255,13 @@ export function RNPickerSelect({
   };
 
   const renderPickerItems = () => {
-    return options?.map((item: any) => {
+    return options?.map((item) => {
       return (
         <Picker.Item
-          color={item.color}
-          key={item.key || item.label}
-          label={item.label}
-          value={item.value}
+          color={item?.color}
+          key={item?.key || item?.label}
+          label={item?.label}
+          value={item?.value}
         />
       );
     });
@@ -408,7 +426,6 @@ export function RNPickerSelect({
         ]}
       >
         <Pressable
-          activeOpacity={1}
           onPress={() => {
             togglePicker(true);
           }}
@@ -467,14 +484,11 @@ export function RNPickerSelect({
   };
 
   const renderAndroidHeadless = () => {
-    const Component: any = fixAndroidTouchableBug ? View : Pressable;
+    // noExplicitAny: Component is View or Pressable depending on a bug workaround flag. View
+    // ignores Pressable-specific props (onPress) at runtime. A type-safe union cannot express this.
+    const Component = (fixAndroidTouchableBug ? View : Pressable) as unknown as typeof Pressable;
     return (
-      <Component
-        activeOpacity={1}
-        onPress={onOpen}
-        testID="android_touchable_wrapper"
-        {...touchableWrapperProps}
-      >
+      <Component onPress={onOpen} testID="android_touchable_wrapper" {...touchableWrapperProps}>
         <View>
           {renderTextInputOrChildren()}
           <Picker
@@ -636,7 +650,7 @@ export function RNPickerSelect({
             // Pass the original (non-stringified) value through so lodash
             // `isEqual` matching in `getSelectedItem` works for number /
             // object values.
-            const originalValue = options[originalIndex]?.value;
+            const originalValue = options[originalIndex]?.value ?? null;
             onValueChangeEvent(originalValue, originalIndex);
             closeWebMenu();
           }}

package/src/SelectBadge.tsx

@@ -3,7 +3,7 @@ import type React from "react";
 import {useCallback, useMemo, useState} from "react";
 import {Modal, Platform, Text, TouchableOpacity, View} from "react-native";
 
-import type {FieldOption, SelectBadgeProps, SurfaceTheme, TextTheme} from "./Common";
+import type {FieldOption, IconColor, SelectBadgeProps, SurfaceTheme, TextTheme} from "./Common";
 import {Icon} from "./Icon";
 import {useTheme} from "./Theme";
 import {useWebDropdownAnchor, WebDropdownMenu, type WebDropdownMenuOption} from "./WebDropdownMenu";
@@ -98,7 +98,7 @@ export const SelectBadge = ({
   );
 
   const renderPickerItems = useCallback(() => {
-    return options?.map((item: any) => (
+    return options?.map((item: FieldOption) => (
       <Picker.Item key={item.key || item.label} label={item.label} value={item.value} />
     ));
   }, [options]);
@@ -321,7 +321,11 @@ export const SelectBadge = ({
             }}
           >
             <Icon
-              color={textColor as any}
+              // noExplicitAny: textColor is a resolved hex string from the theme, but Icon's
+              // color prop expects an IconColor key. Icon falls back to the raw string at runtime
+              // (theme.text[color] ?? color), but the type cannot be narrowed without changing
+              // Icon's type signature to accept arbitrary strings.
+              color={textColor as unknown as IconColor}
               iconName={showPicker ? "chevron-up" : "chevron-down"}
               size="sm"
             />

package/src/SelectField.tsx

@@ -26,10 +26,10 @@ export const SelectField: FC<SelectFieldProps> = ({
         disabled={disabled}
         items={options}
         onValueChange={(v) => {
-          if (v === undefined || v === "") {
+          if (v === undefined || v === null || v === "") {
             onChange("");
           } else {
-            onChange(v);
+            onChange(String(v));
           }
         }}
         placeholder={!requireValue ? clearOption : {}}

package/src/SidebarNavigation.native.tsx

@@ -5,7 +5,7 @@ import {Navigator, Slot} from "expo-router";
 // update the import path here — this is the only place in the codebase that references it.
 // eslint-disable-next-line import/no-internal-modules
 import {Screen} from "expo-router/build/views/Screen";
-import {type FC, useCallback, useEffect, useMemo, useRef, useState} from "react";
+import {type FC, type ReactNode, useCallback, useEffect, useMemo, useRef, useState} from "react";
 import {
   Animated,
   Dimensions,
@@ -361,7 +361,11 @@ const SidebarHeader: FC<{onOpen: () => void}> = ({onOpen}) => {
   const insets = useSafeAreaInsets();
   const {state, descriptors} = Navigator.useContext();
   const activeRoute = state.routes[state.index];
-  const {headerLeft, headerRight, title} = (descriptors[activeRoute?.key]?.options ?? {}) as any;
+  const {headerLeft, headerRight, title} = (descriptors[activeRoute?.key]?.options ?? {}) as {
+    headerLeft?: (props: object) => ReactNode;
+    headerRight?: (props: object) => ReactNode;
+    title?: string;
+  };
 
   return (
     <View

package/src/Signature.native.tsx

@@ -18,6 +18,10 @@ export const Signature: FC<Props> = ({onChange, onStart, onEnd}: Props) => {
 
   const handleClear = () => {
     ref.current?.clearSignature();
+    // `clearSignature` on the underlying canvas does not fire `onOK`, so the
+    // parent never learns the signature is gone. Push an empty value so any
+    // "signature required" gating reflects the cleared state immediately.
+    onChange("");
   };
 
   const onBegin = () => {

package/src/Signature.test.tsx

@@ -49,6 +49,16 @@ describe("Signature", () => {
     expect(clearMock).toHaveBeenCalledTimes(1);
   });
 
+  it("notifies the parent with an empty value when Clear is pressed", () => {
+    clearMock.mockClear();
+    const mockOnChange = mock(() => {});
+    const {getByText} = renderWithTheme(<Signature onChange={mockOnChange} />);
+    fireEvent.press(getByText("Clear"));
+    // Without this, "signature required" gating in parents would never reset
+    // because the underlying canvas clear() does not fire onEnd/onOK.
+    expect(mockOnChange).toHaveBeenCalledWith("");
+  });
+
   it("calls onChange with the data URL when a stroke ends", () => {
     toDataURLReturn = "data:image/png;base64,abc";
     const mockOnChange = mock(() => {});

package/src/Signature.tsx

@@ -17,6 +17,10 @@ export const Signature = ({onChange}: SignatureProps): ReactElement | null => {
 
   const onClear = () => {
     ref.current?.clear();
+    // `clear()` on the underlying canvas does not fire `onEnd`, so the parent
+    // never learns the signature is gone. Push an empty value so any
+    // "signature required" gating reflects the cleared state immediately.
+    onChange("");
   };
 
   const onUpdatedSignature = () => {