@terreno/ui 57.9.0 → 57.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (162) hide show
  1. package/README.md +2 -0
  2. package/dist/Button.d.ts.map +1 -1
  3. package/dist/Button.js +19 -4
  4. package/dist/Button.js.map +1 -1
  5. package/dist/Common.d.ts +68 -1
  6. package/dist/Common.d.ts.map +1 -1
  7. package/dist/Common.js.map +1 -1
  8. package/dist/DateTimeField.d.ts.map +1 -1
  9. package/dist/DateTimeField.js +90 -17
  10. package/dist/DateTimeField.js.map +1 -1
  11. package/dist/FilePickerButton.d.ts +15 -1
  12. package/dist/FilePickerButton.d.ts.map +1 -1
  13. package/dist/FilePickerButton.js +26 -9
  14. package/dist/FilePickerButton.js.map +1 -1
  15. package/dist/GPTChat.d.ts +57 -1
  16. package/dist/GPTChat.d.ts.map +1 -1
  17. package/dist/GPTChat.js +199 -7
  18. package/dist/GPTChat.js.map +1 -1
  19. package/dist/HtmlFrame.d.ts +11 -0
  20. package/dist/HtmlFrame.d.ts.map +1 -0
  21. package/dist/HtmlFrame.js +29 -0
  22. package/dist/HtmlFrame.js.map +1 -0
  23. package/dist/Text.d.ts +1 -1
  24. package/dist/Text.d.ts.map +1 -1
  25. package/dist/Text.js +2 -2
  26. package/dist/Text.js.map +1 -1
  27. package/dist/asks/AskCard.d.ts +34 -0
  28. package/dist/asks/AskCard.d.ts.map +1 -0
  29. package/dist/asks/AskCard.js +91 -0
  30. package/dist/asks/AskCard.js.map +1 -0
  31. package/dist/asks/AskChoice.d.ts +11 -0
  32. package/dist/asks/AskChoice.d.ts.map +1 -0
  33. package/dist/asks/AskChoice.js +146 -0
  34. package/dist/asks/AskChoice.js.map +1 -0
  35. package/dist/asks/AskConfirm.d.ts +15 -0
  36. package/dist/asks/AskConfirm.d.ts.map +1 -0
  37. package/dist/asks/AskConfirm.js +17 -0
  38. package/dist/asks/AskConfirm.js.map +1 -0
  39. package/dist/asks/AskFiles.d.ts +18 -0
  40. package/dist/asks/AskFiles.d.ts.map +1 -0
  41. package/dist/asks/AskFiles.js +149 -0
  42. package/dist/asks/AskFiles.js.map +1 -0
  43. package/dist/asks/AskForm.d.ts +27 -0
  44. package/dist/asks/AskForm.d.ts.map +1 -0
  45. package/dist/asks/AskForm.js +146 -0
  46. package/dist/asks/AskForm.js.map +1 -0
  47. package/dist/asks/AskMarkdown.d.ts +25 -0
  48. package/dist/asks/AskMarkdown.d.ts.map +1 -0
  49. package/dist/asks/AskMarkdown.js +73 -0
  50. package/dist/asks/AskMarkdown.js.map +1 -0
  51. package/dist/asks/SimpleAskCard.d.ts +23 -0
  52. package/dist/asks/SimpleAskCard.d.ts.map +1 -0
  53. package/dist/asks/SimpleAskCard.js +32 -0
  54. package/dist/asks/SimpleAskCard.js.map +1 -0
  55. package/dist/asks/askControls.d.ts +33 -0
  56. package/dist/asks/askControls.d.ts.map +1 -0
  57. package/dist/asks/askControls.js +30 -0
  58. package/dist/asks/askControls.js.map +1 -0
  59. package/dist/asks/askFileRefs.d.ts +26 -0
  60. package/dist/asks/askFileRefs.d.ts.map +1 -0
  61. package/dist/asks/askFileRefs.js +75 -0
  62. package/dist/asks/askFileRefs.js.map +1 -0
  63. package/dist/asks/askFormDraft.d.ts +60 -0
  64. package/dist/asks/askFormDraft.d.ts.map +1 -0
  65. package/dist/asks/askFormDraft.js +224 -0
  66. package/dist/asks/askFormDraft.js.map +1 -0
  67. package/dist/asks/askSummary.d.ts +10 -0
  68. package/dist/asks/askSummary.d.ts.map +1 -0
  69. package/dist/asks/askSummary.js +138 -0
  70. package/dist/asks/askSummary.js.map +1 -0
  71. package/dist/asks/askTypes.d.ts +21 -0
  72. package/dist/asks/askTypes.d.ts.map +1 -0
  73. package/dist/asks/askTypes.js +2 -0
  74. package/dist/asks/askTypes.js.map +1 -0
  75. package/dist/asks/simpleCardButtonVariants.d.ts +5 -0
  76. package/dist/asks/simpleCardButtonVariants.d.ts.map +1 -0
  77. package/dist/asks/simpleCardButtonVariants.js +8 -0
  78. package/dist/asks/simpleCardButtonVariants.js.map +1 -0
  79. package/dist/blocks/BlocksError.d.ts +8 -0
  80. package/dist/blocks/BlocksError.d.ts.map +1 -0
  81. package/dist/blocks/BlocksError.js +14 -0
  82. package/dist/blocks/BlocksError.js.map +1 -0
  83. package/dist/blocks/BlocksView.d.ts +10 -0
  84. package/dist/blocks/BlocksView.d.ts.map +1 -0
  85. package/dist/blocks/BlocksView.js +90 -0
  86. package/dist/blocks/BlocksView.js.map +1 -0
  87. package/dist/blocks/blockRenderers.d.ts +25 -0
  88. package/dist/blocks/blockRenderers.d.ts.map +1 -0
  89. package/dist/blocks/blockRenderers.js +136 -0
  90. package/dist/blocks/blockRenderers.js.map +1 -0
  91. package/dist/blocks/datasetToPoints.d.ts +22 -0
  92. package/dist/blocks/datasetToPoints.d.ts.map +1 -0
  93. package/dist/blocks/datasetToPoints.js +28 -0
  94. package/dist/blocks/datasetToPoints.js.map +1 -0
  95. package/dist/blocks/useBlockSelections.d.ts +6 -0
  96. package/dist/blocks/useBlockSelections.d.ts.map +1 -0
  97. package/dist/blocks/useBlockSelections.js +10 -0
  98. package/dist/blocks/useBlockSelections.js.map +1 -0
  99. package/dist/blocks/useResolvedDatasets.d.ts +18 -0
  100. package/dist/blocks/useResolvedDatasets.d.ts.map +1 -0
  101. package/dist/blocks/useResolvedDatasets.js +59 -0
  102. package/dist/blocks/useResolvedDatasets.js.map +1 -0
  103. package/dist/blocks/useResolvedImages.d.ts +15 -0
  104. package/dist/blocks/useResolvedImages.d.ts.map +1 -0
  105. package/dist/blocks/useResolvedImages.js +66 -0
  106. package/dist/blocks/useResolvedImages.js.map +1 -0
  107. package/dist/index.d.ts +6 -1
  108. package/dist/index.d.ts.map +1 -1
  109. package/dist/index.js +4 -1
  110. package/dist/index.js.map +1 -1
  111. package/dist/lazyBoundaries/heavyOptionalExports.d.ts +6 -0
  112. package/dist/lazyBoundaries/heavyOptionalExports.d.ts.map +1 -1
  113. package/dist/lazyBoundaries/heavyOptionalExports.js +4 -0
  114. package/dist/lazyBoundaries/heavyOptionalExports.js.map +1 -1
  115. package/package.json +2 -1
  116. package/src/Button.test.tsx +72 -0
  117. package/src/Button.tsx +34 -4
  118. package/src/Common.ts +67 -0
  119. package/src/DateTimeField.test.tsx +185 -2
  120. package/src/DateTimeField.tsx +106 -16
  121. package/src/DonutChart.test.tsx +5 -10
  122. package/src/FilePickerButton.test.tsx +56 -3
  123. package/src/FilePickerButton.tsx +83 -17
  124. package/src/GPTChat.test.tsx +758 -2
  125. package/src/GPTChat.tsx +517 -7
  126. package/src/HtmlFrame.tsx +60 -0
  127. package/src/LineChart.test.tsx +5 -10
  128. package/src/Text.test.tsx +22 -0
  129. package/src/Text.tsx +10 -1
  130. package/src/asks/AskCard.test.tsx +1428 -0
  131. package/src/asks/AskCard.tsx +240 -0
  132. package/src/asks/AskChoice.tsx +368 -0
  133. package/src/asks/AskConfirm.tsx +42 -0
  134. package/src/asks/AskFiles.test.tsx +347 -0
  135. package/src/asks/AskFiles.tsx +246 -0
  136. package/src/asks/AskForm.tsx +334 -0
  137. package/src/asks/AskMarkdown.tsx +176 -0
  138. package/src/asks/SimpleAskCard.test.tsx +253 -0
  139. package/src/asks/SimpleAskCard.tsx +82 -0
  140. package/src/asks/askControls.tsx +98 -0
  141. package/src/asks/askFileRefs.test.ts +155 -0
  142. package/src/asks/askFileRefs.ts +98 -0
  143. package/src/asks/askFormDraft.test.ts +347 -0
  144. package/src/asks/askFormDraft.ts +309 -0
  145. package/src/asks/askSummary.test.ts +255 -0
  146. package/src/asks/askSummary.ts +160 -0
  147. package/src/asks/askTypes.ts +25 -0
  148. package/src/asks/asksUseTerrenoComponents.test.ts +55 -0
  149. package/src/asks/simpleCardButtonVariants.ts +14 -0
  150. package/src/blocks/BlocksError.tsx +28 -0
  151. package/src/blocks/BlocksView.test.tsx +607 -0
  152. package/src/blocks/BlocksView.tsx +125 -0
  153. package/src/blocks/blockRenderers.tsx +288 -0
  154. package/src/blocks/datasetToPoints.test.ts +31 -0
  155. package/src/blocks/datasetToPoints.ts +48 -0
  156. package/src/blocks/useBlockSelections.ts +13 -0
  157. package/src/blocks/useResolvedDatasets.ts +78 -0
  158. package/src/blocks/useResolvedImages.ts +81 -0
  159. package/src/index.tsx +7 -0
  160. package/src/isolated/HtmlFrame.isolated.tsx +54 -0
  161. package/src/lazyBoundaries/heavyOptionalExports.test.tsx +2 -0
  162. package/src/lazyBoundaries/heavyOptionalExports.tsx +14 -0
