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

Fix: dont make parents smaller, also fixed the bug why we thought new children didnt fit inside the parent #5175

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Fix: dont make parents smaller, also fixed the bug why we thought new children didnt fit inside the parent #5175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 38 additions & 10 deletions app/web/src/components/ModelingDiagram/ModelingDiagram.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ import {
Ref,
provide,
inject,
toRaw,
} from "vue";
import { Stage as KonvaStage } from "konva/lib/Stage";
import Konva from "konva";
Expand Down Expand Up @@ -1774,19 +1775,28 @@ function endDragElements() {
}

// do i need to resize the new parent to fit the children?
const parentSize = viewsStore.groups[newParent?.def.id || ""];
const parentSize = structuredClone(
toRaw(viewsStore.groups[newParent?.def.id || ""]),
);
if (parentSize && newParent && Object.values(setParents).length > 0) {
parentSize.x -= parentSize.width / 2;
const newSize: Partial<Bounds> = {};
Object.values(setParents).forEach((el) => {
const geo =
el.def.componentType === ComponentType.Component
? viewsStore.components[el.def.id]
: viewsStore.groups[el.def.id];
const isGroup = el.def.componentType !== ComponentType.Component;
const geo = structuredClone(
toRaw(
isGroup
? viewsStore.groups[el.def.id]
: viewsStore.components[el.def.id],
),
);
if (!geo) return;

geo.x -= geo.width / 2;

if (!newSize.left || geo.x < newSize.left) newSize.left = geo.x;
if (!newSize.top || geo.y < newSize.top)
newSize.top = geo.y - NODE_HEADER_HEIGHT * 2;
newSize.top = geo.y - (isGroup ? NODE_HEADER_HEIGHT * 2 : 0);
const right = geo.x + geo.width;
const bottom = geo.y + geo.height;
if (!newSize.right || right > newSize.right) newSize.right = right;
Expand All @@ -1810,10 +1820,28 @@ function endDragElements() {

// we need just a bit more padding space between the parent to fix resizability
newRect.height += 30;
viewsStore.RESIZE_COMPONENT(newParent, newRect, {
writeToChangeSet: true,
broadcastToClients: true,
});

// don't make the parent smaller
if (
newRect.width * newRect.height >
parentSize.width * parentSize.height
) {
newRect.x += newRect.width / 2;
viewsStore.RESIZE_COMPONENT(newParent, newRect, {
writeToChangeSet: true,
broadcastToClients: true,
});
} else {
try {
throw new Error(
`We prevented making a parent smaller ${JSON.stringify(
parentSize,
)} vs ${JSON.stringify(newRect)}`,
);
} catch (e) {
reportError(e);
}
}
}
}

Expand Down
Loading