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.

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

feat(zoom): support zoom by custom center #1000

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/ninety-buckets-drum.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@plait/core': minor
---

updateZoom support center param
2 changes: 1 addition & 1 deletion packages/angular-board/src/board/board.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ export class PlaitBoardComponent implements BoardComponentInterface, OnInit, OnC
-sign *
// reduced amplification for small deltas (small movements on a trackpad)
Math.min(1, absDelta / 20);
BoardTransforms.updateZoom(this.board, newZoom, false);
BoardTransforms.updateZoom(this.board, newZoom, PlaitBoard.getMovingPointInBoard(this.board));
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/plugins/with-hotkey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const withHotkey = (board: PlaitBoard) => {
if (PlaitBoard.getMovingPointInBoard(board) || PlaitBoard.isMovingPointInBoard(board)) {
if (isHotkey(['mod+=', 'mod++'], { byKey: true })(event)) {
event.preventDefault();
BoardTransforms.updateZoom(board, board.viewport.zoom + 0.1, false);
BoardTransforms.updateZoom(board, board.viewport.zoom + 0.1);
return;
}
if (isHotkey(['mod+shift+=', 'mod+shift++'], { byKey: true })(event)) {
Expand Down
7 changes: 3 additions & 4 deletions packages/core/src/transforms/board.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,16 @@ function updateViewport(board: PlaitBoard, origination: Point, zoom?: number) {
clearViewportOrigination(board);
}

function updateZoom(board: PlaitBoard, newZoom: number, isCenter = true) {
function updateZoom(board: PlaitBoard, newZoom: number, center?: Point) {
newZoom = clampZoomLevel(newZoom);

const movingPoint = PlaitBoard.getMovingPointInBoard(board);
const nativeElement = PlaitBoard.getBoardContainer(board);
const nativeElementRect = nativeElement.getBoundingClientRect();
const boardContainerRect = PlaitBoard.getBoardContainer(board).getBoundingClientRect();
let focusPoint = [boardContainerRect.width / 2, boardContainerRect.height / 2];

if (!isCenter && movingPoint && distanceBetweenPointAndRectangle(movingPoint[0], movingPoint[1], nativeElementRect) === 0) {
focusPoint = [movingPoint[0] - nativeElementRect.x, movingPoint[1] - nativeElementRect.y];
if (center && distanceBetweenPointAndRectangle(center[0], center[1], nativeElementRect) === 0) {
focusPoint = [center[0] - nativeElementRect.x, center[1] - nativeElementRect.y];
}

const zoom = board.viewport.zoom;
Expand Down
12 changes: 12 additions & 0 deletions packages/core/src/utils/math.ts
Original file line number Diff line number Diff line change
Expand Up @@ -428,3 +428,15 @@ export function getCrossingPointsBetweenEllipseAndSegment(
.map(t => [startPoint[0] + (endPoint[0] - startPoint[0]) * t + cx, startPoint[1] + (endPoint[1] - startPoint[1]) * t + cy])
);
}

/**
* Get a point between two points.
* @param x0 The x-axis coordinate of the first point.
* @param y0 The y-axis coordinate of the first point.
* @param x1 The x-axis coordinate of the second point.
* @param y1 The y-axis coordinate of the second point.
* @param d Normalized
*/
export function getPointBetween(x0: number, y0: number, x1: number, y1: number, d = 0.5) {
return [x0 + (x1 - x0) * d, y0 + (y1 - y0) * d];
}
3 changes: 2 additions & 1 deletion packages/graph-viz/src/perfect-arrows/get-arrow.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Credits to perfect-arrows
// https://github.com/steveruizok/perfect-arrows/blob/master/src/lib/getArrow.ts

import { getAngle, getDistance, getAngliness, projectPoint, getPointBetween, getSector, rotatePoint, modulate } from './utils';
import { getPointBetween } from '@plait/core';
import { getAngle, getDistance, getAngliness, projectPoint, getSector, rotatePoint, modulate } from './utils';

export type ArrowOptions = {
bow?: number;
Expand Down
12 changes: 0 additions & 12 deletions packages/graph-viz/src/perfect-arrows/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,6 @@ export function projectPoint(x0: number, y0: number, a: number, d: number) {
return [Math.cos(a) * d + x0, Math.sin(a) * d + y0];
}

/**
* Get a point between two points.
* @param x0 The x-axis coordinate of the first point.
* @param y0 The y-axis coordinate of the first point.
* @param x1 The x-axis coordinate of the second point.
* @param y1 The y-axis coordinate of the second point.
* @param d Normalized
*/
export function getPointBetween(x0: number, y0: number, x1: number, y1: number, d = 0.5) {
return [x0 + (x1 - x0) * d, y0 + (y1 - y0) * d];
}

/**
* Get the sector of an angle (e.g. quadrant, octant)
* @param a The angle to check.
Expand Down
Loading