@@ -18,6 +18,13 @@ import {useTheme} from "./Theme";
18
18
  import {TimezonePicker} from "./TimezonePicker";
19
19
  import {resolveFieldTestIDsFromProps} from "./testing/resolveTestId";
20
20
 
21
+ /** The state each segment index edits, per field type. */
22
+ const SEGMENT_NAMES = {
23
+ date: ["month", "day", "year"],
24
+ datetime: ["month", "day", "year", "hour", "minute"],
25
+ time: ["hour", "minute"],
26
+ } as const;
27
+
21
28
  interface SeparatorProps {
22
29
  type: "date" | "time";
23
30
  }
@@ -418,6 +425,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
418
425
  title,
419
426
  value,
420
427
  onChange,
428
+ onEntryStatusChange,
421
429
  timezone: providedTimezone,
422
430
  onTimezoneChange,
423
431
  errorText,
@@ -436,6 +444,18 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
436
444
  const [year, setYear] = useState("");
437
445
  const [hour, setHour] = useState("");
438
446
  const [minute, setMinute] = useState("");
447
+ // Whether the minute's "00" came from the user clearing the segment rather than from a value.
448
+ const isMinuteClearedRef = useRef(false);
449
+ // The last value this field emitted, so a controlled parent passing it back is not taken as
450
+ // an external change.
451
+ const lastEmittedRef = useRef<string | undefined>(undefined);
452
+ const emitChange = useCallback(
453
+ (next: string): void => {
454
+ lastEmittedRef.current = next;
455
+ onChange(next);
456
+ },
457
+ [onChange]
458
+ );
439
459
  const [fieldErrors, setFieldErrors] = useState<Record<number, string | undefined>>({});
