@marktiderman/genesis-ui-native 3.5.0 → 3.6.0

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 (92) hide show
  1. package/README.md +71 -7
  2. package/dist/{chunk-LBVD7XXL.js → chunk-2Z72MYHB.js} +627 -20
  3. package/dist/chunk-2Z72MYHB.js.map +1 -0
  4. package/dist/chunk-4OQOJ2OC.js +80 -0
  5. package/dist/chunk-4OQOJ2OC.js.map +1 -0
  6. package/dist/{chunk-6KWEAGRD.js → chunk-6PGLX6ET.js} +101 -6
  7. package/dist/chunk-6PGLX6ET.js.map +1 -0
  8. package/dist/{chunk-ONH2PCGH.js → chunk-AGTBABAH.js} +9 -15
  9. package/dist/chunk-AGTBABAH.js.map +1 -0
  10. package/dist/{chunk-ABVSSJNT.js → chunk-FUMSL7VZ.js} +198 -168
  11. package/dist/chunk-FUMSL7VZ.js.map +1 -0
  12. package/dist/{chunk-GHYUNNNU.js → chunk-NDXNSSM6.js} +175 -93
  13. package/dist/chunk-NDXNSSM6.js.map +1 -0
  14. package/dist/chunk-SEJ6RBP7.js +361 -0
  15. package/dist/chunk-SEJ6RBP7.js.map +1 -0
  16. package/dist/{chunk-D5RKSPMH.js → chunk-ZRQAFFTN.js} +4 -3
  17. package/dist/chunk-ZRQAFFTN.js.map +1 -0
  18. package/dist/components/index.d.ts +331 -4
  19. package/dist/components/index.js +5 -5
  20. package/dist/data/index.d.ts +68 -4
  21. package/dist/data/index.js +235 -31
  22. package/dist/data/index.js.map +1 -1
  23. package/dist/hooks/index.d.ts +60 -1
  24. package/dist/hooks/index.js +2 -3
  25. package/dist/icons/lucide.d.ts +1 -1
  26. package/dist/icons/lucide.js +7 -1
  27. package/dist/icons/lucide.js.map +1 -1
  28. package/dist/{inbox-page-BEarNEIP.d.ts → inbox-page-B7_Oi2fS.d.ts} +2 -44
  29. package/dist/index.d.ts +8 -5
  30. package/dist/index.js +8 -8
  31. package/dist/layouts/index.d.ts +40 -51
  32. package/dist/layouts/index.js +5 -4
  33. package/dist/{native-modules-PwnGltOU.d.ts → native-modules-Cl3zw3kh.d.ts} +27 -1
  34. package/package.json +78 -4
  35. package/src/__tests__/doctor-rules.test.ts +60 -0
  36. package/src/__tests__/native-modules-lists.test.tsx +1 -0
  37. package/src/components/__tests__/composer-bar.test.tsx +55 -0
  38. package/src/components/__tests__/gallery-card.test.tsx +59 -0
  39. package/src/components/__tests__/gallery-grid.test.tsx +160 -0
  40. package/src/components/__tests__/lightbox-resnap.test.tsx +50 -0
  41. package/src/components/__tests__/lightbox-zoom.test.ts +33 -0
  42. package/src/components/__tests__/lightbox.test.tsx +141 -0
  43. package/src/components/__tests__/live-indicator.test.tsx +72 -0
  44. package/src/components/__tests__/rating.test.tsx +82 -0
  45. package/src/components/__tests__/thread-list.test.tsx +156 -0
  46. package/src/components/composer-bar.tsx +198 -0
  47. package/src/components/drawer.tsx +15 -9
  48. package/src/components/gallery-card.tsx +109 -0
  49. package/src/components/gallery-grid.tsx +285 -0
  50. package/src/components/gallery-layout.ts +2 -0
  51. package/src/components/gallery-types.ts +2 -0
  52. package/src/components/index.ts +44 -0
  53. package/src/components/lightbox-zoom.tsx +282 -0
  54. package/src/components/lightbox.tsx +342 -0
  55. package/src/components/live-indicator.tsx +139 -0
  56. package/src/components/rating.tsx +128 -0
  57. package/src/components/skeleton.tsx +9 -4
  58. package/src/components/thread-list.tsx +427 -0
  59. package/src/components/toast.tsx +7 -4
  60. package/src/data/NativeConflictSheet.tsx +181 -0
  61. package/src/data/NativeResourceForm.tsx +15 -1
  62. package/src/data/index.ts +2 -0
  63. package/src/data/resource-view/NativeLinkPicker.tsx +1 -1
  64. package/src/data/resource-view/NativeRecordView.tsx +85 -8
  65. package/src/data/resource-view/NativeResourceView.tsx +79 -32
  66. package/src/data/resource-view/__tests__/native-link-picker.test.tsx +16 -0
  67. package/src/data/resource-view/__tests__/native-record-view.test.tsx +95 -1
  68. package/src/data/resource-view/__tests__/native-resource-gallery.test.tsx +125 -0
  69. package/src/data/resource-view/mapping.ts +3 -0
  70. package/src/hooks/__tests__/use-motion.test.tsx +106 -0
  71. package/src/hooks/__tests__/use-thread-jump.test.tsx +88 -0
  72. package/src/hooks/index.ts +3 -0
  73. package/src/hooks/use-motion.ts +128 -0
  74. package/src/hooks/use-thread-jump.ts +110 -0
  75. package/src/icon-names.ts +6 -0
  76. package/src/icons/lucide.ts +12 -0
  77. package/src/layouts/__tests__/inbox-page.test.tsx +6 -0
  78. package/src/layouts/__tests__/thread-page.test.tsx +114 -14
  79. package/src/layouts/inbox-page.tsx +6 -55
  80. package/src/layouts/index.ts +2 -0
  81. package/src/layouts/thread-page.tsx +326 -262
  82. package/src/native-modules.tsx +16 -2
  83. package/dist/chunk-6KWEAGRD.js.map +0 -1
  84. package/dist/chunk-7PCWEY6R.js +0 -27
  85. package/dist/chunk-7PCWEY6R.js.map +0 -1
  86. package/dist/chunk-ABVSSJNT.js.map +0 -1
  87. package/dist/chunk-D5RKSPMH.js.map +0 -1
  88. package/dist/chunk-GHYUNNNU.js.map +0 -1
  89. package/dist/chunk-LBVD7XXL.js.map +0 -1
  90. package/dist/chunk-ONH2PCGH.js.map +0 -1
  91. package/dist/chunk-Z3AQYVUA.js +0 -36
  92. package/dist/chunk-Z3AQYVUA.js.map +0 -1
