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

Enable Top-Down Modeling #453

Merged
merged 5 commits into from
Apr 7, 2020
Merged

Enable Top-Down Modeling #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d47ac7
chore(auto-place): refactor #getConnectedDistance
philippfromme Apr 7, 2020
7dfa896
feat(connect-preview): be able to specify connection start and end
philippfromme Mar 19, 2020
e2c9409
feat(bendpoints): accept hints for preview
philippfromme Apr 3, 2020
2c30e10
feat(modeling): accepts layout hints on reconnect
philippfromme Apr 3, 2020
fb737d7
feat(auto-place): refactor #deconflictPosition to be more generic
philippfromme Mar 25, 2020
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
297 changes: 140 additions & 157 deletions lib/features/auto-place/AutoPlaceUtil.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions lib/features/bendpoints/BendpointMove.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export default function BendpointMove(injector, eventBus, canvas, dragging, rule
source = context.source,
target = context.target,
type = context.type,
hints = {};
hints = context.hints || {};

// ensure integer values (important if zoom level was > 1 during move)
var docking = {
Expand All @@ -157,11 +157,9 @@ export default function BendpointMove(injector, eventBus, canvas, dragging, rule

// pass hints about actual moved bendpoint
// useful for connection/label layout
hints = {
bendpointMove: {
insert: insert,
bendpointIndex: bendpointIndex
}
hints.bendpointMove = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What additional info is being passed secretly down here? Does it make sense to be explicit and not monkey patch?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it does not matter, we monkey patch here, too: https://github.com/bpmn-io/diagram-js/pull/453/files#diff-f0a545ec36c40669962054112f362a58R170

insert: insert,
bendpointIndex: bendpointIndex
};

newWaypoints = this.cropWaypoints(connection, newWaypoints);
Expand Down
49 changes: 30 additions & 19 deletions lib/features/bendpoints/BendpointMovePreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,50 +105,61 @@ export default function BendpointMovePreview(bendpointMove, injector, eventBus,
target = connection.target,
newWaypoints = connection.waypoints.slice(),
bendpoint = { x: event.x, y: event.y },
hints;
hints = context.hints || {},
drawPreviewHints = {};

if (connectionPreview) {
hints = {
source: source,
target: target
};
if (hints.connectionStart) {
drawPreviewHints.connectionStart = hints.connectionStart;
}

if (hints.connectionEnd) {
drawPreviewHints.connectionEnd = hints.connectionEnd;
}


if (type === RECONNECT_START) {
if (isReverse(context)) {
hints.connectionEnd = bendpoint;
hints.source = target;
hints.target = hover || source;
drawPreviewHints.connectionEnd = drawPreviewHints.connectionEnd || bendpoint;

drawPreviewHints.source = target;
drawPreviewHints.target = hover || source;

newWaypoints = newWaypoints.reverse();
} else {
hints.connectionStart = bendpoint;
hints.source = hover || source;
drawPreviewHints.connectionStart = drawPreviewHints.connectionStart || bendpoint;

drawPreviewHints.source = hover || source;
drawPreviewHints.target = target;
}
} else if (type === RECONNECT_END) {
if (isReverse(context)) {
hints.connectionStart = bendpoint;
hints.target = source;
hints.source = hover || target;
drawPreviewHints.connectionStart = drawPreviewHints.connectionStart || bendpoint;

drawPreviewHints.source = hover || target;
drawPreviewHints.target = source;

newWaypoints = newWaypoints.reverse();
} else {
hints.connectionEnd = bendpoint;
hints.target = hover || target;
drawPreviewHints.connectionEnd = drawPreviewHints.connectionEnd || bendpoint;

drawPreviewHints.source = source;
drawPreviewHints.target = hover || target;
}

} else {
hints.noCropping = true;
hints.noLayout = true;
drawPreviewHints.noCropping = true;
drawPreviewHints.noLayout = true;
newWaypoints[ bendpointIndex ] = bendpoint;
}

if (type === UPDATE_WAYPOINTS) {
newWaypoints = bendpointMove.cropWaypoints(connection, newWaypoints);
}

hints.waypoints = newWaypoints;
drawPreviewHints.waypoints = newWaypoints;

connectionPreview.drawPreview(context, allowed, hints);
connectionPreview.drawPreview(context, allowed, drawPreviewHints);
}

translate(draggerGfx, event.x, event.y);
Expand Down
22 changes: 14 additions & 8 deletions lib/features/connect/ConnectPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,23 @@ export default function ConnectPreview(injector, eventBus, canvas) {
source = context.source,
start = context.start,
startPosition = context.startPosition,
connectionStart = context.connectionStart,
connectionEnd = context.connectionEnd,
target = context.target;

var connectionStart = isReverse(context) ? {
x: event.x,
y: event.y
} : startPosition;
if (!connectionStart) {
connectionStart = isReverse(context) ? {
x: event.x,
y: event.y
} : startPosition;
}

var connectionEnd = isReverse(context) ? startPosition : {
x: event.x,
y: event.y
};
if (!connectionEnd) {
connectionEnd = isReverse(context) ? startPosition : {
x: event.x,
y: event.y
};
}

connectionPreview.drawPreview(context, canConnect, {
source: source || start,
Expand Down
18 changes: 14 additions & 4 deletions lib/features/modeling/cmd/ReconnectConnectionHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,28 @@ ReconnectConnectionHandler.prototype.postExecute = function(context) {
dockingOrPoints = context.dockingOrPoints,
hints = context.hints || {};

var layoutConnectionHints = {};

if (hints.connectionStart) {
layoutConnectionHints.connectionStart = hints.connectionStart;
}

if (hints.connectionEnd) {
layoutConnectionHints.connectionEnd = hints.connectionEnd;
}

if (hints.layoutConnection === false) {
return;
}

var layoutConnectionHints = {};

if (newSource && (!newTarget || hints.docking === 'source')) {
layoutConnectionHints.connectionStart = getDocking(isArray(dockingOrPoints) ? dockingOrPoints[ 0 ] : dockingOrPoints);
philippfromme marked this conversation as resolved.
Show resolved Hide resolved
layoutConnectionHints.connectionStart = layoutConnectionHints.connectionStart
|| getDocking(isArray(dockingOrPoints) ? dockingOrPoints[ 0 ] : dockingOrPoints);
}

if (newTarget && (!newSource || hints.docking === 'target')) {
layoutConnectionHints.connectionEnd = getDocking(isArray(dockingOrPoints) ? dockingOrPoints[ dockingOrPoints.length - 1 ] : dockingOrPoints);
layoutConnectionHints.connectionEnd = layoutConnectionHints.connectionEnd
|| getDocking(isArray(dockingOrPoints) ? dockingOrPoints[ dockingOrPoints.length - 1 ] : dockingOrPoints);
}

if (hints.newWaypoints) {
Expand Down
Loading