Skip to content

Fix layout on load #57

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

Open
Kr0nox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix layout on load #57

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
13 changes: 11 additions & 2 deletions frontend/webEditor/src/serialize/loadJson.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import {
CommandReturn,
EMPTY_ROOT,
ILogger,
isLocateable,
SModelRootImpl,
SNodeImpl,
} from "sprotty";
import { SavedDiagram } from "./SavedDiagram";
import { Action, SModelElement, SModelRoot } from "sprotty-protocol";
Expand All @@ -17,6 +19,8 @@ import { DefaultFitToScreenAction } from "../fitToScreen/action";
import { FileName } from "../fileName/fileName";
import { ConstraintRegistry } from "../constraint/constraintRegistry";
import { LoadingIndicator } from "../loadingIndicator/loadingIndicator";
import { LayoutModelAction } from "../layout/command";
import { LayoutMethod } from "../layout/layoutMethod";

export interface FileData<T> {
fileName: string;
Expand Down Expand Up @@ -97,8 +101,13 @@ export abstract class LoadJsonCommand extends Command {
this.constraintRegistry.clearConstraints();
}

// TODO: post load actions like layout
this.actionDispatcher.dispatch(DefaultFitToScreenAction.create(this.newRoot));
const containsUnPositionedNodes = this.newRoot.children
.filter((child) => child instanceof SNodeImpl)
.some((child) => isLocateable(child) && child.position.x === 0 && child.position.y === 0);
if (containsUnPositionedNodes) {
await this.actionDispatcher.dispatch(LayoutModelAction.create(LayoutMethod.LINES));
}
await this.actionDispatcher.dispatch(DefaultFitToScreenAction.create(this.newRoot));

this.oldFileName = this.fileName.getName();
this.fileName.setName(this.file.fileName);
Expand Down