@@ -1,16 +1,15 @@
1
- import { NativeImage, NativeAvatar, NativeCard, NativeCardContent, NativeSeparator, NativeLabel, NativeSwitch, NativeCheckbox, NativeSelect, NativeSelectTrigger, NativeSelectContent, NativeSelectItem, NativeTextarea, NativeAlert, NativeAlertTitle, NativeAlertDescription, NativeSheet, NativeSheetScrollView, NativeInlineAlert, NativeSegmentedControl, NativeDatePicker, NativeTimePicker, NativeSearchBar, NativeSkeleton, NativeCardHeader, NativeCardTitle } from '../chunk-GHYUNNNU.js';
2
- import '../chunk-7PCWEY6R.js';
3
- import { showInboxActions, NavBarSaveButton, composeHeaderOptions } from '../chunk-ONH2PCGH.js';
4
- import { NativeListItem, NativeBadge, NativeText, NativeButton, NativeInput, useGenesisModules, NativeLoadingState, NativeSectionListHeader, NativeEmptyState, NativeRefreshControl, NativeIcon } from '../chunk-6KWEAGRD.js';
5
- import { useThemeRoles } from '../chunk-Z3AQYVUA.js';
1
+ import { NativeImage, NativeAvatar, NativeCard, NativeCardContent, NativeSeparator, NativeLabel, NativeSwitch, NativeCheckbox, NativeSelect, NativeSelectTrigger, NativeSelectContent, NativeSelectItem, NativeTextarea, NativeSheet, NativeSheetScrollView, NativeAlert, NativeAlertTitle, NativeAlertDescription, NativeInlineAlert, NativeSegmentedControl, NativeDatePicker, NativeTimePicker, NativeSearchBar, NativeGalleryGrid, NativeCardHeader, NativeCardTitle } from '../chunk-NDXNSSM6.js';
2
+ import { showInboxActions, NavBarSaveButton, composeHeaderOptions } from '../chunk-AGTBABAH.js';
3
+ import { NativeListItem, NativeBadge, NativeText, NativeButton, NativeInput, useGenesisModules, NativeLoadingState, NativeSectionListHeader, NativeEmptyState, NativeRefreshControl, NativeIcon, NativeSkeleton } from '../chunk-6PGLX6ET.js';
4
+ import { useThemeRoles } from '../chunk-4OQOJ2OC.js';
6
5
  import '../chunk-OHZD7KRO.js';
