Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix,feat: canvas followups 4 #6826

Merged
merged 2 commits into from
Sep 9, 2024
Merged

fix,feat: canvas followups 4 #6826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f88cfae
fix(ui): use reactive entity adapter hooks, fix one-behind issue
psychedelicious Sep 9, 2024
5054ab1
fix(ui): do not clear buffer on escape if filtering/transforming
psychedelicious Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions invokeai/frontend/web/src/features/controlLayers/hooks/useEntityAdapter.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion invokeai/frontend/web/src/features/controlLayers/hooks/useEntityFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { useStore } from '@nanostores/react';
import { useAppSelector } from 'app/store/storeHooks';
import { SyncableMap } from 'common/util/SyncableMap/SyncableMap';
import { useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
import { useEntityAdapterSafe } from 'features/controlLayers/contexts/EntityAdapterContext';
import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
import { useEntityAdapterSafe } from 'features/controlLayers/hooks/useEntityAdapter';
import type { AnyObjectRenderer } from 'features/controlLayers/konva/CanvasObject/types';
import { getEmptyRect } from 'features/controlLayers/konva/util';
import { selectIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
Expand Down
2 changes: 1 addition & 1 deletion invokeai/frontend/web/src/features/controlLayers/hooks/useEntityTransform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { useStore } from '@nanostores/react';
import { useAppSelector } from 'app/store/storeHooks';
import { SyncableMap } from 'common/util/SyncableMap/SyncableMap';
import { useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
import { useEntityAdapterSafe } from 'features/controlLayers/contexts/EntityAdapterContext';
import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
import { useEntityAdapterSafe } from 'features/controlLayers/hooks/useEntityAdapter';
import type { AnyObjectRenderer } from 'features/controlLayers/konva/CanvasObject/types';
import { getEmptyRect } from 'features/controlLayers/konva/util';
import { selectIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
Expand Down
7 changes: 6 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool/CanvasToolModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,12 @@ export class CanvasToolModule extends CanvasModuleBase {
// Cancel shape drawing on escape
e.preventDefault();
const selectedEntity = this.manager.stateApi.getSelectedEntityAdapter();
if (selectedEntity) {
if (
selectedEntity &&
!selectedEntity.filterer?.$isFiltering.get() &&
!selectedEntity.transformer.$isTransforming.get() &&
selectedEntity.bufferRenderer.hasBuffer()
) {
selectedEntity.bufferRenderer.clearBuffer();
}
return;
Expand Down
Loading