Skip to content

Commit 4582c41

Browse files
author
Attila Cseh
committed
build error fixed
1 parent dcce85f commit 4582c41

File tree

5 files changed

+38
-23
lines changed

5 files changed

+38
-23
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
rasterLayerAdjustmentsReset,
1414
rasterLayerAdjustmentsSet,
1515
} from 'features/controlLayers/store/canvasSlice';
16-
import { selectCanvasSlice, selectEntity } from 'features/controlLayers/store/selectors';
16+
import { selectEntity, selectSelectedCanvas } from 'features/controlLayers/store/selectors';
1717
import React, { memo, useCallback, useMemo } from 'react';
1818
import { useTranslation } from 'react-i18next';
1919
import { PiArrowCounterClockwiseBold, PiCaretDownBold, PiCheckBold, PiTrashBold } from 'react-icons/pi';
@@ -25,30 +25,32 @@ export const RasterLayerAdjustmentsPanel = memo(() => {
2525
const canvasManager = useCanvasManager();
2626

2727
const selectHasAdjustments = useMemo(() => {
28-
return createSelector(selectCanvasSlice, (canvas) => Boolean(selectEntity(canvas, entityIdentifier)?.adjustments));
28+
return createSelector(selectSelectedCanvas, (canvas) =>
29+
Boolean(selectEntity(canvas, entityIdentifier)?.adjustments)
30+
);
2931
}, [entityIdentifier]);
3032

3133
const hasAdjustments = useAppSelector(selectHasAdjustments);
3234

3335
const selectMode = useMemo(() => {
3436
return createSelector(
35-
selectCanvasSlice,
37+
selectSelectedCanvas,
3638
(canvas) => selectEntity(canvas, entityIdentifier)?.adjustments?.mode ?? 'simple'
3739
);
3840
}, [entityIdentifier]);
3941
const mode = useAppSelector(selectMode);
4042

4143
const selectEnabled = useMemo(() => {
4244
return createSelector(
43-
selectCanvasSlice,
45+
selectSelectedCanvas,
4446
(canvas) => selectEntity(canvas, entityIdentifier)?.adjustments?.enabled ?? false
4547
);
4648
}, [entityIdentifier]);
4749
const enabled = useAppSelector(selectEnabled);
4850

4951
const selectCollapsed = useMemo(() => {
5052
return createSelector(
51-
selectCanvasSlice,
53+
selectSelectedCanvas,
5254
(canvas) => selectEntity(canvas, entityIdentifier)?.adjustments?.collapsed ?? false
5355
);
5456
}, [entityIdentifier]);

‎invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerCurvesAdjustmentsEditor.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
55
import { useEntityAdapterContext } from 'features/controlLayers/contexts/EntityAdapterContext';
66
import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
77
import { rasterLayerAdjustmentsCurvesUpdated } from 'features/controlLayers/store/canvasSlice';
8-
import { selectCanvasSlice, selectEntity } from 'features/controlLayers/store/selectors';
8+
import { selectEntity, selectSelectedCanvas } from 'features/controlLayers/store/selectors';
99
import type { ChannelName, ChannelPoints, CurvesAdjustmentsConfig } from 'features/controlLayers/store/types';
1010
import { memo, useCallback, useEffect, useMemo, useState } from 'react';
1111
import { useTranslation } from 'react-i18next';
@@ -72,15 +72,15 @@ export const RasterLayerCurvesAdjustmentsEditor = memo(() => {
7272
const { t } = useTranslation();
7373
const selectCurves = useMemo(() => {
7474
return createSelector(
75-
selectCanvasSlice,
75+
selectSelectedCanvas,
7676
(canvas) => selectEntity(canvas, entityIdentifier)?.adjustments?.curves ?? DEFAULT_CURVES
7777
);
7878
}, [entityIdentifier]);
7979
const curves = useAppSelector(selectCurves);
8080

8181
const selectIsDisabled = useMemo(() => {
8282
return createSelector(
83-
selectCanvasSlice,
83+
selectSelectedCanvas,
8484
(canvas) => selectEntity(canvas, entityIdentifier)?.adjustments?.enabled !== true
8585
);
8686
}, [entityIdentifier]);

‎invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerMenuItemsAdjustments.tsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
import { MenuItem } from '@invoke-ai/ui-library';
2+
import { createSelector } from '@reduxjs/toolkit';
23
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
34
import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
45
import { rasterLayerAdjustmentsCancel, rasterLayerAdjustmentsSet } from 'features/controlLayers/store/canvasSlice';
6+
import { selectSelectedCanvas } from 'features/controlLayers/store/selectors';
57
import type { CanvasRasterLayerState } from 'features/controlLayers/store/types';
68
import { makeDefaultRasterLayerAdjustments } from 'features/controlLayers/store/util';
7-
import { memo, useCallback } from 'react';
9+
import { memo, useCallback, useMemo } from 'react';
810
import { useTranslation } from 'react-i18next';
911
import { PiSlidersHorizontalBold } from 'react-icons/pi';
1012

1113
export const RasterLayerMenuItemsAdjustments = memo(() => {
1214
const dispatch = useAppDispatch();
1315
const entityIdentifier = useEntityIdentifierContext<'raster_layer'>();
1416
const { t } = useTranslation();
15-
const layer = useAppSelector((s) =>
16-
s.canvas.present.rasterLayers.entities.find((e: CanvasRasterLayerState) => e.id === entityIdentifier.id)
17-
);
17+
const selectRasterLayer = useMemo(() => {
18+
return createSelector(selectSelectedCanvas, (canvas) =>
19+
canvas.rasterLayers.entities.find((e: CanvasRasterLayerState) => e.id === entityIdentifier.id)
20+
);
21+
}, [entityIdentifier]);
22+
const layer = useAppSelector(selectRasterLayer);
1823
const hasAdjustments = Boolean(layer?.adjustments);
1924
const onToggleAdjustmentsPresence = useCallback(() => {
2025
if (hasAdjustments) {

‎invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerSimpleAdjustmentsEditor.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { createSelector } from '@reduxjs/toolkit';
33
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
44
import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
55
import { rasterLayerAdjustmentsSimpleUpdated } from 'features/controlLayers/store/canvasSlice';
6-
import { selectCanvasSlice, selectEntity } from 'features/controlLayers/store/selectors';
6+
import { selectEntity, selectSelectedCanvas } from 'features/controlLayers/store/selectors';
77
import type { SimpleAdjustmentsConfig } from 'features/controlLayers/store/types';
88
import React, { memo, useCallback, useMemo } from 'react';
99
import { useTranslation } from 'react-i18next';
@@ -21,7 +21,7 @@ const AdjustmentSliderRow = ({ label, name, onChange, min = -1, max = 1, step =
2121
const entityIdentifier = useEntityIdentifierContext<'raster_layer'>();
2222
const selectValue = useMemo(() => {
2323
return createSelector(
24-
selectCanvasSlice,
24+
selectSelectedCanvas,
2525
(canvas) =>
2626
selectEntity(canvas, entityIdentifier)?.adjustments?.simple?.[name] ?? DEFAULT_SIMPLE_ADJUSTMENTS[name]
2727
);
@@ -54,7 +54,7 @@ export const RasterLayerSimpleAdjustmentsEditor = memo(() => {
5454
const { t } = useTranslation();
5555
const selectIsDisabled = useMemo(() => {
5656
return createSelector(
57-
selectCanvasSlice,
57+
selectSelectedCanvas,
5858
(canvas) => selectEntity(canvas, entityIdentifier)?.adjustments?.enabled !== true
5959
);
6060
}, [entityIdentifier]);

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ const slice = createSlice({
197197
action: PayloadAction<EntityIdentifierPayload<{ adjustments: RasterLayerAdjustments | null }, 'raster_layer'>>
198198
) => {
199199
const { entityIdentifier, adjustments } = action.payload;
200-
const layer = selectEntity(state, entityIdentifier);
200+
const canvas = getSelectedCanvas(state);
201+
const layer = selectEntity(canvas, entityIdentifier);
201202
if (!layer) {
202203
return;
203204
}
@@ -212,7 +213,8 @@ const slice = createSlice({
212213
},
213214
rasterLayerAdjustmentsReset: (state, action: PayloadAction<EntityIdentifierPayload<void, 'raster_layer'>>) => {
214215
const { entityIdentifier } = action.payload;
215-
const layer = selectEntity(state, entityIdentifier);
216+
const canvas = getSelectedCanvas(state);
217+
const layer = selectEntity(canvas, entityIdentifier);
216218
if (!layer?.adjustments) {
217219
return;
218220
}
@@ -221,7 +223,8 @@ const slice = createSlice({
221223
},
222224
rasterLayerAdjustmentsCancel: (state, action: PayloadAction<EntityIdentifierPayload<void, 'raster_layer'>>) => {
223225
const { entityIdentifier } = action.payload;
224-
const layer = selectEntity(state, entityIdentifier);
226+
const canvas = getSelectedCanvas(state);
227+
const layer = selectEntity(canvas, entityIdentifier);
225228
if (!layer) {
226229
return;
227230
}
@@ -232,7 +235,8 @@ const slice = createSlice({
232235
action: PayloadAction<EntityIdentifierPayload<{ mode: 'simple' | 'curves' }, 'raster_layer'>>
233236
) => {
234237
const { entityIdentifier, mode } = action.payload;
235-
const layer = selectEntity(state, entityIdentifier);
238+
const canvas = getSelectedCanvas(state);
239+
const layer = selectEntity(canvas, entityIdentifier);
236240
if (!layer?.adjustments) {
237241
return;
238242
}
@@ -243,7 +247,8 @@ const slice = createSlice({
243247
action: PayloadAction<EntityIdentifierPayload<{ simple: Partial<SimpleAdjustmentsConfig> }, 'raster_layer'>>
244248
) => {
245249
const { entityIdentifier, simple } = action.payload;
246-
const layer = selectEntity(state, entityIdentifier);
250+
const canvas = getSelectedCanvas(state);
251+
const layer = selectEntity(canvas, entityIdentifier);
247252
if (!layer?.adjustments) {
248253
return;
249254
}
@@ -254,7 +259,8 @@ const slice = createSlice({
254259
action: PayloadAction<EntityIdentifierPayload<{ channel: ChannelName; points: ChannelPoints }, 'raster_layer'>>
255260
) => {
256261
const { entityIdentifier, channel, points } = action.payload;
257-
const layer = selectEntity(state, entityIdentifier);
262+
const canvas = getSelectedCanvas(state);
263+
const layer = selectEntity(canvas, entityIdentifier);
258264
if (!layer?.adjustments) {
259265
return;
260266
}
@@ -265,7 +271,8 @@ const slice = createSlice({
265271
action: PayloadAction<EntityIdentifierPayload<void, 'raster_layer'>>
266272
) => {
267273
const { entityIdentifier } = action.payload;
268-
const layer = selectEntity(state, entityIdentifier);
274+
const canvas = getSelectedCanvas(state);
275+
const layer = selectEntity(canvas, entityIdentifier);
269276
if (!layer?.adjustments) {
270277
return;
271278
}
@@ -276,7 +283,8 @@ const slice = createSlice({
276283
action: PayloadAction<EntityIdentifierPayload<void, 'raster_layer'>>
277284
) => {
278285
const { entityIdentifier } = action.payload;
279-
const layer = selectEntity(state, entityIdentifier);
286+
const canvas = getSelectedCanvas(state);
287+
const layer = selectEntity(canvas, entityIdentifier);
280288
if (!layer?.adjustments) {
281289
return;
282290
}

0 commit comments

Comments
 (0)