From 434afdd21d7a517da7eb6d5e2ca2fa8fd34ae5e5 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Mon, 26 Aug 2024 22:57:56 +1000 Subject: [PATCH] chore(ui): lint --- .../listenerMiddleware/listeners/modelsLoaded.ts | 8 +++++++- .../components/ControlLayer/ControlLayerEntityList.tsx | 4 +++- .../components/InpaintMask/InpaintMaskList.tsx | 4 +++- .../components/RasterLayer/RasterLayerEntityList.tsx | 4 +++- .../RegionalGuidance/RegionalGuidanceEntityList.tsx | 4 +++- .../RegionalGuidance/RegionalGuidanceSettings.tsx | 4 +++- .../features/nodes/util/graph/generation/buildSD1Graph.ts | 7 ++++++- .../nodes/util/graph/generation/buildSDXLGraph.ts | 7 ++++++- 8 files changed, 34 insertions(+), 8 deletions(-) diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts index 6280a7321e..50cc3a1387 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts @@ -83,7 +83,13 @@ const handleMainModels: ModelHandler = (models, state, dispatch, log) => { dispatch(modelChanged({ model: defaultModelInList, previousModel: currentModel })); const optimalDimension = getOptimalDimension(defaultModelInList); - if (getIsSizeOptimal(state.canvasV2.present.bbox.rect.width, state.canvasV2.present.bbox.rect.height, optimalDimension)) { + if ( + getIsSizeOptimal( + state.canvasV2.present.bbox.rect.width, + state.canvasV2.present.bbox.rect.height, + optimalDimension + ) + ) { return; } const { width, height } = calculateNewSize( diff --git a/invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayerEntityList.tsx b/invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayerEntityList.tsx index f1c73bafe1..f408403ab2 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayerEntityList.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayerEntityList.tsx @@ -11,7 +11,9 @@ const selectEntityIds = createMemoizedSelector(selectCanvasV2Slice, (canvasV2) = }); export const ControlLayerEntityList = memo(() => { - const isSelected = useAppSelector((s) => Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'control_layer')); + const isSelected = useAppSelector((s) => + Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'control_layer') + ); const layerIds = useAppSelector(selectEntityIds); if (layerIds.length === 0) { diff --git a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskList.tsx b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskList.tsx index bee1eb8b17..e8f00c7bbd 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskList.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskList.tsx @@ -11,7 +11,9 @@ const selectEntityIds = createMemoizedSelector(selectCanvasV2Slice, (canvasV2) = }); export const InpaintMaskList = memo(() => { - const isSelected = useAppSelector((s) => Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'inpaint_mask')); + const isSelected = useAppSelector((s) => + Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'inpaint_mask') + ); const entityIds = useAppSelector(selectEntityIds); if (entityIds.length === 0) { diff --git a/invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerEntityList.tsx b/invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerEntityList.tsx index 3e0fb7a050..25e85809e3 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerEntityList.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerEntityList.tsx @@ -11,7 +11,9 @@ const selectEntityIds = createMemoizedSelector(selectCanvasV2Slice, (canvasV2) = }); export const RasterLayerEntityList = memo(() => { - const isSelected = useAppSelector((s) => Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'raster_layer')); + const isSelected = useAppSelector((s) => + Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'raster_layer') + ); const layerIds = useAppSelector(selectEntityIds); if (layerIds.length === 0) { diff --git a/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceEntityList.tsx b/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceEntityList.tsx index 452c0843b8..13dce747a7 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceEntityList.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceEntityList.tsx @@ -11,7 +11,9 @@ const selectEntityIds = createMemoizedSelector(selectCanvasV2Slice, (canvasV2) = }); export const RegionalGuidanceEntityList = memo(() => { - const isSelected = useAppSelector((s) => Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'regional_guidance')); + const isSelected = useAppSelector((s) => + Boolean(s.canvasV2.present.selectedEntityIdentifier?.type === 'regional_guidance') + ); const rgIds = useAppSelector(selectEntityIds); if (rgIds.length === 0) { diff --git a/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceSettings.tsx b/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceSettings.tsx index 7339bcdd8c..c771fead7d 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceSettings.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceSettings.tsx @@ -18,7 +18,9 @@ export const RegionalGuidanceSettings = memo(() => { const hasNegativePrompt = useAppSelector( (s) => selectEntityOrThrow(s.canvasV2.present, entityIdentifier).negativePrompt !== null ); - const hasIPAdapters = useAppSelector((s) => selectEntityOrThrow(s.canvasV2.present, entityIdentifier).ipAdapters.length > 0); + const hasIPAdapters = useAppSelector( + (s) => selectEntityOrThrow(s.canvasV2.present, entityIdentifier).ipAdapters.length > 0 + ); return ( diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts index 41aef39bc7..1c2ba5feee 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts @@ -242,7 +242,12 @@ export const buildSD1Graph = async ( type: 'collect', id: getPrefixedId('ip_adapter_collector'), }); - const ipAdapterResult = addIPAdapters(state.canvasV2.present.ipAdapters.entities, g, ipAdapterCollector, modelConfig.base); + const ipAdapterResult = addIPAdapters( + state.canvasV2.present.ipAdapters.entities, + g, + ipAdapterCollector, + modelConfig.base + ); const regionsResult = await addRegions( manager, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts index 21194c89f1..e49837c9fd 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts @@ -245,7 +245,12 @@ export const buildSDXLGraph = async ( type: 'collect', id: getPrefixedId('ip_adapter_collector'), }); - const ipAdapterResult = addIPAdapters(state.canvasV2.present.ipAdapters.entities, g, ipAdapterCollector, modelConfig.base); + const ipAdapterResult = addIPAdapters( + state.canvasV2.present.ipAdapters.entities, + g, + ipAdapterCollector, + modelConfig.base + ); const regionsResult = await addRegions( manager,