feat(ui): single action to reset adjustments

Author: psychedelicious

invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerAdjustmentsPanel.tsx

@@ -7,9 +7,8 @@ import { useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerP
 import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import {
   rasterLayerAdjustmentsCancel,
-  rasterLayerAdjustmentsCurvesUpdated,
+  rasterLayerAdjustmentsReset,
   rasterLayerAdjustmentsSet,
-  rasterLayerAdjustmentsSimpleUpdated,
 } from 'features/controlLayers/store/canvasSlice';
 import { selectCanvasSlice, selectEntity } from 'features/controlLayers/store/selectors';
 import { makeDefaultRasterLayerAdjustments } from 'features/controlLayers/store/util';
@@ -49,27 +48,7 @@ export const RasterLayerAdjustmentsPanel = memo(() => {
 
   const onReset = useCallback(() => {
     // Reset values to defaults but keep adjustments present; preserve enabled/collapsed/mode
-    dispatch(
-      rasterLayerAdjustmentsSimpleUpdated({
-        entityIdentifier,
-        simple: {
-          brightness: 0,
-          contrast: 0,
-          saturation: 0,
-          temperature: 0,
-          tint: 0,
-          sharpness: 0,
-        },
-      })
-    );
-    const defaultPoints: Array<[number, number]> = [
-      [0, 0],
-      [255, 255],
-    ];
-    dispatch(rasterLayerAdjustmentsCurvesUpdated({ entityIdentifier, channel: 'master', points: defaultPoints }));
-    dispatch(rasterLayerAdjustmentsCurvesUpdated({ entityIdentifier, channel: 'r', points: defaultPoints }));
-    dispatch(rasterLayerAdjustmentsCurvesUpdated({ entityIdentifier, channel: 'g', points: defaultPoints }));
-    dispatch(rasterLayerAdjustmentsCurvesUpdated({ entityIdentifier, channel: 'b', points: defaultPoints }));
+    dispatch(rasterLayerAdjustmentsReset({ entityIdentifier }));
   }, [dispatch, entityIdentifier]);
 
   const onCancel = useCallback(() => {

invokeai/frontend/web/src/features/controlLayers/store/canvasSlice.ts

@@ -131,6 +131,17 @@ const slice = createSlice({
       }
       layer.adjustments = merge(layer.adjustments, adjustments);
     },
+    rasterLayerAdjustmentsReset: (state, action: PayloadAction<EntityIdentifierPayload<void, 'raster_layer'>>) => {
+      const { entityIdentifier } = action.payload;
+      const layer = selectEntity(state, entityIdentifier);
+      if (!layer) {
+        return;
+      }
+      if (layer.adjustments) {
+        layer.adjustments.simple = makeDefaultRasterLayerAdjustments('simple').simple;
+        layer.adjustments.curves = makeDefaultRasterLayerAdjustments('curves').curves;
+      }
+    },
     rasterLayerAdjustmentsCancel: (state, action: PayloadAction<EntityIdentifierPayload<void, 'raster_layer'>>) => {
       const { entityIdentifier } = action.payload;
       const layer = selectEntity(state, entityIdentifier);
@@ -1739,6 +1750,7 @@ export const {
   // Raster layer adjustments
   rasterLayerAdjustmentsSet,
   rasterLayerAdjustmentsCancel,
+  rasterLayerAdjustmentsReset,
   rasterLayerAdjustmentsSimpleUpdated,
   rasterLayerAdjustmentsCurvesUpdated,
   entityDeleted,