7
6
  import '../chunk-DGUM43GV.js';
8
- import { Platform, View, Pressable, Text, Linking, ScrollView, Alert, SectionList, ActionSheetIOS, FlatList } from 'react-native';
7
+ import { Platform, View, Pressable, Text, Linking, ScrollView, AccessibilityInfo, Alert, SectionList, ActionSheetIOS, FlatList } from 'react-native';
9
8
  import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
10
9
  import * as React from 'react';
11
- import { createContext, memo, useState, useCallback, useMemo, useEffect, useContext, useRef, useLayoutEffect } from 'react';
10
+ import { createContext, memo, useState, useCallback, useEffect, useMemo, useContext, useRef, useLayoutEffect } from 'react';
12
11
  import { SafeAreaView } from 'react-native-safe-area-context';
13
- import { encodeRecordKey, titleCase, useResourceForm, resourceKeys, useDataProvider, useViewer as useViewer$1, useCapabilities as useCapabilities$1, DataWriteError } from '@marktiderman/genesis-core';
12
+ import { encodeRecordKey, titleCase, useResourceForm, resourceKeys, useDataProvider, useCapabilities as useCapabilities$1, useViewer as useViewer$1, useResource as useResource$1, writeConflict, isDataWriteError, DataWriteError } from '@marktiderman/genesis-core';
14
13
  import { Controller, useForm } from 'react-hook-form';
15
14
  import { useRelationLabel, useResource, useViewer, useInfiniteResource, useCapabilities, useOptionalViewerScope, scopeClock, useOne, useLinkOptions } from '@marktiderman/genesis-core/hooks';
16
15
  import { personTimeZone, isTimeZone, wallClock } from '@marktiderman/genesis-core/dates';
@@ -410,6 +409,98 @@ function NativeResourceFormFieldRenderer({
410
409
  }
411
410
  );
412
411
  }
