Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): use konva generics for types in selector functions

Browse Source
This commit is contained in:
psychedelicious 2024-04-17 12:29:31 +10:00 committed by Kent Keirsey
parent 525e6d697c
commit cdb481e836
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
invokeai/frontend/web/src/features/regionalPrompts/components/imperative/konvaApiDraft.tsx
View File

@ -175,14 +175,14 @@ export const LogicalStage = (props: Props) => {
const reduxLayerIds = state.layers.map((l) => l.id); const reduxLayerIds = state.layers.map((l) => l.id);
// Remove deleted layers - we know these are of type Layer // Remove deleted layers - we know these are of type Layer
for (const konvaLayer of stage.find(`.${REGIONAL_PROMPT_LAYER_NAME}`) as Konva.Layer[]) { for (const konvaLayer of stage.find<Konva.Layer>(`.${REGIONAL_PROMPT_LAYER_NAME}`)) {
if (!reduxLayerIds.includes(konvaLayer.id())) { if (!reduxLayerIds.includes(konvaLayer.id())) {
konvaLayer.destroy(); konvaLayer.destroy();
} }
} }
for (const reduxLayer of state.layers) { for (const reduxLayer of state.layers) {
let konvaLayer = stage.findOne(`#${reduxLayer.id}`) as Konva.Layer | undefined; let konvaLayer = stage.findOne<Konva.Layer>(`#${reduxLayer.id}`);
// New layer - create a new Konva layer // New layer - create a new Konva layer
if (!konvaLayer) { if (!konvaLayer) {
@ -231,7 +231,7 @@ export const LogicalStage = (props: Props) => {
} }
const color = rgbColorToString(reduxLayer.color); const color = rgbColorToString(reduxLayer.color);
const konvaObjectGroup = konvaLayer.findOne(`.${REGIONAL_PROMPT_LAYER_OBJECT_GROUP_NAME}`) as Konva.Group; const konvaObjectGroup = konvaLayer.findOne<Konva.Group>(`.${REGIONAL_PROMPT_LAYER_OBJECT_GROUP_NAME}`);
// Remove deleted objects // Remove deleted objects
const objectIds = reduxLayer.objects.map((o) => o.id); const objectIds = reduxLayer.objects.map((o) => o.id);
@ -246,11 +246,11 @@ export const LogicalStage = (props: Props) => {
if (reduxObject.kind !== 'line') { if (reduxObject.kind !== 'line') {
return; return;
} }
const konvaObject = stage.findOne(`#${reduxObject.id}`) as Konva.Line | undefined; const konvaObject = stage.findOne<Konva.Line>(`#${reduxObject.id}`);
if (!konvaObject) { if (!konvaObject) {
// This object hasn't been added to the konva state yet. // This object hasn't been added to the konva state yet.
konvaObjectGroup.add( konvaObjectGroup?.add(
new Konva.Line({ new Konva.Line({
id: reduxObject.id, id: reduxObject.id,
key: reduxObject.id, key: reduxObject.id,
@ -306,10 +306,10 @@ export const LogicalStage = (props: Props) => {
return; return;
} }
for (const konvaLayer of stage.find(`.${REGIONAL_PROMPT_LAYER_NAME}`) as Konva.Layer[]) { for (const konvaLayer of stage.find<Konva.Layer>(`.${REGIONAL_PROMPT_LAYER_NAME}`)) {
const bbox = getKonvaLayerBbox(konvaLayer); const bbox = getKonvaLayerBbox(konvaLayer);
dispatch(layerBboxChanged({ layerId: konvaLayer.id(), bbox })); dispatch(layerBboxChanged({ layerId: konvaLayer.id(), bbox }));
let rect = konvaLayer.findOne('.layer-bbox') as Konva.Rect | undefined; let rect = konvaLayer.findOne<Konva.Rect>('.layer-bbox');
if (!rect) { if (!rect) {
rect = new Konva.Rect({ rect = new Konva.Rect({
id: `${konvaLayer.id()}-bbox`, id: `${konvaLayer.id()}-bbox`,