440
460
  const [localTimezone, setLocalTimezone] = useState(
441
461
  providedTimezone ?? DateTime.local().zoneName ?? "UTC"
@@ -574,10 +594,13 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
574
594
  const hourVal = override?.hour ?? hour;
575
595
  let date: DateTime;
576
596
  if (type === "datetime") {
577
- if (!monthVal || !dayVal || !yearVal || !hour || !minuteVal) {
597
+ if (!monthVal || !dayVal || !yearVal || !hourVal || !minuteVal) {
578
598
  return undefined;
579
599
  }
580
600
  let hourNum = parseInt(hourVal, 10);
601
+ if (Number.isNaN(hourNum)) {
602
+ return undefined;
603
+ }
581
604
  if (ampPmVal === "pm" && hourNum !== 12) {
582
605
  hourNum += 12;
583
606
  } else if (ampPmVal === "am" && hourNum === 12) {
@@ -616,10 +639,13 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
616
639
  }
617
640
  );
618
641
  } else {
619
- if (!hour || !minuteVal) {
642
+ if (!hourVal || !minuteVal) {
643
+ return undefined;
644
+ }
645
+ let hourNum = parseInt(hourVal, 10);
646
+ if (Number.isNaN(hourNum)) {
620
647
  return undefined;
621
648
  }
622
- let hourNum = parseInt(hour, 10);
623
649
  if (ampPmVal === "pm" && hourNum !== 12) {
624
650
  hourNum += 12;
625
651
  } else if (ampPmVal === "am" && hourNum === 12) {
@@ -647,6 +673,37 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
647
673
  [amPm, month, day, year, hour, minute, timezone, type]
648
674
  );
649
675
 
676
+ /**
677
+ * Tells `onEntryStatusChange` what the segments hold after a typed change: nothing, an entry
678
+ * that is unfinished or has a segment error, or a complete value. Clearing the minute segment
679
+ * resets it to "00", so a "00" minute counts as empty only when the user cleared it; the "00"
680
+ * of an on-the-hour value is still part of the entry.
681
+ */
682
+ const reportEntryStatus = useCallback(
683
+ (
684
+ override: {day?: string; hour?: string; minute?: string; month?: string; year?: string},
685
+ errors: Record<number, string | undefined>
686
+ ): void => {
687
+ if (!onEntryStatusChange) {
688
+ return;
689
+ }
690
+ const next = {day, hour, minute, month, year, ...override};
691
+ const dateParts = type === "time" ? [] : [next.month, next.day, next.year];
692
+ const timeParts = type === "date" ? [] : [next.hour];
693
+ const hasMinute =
694
+ type !== "date" &&
695
+ next.minute !== "" &&
696
+ !(next.minute === "00" && isMinuteClearedRef.current);
697
+ if (![...dateParts, ...timeParts].some(Boolean) && !hasMinute) {
698
+ onEntryStatusChange("empty");
699
+ return;
700
+ }
701
+ const hasError = Object.values(errors).some((error) => error !== undefined);
702
+ onEntryStatusChange(!hasError && getISOFromFields(override) ? "valid" : "invalid");
703
+ },
704
+ [onEntryStatusChange, day, hour, minute, month, year, type, getISOFromFields]
705
+ );
706
+
650
707
  /**
651
708
  * Handles text changes in any {@link DateTimeSegment} input.
652
709
  * Strips non-numeric characters, validates the value, updates local state,
@@ -665,14 +722,21 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
665
722
  // This lets users freely edit or clear the minute field without breaking the time format.
666
723
  const finalValue = numericValue === "" ? "00" : numericValue.slice(-2);
667
724
  const minuteNum = parseInt(finalValue, 10);
725
+ isMinuteClearedRef.current = numericValue === "";
668
726
 
669
727
  // Update the minute state so the UI reflects the latest input,
670
728
  // even if it's temporarily invalid
671
729
  // This allows the user to freely edit or clear the field.
672
730
  setMinute(finalValue);
673
731
 
732
+ const isValidMinute = !Number.isNaN(minuteNum) && minuteNum >= 0 && minuteNum <= 59;
733
+ reportEntryStatus(
734
+ {minute: finalValue},
735
+ {...fieldErrors, [index]: isValidMinute ? undefined : "Minute must be between 0 and 59"}
736
+ );
737
+
674
738
  // Only update ref and result if it's a valid minute value
675
- if (!Number.isNaN(minuteNum) && minuteNum >= 0 && minuteNum <= 59) {
739
+ if (isValidMinute) {
676
740
  pendingValueRef.current = {minute: finalValue};
677
741
  setFieldErrors((prev) => ({...prev, [index]: undefined}));
678
742
 
@@ -681,7 +745,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
681
745
  if (result) {
682
746
  const currentValueUTC = value ? DateTime.fromISO(value).toUTC().toISO() : undefined;
683
747
  if (result !== currentValueUTC) {
684
- onChange(result);
748
+ emitChange(result);
685
749
  }
686
750
  }
687
751
  } else {
@@ -700,6 +764,10 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
700
764
 
701
765
  const error = validateField(index, finalValue);
702
766
  setFieldErrors((prev) => ({...prev, [index]: error}));
767
+ const segmentName = SEGMENT_NAMES[type][index];
768
+ if (segmentName) {
769
+ reportEntryStatus({[segmentName]: finalValue}, {...fieldErrors, [index]: error});
770
+ }
703
771
 
704
772
  if (type === "date" || type === "datetime") {
705
773
  if (index === 0) {
@@ -744,7 +812,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
744
812
  if (result) {
745
813
  const currentValueUTC = value ? DateTime.fromISO(value).toUTC().toISO() : undefined;
746
814
  if (result !== currentValueUTC) {
747
- onChange(result);
815
+ emitChange(result);
748
816
  }
749
817
  }
750
818
  }
@@ -756,7 +824,19 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
756
824
  inputRefs.current[index + 1]?.focus();
757
825
  }
758
826
  },
759
- [type, getFieldConfigs, getISOFromFields, onChange, value, validateField, month, day, year]
827
+ [
828
+ type,
829
+ getFieldConfigs,
830
+ getISOFromFields,
831
+ emitChange,
832
+ value,
833
+ validateField,
834
+ month,
835
+ day,
836
+ year,
837
+ fieldErrors,
838
+ reportEntryStatus,
839
+ ]
760
840
  );
761
841
 
762
842
  /**
@@ -768,7 +848,8 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
768
848
  (inputDate: string) => {
769
849
  // Handle clear case - empty string should clear the field
770
850
  if (!inputDate || inputDate === "") {
771
- onChange("");
851
+ emitChange("");
852
+ onEntryStatusChange?.("empty");
772
853
  setShowDate(false);
773
854
  return;
774
855
  }
@@ -794,6 +875,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
794
875
  hourNum = hourNum === 0 ? 12 : hourNum;
795
876
  setHour(hourNum.toString().padStart(2, "0"));
796
877
  setMinute(parsedDate.minute.toString().padStart(2, "0"));
878
+ isMinuteClearedRef.current = false;
797
879
  }
798
880
 
799
881
  // Normalize emitted value to ISO (UTC for date-only)
@@ -804,10 +886,11 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
804
886
  .set({millisecond: 0, second: 0})
805
887
  .toISO()
806
888
  : parsedDate.set({millisecond: 0, second: 0}).toUTC().toISO();
807
- onChange(normalized ?? "");
889
+ emitChange(normalized ?? "");
890
+ onEntryStatusChange?.("valid");
808
891
  setShowDate(false);
809
892
  },
810
- [onChange, type]
893
+ [emitChange, onEntryStatusChange, type]
811
894
  );
812
895
 
813
896
  /**
@@ -820,13 +903,14 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
820
903
  // Compare in UTC to avoid timezone issues
821
904
  const currentValueUTC = value ? DateTime.fromISO(value).toUTC().toISO() : undefined;
822
905
  if (iso && iso !== currentValueUTC) {
823
- onChange(iso);
906
+ emitChange(iso);
824
907
  }
908
+ reportEntryStatus({...pendingValueRef.current}, fieldErrors);
825
909
 
826
910
  // Clear the pending value after processing
827
911
  pendingValueRef.current = undefined;
828
912
  },
829
- [getISOFromFields, onChange, value]
913
+ [getISOFromFields, emitChange, value, reportEntryStatus, fieldErrors]
830
914
  );
831
915
 
832
916
  // Handle external value changes
@@ -865,6 +949,12 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
865
949
  hourNum = hourNum === 0 ? 12 : hourNum;
866
950
  setHour(hourNum.toString().padStart(2, "0"));
867
951
  setMinute(parsedDate.minute.toString().padStart(2, "0"));
952
+ const lastEmitted = lastEmittedRef.current
953
+ ? DateTime.fromISO(lastEmittedRef.current)
954
+ : undefined;
955
+ if (!lastEmitted?.isValid || lastEmitted.toMillis() !== parsedDate.toMillis()) {
956
+ isMinuteClearedRef.current = false;
957
+ }
868
958
  }
869
959
  }, [value, type, timezone]);
870
960
 
@@ -936,10 +1026,10 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
936
1026
  const iso = getISOFromFields({amPm: newAmPm});
937
1027
  const currentValueUTC = value ? DateTime.fromISO(value).toUTC().toISO() : undefined;
938
1028
  if (iso && iso !== currentValueUTC) {
939
- onChange(iso);
1029
+ emitChange(iso);
940
1030
  }
941
1031
  },
942
- [getISOFromFields, value, onChange]
1032
+ [getISOFromFields, value, emitChange]
943
1033
  );
944
1034
 
945
1035
  /** Handles timezone changes from the TimezonePicker, recomputes and emits the ISO value. */
@@ -953,10 +1043,10 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
953
1043
  const iso = getISOFromFields({timezone: tz});
954
1044
  const currentValueUTC = value ? DateTime.fromISO(value).toUTC().toISO() : undefined;
955
1045
  if (iso && iso !== currentValueUTC) {
956
- onChange(iso);
1046
+ emitChange(iso);
957
1047
  }
958
1048
  },
959
- [getISOFromFields, value, onChange, onTimezoneChange]
1049
+ [getISOFromFields, value, emitChange, onTimezoneChange]
960
1050
  );
961
1051
 
962
1052
  const openActionSheet = useCallback((): void => {
@@ -1,7 +1,6 @@
1
- import {describe, expect, it, spyOn} from "bun:test";
1
+ import {describe, expect, it} from "bun:test";
2
2
  import {act, fireEvent} from "@testing-library/react-native";
3
3
  import {assert} from "chai";
4
- import {Linking} from "react-native";
5
4
 
6
5
  import {DonutChart} from "./DonutChart";
7
6
  import {renderWithTheme} from "./test-utils";
@@ -178,17 +177,13 @@ describe("DonutChart", () => {
178
177
  expect(queryByTestId("chart.tooltip")).toBeNull();
179
178
  });
180
179
 
181
- it("does not open URLs from slice legend labels", async () => {
182
- const openURLSpy = spyOn(Linking, "openURL").mockImplementation(() => Promise.resolve(true));
180
+ it("does not open URLs from slice legend labels", () => {
183
181
  const {getByText} = renderWithTheme(
184
182
  <DonutChart data={[{label: "https://evil.example", value: 10}]} />
185
183
  );
186
184
 
187
- await act(async () => {
188
- fireEvent.press(getByText("https://evil.example"));
189
- });
190
-
191
- expect(openURLSpy).not.toHaveBeenCalled();
192
- openURLSpy.mockRestore();
185
+ // The suite shares one Linking mock, so a spy on openURL also records calls
186
+ // from other files. A label is inert when it has no press handler.
187
+ expect(getByText("https://evil.example").props.onPress).toBeUndefined();
193
188
  });
194
189
  });
@@ -1,5 +1,5 @@
1
1
  import {afterAll, beforeEach, describe, expect, it, mock} from "bun:test";
2
- import {fireEvent, waitFor} from "@testing-library/react-native";
2
+ import {fireEvent, waitFor, within} from "@testing-library/react-native";
3
3
  import {Platform, Pressable} from "react-native";
4
4
 
5
5
  // Override the IconButton mock so the onClick fires when pressed.
@@ -35,12 +35,12 @@ import {FilePickerButton, type SelectedFile} from "./FilePickerButton";
35
35
  import {renderWithTheme} from "./test-utils";
36
36
 
37
37
  interface ImagePickerResult {
38
- assets: Array<{fileName?: string; mimeType?: string; uri: string}>;
38
+ assets: Array<{fileName?: string; fileSize?: number; mimeType?: string; uri: string}>;
39
39
  canceled: boolean;
40
40
  }
41
41
 
42
42
  interface DocumentPickerResult {
43
- assets: Array<{mimeType?: string; name: string; uri: string}>;
43
+ assets: Array<{mimeType?: string; name: string; size?: number; uri: string}>;
44
44
  canceled: boolean;
45
45
  }
46
46
 
@@ -168,6 +168,59 @@ describe("FilePickerButton", () => {
168
168
  expect(empty.files).toHaveLength(0);
169
169
  });
170
170
 
171
+ it("shows a labelled button when text is set", () => {
172
+ const {getByTestId} = renderWithTheme(
173
+ <FilePickerButton onFilesSelected={() => {}} text="Choose files" />
174
+ );
175
+ expect(within(getByTestId("file-picker-button")).getByText("Choose files")).toBeTruthy();
176
+ });
177
+
178
+ it("opens the document picker with the given types directly when images are off", async () => {
179
+ documentPickerResult = {
180
+ assets: [{mimeType: "text/csv", name: "day.csv", size: 42, uri: "file:///day.csv"}],
181
+ canceled: false,
182
+ };
183
+ const files: SelectedFile[][] = [];
184
+ const {getByTestId, queryByText} = renderWithTheme(
185
+ <FilePickerButton
186
+ documentTypes={["text/csv"]}
187
+ includeImages={false}
188
+ onFilesSelected={(selected) => files.push(selected)}
189
+ text="Choose files"
190
+ />
191
+ );
192
+
193
+ fireEvent.press(getByTestId("file-picker-button"));
194
+
195
+ await waitFor(() => expect(files).toHaveLength(1));
196
+ expect(queryByText("Photo Library")).toBeNull();
197
+ expect(getDocumentAsync).toHaveBeenCalledWith({multiple: false, type: ["text/csv"]});
198
+ expect(files[0]).toEqual([
199
+ {mimeType: "text/csv", name: "day.csv", size: 42, uri: "file:///day.csv"},
200
+ ]);
201
+ });
202
+
203
+ it("opens the photo library directly when there are no document types", async () => {
204
+ imagePickerResult = {
205
+ assets: [
206
+ {fileName: "pic.png", fileSize: 2048, mimeType: "image/png", uri: "file:///pic.png"},
207
+ ],
208
+ canceled: false,
209
+ };
210
+ const files: SelectedFile[][] = [];
211
+ const {getByTestId} = renderWithTheme(
212
+ <FilePickerButton documentTypes={[]} onFilesSelected={(selected) => files.push(selected)} />
213
+ );
214
+
215
+ fireEvent.press(getByTestId("file-picker-button"));
216
+
217
+ await waitFor(() => expect(files).toHaveLength(1));
218
+ expect(getDocumentAsync).not.toHaveBeenCalled();
219
+ expect(files[0]).toEqual([
220
+ {mimeType: "image/png", name: "pic.png", size: 2048, uri: "file:///pic.png"},
221
+ ]);
222
+ });
223
+
171
224
  it("opens a browser file input for documents on web and returns data URLs", async () => {
172
225
  const listeners: Record<string, () => void | Promise<void>> = {};
173
226
  const file = {name: "notes.txt", type: "text/plain"};
@@ -3,6 +3,7 @@ import React, {useCallback, useState} from "react";
3
3
  import {Platform} from "react-native";
4
4
 
5
5
  import {Box} from "./Box";
6
+ import {Button} from "./Button";
6
7
  import {DropdownMenuItem} from "./DropdownMenuItem";
7
8
  import {DropdownPanel} from "./DropdownPanel";
8
9
  import {IconButton} from "./IconButton";
@@ -10,18 +11,32 @@ import {IconButton} from "./IconButton";
10
11
  export interface SelectedFile {
11
12
  mimeType: string;
12
13
  name: string;
14
+ /** The file's size in bytes, when the picker reports it. */
15
+ size?: number;
13
16
  uri: string;
14
17
  }
15
18
 
19
+ const DEFAULT_DOCUMENT_TYPES = ["application/pdf", "text/plain", "text/csv", "application/json"];
20
+
16
21
  export interface FilePickerButtonProps {
17
22
  disabled?: boolean;
23
+ /**
24
+ * The MIME types the document picker offers. Defaults to PDF, text, CSV, and JSON. An empty list
25
+ * hides Document, so the button opens the photo library directly.
26
+ */
27
+ documentTypes?: string[];
28
+ /**
29
+ * Offer Photo Library. Defaults to true. When false, the button opens the document picker
30
+ * directly.
31
+ */
32
+ includeImages?: boolean;
18
33
  multiple?: boolean;
19
34
  onFilesSelected: (files: SelectedFile[]) => void;
20
35
  testID?: string;
36
+ /** Shows a labelled button, such as "Choose files", instead of the paperclip icon. */
37
+ text?: string;
21
38
  }
22
39
 
23
- const DOCUMENT_MIME_TYPES = ["application/pdf", "text/plain", "text/csv", "application/json"];
24
-
25
40
  const readFileAsDataUrl = (file: File): Promise<string> =>
26
41
  new Promise((resolve, reject) => {
27
42
  const reader = new FileReader();
@@ -59,6 +74,7 @@ const pickFilesOnWeb = ({
59
74
  files.map(async (file) => ({
60
75
  mimeType: file.type || "application/octet-stream",
61
76
  name: file.name,
77
+ ...(file.size === undefined ? {} : {size: file.size}),
62
78
  uri: await readFileAsDataUrl(file),
63
79
  }))
64
80
  );
@@ -78,11 +94,15 @@ const pickFilesOnWeb = ({
78
94
 
79
95
  export const FilePickerButton = ({
80
96
  disabled = false,
97
+ documentTypes = DEFAULT_DOCUMENT_TYPES,
98
+ includeImages = true,
81
99
  multiple = false,
82
100
  onFilesSelected,
83
101
  testID,
102
+ text,
84
103
  }: FilePickerButtonProps): React.ReactElement => {
85
104
  const [isMenuOpen, setIsMenuOpen] = useState(false);
105
+ const includeDocuments = documentTypes.length > 0;
86
106
  const triggerTestID = testID ?? "file-picker-button";
87
107
 
88
108
  const handleWebPick = useCallback(
@@ -112,6 +132,7 @@ export const FilePickerButton = ({
112
132
  const files: SelectedFile[] = result.assets.map((asset) => ({
113
133
  mimeType: asset.mimeType ?? "image/jpeg",
114
134
  name: asset.fileName ?? `image-${DateTime.now().toMillis()}.jpg`,
135
+ ...(asset.fileSize === undefined ? {} : {size: asset.fileSize}),
115
136
  uri: asset.uri,
116
137
  }));
117
138
  onFilesSelected(files);
@@ -121,39 +142,84 @@ export const FilePickerButton = ({
121
142
  const handlePickDocument = useCallback(async () => {
122
143
  setIsMenuOpen(false);
123
144
  if (Platform.OS === "web") {
124
- await handleWebPick(DOCUMENT_MIME_TYPES.join(","));
145
+ await handleWebPick(documentTypes.join(","));
125
146
  return;
126
147
  }
127
148
  const DocumentPicker = await import("expo-document-picker");
128
- const result = await DocumentPicker.getDocumentAsync({
129
- multiple,
130
- type: DOCUMENT_MIME_TYPES,
131
- });
149
+ const result = await DocumentPicker.getDocumentAsync({multiple, type: documentTypes});
132
150
 
133
151
  if (!result.canceled && result.assets.length > 0) {
134
152
  const files: SelectedFile[] = result.assets.map((asset) => ({
135
153
  mimeType: asset.mimeType ?? "application/octet-stream",
136
154
  name: asset.name,
155
+ ...(asset.size === undefined ? {} : {size: asset.size}),
137
156
  uri: asset.uri,
138
157
  }));
139
158
  onFilesSelected(files);
140
159
  }
141
- }, [handleWebPick, multiple, onFilesSelected]);
160
+ }, [documentTypes, handleWebPick, multiple, onFilesSelected]);
161
+
162
+ const handleOpen = useCallback((): void => {
163
+ if (!includeImages) {
164
+ void handlePickDocument();
165
+ return;
166
+ }
167
+ if (!includeDocuments) {
168
+ void handlePickImage();
169
+ return;
170
+ }
171
+ setIsMenuOpen(true);
172
+ }, [handlePickDocument, handlePickImage, includeDocuments, includeImages]);
173
+
174
+ const trigger =
175
+ text === undefined ? (
176
+ <IconButton
177
+ accessibilityLabel="Attach file"
178
+ disabled={disabled}
179
+ iconName="paperclip"
180
+ onClick={handleOpen}
181
+ testID={triggerTestID}
182
+ />
183
+ ) : (
184
+ <Button
185
+ disabled={disabled}
186
+ iconName="paperclip"
187
+ onClick={handleOpen}
188
+ testID={triggerTestID}
189
+ text={text}
190
+ variant="outline"
191
+ />
192
+ );
193
+
194
+ if (!includeImages || !includeDocuments) {
195
+ return trigger;
196
+ }
142
197
 
143
198
  return (
144
199
  <DropdownPanel
145
200
  align="auto"
146
201
  isOpen={isMenuOpen}
147
202
  onOpenChange={setIsMenuOpen}
148
- renderTrigger={({toggle}) => (
149
- <IconButton
150
- accessibilityLabel="Attach file"
151
- disabled={disabled}
152
- iconName="paperclip"
153
- onClick={toggle}
154
- testID={triggerTestID}
155
- />
156
- )}
203
+ renderTrigger={({toggle}) =>
204
+ text === undefined ? (
205
+ <IconButton
206
+ accessibilityLabel="Attach file"
207
+ disabled={disabled}
208
+ iconName="paperclip"
209
+ onClick={toggle}
210
+ testID={triggerTestID}
211
+ />
212
+ ) : (
213
+ <Button
214
+ disabled={disabled}
215
+ iconName="paperclip"
216
+ onClick={toggle}
217
+ testID={triggerTestID}
218
+ text={text}
219
+ variant="outline"
220
+ />
221
+ )
222
+ }
157
223
  showActionButtons={false}
158
224
  testID={`${triggerTestID}-menu`}
159
225
  width={200}