@inspectorhub/field-ui 0.6.0 → 0.6.1

package/dist/index.js

@@ -9720,7 +9720,7 @@ var editor_route_mobile_begin = (
   () => {
     return (
       /** @type {LocalizedString} */
-      `Tap [\u2630 Sections] below to begin`
+      `Open [\u2630 Sections] below to begin`
     );
   }
 );
@@ -30398,7 +30398,7 @@ var editor_route_mobile_begin2 = (
   () => {
     return (
       /** @type {LocalizedString} */
-      `Toque [\u2630 Secciones] abajo para comenzar`
+      `Abra [\u2630 Secciones] abajo para comenzar`
     );
   }
 );
@@ -63793,6 +63793,42 @@ function isMetaKey(key) {
   return key.startsWith("_") && key.split(":").length < 3;
 }
 
+// src/shared/photo-batch-order.ts
+import * as Y from "yjs";
+function matches(el, name) {
+  return name.key ? el.get("key") === name.key : !!name.pendingId && el.get("pendingId") === name.pendingId;
+}
+function orderPhotoBatch(doc, findingKey3, selection) {
+  const item = doc.getMap("results").get(findingKey3);
+  if (!(item instanceof Y.Map)) return;
+  const arr = item.get("photos");
+  if (!(arr instanceof Y.Array)) return;
+  const elements = [];
+  const slots = [];
+  for (const name of selection) {
+    for (let i = 0; i < arr.length; i++) {
+      const el = arr.get(i);
+      if (!(el instanceof Y.Map) || slots.includes(i) || !matches(el, name)) continue;
+      slots.push(i);
+      elements.push(el);
+      break;
+    }
+  }
+  slots.sort((a, b) => a - b);
+  const moves = slots.filter((slot, n) => arr.get(slot) !== elements[n]);
+  if (moves.length === 0) return;
+  doc.transact(() => {
+    const copies = /* @__PURE__ */ new Map();
+    for (const slot of moves) copies.set(slot, elements[slots.indexOf(slot)].toJSON());
+    for (const slot of moves) {
+      const el = new Y.Map();
+      for (const [k, v] of Object.entries(copies.get(slot))) if (v !== void 0) el.set(k, v);
+      arr.delete(slot, 1);
+      arr.insert(slot, [el]);
+    }
+  });
+}
+
 // src/shared/findings-shared.ts
 function cloneByScope(src, scope) {
   if (scope === "all") return { ...src };
@@ -63808,7 +63844,7 @@ function cloneByScope(src, scope) {
 }
 
 // src/shared/results-doc.ts
-import * as Y from "yjs";
+import * as Y2 from "yjs";
 
 // src/shared/repair-price-keys.ts
 var REPAIR_PRICE_KEYS = [
@@ -63832,19 +63868,19 @@ function withoutRepairPriceRows(rows) {
 
 // src/shared/results-doc.ts
 function buildItemMap() {
-  const item = new Y.Map();
-  item.set("attributes", new Y.Map());
-  const tabs = new Y.Map();
-  tabs.set("information", new Y.Array());
-  tabs.set("limitations", new Y.Array());
-  tabs.set("defects", new Y.Array());
+  const item = new Y2.Map();
+  item.set("attributes", new Y2.Map());
+  const tabs = new Y2.Map();
+  tabs.set("information", new Y2.Array());
+  tabs.set("limitations", new Y2.Array());
+  tabs.set("defects", new Y2.Array());
   item.set("tabs", tabs);
-  item.set("photos", new Y.Array());
-  item.set("recommendations", new Y.Array());
-  const customComments = new Y.Map();
-  customComments.set("information", new Y.Array());
-  customComments.set("limitations", new Y.Array());
-  customComments.set("defects", new Y.Array());
+  item.set("photos", new Y2.Array());
+  item.set("recommendations", new Y2.Array());
+  const customComments = new Y2.Map();
+  customComments.set("information", new Y2.Array());
+  customComments.set("limitations", new Y2.Array());
+  customComments.set("defects", new Y2.Array());
   item.set("customComments", customComments);
   return item;
 }
@@ -63856,22 +63892,22 @@ function getOrSeedItem(results, findingKey3) {
 }
 function getOrCreateArray(parent, key) {
   const existing = parent.get(key);
-  if (existing instanceof Y.Array) return existing;
-  const arr = new Y.Array();
+  if (existing instanceof Y2.Array) return existing;
+  const arr = new Y2.Array();
   parent.set(key, arr);
   return arr;
 }
 function getOrCreateMap(parent, key) {
   const existing = parent.get(key);
-  if (existing instanceof Y.Map) return existing;
-  const map = new Y.Map();
+  if (existing instanceof Y2.Map) return existing;
+  const map = new Y2.Map();
   parent.set(key, map);
   return map;
 }
 function findElementByKey(arr, identityField, identityValue) {
   for (let i = 0; i < arr.length; i++) {
     const el = arr.get(i);
-    if (el instanceof Y.Map && el.get(identityField) === identityValue) {
+    if (el instanceof Y2.Map && el.get(identityField) === identityValue) {
       return el;
     }
   }
@@ -63890,14 +63926,14 @@ function upsertElement(arr, identityField, entry) {
     assignFields(existing, entry);
     return;
   }
-  const el = new Y.Map();
+  const el = new Y2.Map();
   assignFields(el, entry);
   arr.push([el]);
 }
 function removeElement(arr, identityField, identityValue) {
   for (let i = 0; i < arr.length; i++) {
     const el = arr.get(i);
-    if (el instanceof Y.Map && el.get(identityField) === identityValue) {
+    if (el instanceof Y2.Map && el.get(identityField) === identityValue) {
       arr.delete(i, 1);
       return;
     }
@@ -63954,8 +63990,8 @@ function revertPhoto(doc, findingKey3, key) {
     const arr = getOrCreateArray(item, "photos");
     for (let i = 0; i < arr.length; i++) {
       const el = arr.get(i);
-      if (el instanceof Y.Map && el.get("key") === key) {
-        const fresh = new Y.Map();
+      if (el instanceof Y2.Map && el.get("key") === key) {
+        const fresh = new Y2.Map();
         fresh.set("key", key);
         arr.delete(i, 1);
         arr.insert(i, [fresh]);
@@ -63971,8 +64007,8 @@ function replacePhoto(doc, findingKey3, key, entry) {
     const arr = getOrCreateArray(item, "photos");
     for (let i = 0; i < arr.length; i++) {
       const el = arr.get(i);
-      if (el instanceof Y.Map && el.get("key") === key) {
-        const fresh = new Y.Map();
+      if (el instanceof Y2.Map && el.get("key") === key) {
+        const fresh = new Y2.Map();
         assignFields(fresh, { ...entry });
         arr.delete(i, 1);
         arr.insert(i, [fresh]);
@@ -63988,8 +64024,8 @@ function replacePhotoByPendingId(doc, findingKey3, pendingId, entry) {
     const arr = getOrCreateArray(item, "photos");
     for (let i = 0; i < arr.length; i++) {
       const el = arr.get(i);
-      if (el instanceof Y.Map && el.get("pendingId") === pendingId) {
-        const fresh = new Y.Map();
+      if (el instanceof Y2.Map && el.get("pendingId") === pendingId) {
+        const fresh = new Y2.Map();
         assignFields(fresh, { ...entry });
         arr.delete(i, 1);
         arr.insert(i, [fresh]);
@@ -64006,7 +64042,7 @@ function reorderPhotos(doc, findingKey3, orderedKeys) {
     const byKey = /* @__PURE__ */ new Map();
     for (let i = 0; i < arr.length; i++) {
       const el = arr.get(i);
-      if (el instanceof Y.Map) {
+      if (el instanceof Y2.Map) {
         const entry = el.toJSON();
         if (typeof entry.key === "string") byKey.set(entry.key, entry);
       }
@@ -64019,7 +64055,7 @@ function reorderPhotos(doc, findingKey3, orderedKeys) {
     }
     arr.delete(0, arr.length);
     const rebuilt = orderedKeys.map((k) => {
-      const el = new Y.Map();
+      const el = new Y2.Map();
       assignFields(el, { ...byKey.get(k) });
       return el;
     });
@@ -64081,7 +64117,7 @@ function projectResults(doc) {
   const results = doc.getMap("results");
   const projection = {};
   results.forEach((rawItem, findingKey3) => {
-    if (!(rawItem instanceof Y.Map) || isMetaKey(findingKey3)) return;
+    if (!(rawItem instanceof Y2.Map) || isMetaKey(findingKey3)) return;
     const entry = {};
     const rating = rawItem.get("rating");
     if (typeof rating === "string" && rating.length > 0) {
@@ -64100,17 +64136,17 @@ function projectResults(doc) {
       entry.recommendation = recommendation;
     }
     const attributesRaw = rawItem.get("attributes");
-    if (attributesRaw instanceof Y.Map && attributesRaw.size > 0) {
+    if (attributesRaw instanceof Y2.Map && attributesRaw.size > 0) {
       entry.attributes = attributesRaw.toJSON();
     }
     const tabsRaw = rawItem.get("tabs");
-    if (tabsRaw instanceof Y.Map) {
+    if (tabsRaw instanceof Y2.Map) {
       const information = tabsRaw.get("information");
       const limitations = tabsRaw.get("limitations");
       const defects = tabsRaw.get("defects");
-      const infoArr = information instanceof Y.Array ? information.toJSON() : [];
-      const limArr = limitations instanceof Y.Array ? limitations.toJSON() : [];
-      const defArr = defects instanceof Y.Array ? withoutRepairPriceRows(defects.toJSON()) : [];
+      const infoArr = information instanceof Y2.Array ? information.toJSON() : [];
+      const limArr = limitations instanceof Y2.Array ? limitations.toJSON() : [];
+      const defArr = defects instanceof Y2.Array ? withoutRepairPriceRows(defects.toJSON()) : [];
       const tabsEntry = {};
       if (infoArr.length > 0) tabsEntry.information = infoArr;
       if (limArr.length > 0) tabsEntry.limitations = limArr;
@@ -64120,21 +64156,21 @@ function projectResults(doc) {
       }
     }
     const photosRaw = rawItem.get("photos");
-    if (photosRaw instanceof Y.Array && photosRaw.length > 0) {
+    if (photosRaw instanceof Y2.Array && photosRaw.length > 0) {
       entry.photos = photosRaw.toJSON();
     }
     const recsRaw = rawItem.get("recommendations");
-    if (recsRaw instanceof Y.Array && recsRaw.length > 0) {
+    if (recsRaw instanceof Y2.Array && recsRaw.length > 0) {
       entry.recommendations = recsRaw.toJSON();
     }
     const customRaw = rawItem.get("customComments");
-    if (customRaw instanceof Y.Map) {
+    if (customRaw instanceof Y2.Map) {
       const ccInfo = customRaw.get("information");
       const ccLim = customRaw.get("limitations");
       const ccDef = customRaw.get("defects");
-      const ccInfoArr = ccInfo instanceof Y.Array ? ccInfo.toJSON() : [];
-      const ccLimArr = ccLim instanceof Y.Array ? ccLim.toJSON() : [];
-      const ccDefArr = ccDef instanceof Y.Array ? withoutRepairPriceRows(ccDef.toJSON()) : [];
+      const ccInfoArr = ccInfo instanceof Y2.Array ? ccInfo.toJSON() : [];
+      const ccLimArr = ccLim instanceof Y2.Array ? ccLim.toJSON() : [];
+      const ccDefArr = ccDef instanceof Y2.Array ? withoutRepairPriceRows(ccDef.toJSON()) : [];
       if (ccInfoArr.length > 0 || ccLimArr.length > 0 || ccDefArr.length > 0) {
         const ccEntry = {};
         if (ccInfoArr.length > 0) ccEntry.information = ccInfoArr;
@@ -64144,14 +64180,14 @@ function projectResults(doc) {
       }
     }
     const originalRaw = rawItem.get("original");
-    if (originalRaw instanceof Y.Map) {
+    if (originalRaw instanceof Y2.Map) {
       const orig = {};
       const origRating = originalRaw.get("rating");
       const origNotes = originalRaw.get("notes");
       const origPhotos = originalRaw.get("photos");
       if (origRating !== void 0) orig.rating = origRating;
       if (origNotes !== void 0) orig.notes = origNotes;
-      if (origPhotos instanceof Y.Array && origPhotos.length > 0) {
+      if (origPhotos instanceof Y2.Array && origPhotos.length > 0) {
         orig.photos = origPhotos.toJSON();
       }
       entry.original = orig;
@@ -64428,6 +64464,11 @@ function buildCollabFindingsApi(doc, deps) {
     }
     setDirty(true);
   };
+  const orderPhotoBatch2 = (itemId, selection) => {
+    const sid = sectionIdForItem(itemId);
+    if (!sid) return;
+    orderPhotoBatch(doc, findingKey2(unit, sid, itemId), selection);
+  };
   const getPhotoCount = (itemId) => {
     const r = getResult(itemId);
     const photos = r.photos;
@@ -64473,6 +64514,7 @@ function buildCollabFindingsApi(doc, deps) {
     batchSetRating,
     addPhotoToItem,
     addPhotoToDefect,
+    orderPhotoBatch: orderPhotoBatch2,
     getPhotoCount,
     addCustomDefect: addCustomDefect2,
     toggleCustomDefect: toggleCustomDefect2,
@@ -64526,6 +64568,7 @@ function useFindings(results, setResults, options) {
     batchSetRating: () => 0,
     addPhotoToItem: noop,
     addPhotoToDefect: noop,
+    orderPhotoBatch: noop,
     getPhotoCount: (itemId) => {
       const photos = getResult(itemId).photos;
       return Array.isArray(photos) ? photos.length : 0;
@@ -68231,16 +68274,16 @@ function videoEntryIdentity(photo, idx) {
 }
 
 // src/shared/results-doc-media.ts
-import * as Y2 from "yjs";
+import * as Y3 from "yjs";
 function removeMediaBy(doc, findingKey3, identityField, value) {
   const item = doc.getMap("results").get(findingKey3);
-  if (!(item instanceof Y2.Map)) return;
+  if (!(item instanceof Y3.Map)) return;
   const photos = item.get("photos");
-  if (!(photos instanceof Y2.Array)) return;
+  if (!(photos instanceof Y3.Array)) return;
   doc.transact(() => {
     for (let i = 0; i < photos.length; i++) {
       const el = photos.get(i);
-      if (el instanceof Y2.Map && el.get(identityField) === value) {
+      if (el instanceof Y3.Map && el.get(identityField) === value) {
         photos.delete(i, 1);
         return;
       }
@@ -69594,6 +69637,7 @@ function usePhotoBatchUpload(inspectionId, doc) {
     const uploader = dataSourceRef.current.media.uploader(inspectionRef.current, docRef.current);
     const meta = metaOf(batch);
     const results = new Array(batch.files.length);
+    const pendingIds = new Array(batch.files.length).fill("");
     let next = 0;
     const worker = async () => {
       for (; ; ) {
@@ -69608,6 +69652,7 @@ function usePhotoBatchUpload(inspectionId, doc) {
           createdAt: Date.now(),
           meta
         };
+        pendingIds[index] = rec.pendingId;
         try {
           const refusal = await photoRefusal(rec.blob);
           if (refusal !== null) {
@@ -69627,6 +69672,7 @@ function usePhotoBatchUpload(inspectionId, doc) {
       ok: batch.files.length > 0 && batch.itemId !== "" && results.every((r) => r.ok || r.kept === true),
       keys,
       results,
+      pendingIds,
       unsaved: batch.files.length === 0 || batch.itemId === "" || results.some((r) => !r.ok && r.kept !== true && r.permanent !== true),
       itemId: batch.itemId,
       targetType: batch.target === null ? "item" : "defect",
@@ -69648,6 +69694,7 @@ function usePhotoBatchUpload(inspectionId, doc) {
             ok: false,
             keys: [],
             results: batch.files.map((_, index) => ({ index, ok: false, error: "EXCEPTION" })),
+            pendingIds: batch.files.map(() => ""),
             unsaved: true,
             itemId: batch.itemId,
             targetType: batch.target === null ? "item" : "defect",
@@ -69670,6 +69717,23 @@ function usePhotoBatchUpload(inspectionId, doc) {
   return { busy: pending > 0, outcomes, failedSinceIdle, consume, submit };
 }
 
+// src/hooks/attachPhotoBatch.ts
+function attachPhotoBatch(findings, d) {
+  if (!d.keys.length || !d.itemId) return;
+  for (const k of d.keys) {
+    if (d.targetType === "defect" && d.customId) {
+      findings.addPhotoToDefect(d.itemId, { kind: d.defectKind, id: d.customId }, k);
+    } else {
+      findings.addPhotoToItem(d.itemId, k);
+    }
+  }
+  if (d.targetType === "defect" && d.customId) return;
+  findings.orderPhotoBatch(
+    d.itemId,
+    d.results.flatMap((r) => r.ok && r.key ? [{ key: r.key }] : r.kept === true && d.pendingIds[r.index] ? [{ pendingId: d.pendingIds[r.index] }] : [])
+  );
+}
+
 // src/hooks/useReportCoverWrites.ts
 import { useCallback as useCallback22, useRef as useRef18 } from "react";
 var FAILED_MS = 8e3;
@@ -69897,15 +69961,15 @@ function useResultsDoc(inspectionId, onSynced) {
 import { useCallback as useCallback24, useEffect as useEffect17, useRef as useRef21 } from "react";
 
 // src/collab/pending-photo-drop.ts
-import * as Y3 from "yjs";
+import * as Y4 from "yjs";
 function dropPendingPhoto(doc, findingKey3, pendingId) {
   const item = doc.getMap("results").get(findingKey3);
-  if (!(item instanceof Y3.Map)) return;
+  if (!(item instanceof Y4.Map)) return;
   const photos = item.get("photos");
-  if (!(photos instanceof Y3.Array)) return;
+  if (!(photos instanceof Y4.Array)) return;
   for (let i = 0; i < photos.length; i++) {
     const el = photos.get(i);
-    if (el instanceof Y3.Map && el.get("pendingId") === pendingId) {
+    if (el instanceof Y4.Map && el.get("pendingId") === pendingId) {
       doc.transact(() => photos.delete(i, 1));
       return;
     }
@@ -69913,12 +69977,12 @@ function dropPendingPhoto(doc, findingKey3, pendingId) {
 }
 function clearPendingDerivative(doc, findingKey3, photoKey, pendingId) {
   const item = doc.getMap("results").get(findingKey3);
-  if (!(item instanceof Y3.Map)) return;
+  if (!(item instanceof Y4.Map)) return;
   const photos = item.get("photos");
-  if (!(photos instanceof Y3.Array)) return;
+  if (!(photos instanceof Y4.Array)) return;
   for (let i = 0; i < photos.length; i++) {
     const el = photos.get(i);
-    if (el instanceof Y3.Map && el.get("key") === photoKey && el.get("pendingId") === pendingId) {
+    if (el instanceof Y4.Map && el.get("key") === photoKey && el.get("pendingId") === pendingId) {
       doc.transact(() => {
         if (el.get("pendingKind") === "annotate" && !el.get("annotatedKey")) el.delete("annotationsJson");
         el.delete("pendingId");
@@ -70082,7 +70146,7 @@ async function addOfflinePhotos(store, doc, target, files) {
 import { useEffect as useEffect18, useRef as useRef22 } from "react";
 
 // src/collab/results-merge.ts
-import * as Y4 from "yjs";
+import * as Y5 from "yjs";
 var SCALARS = ["rating", "notes", "value", "recommendation"];
 var COLLECTIONS = ["attributes", "tabs", "recommendations", "customComments"];
 function mergePhotos(before, docPhotos) {
@@ -70094,7 +70158,7 @@ function mergeUnsyncedResults(prev, doc) {
   const projection = projectResults(doc);
   const out = { ...prev };
   doc.getMap("results").forEach((raw, key) => {
-    if (!(raw instanceof Y4.Map)) return;
+    if (!(raw instanceof Y5.Map)) return;
     const { itemId, unitId } = parseFindingKey(key);
     const projected = projection[key] ?? {};
     const merged = { ...prev[key] ?? (unitId === "_default" ? prev[itemId] : void 0) ?? {} };
@@ -72012,7 +72076,7 @@ import { useState as useState32, useMemo as useMemo13, useEffect as useEffect28,
 // src/components/editor/CommentTypeahead.tsx
 import { jsx as jsx46, jsxs as jsxs36 } from "react/jsx-runtime";
 function CommentTypeahead({
-  matches,
+  matches: matches2,
   open,
   selectedIndex,
   onHoverIndex,
@@ -72023,13 +72087,13 @@ function CommentTypeahead({
     information: index_exports.editor_typeahead_kind_info(),
     limitations: index_exports.editor_typeahead_kind_limitations()
   };
-  if (!open || matches.length === 0) return null;
+  if (!open || matches2.length === 0) return null;
   return /* @__PURE__ */ jsx46(
     "ul",
     {
       role: "listbox",
       className: "absolute z-30 left-0 right-0 mt-1 max-h-64 overflow-y-auto rounded-lg border border-ih-border bg-ih-bg-card shadow-ih-popover",
-      children: matches.map((match, i) => /* @__PURE__ */ jsxs36(
+      children: matches2.map((match, i) => /* @__PURE__ */ jsxs36(
         "li",
         {
           role: "option",
@@ -72121,29 +72185,29 @@ function replaceFragmentBeforeCaret(value, caret, replacement) {
 // src/hooks/useCommentTypeahead.ts
 function useCommentTypeahead(entries, query, opts) {
   const max = opts?.max ?? 8;
-  const matches = useMemo10(
+  const matches2 = useMemo10(
     () => rankTypeaheadMatches(entries, query).slice(0, max),
     [entries, query, max]
   );
   const [selectedIndex, setSelectedIndex] = useState25(0);
   useEffect22(() => {
     setSelectedIndex(0);
-  }, [query, matches.length]);
+  }, [query, matches2.length]);
   const move = useCallback26(
     (delta) => {
       setSelectedIndex((i) => {
-        const n = matches.length;
+        const n = matches2.length;
         if (n === 0) return 0;
         return ((i + delta) % n + n) % n;
       });
     },
-    [matches.length]
+    [matches2.length]
   );
   const current = useCallback26(
-    () => matches[selectedIndex] ?? null,
-    [matches, selectedIndex]
+    () => matches2[selectedIndex] ?? null,
+    [matches2, selectedIndex]
   );
-  return { matches, selectedIndex, setSelectedIndex, move, current };
+  return { matches: matches2, selectedIndex, setSelectedIndex, move, current };
 }
 
 // src/components/editor/AiAssistPanel.tsx
@@ -83428,19 +83492,7 @@ function FieldEditorInner({ data }) {
     for (const o of settled) processedUploads.current.add(o);
     photoUpload.consume(photoUpload.outcomes.length);
     for (const d of settled) {
-      if (d.keys.length && d.itemId) {
-        for (const k of d.keys) {
-          if (d.targetType === "defect" && d.customId) {
-            findings.addPhotoToDefect(
-              d.itemId,
-              { kind: d.defectKind, id: d.customId },
-              k
-            );
-          } else {
-            findings.addPhotoToItem(d.itemId, k);
-          }
-        }
-      }
+      attachPhotoBatch(findings, d);
       const total = d.results.length;
       const keptCount = d.results.filter((r) => !r.ok && r.kept === true).length;
       const successCount = d.results.filter((r) => r.ok).length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspectorhub/field-ui",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "The OpenInspection field inspection editor as an embeddable React package.",
   "license": "AGPL-3.0-only",
   "repository": {