@yogiswara/honcho-editor-ui 3.4.16 → 3.4.17

package/dist/hooks/editor/useHonchoEditorBulk.js

@@ -161,7 +161,6 @@ export function useHonchoEditorBulk(controller, eventID, firebaseUid) {
     const currentAdjustments = useMemo(() => {
         return getCurrentAdjustmentsForCopy(selectedIds, currentBatch);
     }, [selectedIds, currentBatch]);
-    // Calculate active preset based on preset_id from history (not value comparison)
     const areAdjustmentsEqual = (adj1, adj2) => {
         // The fix is to use this more specific type for our keys array
         const keys = [
@@ -177,38 +176,70 @@ export function useHonchoEditorBulk(controller, eventID, firebaseUid) {
         }
         return true;
     };
+    // Calculate active preset based on preset_id from history (not value comparison)
     const { activePreset, presetSummary } = useMemo(() => {
         if (selectedIds.length === 0) {
             return { activePreset: null, presetSummary: 'NO_SELECTION' };
         }
-        const presetIds = selectedIds.map(id => currentBatch.allImages[id]?.preset_id);
-        const uniquePresetIds = new Set(presetIds);
-        // Case 1: All selected images have NO preset.
-        if (uniquePresetIds.size === 1 && uniquePresetIds.has(undefined)) {
+        const imageDetails = selectedIds.map(id => {
+            const adjustment = currentBatch.allImages[id];
+            const presetId = adjustment?.preset_id || null;
+            // Check if preset exists in our presets list
+            const matchingPreset = presetId ? presets.find(p => p.id === presetId) : null;
+            // Check if the adjustment values actually match the preset values
+            let hasValidMatchingPreset = false;
+            if (matchingPreset && adjustment) {
+                const presetAdjustments = presetToAdjustmentState(matchingPreset);
+                hasValidMatchingPreset = areAdjustmentsEqual(adjustment, presetAdjustments);
+            }
+            return {
+                imageId: id,
+                presetId,
+                matchingPreset,
+                hasValidMatchingPreset,
+                adjustmentValues: adjustment
+            };
+        });
+        console.log('Debug preset calculation (with custom check):', {
+            selectedIds,
+            imageDetails: imageDetails.map(detail => ({
+                imageId: detail.imageId,
+                presetId: detail.presetId,
+                presetName: detail.matchingPreset?.name || 'N/A',
+                hasValidMatchingPreset: detail.hasValidMatchingPreset,
+                isCustomAdjustment: detail.presetId && !detail.hasValidMatchingPreset
+            }))
+        });
+        // Get images that have ACTUALLY matching presets (not just preset IDs)
+        const imagesWithValidPresets = imageDetails.filter(detail => detail.hasValidMatchingPreset);
+        const validPresetIds = imagesWithValidPresets.map(detail => detail.presetId);
+        const uniqueValidPresetIds = new Set(validPresetIds);
+        // Case 1: No images have actually matching presets
+        // This includes: no preset_id, non-existent preset_id, or preset_id with modified values
+        if (imagesWithValidPresets.length === 0) {
+            console.log('Case 1: No images have valid matching presets - showing Select');
             return { activePreset: null, presetSummary: 'NO_SELECTION' };
         }
-        // Case 2: A mix of presets, or some with a preset and some without.
-        if (uniquePresetIds.size > 1) {
-            return { activePreset: null, presetSummary: 'MULTIPLE_PRESETS' };
-        }
-        // Case 3: All have the SAME preset ID. Now we must verify the adjustments.
-        const singlePresetId = presetIds[0];
-        if (typeof singlePresetId !== 'string') {
+        // Case 2: Some images have valid matching presets, some don't (mixed state)
+        if (imagesWithValidPresets.length > 0 && imagesWithValidPresets.length < selectedIds.length) {
+            console.log('Case 2: Mixed preset state (some valid, some custom/none) - showing Multiple presets');
             return { activePreset: null, presetSummary: 'MULTIPLE_PRESETS' };
         }
-        const matchingPreset = presets.find(p => p.id === singlePresetId);
-        if (!matchingPreset) {
+        // Case 3: All images have valid matching presets, but different ones
+        if (uniqueValidPresetIds.size > 1) {
+            console.log('Case 3: Multiple different valid presets - showing Multiple presets');
             return { activePreset: null, presetSummary: 'MULTIPLE_PRESETS' };
         }
-        // THE FINAL VERIFICATION
-        const firstImageAdjustments = currentBatch.allImages[selectedIds[0]];
-        const presetAdjustments = presetToAdjustmentState(matchingPreset);
-        if (firstImageAdjustments && areAdjustmentsEqual(firstImageAdjustments, presetAdjustments)) {
-            // ID and adjustments match perfectly.
+        // Case 4: All images have the same valid matching preset
+        const singleValidPresetId = Array.from(uniqueValidPresetIds)[0];
+        const matchingPreset = presets.find(p => p.id === singleValidPresetId);
+        if (matchingPreset) {
+            console.log('Case 4: All images have the same valid matching preset');
             return { activePreset: matchingPreset, presetSummary: 'SINGLE' };
         }
         else {
-            // This is a custom adjustment! The ID is there but the values don't match.
+            // This shouldn't happen given our filtering above, but safety check
+            console.log('Case 4 safety check failed - showing Select');
             return { activePreset: null, presetSummary: 'NO_SELECTION' };
         }
     }, [selectedIds, currentBatch.allImages, presets]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yogiswara/honcho-editor-ui",
-  "version": "3.4.16",
+  "version": "3.4.17",
   "description": "A complete UI component library for the Honcho photo editor.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",