Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

feat(erp): open a step slide image full size with zoom (#1978)

BettrCallRaul9ae23d63eb37
diff --git a/apps/erp/app/components/SlidesEditor.tsx b/apps/erp/app/components/SlidesEditor.tsx
index b01d0cb979..d3d47f2bb4 100644
--- a/apps/erp/app/components/SlidesEditor.tsx
+++ b/apps/erp/app/components/SlidesEditor.tsx
@@ -11,6 +11,7 @@ import {
Button,
cn,
IconButton,
+ ImageZoomViewer,
Label,
Tooltip,
TooltipContent,
@@ -196,6 +197,9 @@ export function SlidesEditor({
const { t } = useLingui();
const [annotatingIndex, setAnnotatingIndex] = useState<number | null>(null);
const annotating = annotatingIndex == null ? null : slides[annotatingIndex];
+ // The image slide open full size. A model slide has no image to enlarge.
+ const [viewingIndex, setViewingIndex] = useState<number | null>(null);
+ const viewing = viewingIndex == null ? null : slides[viewingIndex];
const models = useSlideModels(slides);
if (isDisabled && slides.length === 0) return null;
@@ -316,16 +320,26 @@ export function SlidesEditor({
</div>
) : (
<>
- <img
- src={
- slide.imagePath ? getPrivateUrl(slide.imagePath) : ""
- }
- alt={slide.caption ?? "Slide"}
- className={cn(
- "w-full rounded-md bg-muted/40 object-contain",
- SLIDE_IMAGE_HEIGHT
- )}
- />
+ <button
+ type="button"
+ aria-label={t`View full size`}
+ title={t`View full size`}
+ className="block w-full cursor-zoom-in rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+ onClick={() => setViewingIndex(index)}
+ >
+ <img
+ src={
+ slide.imagePath
+ ? getPrivateUrl(slide.imagePath)
+ : ""
+ }
+ alt={slide.caption ?? "Slide"}
+ className={cn(
+ "w-full rounded-md bg-muted/40 object-contain",
+ SLIDE_IMAGE_HEIGHT
+ )}
+ />
+ </button>
{/* Read-only pin preview so an annotated slide reads at a glance. */}
<SlidePinOverlay pins={pins} />
</>
@@ -377,6 +391,14 @@ export function SlidesEditor({
</div>
)}
+ <ImageZoomViewer
+ open={!!viewing?.imagePath && !viewing.modelUploadId}
+ src={viewing?.imagePath ? getPrivateUrl(viewing.imagePath) : null}
+ caption={viewing?.caption}
+ annotations={viewing?.annotations ?? []}
+ onClose={() => setViewingIndex(null)}
+ />
+
{annotating?.imagePath && annotatingIndex != null && (
<SlideAnnotator
open
diff --git a/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx b/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx
index 8ca101883a..5fee4dc735 100644
--- a/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx
+++ b/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx
@@ -30,6 +30,7 @@ import {
generateHTML,
HStack,
IconButton,
+ ImageZoomViewer,
Label,
Loading,
MENU_ITEM_SHORTCUTS,
@@ -3562,6 +3563,7 @@ function OperationPreview({
const allTools = useTools();
const [current, setCurrent] = useState(0);
const [slideIdx, setSlideIdx] = useState(0);
+ const [isViewingSlide, setIsViewingSlide] = useState(false);
// Move to a step and reset to its first slide.
const goToStep = (next: number) => {
@@ -3713,11 +3715,19 @@ function OperationPreview({
</>
) : slideImage ? (
<div className="relative inline-block">
- <img
- src={slideImage}
- alt={slide.caption ?? ""}
- className="block max-h-[520px] w-auto max-w-full rounded-md"
- />
+ <button
+ type="button"
+ aria-label={t`View full size`}
+ title={t`View full size`}
+ className="block cursor-zoom-in rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+ onClick={() => setIsViewingSlide(true)}
+ >
+ <img
+ src={slideImage}
+ alt={slide.caption ?? ""}
+ className="block max-h-[520px] w-auto max-w-full rounded-md"
+ />
+ </button>
<SlidePinOverlay pins={slide.annotations ?? []} />
</div>
) : (
@@ -3731,6 +3741,19 @@ function OperationPreview({
<p className="text-xs text-muted-foreground">{slide.caption}</p>
) : null}
+ <ImageZoomViewer
+ open={isViewingSlide && !!slideImage && !slide?.modelUploadId}
+ src={slideImage}
+ caption={slide?.caption}
+ annotations={slide?.annotations ?? []}
+ toolNameById={
+ isViewingSlide
+ ? new Map(allTools.map((tool) => [tool.id, tool.name]))
+ : undefined
+ }
+ onClose={() => setIsViewingSlide(false)}
+ />
+
{pinLegend.length > 0 && (
<div className="flex flex-col gap-1">
{pinLegend.map(({ pin, index, toolId, toolName }) => (
diff --git a/apps/mes/app/components/AssemblyView.tsx b/apps/mes/app/components/AssemblyView.tsx
index 9c7795e45b..42e52ef93c 100644
--- a/apps/mes/app/components/AssemblyView.tsx
+++ b/apps/mes/app/components/AssemblyView.tsx
@@ -27,6 +27,7 @@ import {
generateHTML,
hasOpenDialog,
IconButton,
+ ImageZoomViewer,
Modal,
ModalBody,
ModalContent,
@@ -92,7 +93,6 @@ import {
} from "react-icons/lu";
import { useFetcher, useNavigate, useSearchParams } from "react-router";
import { TrackingTypeIcon } from "~/components/Icons";
-import { ImageZoomViewer } from "~/components/ImageZoomViewer";
import { OperationChat } from "~/components/JobOperation/components/Chat";
import { IssueMaterialModal } from "~/components/JobOperation/components/IssueMaterialModal";
import { MaintenanceDispatch } from "~/components/JobOperation/components/MaintenanceDispatch";
diff --git a/apps/mes/app/components/JobOperation/components/Step.tsx b/apps/mes/app/components/JobOperation/components/Step.tsx
index 8734f1145b..293ec8693c 100644
--- a/apps/mes/app/components/JobOperation/components/Step.tsx
+++ b/apps/mes/app/components/JobOperation/components/Step.tsx
@@ -24,6 +24,7 @@ import {
generateHTML,
HStack,
IconButton,
+ ImageZoomViewer,
Modal,
ModalBody,
ModalContent,
@@ -60,7 +61,6 @@ import {
import { useFetcher } from "react-router";
import { DateTime } from "~/components";
import { ProcedureStepTypeIcon } from "~/components/Icons";
-import { ImageZoomViewer } from "~/components/ImageZoomViewer";
import ItemThumbnail from "~/components/ItemThumbnail";
import { useUser } from "~/hooks";
import { stepRecordValidator } from "~/services/models";
diff --git a/packages/locale/locales/de/erp.po b/packages/locale/locales/de/erp.po
index 5b1975ac72..c1cba7fb22 100644
--- a/packages/locale/locales/de/erp.po
+++ b/packages/locale/locales/de/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Anheften {0}"
msgid "Pin or unpin"
msgstr "Anheften oder Abheften"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Zum Zoomen zusammenziehen oder scrollen · zum Verschieben ziehen · zum Zurücksetzen doppelt tippen"
+
msgid "Pinned"
msgstr "Angeheftet"
@@ -18528,6 +18531,9 @@ msgstr "Reduziert"
msgid "Reference"
msgstr "Referenz"
+msgid "Reference image"
+msgstr "Referenzbild"
+
msgid "Refresh"
msgstr "Aktualisieren"
@@ -25725,6 +25731,9 @@ msgstr "Kunden anzeigen"
msgid "View Employees"
msgstr "Mitarbeiter anzeigen"
+msgid "View full size"
+msgstr "In voller Größe anzeigen"
+
msgid "View History"
msgstr "Verlauf anzeigen"
diff --git a/packages/locale/locales/de/mes.po b/packages/locale/locales/de/mes.po
index 11a6176789..2b2a5242a3 100644
--- a/packages/locale/locales/de/mes.po
+++ b/packages/locale/locales/de/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Anheften oder Lösen"
msgid "Pin Out"
msgstr "Abmelden"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Zum Zoomen zusammenziehen oder scrollen · zum Verschieben ziehen · zum Zurücksetzen doppelt tippen"
+
msgid "Planned"
msgstr "Geplant"
@@ -1586,6 +1589,9 @@ msgstr "Teilweise aufzeichnen"
msgid "Recorded"
msgstr "Aufgezeichnet"
+msgid "Reference image"
+msgstr "Referenzbild"
+
msgid "Registration failed"
msgstr "Registrierung fehlgeschlagen"
diff --git a/packages/locale/locales/en/erp.po b/packages/locale/locales/en/erp.po
index 0305c30261..39a2f41ebd 100644
--- a/packages/locale/locales/en/erp.po
+++ b/packages/locale/locales/en/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Pin {0}"
msgid "Pin or unpin"
msgstr "Pin or unpin"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+
msgid "Pinned"
msgstr "Pinned"
@@ -18528,6 +18531,9 @@ msgstr "Reduced"
msgid "Reference"
msgstr "Reference"
+msgid "Reference image"
+msgstr "Reference image"
+
msgid "Refresh"
msgstr "Refresh"
@@ -25725,6 +25731,9 @@ msgstr "View Customers"
msgid "View Employees"
msgstr "View Employees"
+msgid "View full size"
+msgstr "View full size"
+
msgid "View History"
msgstr "View History"
diff --git a/packages/locale/locales/en/mes.po b/packages/locale/locales/en/mes.po
index 619a5f5a0b..3f9bfa8790 100644
--- a/packages/locale/locales/en/mes.po
+++ b/packages/locale/locales/en/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Pin or unpin"
msgid "Pin Out"
msgstr "Pin Out"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+
msgid "Planned"
msgstr "Planned"
@@ -1586,6 +1589,9 @@ msgstr "Record Partial"
msgid "Recorded"
msgstr "Recorded"
+msgid "Reference image"
+msgstr "Reference image"
+
msgid "Registration failed"
msgstr "Registration failed"
diff --git a/packages/locale/locales/es/erp.po b/packages/locale/locales/es/erp.po
index 8ed721c769..ffb0800c61 100644
--- a/packages/locale/locales/es/erp.po
+++ b/packages/locale/locales/es/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Fijar {0}"
msgid "Pin or unpin"
msgstr "Fijar o desfijar"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pellizque o desplácese para hacer zoom · arrastre para mover · toque dos veces para restablecer"
+
msgid "Pinned"
msgstr "Fijado"
@@ -18528,6 +18531,9 @@ msgstr "Reducido"
msgid "Reference"
msgstr "Referencia"
+msgid "Reference image"
+msgstr "Imagen de referencia"
+
msgid "Refresh"
msgstr "Actualizar"
@@ -25725,6 +25731,9 @@ msgstr "Ver Clientes"
msgid "View Employees"
msgstr "Ver Empleados"
+msgid "View full size"
+msgstr "Ver a tamaño completo"
+
msgid "View History"
msgstr "Ver Historial"
diff --git a/packages/locale/locales/es/mes.po b/packages/locale/locales/es/mes.po
index 41c219aa13..14225f233c 100644
--- a/packages/locale/locales/es/mes.po
+++ b/packages/locale/locales/es/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Fijar o desfijar"
msgid "Pin Out"
msgstr "Cerrar sesión con PIN"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pellizque o desplácese para hacer zoom · arrastre para mover · toque dos veces para restablecer"
+
msgid "Planned"
msgstr "Planificado"
@@ -1586,6 +1589,9 @@ msgstr "Registrar Parcial"
msgid "Recorded"
msgstr "Registrado"
+msgid "Reference image"
+msgstr "Imagen de referencia"
+
msgid "Registration failed"
msgstr "Falló el registro"
diff --git a/packages/locale/locales/fr/erp.po b/packages/locale/locales/fr/erp.po
index 25e3099de6..1094c1e2c1 100644
--- a/packages/locale/locales/fr/erp.po
+++ b/packages/locale/locales/fr/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Épingler {0}"
msgid "Pin or unpin"
msgstr "Épingler ou dépingler"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pincez ou faites défiler pour zoomer · faites glisser pour déplacer · touchez deux fois pour réinitialiser"
+
msgid "Pinned"
msgstr "Épinglé"
@@ -18528,6 +18531,9 @@ msgstr "Réduit"
msgid "Reference"
msgstr "Référence"
+msgid "Reference image"
+msgstr "Image de référence"
+
msgid "Refresh"
msgstr "Actualiser"
@@ -25725,6 +25731,9 @@ msgstr "Afficher les clients"
msgid "View Employees"
msgstr "Afficher les employés"
+msgid "View full size"
+msgstr "Afficher en taille réelle"
+
msgid "View History"
msgstr "Afficher l'historique"
diff --git a/packages/locale/locales/fr/mes.po b/packages/locale/locales/fr/mes.po
index db5e157b20..1b948d04ef 100644
--- a/packages/locale/locales/fr/mes.po
+++ b/packages/locale/locales/fr/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Épingler ou dépingler"
msgid "Pin Out"
msgstr "Déconnecter"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pincez ou faites défiler pour zoomer · faites glisser pour déplacer · touchez deux fois pour réinitialiser"
+
msgid "Planned"
msgstr "Planifié"
@@ -1586,6 +1589,9 @@ msgstr "Enregistrer partiellement"
msgid "Recorded"
msgstr "Enregistré"
+msgid "Reference image"
+msgstr "Image de référence"
+
msgid "Registration failed"
msgstr "L'inscription a échoué"
diff --git a/packages/locale/locales/hi/erp.po b/packages/locale/locales/hi/erp.po
index 8f9f868443..7cedaecf9a 100644
--- a/packages/locale/locales/hi/erp.po
+++ b/packages/locale/locales/hi/erp.po
@@ -16928,6 +16928,9 @@ msgstr "{0} को पिन करें"
msgid "Pin or unpin"
msgstr "पिन करें या अनपिन करें"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "ज़ूम करने के लिए पिंच या स्क्रॉल करें · खिसकाने के लिए खींचें · रीसेट करने के लिए दो बार टैप करें"
+
msgid "Pinned"
msgstr "पिन किया गया"
@@ -18528,6 +18531,9 @@ msgstr "शिथिल"
msgid "Reference"
msgstr "संदर्भ"
+msgid "Reference image"
+msgstr "संदर्भ छवि"
+
msgid "Refresh"
msgstr "ताज़ा करें"
@@ -25725,6 +25731,9 @@ msgstr "ग्राहकों को देखें"
msgid "View Employees"
msgstr "कर्मचारियों को देखें"
+msgid "View full size"
+msgstr "पूरे आकार में देखें"
+
msgid "View History"
msgstr "इतिहास देखें"
diff --git a/packages/locale/locales/hi/mes.po b/packages/locale/locales/hi/mes.po
index 11cefb82cd..b4627a1c6f 100644
--- a/packages/locale/locales/hi/mes.po
+++ b/packages/locale/locales/hi/mes.po
@@ -1473,6 +1473,9 @@ msgstr "पिन करें या अनपिन करें"
msgid "Pin Out"
msgstr "पिन आउट"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "ज़ूम करने के लिए पिंच या स्क्रॉल करें · खिसकाने के लिए खींचें · रीसेट करने के लिए दो बार टैप करें"
+
msgid "Planned"
msgstr "नियोजित"
@@ -1586,6 +1589,9 @@ msgstr "आंशिक रिकॉर्ड करें"
msgid "Recorded"
msgstr "रिकॉर्ड किया गया"
+msgid "Reference image"
+msgstr "संदर्भ छवि"
+
msgid "Registration failed"
msgstr "पंजीकरण विफल"
diff --git a/packages/locale/locales/it/erp.po b/packages/locale/locales/it/erp.po
index bb3f118ef2..59a618a63d 100644
--- a/packages/locale/locales/it/erp.po
+++ b/packages/locale/locales/it/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Fissa {0}"
msgid "Pin or unpin"
msgstr "Fissa o scollega"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pizzica o scorri per ingrandire · trascina per spostare · tocca due volte per ripristinare"
+
msgid "Pinned"
msgstr "Fissato"
@@ -18528,6 +18531,9 @@ msgstr "Ridotto"
msgid "Reference"
msgstr "Riferimento"
+msgid "Reference image"
+msgstr "Immagine di riferimento"
+
msgid "Refresh"
msgstr "Aggiorna"
@@ -25725,6 +25731,9 @@ msgstr "Visualizza Clienti"
msgid "View Employees"
msgstr "Visualizza Dipendenti"
+msgid "View full size"
+msgstr "Visualizza a grandezza intera"
+
msgid "View History"
msgstr "Visualizza Cronologia"
diff --git a/packages/locale/locales/it/mes.po b/packages/locale/locales/it/mes.po
index dfdd801c32..b295c66659 100644
--- a/packages/locale/locales/it/mes.po
+++ b/packages/locale/locales/it/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Fissa o scollega"
msgid "Pin Out"
msgstr "Disconnetti"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pizzica o scorri per ingrandire · trascina per spostare · tocca due volte per ripristinare"
+
msgid "Planned"
msgstr "Pianificato"
@@ -1586,6 +1589,9 @@ msgstr "Registra Parziale"
msgid "Recorded"
msgstr "Registrato"
+msgid "Reference image"
+msgstr "Immagine di riferimento"
+
msgid "Registration failed"
msgstr "Registrazione fallita"
diff --git a/packages/locale/locales/ja/erp.po b/packages/locale/locales/ja/erp.po
index 748342f433..bb7e79bc28 100644
--- a/packages/locale/locales/ja/erp.po
+++ b/packages/locale/locales/ja/erp.po
@@ -16928,6 +16928,9 @@ msgstr "{0}をピン留"
msgid "Pin or unpin"
msgstr "ピン留めまたはピン留め解除"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "ピンチまたはスクロールで拡大縮小 · ドラッグで移動 · ダブルタップでリセット"
+
msgid "Pinned"
msgstr "ピン留め"
@@ -18528,6 +18531,9 @@ msgstr "ゆるい検査"
msgid "Reference"
msgstr "参照"
+msgid "Reference image"
+msgstr "参照画像"
+
msgid "Refresh"
msgstr "更新"
@@ -25725,6 +25731,9 @@ msgstr "得意先を表示"
msgid "View Employees"
msgstr "従業員を表示"
+msgid "View full size"
+msgstr "フルサイズで表示"
+
msgid "View History"
msgstr "履歴を表示"
diff --git a/packages/locale/locales/ja/mes.po b/packages/locale/locales/ja/mes.po
index 7cea5b80aa..ee0a5905cf 100644
--- a/packages/locale/locales/ja/mes.po
+++ b/packages/locale/locales/ja/mes.po
@@ -1473,6 +1473,9 @@ msgstr "ピン留めまたはピン留め解除"
msgid "Pin Out"
msgstr "ピンアウト"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "ピンチまたはスクロールで拡大縮小 · ドラッグで移動 · ダブルタップでリセット"
+
msgid "Planned"
msgstr "計画済み"
@@ -1586,6 +1589,9 @@ msgstr "一部を記録"
msgid "Recorded"
msgstr "記録済"
+msgid "Reference image"
+msgstr "参照画像"
+
msgid "Registration failed"
msgstr "登録に失敗しました"
diff --git a/packages/locale/locales/ko/erp.po b/packages/locale/locales/ko/erp.po
index cb09c73ff5..9618c9532d 100644
--- a/packages/locale/locales/ko/erp.po
+++ b/packages/locale/locales/ko/erp.po
@@ -16928,6 +16928,9 @@ msgstr "{0} 고정"
msgid "Pin or unpin"
msgstr "고정 또는 고정 해제"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "핀치하거나 스크롤하여 확대/축소 · 드래그하여 이동 · 두 번 탭하여 초기화"
+
msgid "Pinned"
msgstr "고정됨"
@@ -18528,6 +18531,9 @@ msgstr "수월한 검사"
msgid "Reference"
msgstr "참조"
+msgid "Reference image"
+msgstr "참조 이미지"
+
msgid "Refresh"
msgstr "새로고침"
@@ -25725,6 +25731,9 @@ msgstr "고객 보기"
msgid "View Employees"
msgstr "직원 보기"
+msgid "View full size"
+msgstr "전체 크기로 보기"
+
msgid "View History"
msgstr "이력 보기"
diff --git a/packages/locale/locales/ko/mes.po b/packages/locale/locales/ko/mes.po
index a08ed0cc87..9eff3929db 100644
--- a/packages/locale/locales/ko/mes.po
+++ b/packages/locale/locales/ko/mes.po
@@ -1473,6 +1473,9 @@ msgstr "고정 또는 고정 해제"
msgid "Pin Out"
msgstr "PIN 로그아웃"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "핀치하거나 스크롤하여 확대/축소 · 드래그하여 이동 · 두 번 탭하여 초기화"
+
msgid "Planned"
msgstr "계획됨"
@@ -1586,6 +1589,9 @@ msgstr "부분 기록"
msgid "Recorded"
msgstr "기록됨"
+msgid "Reference image"
+msgstr "참조 이미지"
+
msgid "Registration failed"
msgstr "등록 실패"
diff --git a/packages/locale/locales/pl/erp.po b/packages/locale/locales/pl/erp.po
index 10fe978937..3860592e05 100644
--- a/packages/locale/locales/pl/erp.po
+++ b/packages/locale/locales/pl/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Przypnij {0}"
msgid "Pin or unpin"
msgstr "Przypnij lub odepnij"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Zsuń palce lub przewiń, aby powiększyć · przeciągnij, aby przesunąć · stuknij dwukrotnie, aby zresetować"
+
msgid "Pinned"
msgstr "Przypięte"
@@ -18528,6 +18531,9 @@ msgstr "Ulgowa"
msgid "Reference"
msgstr "Odniesienie"
+msgid "Reference image"
+msgstr "Obraz referencyjny"
+
msgid "Refresh"
msgstr "Odśwież"
@@ -25725,6 +25731,9 @@ msgstr "Wyświetl Klientów"
msgid "View Employees"
msgstr "Wyświetl pracowników"
+msgid "View full size"
+msgstr "Pokaż w pełnym rozmiarze"
+
msgid "View History"
msgstr "Wyświetl historię"
diff --git a/packages/locale/locales/pl/mes.po b/packages/locale/locales/pl/mes.po
index 9441334b01..d38ab21a12 100644
--- a/packages/locale/locales/pl/mes.po
+++ b/packages/locale/locales/pl/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Przypnij lub odepnij"
msgid "Pin Out"
msgstr "Wyloguj PIN"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Zsuń palce lub przewiń, aby powiększyć · przeciągnij, aby przesunąć · stuknij dwukrotnie, aby zresetować"
+
msgid "Planned"
msgstr "Planowane"
@@ -1586,6 +1589,9 @@ msgstr "Zapisz częściowo"
msgid "Recorded"
msgstr "Zaraportowano"
+msgid "Reference image"
+msgstr "Obraz referencyjny"
+
msgid "Registration failed"
msgstr "Rejestracja nie powiodła się"
diff --git a/packages/locale/locales/pt/erp.po b/packages/locale/locales/pt/erp.po
index 92cf387c79..811a7cc426 100644
--- a/packages/locale/locales/pt/erp.po
+++ b/packages/locale/locales/pt/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Fixar {0}"
msgid "Pin or unpin"
msgstr "Fixar ou desafixar"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pince ou role para ampliar · arraste para mover · toque duas vezes para redefinir"
+
msgid "Pinned"
msgstr "Fixado"
@@ -18528,6 +18531,9 @@ msgstr "Atenuada"
msgid "Reference"
msgstr "Referência"
+msgid "Reference image"
+msgstr "Imagem de referência"
+
msgid "Refresh"
msgstr "Atualizar"
@@ -25725,6 +25731,9 @@ msgstr "Ver Clientes"
msgid "View Employees"
msgstr "Ver Funcionários"
+msgid "View full size"
+msgstr "Ver em tamanho real"
+
msgid "View History"
msgstr "Ver Histórico"
diff --git a/packages/locale/locales/pt/mes.po b/packages/locale/locales/pt/mes.po
index 9d4f0de7df..b614ecef3f 100644
--- a/packages/locale/locales/pt/mes.po
+++ b/packages/locale/locales/pt/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Fixar ou desafixar"
msgid "Pin Out"
msgstr "Desconectar"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Pince ou role para ampliar · arraste para mover · toque duas vezes para redefinir"
+
msgid "Planned"
msgstr "Planejado"
@@ -1586,6 +1589,9 @@ msgstr "Registrar Parcial"
msgid "Recorded"
msgstr "Registrado"
+msgid "Reference image"
+msgstr "Imagem de referência"
+
msgid "Registration failed"
msgstr "Falha no registro"
diff --git a/packages/locale/locales/ru/erp.po b/packages/locale/locales/ru/erp.po
index ad6c42c70c..7a60c1615e 100644
--- a/packages/locale/locales/ru/erp.po
+++ b/packages/locale/locales/ru/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Закрепить {0}"
msgid "Pin or unpin"
msgstr "Прикрепить или открепить"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Сведите пальцы или прокрутите для масштабирования · перетащите для перемещения · коснитесь дважды для сброса"
+
msgid "Pinned"
msgstr "Закреплено"
@@ -18528,6 +18531,9 @@ msgstr "Ослабленный"
msgid "Reference"
msgstr "Ссылка"
+msgid "Reference image"
+msgstr "Справочное изображение"
+
msgid "Refresh"
msgstr "Обновить"
@@ -25725,6 +25731,9 @@ msgstr "Просмотр Покупателей"
msgid "View Employees"
msgstr "Просмотр сотрудников"
+msgid "View full size"
+msgstr "Открыть в полном размере"
+
msgid "View History"
msgstr "Просмотр истории"
diff --git a/packages/locale/locales/ru/mes.po b/packages/locale/locales/ru/mes.po
index 244b9274e0..c415f280eb 100644
--- a/packages/locale/locales/ru/mes.po
+++ b/packages/locale/locales/ru/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Закрепить или открепить"
msgid "Pin Out"
msgstr "Выход по PIN"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Сведите пальцы или прокрутите для масштабирования · перетащите для перемещения · коснитесь дважды для сброса"
+
msgid "Planned"
msgstr "Плановое"
@@ -1586,6 +1589,9 @@ msgstr "Записать частичный результат"
msgid "Recorded"
msgstr "Записано"
+msgid "Reference image"
+msgstr "Справочное изображение"
+
msgid "Registration failed"
msgstr "Регистрация не удалась"
diff --git a/packages/locale/locales/tr/erp.po b/packages/locale/locales/tr/erp.po
index 680c2f704a..856bdb257e 100644
--- a/packages/locale/locales/tr/erp.po
+++ b/packages/locale/locales/tr/erp.po
@@ -16928,6 +16928,9 @@ msgstr "Sabitle {0}"
msgid "Pin or unpin"
msgstr "Sabitle veya kaldır"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Yakınlaştırmak için kıstırın veya kaydırın · kaydırmak için sürükleyin · sıfırlamak için iki kez dokunun"
+
msgid "Pinned"
msgstr "Sabitlenmiş"
@@ -18528,6 +18531,9 @@ msgstr "Gevşetilmiş"
msgid "Reference"
msgstr "Referans"
+msgid "Reference image"
+msgstr "Referans görseli"
+
msgid "Refresh"
msgstr "Yenile"
@@ -25725,6 +25731,9 @@ msgstr "Müşterileri Görüntüle"
msgid "View Employees"
msgstr "Çalışanları Görüntüle"
+msgid "View full size"
+msgstr "Tam boyutta görüntüle"
+
msgid "View History"
msgstr "Geçmişi Görüntüle"
diff --git a/packages/locale/locales/tr/mes.po b/packages/locale/locales/tr/mes.po
index 597ee16a47..31bd786cf1 100644
--- a/packages/locale/locales/tr/mes.po
+++ b/packages/locale/locales/tr/mes.po
@@ -1473,6 +1473,9 @@ msgstr "Sabitle veya sabitliği kaldır"
msgid "Pin Out"
msgstr "Çıkış Yap"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "Yakınlaştırmak için kıstırın veya kaydırın · kaydırmak için sürükleyin · sıfırlamak için iki kez dokunun"
+
msgid "Planned"
msgstr "Planlı"
@@ -1586,6 +1589,9 @@ msgstr "Kısmi Kaydı"
msgid "Recorded"
msgstr "Kaydedildi"
+msgid "Reference image"
+msgstr "Referans görseli"
+
msgid "Registration failed"
msgstr "Kayıt başarısız"
diff --git a/packages/locale/locales/zh/erp.po b/packages/locale/locales/zh/erp.po
index 5c46ea9dbc..f491609909 100644
--- a/packages/locale/locales/zh/erp.po
+++ b/packages/locale/locales/zh/erp.po
@@ -16928,6 +16928,9 @@ msgstr "固定{0}"
msgid "Pin or unpin"
msgstr "固定或取消固定"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "双指捏合或滚动以缩放 · 拖动以平移 · 双击以重置"
+
msgid "Pinned"
msgstr "已固定"
@@ -18528,6 +18531,9 @@ msgstr "放宽检验"
msgid "Reference"
msgstr "参考"
+msgid "Reference image"
+msgstr "参考图像"
+
msgid "Refresh"
msgstr "刷新"
@@ -25725,6 +25731,9 @@ msgstr "查看客户"
msgid "View Employees"
msgstr "查看员工"
+msgid "View full size"
+msgstr "查看原图"
+
msgid "View History"
msgstr "查看历史记录"
diff --git a/packages/locale/locales/zh/mes.po b/packages/locale/locales/zh/mes.po
index d36fcecb50..e6895b8ef2 100644
--- a/packages/locale/locales/zh/mes.po
+++ b/packages/locale/locales/zh/mes.po
@@ -1473,6 +1473,9 @@ msgstr "固定或取消固定"
msgid "Pin Out"
msgstr "退出登录"
+msgid "Pinch or scroll to zoom · drag to pan · double-tap to reset"
+msgstr "双指捏合或滚动以缩放 · 拖动以平移 · 双击以重置"
+
msgid "Planned"
msgstr "已计划"
@@ -1586,6 +1589,9 @@ msgstr "记录部分"
msgid "Recorded"
msgstr "已记录"
+msgid "Reference image"
+msgstr "参考图像"
+
msgid "Registration failed"
msgstr "注册失败"
diff --git a/apps/mes/app/components/ImageZoomViewer.tsx b/packages/react/src/ImageZoomViewer.tsx
similarity index 52%
rename from apps/mes/app/components/ImageZoomViewer.tsx
rename to packages/react/src/ImageZoomViewer.tsx
index e9d5162e0a..86a704a403 100644
--- a/apps/mes/app/components/ImageZoomViewer.tsx
+++ b/packages/react/src/ImageZoomViewer.tsx
@@ -2,9 +2,12 @@
// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,
// including ports, remain AGPLv3; serving them over a network requires releasing their source.
-import { cn, IconButton } from "@carbon/react";
+import { useLingui } from "@lingui/react/macro";
+import * as DialogPrimitive from "@radix-ui/react-dialog";
import { useCallback, useEffect, useRef, useState } from "react";
import { LuX } from "react-icons/lu";
+import { IconButton } from "./IconButton";
+import { cn } from "./utils/cn";
const MIN_SCALE = 1;
const MAX_SCALE = 6;
@@ -12,10 +15,13 @@ const MAX_SCALE = 6;
const clampScale = (s: number) => Math.min(MAX_SCALE, Math.max(MIN_SCALE, s));
/**
- * Fullscreen reference-image viewer for the shop floor. Pointer-events based so the same
- * code handles a mouse (wheel to zoom, drag to pan) and an iPad (two-finger pinch to zoom,
- * one-finger drag to pan). Double-tap toggles between fit and a 2.5× zoom. Escape, the close
- * button, or tapping the backdrop while at fit-scale dismisses it.
+ * Fullscreen reference-image viewer, used by the MES and the ERP step slides. Pointer-events
+ * based so the same code handles a mouse (wheel to zoom, drag to pan) and an iPad (two-finger
+ * pinch to zoom, one-finger drag to pan). Double-tap toggles between fit and a 2.5× zoom.
+ * Escape, the close button, or tapping the backdrop while at fit-scale dismisses it. It is a
+ * portaled Radix dialog: it covers the viewport even under a transformed ancestor (a phone
+ * bottom sheet, a sortable row), stacks above other dialogs (z-[80], over BottomSheet's
+ * z-[70]), and an open sheet treats taps on it as inside, not as a dismiss.
*/
type Annotation = {
id: string;
@@ -32,7 +38,7 @@ export function ImageZoomViewer({
caption,
annotations = [],
toolNameById,
- alt = "Reference image",
+ alt,
onClose
}: {
open: boolean;
@@ -43,6 +49,7 @@ export function ImageZoomViewer({
alt?: string;
onClose: () => void;
}) {
+ const { t } = useLingui();
const containerRef = useRef<HTMLDivElement>(null);
const [scale, setScale] = useState(1);
const [tx, setTx] = useState(0);
@@ -69,16 +76,6 @@ export function ImageZoomViewer({
if (open) reset();
}, [open, src, reset]);
- // Escape to close.
- useEffect(() => {
- if (!open) return;
- const onKey = (e: KeyboardEvent) => {
- if (e.key === "Escape") onClose();
- };
- window.addEventListener("keydown", onKey);
- return () => window.removeEventListener("keydown", onKey);
- }, [open, onClose]);
-
if (!open || !src) return null;
// Focal point in container-center coordinates (origin at the container's center, matching
@@ -138,9 +135,9 @@ export function ImageZoomViewer({
const pts = [...pointers.current.values()];
- if (pts.length >= 2) {
+ const [a, b] = pts;
+ if (a && b) {
// Pinch: scale by the change in finger distance, pan by the midpoint shift.
- const [a, b] = pts;
const dist = Math.hypot(a.x - b.x, a.y - b.y);
const midClient = { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 };
const mid = toFocal(midClient.x, midClient.y);
@@ -171,86 +168,103 @@ export function ImageZoomViewer({
}
};
+ const altText = alt ?? t`Reference image`;
+
return (
- <div
- className="fixed inset-0 z-[60] flex flex-col bg-black/90 backdrop-blur-sm"
- // Tapping the backdrop at fit-scale closes; while zoomed it's reserved for panning.
- onClick={(e) => {
- if (e.target === e.currentTarget && scale === 1) onClose();
+ <DialogPrimitive.Root
+ open
+ // Escape closes through here.
+ onOpenChange={(next) => {
+ if (!next) onClose();
}}
>
- <div className="flex shrink-0 items-center justify-end p-3">
- <IconButton
- aria-label="Close"
- variant="ghost"
- size="lg"
- className="text-white hover:bg-white/10 hover:text-white"
- icon={<LuX className="size-6" />}
- onClick={onClose}
- />
- </div>
-
- <div
- ref={containerRef}
- className="relative flex min-h-0 flex-1 select-none items-center justify-center overflow-hidden"
- style={{ touchAction: "none" }}
- onWheel={onWheel}
- onPointerDown={onPointerDown}
- onPointerMove={onPointerMove}
- onPointerUp={endPointer}
- onPointerCancel={endPointer}
- >
- {/* Image + pins share one transformed wrapper so annotations pan/zoom with the art. */}
- <div
- className={cn(
- "relative inline-flex max-h-full max-w-full will-change-transform",
- scale > 1 ? "cursor-grab" : "cursor-zoom-in"
- )}
- style={{
- transform: `translate(${tx}px, ${ty}px) scale(${scale})`,
- transformOrigin: "center center"
+ <DialogPrimitive.Portal>
+ <DialogPrimitive.Content
+ aria-describedby={undefined}
+ className="fixed inset-0 z-[80] flex flex-col bg-black/90 backdrop-blur-sm outline-none"
+ // Tapping the backdrop at fit-scale closes; while zoomed it's reserved for panning.
+ onClick={(e) => {
+ if (e.target === e.currentTarget && scale === 1) onClose();
}}
>
- <img
- src={src}
- alt={alt}
- draggable={false}
- className="max-h-full max-w-full object-contain"
- />
- {annotations.map((pin, i) => {
- const toolName = pin.toolId
- ? toolNameById?.get(pin.toolId)
- : undefined;
- const title =
- [`#${i + 1}`, toolName, pin.label].filter(Boolean).join(" · ") ||
- undefined;
- return (
- <span
- key={pin.id}
- className="pointer-events-none absolute flex size-6 -translate-x-1/2 -translate-y-1/2 items-center justify-center rounded-full border-2 border-white text-xs font-semibold text-white shadow-md"
- style={{
- left: `${pin.x * 100}%`,
- top: `${pin.y * 100}%`,
- backgroundColor: pin.color ?? "#ef4444"
- }}
- title={title}
- >
- {i + 1}
- </span>
- );
- })}
- </div>
- </div>
+ <DialogPrimitive.Title className="sr-only">
+ {caption || altText}
+ </DialogPrimitive.Title>
+ <div className="flex shrink-0 items-center justify-end p-3">
+ <IconButton
+ aria-label={t`Close`}
+ variant="ghost"
+ size="lg"
+ className="text-white hover:bg-white/10 hover:text-white"
+ icon={<LuX className="size-6" />}
+ onClick={onClose}
+ />
+ </div>
- {caption ? (
- <p className="shrink-0 px-4 pb-4 pt-2 text-center text-sm text-white/80">
- {caption}
- </p>
- ) : (
- <p className="shrink-0 px-4 pb-4 pt-2 text-center text-xs text-white/40">
- Pinch or scroll to zoom · drag to pan · double-tap to reset
- </p>
- )}
- </div>
+ <div
+ ref={containerRef}
+ className="relative flex min-h-0 flex-1 select-none items-center justify-center overflow-hidden"
+ style={{ touchAction: "none" }}
+ onWheel={onWheel}
+ onPointerDown={onPointerDown}
+ onPointerMove={onPointerMove}
+ onPointerUp={endPointer}
+ onPointerCancel={endPointer}
+ >
+ {/* Image + pins share one transformed wrapper so annotations pan/zoom with the art. */}
+ <div
+ className={cn(
+ "relative inline-flex max-h-full max-w-full will-change-transform",
+ scale > 1 ? "cursor-grab" : "cursor-zoom-in"
+ )}
+ style={{
+ transform: `translate(${tx}px, ${ty}px) scale(${scale})`,
+ transformOrigin: "center center"
+ }}
+ >
+ <img
+ src={src}
+ alt={altText}
+ draggable={false}
+ className="max-h-full max-w-full object-contain"
+ />
+ {annotations.map((pin, i) => {
+ const toolName = pin.toolId
+ ? toolNameById?.get(pin.toolId)
+ : undefined;
+ const title =
+ [`#${i + 1}`, toolName, pin.label]
+ .filter(Boolean)
+ .join(" · ") || undefined;
+ return (
+ <span
+ key={pin.id}
+ className="pointer-events-none absolute flex size-6 -translate-x-1/2 -translate-y-1/2 items-center justify-center rounded-full border-2 border-white text-xs font-semibold text-white shadow-md"
+ style={{
+ left: `${pin.x * 100}%`,
+ top: `${pin.y * 100}%`,
+ backgroundColor: pin.color ?? "#ef4444"
+ }}
+ title={title}
+ >
+ {i + 1}
+ </span>
+ );
+ })}
+ </div>
+ </div>
+
+ {caption ? (
+ <p className="shrink-0 px-4 pb-4 pt-2 text-center text-sm text-white/80">
+ {caption}
+ </p>
+ ) : (
+ <p className="shrink-0 px-4 pb-4 pt-2 text-center text-xs text-white/40">
+ {t`Pinch or scroll to zoom · drag to pan · double-tap to reset`}
+ </p>
+ )}
+ </DialogPrimitive.Content>
+ </DialogPrimitive.Portal>
+ </DialogPrimitive.Root>
);
}
diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsx
index bbaaa0c78e..851aed9b84 100644
--- a/packages/react/src/index.tsx
+++ b/packages/react/src/index.tsx
@@ -410,6 +410,7 @@ import { VStack } from "./VStack";
export * from "./Acknowledge";
export * from "./ColorPicker";
export * from "./hooks";
+export * from "./ImageZoomViewer";
export * from "./RecordOutlet";
export type {
ActionPresentation,