github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): improved undo/redo history grouping for selections and postiino changes

Browse Source
This commit is contained in:
psychedelicious
2025-04-07 20:53:48 +10:00
parent d23db705dd
commit 3e04baa684
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
invokeai/frontend/web/src/features/nodes/store/nodesSlice.ts
View File

@@ -775,16 +775,31 @@ const isEdgeSelectionAction = (action: UnknownAction): action is EdgeSelectionAc
return false;
};
type NodePositionOrDimensionAction = {
type NodeDimensionChangeAction = {
type: ReturnType<typeof nodesChanged>['type'];
payload: NodeDimensionChange[];
};
const isDimensionsChangeAction = (action: UnknownAction): action is NodeDimensionChangeAction => {
if (!nodesChanged.match(action)) {
return false;
}
if (action.payload.every((change) => change.type === 'dimensions')) {
return true;
}
return false;
};
type NodePositionChangeAction = {
type: ReturnType<typeof nodesChanged>['type'];
payload: (NodeDimensionChange | NodePositionChange)[];
};
const isDimensionsOrPositionAction = (action: UnknownAction): action is NodePositionOrDimensionAction => {
const isPositionChangeAction = (action: UnknownAction): action is NodePositionChangeAction => {
if (!nodesChanged.match(action)) {
return false;
}
if (action.payload.every((change) => change.type === 'dimensions' || change.type === 'position')) {
if (action.payload.every((change) => change.type === 'position')) {
return true;
}
return false;
@@ -837,18 +852,14 @@ export const nodesUndoableConfig: UndoableOptions<NodesState, UnknownAction> = {
limit: 64,
undoType: nodesSlice.actions.undo.type,
redoType: nodesSlice.actions.redo.type,
groupBy: (action, state, history) => {
if (isNodeSelectionAction(action) || isEdgeSelectionAction(action)) {
// Changes to selection should never be recorded on their own
return history.group;
}
groupBy: (action, _state, _history) => {
if (isHighFrequencyFieldChangeAction(action)) {
// Group by type, node id and field name
const { type, payload } = action;
const { nodeId, fieldName } = payload;
return `${type}-${nodeId}-${fieldName}`;
}
if (isDimensionsOrPositionAction(action)) {
if (isPositionChangeAction(action)) {
const ids = action.payload.map((change) => change.id).join(',');
// Group by type and node ids
return `dimensions-or-position-${ids}`;
@@ -875,6 +886,14 @@ export const nodesUndoableConfig: UndoableOptions<NodesState, UnknownAction> = {
if (!action.type.startsWith(nodesSlice.name)) {
return false;
}
// Ignore actions that only select or deselect nodes and edges
if (isNodeSelectionAction(action) || isEdgeSelectionAction(action)) {
return false;
}
if (isDimensionsChangeAction(action)) {
// Ignore actions that only change the dimensions of nodes - these are internal to reactflow
return false;
}
return true;
},
};