412
+ var english = {
413
+ title: "Someone else changed this {noun}",
414
+ description: "They saved a change after you opened it. Theirs is next to yours below: keep yours to save it over theirs, or take theirs and drop your changes.",
415
+ same: "Their change already matches yours, so there's nothing to choose.",
416
+ theirs: "Theirs",
417
+ mine: "Yours",
418
+ empty: "Empty",
419
+ unknown: "Not shown",
420
+ keepMine: "Keep my version",
421
+ takeTheirs: "Take their version",
422
+ failed: "Your version wasn't saved.",
423
+ yes: "Yes",
424
+ no: "No",
425
+ record: "record"
426
+ };
427
+ function plain(value, w) {
428
+ if (value === null || value === void 0 || value === "") return w.empty;
429
+ if (typeof value === "boolean") return value ? w.yes : w.no;
430
+ if (typeof value === "object") {
431
+ try {
432
+ return JSON.stringify(value);
433
+ } catch {
434
+ return String(value);
435
+ }
436
+ }
437
+ return String(value);
438
+ }
439
+ function NativeConflictSheet({
440
+ conflict,
441
+ noun,
442
+ label = titleCase,
443
+ format,
444
+ onKeepMine,
445
+ onTakeTheirs,
446
+ onDismiss,
447
+ messages,
448
+ testID = "native-conflict-sheet"
449
+ }) {
450
+ const w = { ...english, ...messages };
451
+ const [keeping, setKeeping] = useState(false);
452
+ const [failed, setFailed] = useState(null);
453
+ const fields = conflict?.fields ?? [];
454
+ const title = w.title.replace("{noun}", noun ?? w.record);
455
+ const canKeep = fields.length > 0 && conflict?.currentVersion != null;
456
+ useEffect(() => {
457
+ setFailed(null);
458
+ if (conflict) AccessibilityInfo.announceForAccessibility?.(title);
459
+ }, [conflict, title]);
460
+ const has = (field) => !!conflict && field in conflict.theirs;
461
+ const text2 = (field, value, known = true) => known ? plain(value, w) : w.unknown;
462
+ const show = (field, value, known = true) => format && known ? format(field, value) : /* @__PURE__ */ jsx(NativeText, { preset: "body-sm", children: text2(field, value, known) });
463
+ const keep = async () => {
464
+ setKeeping(true);
465
+ setFailed(null);
466
+ try {
467
+ await onKeepMine();
468
+ } catch (error) {
469
+ setFailed(error instanceof Error && error.message ? error.message : w.failed);
470
+ } finally {
471
+ setKeeping(false);
472
+ }
473
+ };
474
+ return /* @__PURE__ */ jsx(
475
+ NativeSheet,
476
+ {
477
+ open: conflict !== null,
478
+ onOpenChange: (open) => !open && !keeping && onDismiss(),
479
+ fitContent: true,
480
+ testID,
481
+ children: /* @__PURE__ */ jsx(NativeSheetScrollView, { children: /* @__PURE__ */ jsxs(View, { style: { gap: 12, paddingHorizontal: 16, paddingVertical: 12 }, children: [
482
+ /* @__PURE__ */ jsx(NativeText, { preset: "h4", accessibilityRole: "header", children: title }),
483
+ /* @__PURE__ */ jsx(NativeText, { preset: "body-sm", className: "text-muted-foreground", children: fields.length > 0 ? w.description : w.same }),
484
+ conflict ? fields.map((field) => /* @__PURE__ */ jsxs(View, { style: { gap: 4 }, testID: `${testID}-field-${field}`, children: [
485
+ /* @__PURE__ */ jsx(NativeText, { preset: "label", children: label(field) }),
486
+ /* @__PURE__ */ jsxs(View, { accessible: true, ...format ? {} : { accessibilityLabel: `${w.theirs}: ${text2(field, conflict.theirs[field], has(field))}` }, children: [
487
+ /* @__PURE__ */ jsx(NativeText, { preset: "caption", className: "text-muted-foreground", children: w.theirs }),
488
+ show(field, conflict.theirs[field], has(field))
489
+ ] }),
490
+ /* @__PURE__ */ jsxs(View, { accessible: true, ...format ? {} : { accessibilityLabel: `${w.mine}: ${text2(field, conflict.mine[field])}` }, children: [
491
+ /* @__PURE__ */ jsx(NativeText, { preset: "caption", className: "text-muted-foreground", children: w.mine }),
492
+ show(field, conflict.mine[field])
493
+ ] })
494
+ ] }, field)) : null,
495
+ failed ? /* @__PURE__ */ jsx(NativeText, { preset: "body-sm", className: "text-destructive", accessibilityRole: "alert", testID: `${testID}-failed`, children: failed }) : null,
496
+ /* @__PURE__ */ jsxs(View, { style: { gap: 8, paddingTop: 4 }, children: [
497
+ canKeep ? /* @__PURE__ */ jsx(NativeButton, { size: "lg", onPress: () => void keep(), loading: keeping, disabled: keeping, testID: `${testID}-keep-mine`, children: w.keepMine }) : null,
498
+ /* @__PURE__ */ jsx(NativeButton, { size: "lg", variant: "outline", onPress: onTakeTheirs, disabled: keeping, testID: `${testID}-take-theirs`, children: w.takeTheirs })
499
+ ] })
500
+ ] }) })
501
+ }
502
+ );
503
+ }
413
504
  function NativeResourceForm({
414
505
  resource,
415
506
  action,
@@ -433,7 +524,18 @@ function NativeResourceForm({
433
524
  prefillFromUrl: false,
434
525
  validationMode: "onSubmit"
435
526
  };
436
- const { form, resolvedFields, onSubmit, isSaving } = useResourceForm(options);
527
+ const { form, resolvedFields, onSubmit, isSaving, conflict, keepMine, takeTheirs, dismissConflict } = useResourceForm(options);
528
+ const conflictSheet = /* @__PURE__ */ jsx(
529
+ NativeConflictSheet,
530
+ {
531
+ conflict,
532
+ label: (field) => resolvedFields.find((f) => f.key === field)?.label ?? titleCase(field),
533
+ onKeepMine: keepMine,
534
+ onTakeTheirs: takeTheirs,
535
+ onDismiss: dismissConflict,
536
+ testID: "native-resource-form-conflict"
537
+ }
538
+ );
437
539
  const resolvedTitle = title ?? (action === "create" ? `Create ${titleCase(resource)}` : `Edit ${titleCase(resource)}`);
438
540
  const submitLabel = action === "create" ? "Create" : "Save";
439
541
  const values = form.watch();
@@ -481,20 +583,24 @@ function NativeResourceForm({
481
583
  if (layout === "inline") {
482
584
  return /* @__PURE__ */ jsxs(View, { style: { gap: 16 }, children: [
483
585
  /* @__PURE__ */ jsx(NativeText, { preset: "h3", children: resolvedTitle }),
484
- formContent
586
+ formContent,
587
+ conflictSheet
485
588
  ] });
486
589
  }
487
- return /* @__PURE__ */ jsx(SafeAreaView, { edges: ["bottom"], style: { flex: 1 }, children: /* @__PURE__ */ jsxs(
488
- ScrollView,
489
- {
490
- contentContainerStyle: { padding: 16, gap: 16 },
491
- showsVerticalScrollIndicator: false,
492
- children: [
493
- /* @__PURE__ */ jsx(NativeText, { preset: "h3", children: resolvedTitle }),
494
- formContent
495
- ]
496
- }
497
- ) });
590
+ return /* @__PURE__ */ jsxs(SafeAreaView, { edges: ["bottom"], style: { flex: 1 }, children: [
591
+ /* @__PURE__ */ jsxs(
592
+ ScrollView,
593
+ {
594
+ contentContainerStyle: { padding: 16, gap: 16 },
595
+ showsVerticalScrollIndicator: false,
596
+ children: [
597
+ /* @__PURE__ */ jsx(NativeText, { preset: "h3", children: resolvedTitle }),
598
+ formContent
599
+ ]
600
+ }
601
+ ),
602
+ conflictSheet
603
+ ] });
498
604
  }
499
605
  function resolveField(f, index) {
500
606
  if (typeof f === "string") {
@@ -1135,6 +1241,9 @@ function heldTo(link, keys) {
1135
1241
  get labelField() {
1136
1242
  return link.labelField;
1137
1243
  },
1244
+ get orderBy() {
1245
+ return link.orderBy;
1246
+ },
1138
1247
  ...link.searchFields ? { searchFields: link.searchFields } : {},
1139
1248
  filters: (scope, values) => [...link.filters(scope, values), held]
1140
1249
  });
@@ -1233,7 +1342,7 @@ function NativeLinkPicker({ field, value, onChange, values, error, testID }) {
1233
1342
  const filters = useMemo(() => JSON.parse(filtersKey), [filtersKey]);
1234
1343
  const labelField = field.labelField ?? link.labelField;
1235
1344
  const list = useLinkOptions(
1236
- { resource: link.resource, field: link.field, labelField, searchFields: link.searchFields },
1345
+ { resource: link.resource, field: link.field, labelField, searchFields: link.searchFields, orderBy: link.orderBy },
1237
1346
  { filters, search, enabled: open, untitled: words.untitled }
1238
1347
  );
1239
1348
  const loaded = isEmptyValue(value) ? void 0 : list.options.find((o) => String(o.value) === String(value));
@@ -1965,6 +2074,7 @@ function Screen(props) {
1965
2074
  searchable,
1966
2075
  mode = "list",
1967
2076
  numColumns: columnsProp,
2077
+ gallery: screenGallery,
1968
2078
  renderCard,
1969
2079
  scopeTimeZone: _zone,
1970
2080
  testID = "native-resource-view",
@@ -2145,10 +2255,43 @@ function Screen(props) {
2145
2255
  const { formFields } = state;
2146
2256
  const createFields = useMemo(() => formFields("create"), [formFields]);
2147
2257
  const editFields = useMemo(() => formFields("edit"), [formFields]);
2258
+ const galleryKey = JSON.stringify(screenGallery ?? null);
2259
+ const photos = useMemo(() => {
2260
+ if (!grid || !(view.definition.gallery || screenGallery?.image)) return null;
2261
+ const byId = /* @__PURE__ */ new Map();
2262
+ const items = [];
2263
+ for (const section of state.sections) {
2264
+ for (const row of section.data) {
2265
+ const photo = view.galleryItem(row, screenGallery);
2266
+ if (!photo) continue;
2267
+ byId.set(photo.id, row);
2268
+ items.push(photo);
2269
+ }
2270
+ }
2271
+ return { items, byId };
2272
+ }, [grid, view, galleryKey, state.sections]);
2273
+ const galleryRowHeight = screenGallery?.rowHeight ?? view.definition.gallery?.rowHeight;
2148
2274
  const peekActions = peek ? actionsFor(peek, handlers) : [];
2149
2275
  const editLoading = sheet?.mode === "edit" && editRow.data === void 0 && !editRow.isError;
2150
2276
  return /* @__PURE__ */ jsxs(SafeAreaView, { testID, edges: ["left", "right", "bottom"], style: { flex: 1, backgroundColor: colors.groupedBackground }, children: [
2151
- /* @__PURE__ */ jsx(
2277
+ photos ? /* @__PURE__ */ jsx(
2278
+ NativeGalleryGrid,
2279
+ {
2280
+ testID: `${testID}-gallery`,
2281
+ items: photos.items,
2282
+ ...galleryRowHeight !== void 0 ? { rowHeight: galleryRowHeight } : {},
2283
+ onItemPress: (photo) => {
2284
+ const row = photos.byId.get(photo.id);
2285
+ if (row) press(row);
2286
+ },
2287
+ header: /* @__PURE__ */ jsxs(Fragment, { children: [
2288
+ listHeader,
2289
+ photos.items.length === 0 ? empty : null
2290
+ ] }),
2291
+ footer: state.loadingMore ? /* @__PURE__ */ jsx(NativeLoadingState, { fullScreen: false, size: "small", label: messages.list.loadingMore, testID: `${testID}-more` }) : null,
2292
+ ...state.hasMore ? { loadMore: state.loadMore } : {}
2293
+ }
2294
+ ) : /* @__PURE__ */ jsx(
2152
2295
  SectionList,
2153
2296
  {
2154
2297
  testID: `${testID}-list`,
@@ -2282,6 +2425,8 @@ function useHeaderActions({ view: recordView, row, onAction, can, messages }) {
2282
2425
  return { actions, press, pending, words };
2283
2426
  }
2284
2427
  var A11Y_PREFIX = "action:";
2428
+ var alreadyShown = () => {
2429
+ };
2285
2430
  function NativeRecordViewMenu(props) {
2286
2431
  const { testID = "native-resource-workspace-menu" } = props;
2287
2432
  const { actions, press, pending, words } = useHeaderActions(props);
@@ -2481,13 +2626,17 @@ function NativeRecordView(props) {
2481
2626
  function SettingsGroup({
2482
2627
  recordView,
2483
2628
  sectionId,
2484
- row,
2629
+ row: rowProp,
2485
2630
  words,
2486
2631
  onSaved,
2487
2632
  testID
2488
2633
  }) {
2489
2634
  const provider = useDataProvider();
2635
+ const [theirsRow, setTheirsRow] = useState(null);
2636
+ useEffect(() => setTheirsRow(null), [rowProp]);
2637
+ const row = theirsRow ?? rowProp;
2490
2638
  const view = recordView.view;
2639
+ const versionField = useCapabilities$1(view.resource, { enabled: !!provider.capabilities }).data?.version?.field;
2491
2640
  const fields = useMemo(() => {
2492
2641
  const byKey = new Map(formFieldsFor(view, "edit").map((f) => [f.key, f]));
2493
2642
  return recordView.settingsFields(sectionId).map((f) => byKey.get(f.field.name)).filter((f) => !!f && !f.readOnly);
@@ -2495,6 +2644,10 @@ function SettingsGroup({
2495
2644
  const viewer = useViewer$1();
2496
2645
  const locked = recordView.settingsLocked(row, viewer);
2497
2646
  const [edits, setEdits] = useState({});
2647
+ const editBase = useRef(void 0);
2648
+ useEffect(() => {
2649
+ if (Object.keys(edits).length === 0) editBase.current = void 0;
2650
+ }, [edits]);
2498
2651
  const draft = useMemo(() => ({ ...Object.fromEntries(fields.map((f) => [f.key, row[f.key]])), ...edits }), [fields, row, edits]);
2499
2652
  useEffect(() => {
2500
2653
  setEdits((current) => {
@@ -2510,23 +2663,61 @@ function SettingsGroup({
2510
2663
  for (const f of shown) if (f.key in edits && !sameFormValue(draft[f.key], row[f.key])) changed[f.key] = draft[f.key];
2511
2664
  const dirty = Object.keys(changed).length > 0 && !shown.some((f) => invalid[f.key]);
2512
2665
  const set = (key, value, error) => {
2666
+ if (Object.keys(edits).length === 0 && editBase.current === void 0) editBase.current = row;
2513
2667
  setRefusal(null);
2514
2668
  setInvalid(({ [key]: _old, ...rest }) => error ? { ...rest, [key]: error } : rest);
2515
2669
  setEdits((d) => ({ ...d, [key]: value }));
2516
2670
  };
2517
- const save = async () => {
2671
+ const queryClient = useQueryClient();
2672
+ const { update } = useResource$1(view.resource, { enabled: false, onError: alreadyShown });
2673
+ const [conflict, setConflict] = useState(null);
2674
+ const lastFailure = useRef(null);
2675
+ const save = async (values = changed, expectedVersion) => {
2518
2676
  setSaving(true);
2519
2677
  setRefusal(null);
2678
+ const data = recordView.settingsPatch(sectionId, values);
2520
2679
  try {
2521
- const result = await provider.update(view.resource, { id: recordView.recordId(row), data: recordView.settingsPatch(sectionId, changed) });
2522
- if (!result || result.data === null || result.data === void 0) setRefusal(fill(words.notChanged, { noun: view.noun }));
2523
- else onSaved(result.data);
2680
+ const version = expectedVersion ?? (versionField ? (editBase.current ?? row)[versionField] : void 0);
2681
+ const saved = await update(recordView.recordId(row), data, version != null ? { expectedVersion: String(version) } : void 0);
2682
+ if (saved === null || saved === void 0) {
2683
+ lastFailure.current = fill(words.notChanged, { noun: view.noun });
2684
+ setRefusal(lastFailure.current);
2685
+ return "failed";
2686
+ }
2687
+ if (versionField && saved[versionField] != null) editBase.current = { ...editBase.current ?? row, [versionField]: saved[versionField] };
2688
+ setConflict(null);
2689
+ onSaved(saved);
2690
+ return "saved";
2524
2691
  } catch (error) {
2525
- setRefusal(refusalMessage(error, words.failed));
2692
+ const found = writeConflict(error, data);
2693
+ if (found && isDataWriteError(error) && error.current) {
2694
+ setConflict({ conflict: found, values, row: error.current, message: error.message });
2695
+ return "conflict";
2696
+ }
2697
+ lastFailure.current = refusalMessage(error, words.failed);
2698
+ setRefusal(lastFailure.current);
2699
+ return "failed";
2526
2700
  } finally {
2527
2701
  setSaving(false);
2528
2702
  }
2529
2703
  };
2704
+ const keepMine = async () => {
2705
+ if (!conflict) return;
2706
+ const { values, conflict: c } = conflict;
2707
+ if (await save(values, c.currentVersion ?? void 0) === "failed") throw new Error(lastFailure.current ?? words.failed);
2708
+ };
2709
+ const takeTheirs = () => {
2710
+ if (!conflict) return;
2711
+ const { row: theirs } = conflict;
2712
+ setConflict(null);
2713
+ setEdits({});
2714
+ setTheirsRow({ ...rowProp, ...theirs });
2715
+ void queryClient.invalidateQueries({ queryKey: [...resourceKeys(view.resource).all] });
2716
+ };
2717
+ const dismissConflict = () => {
2718
+ if (conflict) setRefusal(conflict.message);
2719
+ setConflict(null);
2720
+ };
2530
2721
  return /* @__PURE__ */ jsxs(View, { style: { gap: 12 }, children: [
2531
2722
  refusal ? /* @__PURE__ */ jsx(NativeInlineAlert, { testID: `${testID}-refusal`, variant: "destructive", description: refusal }) : null,
2532
2723
  locked !== null ? /* @__PURE__ */ jsx(NativeInlineAlert, { testID: `${testID}-locked`, variant: "info", description: locked }) : null,
@@ -2543,7 +2734,20 @@ function SettingsGroup({
2543
2734
  testID: `${testID}-${f.key}`
2544
2735
  }
2545
2736
  ) }, f.key)) }),
2546
- locked === null ? /* @__PURE__ */ jsx(NativeButton, { testID: `${testID}-save`, disabled: !dirty || saving, loading: saving, onPress: () => void save(), children: words.save }) : null
2737
+ locked === null ? /* @__PURE__ */ jsx(NativeButton, { testID: `${testID}-save`, disabled: !dirty || saving, loading: saving, onPress: () => void save(), children: words.save }) : null,
2738
+ /* @__PURE__ */ jsx(
2739
+ NativeConflictSheet,
2740
+ {
2741
+ conflict: conflict?.conflict ?? null,
2742
+ noun: view.noun,
2743
+ label: (key) => fields.find((f) => f.key === key)?.label ?? key,
2744
+ onKeepMine: keepMine,
2745
+ onTakeTheirs: takeTheirs,
2746
+ onDismiss: dismissConflict,
2747
+ ...words.conflict ? { messages: words.conflict } : {},
2748
+ testID: `${testID}-conflict`
2749
+ }
2750
+ )
2547
2751
  ] });
2548
2752
  }
2549
2753
  function NativeResourceWorkspace({ workspace, ...props }) {
@@ -2664,6 +2868,6 @@ function Cell({ last, children }) {
2664
2868
  ] });
2665
2869
  }
2666
2870
 
2667
- export { DEFAULT_MAX_PAGES, DisplayRenderersProvider, DisplayTimeZonesProvider, NativeDataFilters, NativeDataPageShell, NativeDetailPanel, NativeEmptyState2 as NativeEmptyState, NativeRecordView, NativeRecordViewMenu, NativeResourceForm, NativeResourceFormFieldRenderer, NativeResourceFormSheet, NativeResourcePage, NativeResourceView, NativeResourceViewMessagesProvider, NativeResourceWorkspace, NativeResourceWorkspaceMenu, SEARCH_DEBOUNCE_MS2 as SEARCH_DEBOUNCE_MS, SEGMENTED_SECTIONS_MAX, allowed, dateToDay, dayToDate, defaultNativeRecordViewMessages, defaultNativeResourceViewMessages, defaultNativeResourceWorkspaceMessages, displayText, formFieldsFor, formatDay, formatInstant, getNativeRecordViewStackOptions, getNativeResourceWorkspaceStackOptions, nativeDisplayRenderers, openableUrl, parseSettingNumber, resolveZone, rowItem, screenValues, sectionsFor, serverSort, serverSorts, swipeActionsFor, useDisplayCell, useDisplayTimeZones, useNativeResourceView, useNativeResourceViewMessages, validateValues, writableValues };
2871
+ export { DEFAULT_MAX_PAGES, DisplayRenderersProvider, DisplayTimeZonesProvider, NativeConflictSheet, NativeDataFilters, NativeDataPageShell, NativeDetailPanel, NativeEmptyState2 as NativeEmptyState, NativeRecordView, NativeRecordViewMenu, NativeResourceForm, NativeResourceFormFieldRenderer, NativeResourceFormSheet, NativeResourcePage, NativeResourceView, NativeResourceViewMessagesProvider, NativeResourceWorkspace, NativeResourceWorkspaceMenu, SEARCH_DEBOUNCE_MS2 as SEARCH_DEBOUNCE_MS, SEGMENTED_SECTIONS_MAX, allowed, dateToDay, dayToDate, defaultNativeRecordViewMessages, defaultNativeResourceViewMessages, defaultNativeResourceWorkspaceMessages, displayText, formFieldsFor, formatDay, formatInstant, getNativeRecordViewStackOptions, getNativeResourceWorkspaceStackOptions, nativeDisplayRenderers, openableUrl, parseSettingNumber, resolveZone, rowItem, screenValues, sectionsFor, serverSort, serverSorts, swipeActionsFor, useDisplayCell, useDisplayTimeZones, useNativeResourceView, useNativeResourceViewMessages, validateValues, writableValues };
2668
2872
  //# sourceMappingURL=index.js.map
2669
2873
  //# sourceMappingURL=index.js.map