diff --git a/dev/main.ts b/dev/main.ts index 39712e1..93b4aeb 100644 --- a/dev/main.ts +++ b/dev/main.ts @@ -29,9 +29,8 @@ async function main() { treemap.init(root) main().catch(console.error) - treemap.on('click', function(metadata) { - this.zoom(metadata.module) + // this.zoom(metadata.module) }) new ResizeObserver(() => treemap.resize()).observe(root) diff --git a/src/etoile/native/dom.ts b/src/etoile/native/dom.ts index ccc3530..abb9e43 100644 --- a/src/etoile/native/dom.ts +++ b/src/etoile/native/dom.ts @@ -98,7 +98,7 @@ export function createEffectScope() { // eslint-disable-next-line @typescript-eslint/no-explicit-any export function bindDOMEvent(el: HTMLElement, evt: DOMEventType | (string & {}), dom: DOMEvent) { const handler = (e: unknown) => { - const { x, y } = captureBoxXY(el, e, dom.matrix.a, dom.matrix.d, dom.matrix.e, dom.matrix.f) + const { x, y } = captureBoxXY(el, e, 1, 1, dom.matrix.e, dom.matrix.f) // @ts-expect-error safe dom.emit(evt, { native: e, loc: { x, y } }) } diff --git a/src/primitives/event.ts b/src/primitives/event.ts index d0698f6..343c0cc 100644 --- a/src/primitives/event.ts +++ b/src/primitives/event.ts @@ -133,7 +133,7 @@ function drawHighlight(treemap: TreemapLayout, evt: TreemapEvent) { highlight.add(mask) highlight.setZIndexForHighlight('1') applyForOpacity(mask, 0.4, 0.4, easedProgress) - stackMatrixTransform(mask, evt.matrix.e, evt.matrix.f, evt.matrix.a) + stackMatrixTransform(mask, evt.matrix.e, evt.matrix.f, 1) highlight.update() }, { duration: ANIMATION_DURATION, @@ -213,7 +213,7 @@ export class TreemapEvent extends DOMEvent { if (this.state.currentNode !== node) { this.state.currentNode = node } - // drawHighlight(ctx.treemap, this) + drawHighlight(ctx.treemap, this) } else { // for drag const { treemap } = ctx @@ -404,7 +404,9 @@ function createOnZoom(treemap: TreemapLayout, evt: TreemapEvent) { treemap.update() }, { duration: ANIMATION_DURATION, - onStop: () => evt.state.isZooming = false + onStop: () => { + evt.state.isZooming = false + } }) } root = node