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(treemap): add scaleLimit option to limit the zooming #18304

Merged
merged 8 commits into from
Jun 11, 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
8 changes: 8 additions & 0 deletions src/chart/treemap/TreemapSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ class TreemapSeriesModel extends SeriesModel<TreemapSeriesOption> {
private _idIndexMap: zrUtil.HashMap<number>;
private _idIndexMapCount: number;

zoom: number;
zoomLimit: {
max?: number;
min?: number;
};

static defaultOption: TreemapSeriesOption = {
// Disable progressive rendering
progressive: 0,
Expand All @@ -251,6 +257,8 @@ class TreemapSeriesModel extends SeriesModel<TreemapSeriesOption> {

zoomToNodeRatio: 0.32 * 0.32,

scaleLimit: null,

roam: true,
nodeClick: 'zoomToNode',
animation: true,
Expand Down
43 changes: 41 additions & 2 deletions src/chart/treemap/TreemapView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
import DataDiffer from '../../data/DataDiffer';
import * as helper from '../helper/treeHelper';
import Breadcrumb from './Breadcrumb';
import RoamController, { RoamEventParams } from '../../component/helper/RoamController';
import RoamController, { RoamEventParams, RoamControllerHost } from '../../component/helper/RoamController';
import BoundingRect, { RectLike } from 'zrender/src/core/BoundingRect';
import * as matrix from 'zrender/src/core/matrix';
import * as animationUtil from '../../util/animation';
Expand Down Expand Up @@ -153,6 +153,7 @@ class TreemapView extends ChartView {
private _containerGroup: graphic.Group;
private _breadcrumb: Breadcrumb;
private _controller: RoamController;
private _controllerHost: RoamControllerHost;

private _oldTree: Tree;

Expand Down Expand Up @@ -273,6 +274,14 @@ class TreemapView extends ChartView {
this._oldTree = thisTree;
this._storage = thisStorage;

if (this._controllerHost) {
const _oldRootLayout = this.seriesModel.layoutInfo;
const rootLayout = thisTree.root.getLayout();
if (rootLayout.width === _oldRootLayout.width && rootLayout.height === _oldRootLayout.height) {
this._controllerHost.zoom = 1;
}
}

return {
lastsForAnimation,
willDeleteEls,
Expand Down Expand Up @@ -471,11 +480,21 @@ class TreemapView extends ChartView {

private _resetController(api: ExtensionAPI) {
let controller = this._controller;
let controllerHost = this._controllerHost;

if (!controllerHost) {
this._controllerHost = {
target: this.group
} as RoamControllerHost;
controllerHost = this._controllerHost;
}

// Init controller.
if (!controller) {
controller = this._controller = new RoamController(api.getZr());
controller.enable(this.seriesModel.get('roam'));
controllerHost.zoomLimit = this.seriesModel.get('scaleLimit');
controllerHost.zoom = this.seriesModel.get('zoom');
controller.on('pan', bind(this._onPan, this));
controller.on('zoom', bind(this._onZoom, this));
}
Expand All @@ -488,6 +507,7 @@ class TreemapView extends ChartView {

private _clearController() {
let controller = this._controller;
this._controllerHost = null;
if (controller) {
controller.dispose();
controller = null;
Expand Down Expand Up @@ -526,6 +546,7 @@ class TreemapView extends ChartView {
private _onZoom(e: RoamEventParams['zoom']) {
let mouseX = e.originX;
let mouseY = e.originY;
const zoomDelta = e.scale;

if (this._state !== 'animating') {
// These param must not be cached.
Expand All @@ -544,6 +565,24 @@ class TreemapView extends ChartView {
const rect = new BoundingRect(
rootLayout.x, rootLayout.y, rootLayout.width, rootLayout.height
);

// scaleLimit
let zoomLimit = null;
const _controllerHost = this._controllerHost;
zoomLimit = _controllerHost.zoomLimit;

let newZoom = _controllerHost.zoom = _controllerHost.zoom || 1;
newZoom *= zoomDelta;
if (zoomLimit) {
const zoomMin = zoomLimit.min || 0;
const zoomMax = zoomLimit.max || Infinity;
newZoom = Math.max(
Math.min(zoomMax, newZoom),
zoomMin
);
}
const zoomScale = newZoom / _controllerHost.zoom;
_controllerHost.zoom = newZoom;
const layoutInfo = this.seriesModel.layoutInfo;

// Transform mouse coord from global to containerGroup.
Expand All @@ -553,7 +592,7 @@ class TreemapView extends ChartView {
// Scale root bounding rect.
const m = matrix.create();
matrix.translate(m, m, [-mouseX, -mouseY]);
matrix.scale(m, m, [e.scale, e.scale]);
matrix.scale(m, m, [zoomScale, zoomScale]);
matrix.translate(m, m, [mouseX, mouseY]);

rect.applyTransform(m);
Expand Down
181 changes: 181 additions & 0 deletions test/treemap-scaleLimit.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.