@mcurros2/microm 1.1.357-0 → 1.1.360-0

package/dist/index.js

@@ -9215,7 +9215,7 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         loadFilesOnMount
     ]);
     (0, $b4te3$react.useEffect)(()=>()=>activeControllerRef.current?.abort(), []);
-    const openImageEditor = (0, $b4te3$react.useCallback)(async (file)=>{
+    const openImageEditor = (0, $b4te3$react.useCallback)(async (file, options)=>{
         if (!editor) return null;
         if (file) (0, $dE75A.getImageOutputSettings)(file, processingOptions);
         return await new Promise(async (resolveEditor)=>{
@@ -9231,6 +9231,8 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
                     sourceFile: file,
                     options: processingOptions,
                     ...imageEditorProps,
+                    initiallyDirty: options?.initiallyDirty ?? !!file,
+                    onBeforeSave: options?.onBeforeSave,
                     onSave: (result)=>settle(result),
                     onCancel: ()=>settle(null)
                 }),
@@ -9259,15 +9261,15 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         modals,
         processingOptions
     ]);
-    const processSelectedFile = (0, $b4te3$react.useCallback)(async (file)=>{
+    const processSelectedFile = (0, $b4te3$react.useCallback)(async (file, editorOptions)=>{
         if (editorProcessedFilesRef.current.has(file)) {
             editorProcessedFilesRef.current.delete(file);
             return onProcessFile ? await onProcessFile(file) : file;
         }
         if (onProcessFile) return await onProcessFile(file);
-        if (editor) return await openImageEditor(file);
-        if (imageProcessing) return await (0, $dE75A.processImageFileAutomatically)(file, processingOptions);
-        return file;
+        if (editor) return await openImageEditor(file, editorOptions);
+        const processedFile = imageProcessing ? await (0, $dE75A.processImageFileAutomatically)(file, processingOptions) : file;
+        return processedFile;
     }, [
         editor,
         imageProcessing,
@@ -9293,7 +9295,7 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         maxTotalFilesSize,
         totalUploadExceedsMaximumSizeText
     ]);
-    const prepareSelectedFile = (0, $b4te3$react.useCallback)(async (file, excludedGUIDs = [])=>{
+    const prepareSelectedFile = (0, $b4te3$react.useCallback)(async (file, excludedGUIDs = [], editorOptions)=>{
         if (onValidateFile) {
             const validation = await onValidateFile(file);
             if (validation.error) {
@@ -9301,12 +9303,16 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
                 return null;
             }
         }
-        const processedFile = await processSelectedFile(file);
+        const saveGuardRunsInEditor = editor === true && !onProcessFile && !editorProcessedFilesRef.current.has(file);
+        const processedFile = await processSelectedFile(file, editorOptions);
         if (!processedFile || !validateFileSize(processedFile, excludedGUIDs)) return null;
         if (onBeforeUpload && !await onBeforeUpload(processedFile)) return null;
+        if (!saveGuardRunsInEditor && editorOptions?.onBeforeSave && !await editorOptions.onBeforeSave(processedFile)) return null;
         return processedFile;
     }, [
+        editor,
         onBeforeUpload,
+        onProcessFile,
         onValidateFile,
         processSelectedFile,
         validateFileSize
@@ -9493,11 +9499,14 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         editor,
         findFile
     ]);
-    const performReplacement = (0, $b4te3$react.useCallback)(async (currentFile, replacementSource, signal)=>{
+    const performReplacement = (0, $b4te3$react.useCallback)(async (currentFile, replacementSource, signal, initiallyDirty = true)=>{
         const currentGUID = currentFile.vc_fileguid;
         const preparedFile = await prepareSelectedFile(replacementSource, [
             currentGUID
-        ]);
+        ], {
+            initiallyDirty: initiallyDirty,
+            onBeforeSave: async (candidateFile)=>!onBeforeReplace || await onBeforeReplace(currentFile, candidateFile)
+        });
         if (!preparedFile) return null;
         const replacement = await uploadFile(preparedFile, signal);
         if (replacement.cancelled) {
@@ -9562,6 +9571,7 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         completeUpload,
         deleteStoredFile,
         loadFilesFromServer,
+        onBeforeReplace,
         prepareSelectedFile,
         unspecifiedErrorWhenUploadingFileText,
         uploadFile
@@ -9574,7 +9584,6 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         try {
             setErrorNotification(undefined);
             setCancelledNotification(false);
-            if (onBeforeReplace && !await onBeforeReplace(currentFile, replacementFile)) return null;
             return await performReplacement(currentFile, replacementFile, controller.signal);
         } catch (error) {
             if (!(error instanceof Error && error.name === 'AbortError')) setErrorNotification(error instanceof Error ? error.message : String(error));
@@ -9586,7 +9595,6 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         beginOperation,
         findFile,
         finishOperation,
-        onBeforeReplace,
         performReplacement
     ]);
     const editImage = (0, $b4te3$react.useCallback)(async (file)=>{
@@ -9597,7 +9605,6 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         try {
             setErrorNotification(undefined);
             setCancelledNotification(false);
-            if (onBeforeReplace && !await onBeforeReplace(currentFile)) return null;
             const blob = await client.downloadBlob(currentFile.documentURL, controller.signal);
             const imageType = (0, $dE75A.getSupportedImageMimeType)(currentFile.file_name, blob.type);
             if (!imageType) throw new Error(`The image format "${blob.type || currentFile.file_name}" cannot be processed in the browser.`);
@@ -9607,7 +9614,7 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
                 type: imageType,
                 lastModified: Date.now()
             });
-            return await performReplacement(currentFile, sourceFile, controller.signal);
+            return await performReplacement(currentFile, sourceFile, controller.signal, false);
         } catch (error) {
             if (!(error instanceof Error && error.name === 'AbortError')) setErrorNotification(error instanceof Error ? error.message : String(error));
             return null;
@@ -9620,7 +9627,6 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
         client,
         findFile,
         finishOperation,
-        onBeforeReplace,
         performReplacement
     ]);
     const captureImage = (0, $b4te3$react.useCallback)(async ()=>{
@@ -9726,7 +9732,7 @@ function $ad822dbf504c78b4$export$5c1c888d0d490e03(props) {
             uploadFiles: (selectedFiles)=>actionsRef.current.uploadFiles(selectedFiles),
             replaceFile: (fileGUID, replacementFile)=>actionsRef.current.replaceFile(fileGUID, replacementFile),
             editImage: (file)=>actionsRef.current.editImage(file),
-            openImageEditor: (file)=>actionsRef.current.openImageEditor(file),
+            openImageEditor: (file, options)=>actionsRef.current.openImageEditor(file, options),
             captureImage: ()=>actionsRef.current.captureImage(),
             canEditImage: (file)=>actionsRef.current.canEditImage(file),
             refreshFiles: ()=>actionsRef.current.refreshFiles(),
@@ -10008,10 +10014,11 @@ const $0cac5edaa1a7f2eb$export$6e31a2501ac1134a = {
     rotateClockwiseLabel: 'Rotate right',
     rotateCounterClockwiseLabel: 'Rotate left',
     takePhotoLabel: 'Take photo',
-    camera: true
+    camera: true,
+    initiallyDirty: true
 };
 const $0cac5edaa1a7f2eb$export$d0486c7a5136628 = (props)=>{
-    const { sourceFile: sourceFile, options: options, onSave: onSave, onCancel: onCancel, saveLabel: saveLabel, cancelLabel: cancelLabel, rotateClockwiseLabel: rotateClockwiseLabel, rotateCounterClockwiseLabel: rotateCounterClockwiseLabel, takePhotoLabel: takePhotoLabel, camera: camera } = (0, $b4te3$mantinecore.useComponentDefaultProps)('ImageEditor', $0cac5edaa1a7f2eb$export$6e31a2501ac1134a, props);
+    const { sourceFile: sourceFile, options: options, onSave: onSave, onBeforeSave: onBeforeSave, onCancel: onCancel, initiallyDirty: initiallyDirty, saveLabel: saveLabel, cancelLabel: cancelLabel, rotateClockwiseLabel: rotateClockwiseLabel, rotateCounterClockwiseLabel: rotateCounterClockwiseLabel, takePhotoLabel: takePhotoLabel, camera: camera } = (0, $b4te3$mantinecore.useComponentDefaultProps)('ImageEditor', $0cac5edaa1a7f2eb$export$6e31a2501ac1134a, props);
     const [editorSource, setEditorSource] = (0, $b4te3$react.useState)(sourceFile);
     const [cameraMode, setCameraMode] = (0, $b4te3$react.useState)(!sourceFile && camera !== false);
     const [preparedImage, setPreparedImage] = (0, $b4te3$react.useState)();
@@ -10027,6 +10034,7 @@ const $0cac5edaa1a7f2eb$export$d0486c7a5136628 = (props)=>{
     const [error, setError] = (0, $b4te3$react.useState)();
     const cropEnabled = options.crop !== false;
     const manualRotation = options.manualRotation;
+    const dirty = !!editorSource && (initiallyDirty === true || editorSource !== sourceFile || crop.x !== 0 || crop.y !== 0 || zoom !== 1 || rotationDegrees !== 0);
     (0, $b4te3$react.useEffect)(()=>{
         setEditorSource(sourceFile);
         setCameraMode(!sourceFile && camera !== false);
@@ -10081,12 +10089,13 @@ const $0cac5edaa1a7f2eb$export$d0486c7a5136628 = (props)=>{
         manualRotation
     ]);
     const save = (0, $b4te3$react.useCallback)(async ()=>{
-        if (!editorSource || !preparedImage || cropEnabled && !croppedAreaPixels) return;
+        if (!dirty || !editorSource || !preparedImage || cropEnabled && !croppedAreaPixels) return;
         setSaving(true);
         setError(undefined);
         try {
             const canvas = (0, $g81NG.renderEditedImage)(preparedImage.canvas, cropEnabled ? croppedAreaPixels : undefined, rotationDegrees, options);
             const file = await (0, $dE75A.canvasToProcessedFile)(canvas, editorSource, options);
+            if (onBeforeSave && !await onBeforeSave(file)) return;
             await onSave(file);
         } catch (e) {
             setError(e instanceof Error ? e.message : String(e));
@@ -10096,7 +10105,9 @@ const $0cac5edaa1a7f2eb$export$d0486c7a5136628 = (props)=>{
     }, [
         cropEnabled,
         croppedAreaPixels,
+        dirty,
         editorSource,
+        onBeforeSave,
         onSave,
         options,
         preparedImage,
@@ -10213,7 +10224,7 @@ const $0cac5edaa1a7f2eb$export$d0486c7a5136628 = (props)=>{
                         /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$mantinecore.Button), {
                             onClick: ()=>void save(),
                             loading: saving,
-                            disabled: !editorSource || !ready,
+                            disabled: !dirty || !ready,
                             leftIcon: /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$tablericonsreact.IconCheck), {
                                 size: "1rem"
                             }),
@@ -10511,7 +10522,8 @@ function $150e740bf624ab8d$export$4c90be38156c1022(props) {
                 style: {
                     width: '100%',
                     maxHeight: '60vh',
-                    objectFit: 'contain',
+                    objectFit: 'cover',
+                    borderRadius: '1rem',
                     background: '#0f0e13',
                     display: !!captured || !streaming ? 'none' : 'inline-block'
                 }
@@ -10522,7 +10534,8 @@ function $150e740bf624ab8d$export$4c90be38156c1022(props) {
                 style: {
                     width: '100%',
                     maxHeight: '60vh',
-                    objectFit: 'contain',
+                    objectFit: 'cover',
+                    borderRadius: '1rem',
                     background: '#0f0e13'
                 }
             }),