Unverified Commit 684fb730 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

bundle analyzer: prevent flashes and stuck empty canvases on resize (#87289)

parent 1c09f449
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import { darken, lighten, readableColor } from 'polished' import { darken, lighten, readableColor } from 'polished'
import type React from 'react' import type React from 'react'
import { useEffect, useMemo, useRef, useState } from 'react' import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
import type { AnalyzeData } from '@/lib/analyze-data' import type { AnalyzeData } from '@/lib/analyze-data'
import { import {
computeTreemapLayoutFromAnalyze, computeTreemapLayoutFromAnalyze,
...@@ -718,13 +718,16 @@ export function TreemapVisualizer({ ...@@ -718,13 +718,16 @@ export function TreemapVisualizer({
const [hoveredNode, setHoveredNode] = useState<LayoutNode | null>(null) const [hoveredNode, setHoveredNode] = useState<LayoutNode | null>(null)
const [shouldDimOthers, setShouldDimOthers] = useState(false) const [shouldDimOthers, setShouldDimOthers] = useState(false)
const hoverTimeoutRef = useRef<NodeJS.Timeout | null>(null) const hoverTimeoutRef = useRef<NodeJS.Timeout | null>(null)
const [cssDimensions, setCssDimensions] = useState({ const [dimensions, setDimensions] = useState<{
width: 1200, cssWidth: number
height: 800, cssHeight: number
}) canvasWidth: number
const [canvasDimensions, setCanvasDimensions] = useState({ canvasHeight: number
width: 1200, }>({
height: 800, cssWidth: 1200,
cssHeight: 800,
canvasWidth: 1200,
canvasHeight: 800,
}) })
const [, _setTheme] = useState<'light' | 'dark'>('light') const [, _setTheme] = useState<'light' | 'dark'>('light')
...@@ -785,15 +788,22 @@ export function TreemapVisualizer({ ...@@ -785,15 +788,22 @@ export function TreemapVisualizer({
if (!container) return if (!container) return
const updateSize = () => { const updateSize = () => {
const rect = container.getBoundingClientRect()
const dpr = window.devicePixelRatio || 1 const dpr = window.devicePixelRatio || 1
setCssDimensions({ setDimensions((dimensions) => {
width: Math.floor(rect.width), const rect = container.getBoundingClientRect()
height: Math.floor(rect.height), if (
}) dimensions.cssWidth === Math.floor(rect.width) &&
setCanvasDimensions({ dimensions.cssHeight === Math.floor(rect.height)
width: Math.floor(rect.width * dpr), ) {
height: Math.floor(rect.height * dpr), return dimensions
}
return {
cssWidth: Math.floor(rect.width),
cssHeight: Math.floor(rect.height),
canvasWidth: Math.floor(rect.width * dpr),
canvasHeight: Math.floor(rect.height * dpr),
}
}) })
} }
...@@ -813,8 +823,8 @@ export function TreemapVisualizer({ ...@@ -813,8 +823,8 @@ export function TreemapVisualizer({
{ {
x: 0, x: 0,
y: 12 * focusedAncestorChain.length, y: 12 * focusedAncestorChain.length,
width: cssDimensions.width, width: dimensions.cssWidth,
height: cssDimensions.height, height: dimensions.cssHeight,
}, },
filterSource, filterSource,
sizeMode sizeMode
...@@ -826,8 +836,8 @@ export function TreemapVisualizer({ ...@@ -826,8 +836,8 @@ export function TreemapVisualizer({
focusedLayout, focusedLayout,
focusedAncestorChain, focusedAncestorChain,
analyzeData, analyzeData,
cssDimensions.width, dimensions.cssWidth,
cssDimensions.height, dimensions.cssHeight,
12 12
) )
} }
...@@ -837,13 +847,13 @@ export function TreemapVisualizer({ ...@@ -837,13 +847,13 @@ export function TreemapVisualizer({
analyzeData, analyzeData,
focusedSourceIndex, focusedSourceIndex,
focusedAncestorChain, focusedAncestorChain,
cssDimensions.width, dimensions.cssWidth,
cssDimensions.height, dimensions.cssHeight,
filterSource, filterSource,
sizeMode, sizeMode,
]) ])
useEffect(() => { useLayoutEffect(() => {
const canvas = canvasRef.current const canvas = canvasRef.current
if (!canvas) return if (!canvas) return
...@@ -854,7 +864,7 @@ export function TreemapVisualizer({ ...@@ -854,7 +864,7 @@ export function TreemapVisualizer({
ctx.setTransform(1, 0, 0, 1, 0, 0) ctx.setTransform(1, 0, 0, 1, 0, 0)
ctx.scale(dpr, dpr) ctx.scale(dpr, dpr)
ctx.clearRect(0, 0, cssDimensions.width, cssDimensions.height) ctx.clearRect(0, 0, dimensions.cssWidth, dimensions.cssHeight)
drawTreemap( drawTreemap(
ctx, ctx,
...@@ -871,8 +881,8 @@ export function TreemapVisualizer({ ...@@ -871,8 +881,8 @@ export function TreemapVisualizer({
layout, layout,
hoveredAncestorChain, hoveredAncestorChain,
selectedAncestorChain, selectedAncestorChain,
cssDimensions.width, dimensions.cssWidth,
cssDimensions.height, dimensions.cssHeight,
isMouseInTreemap, isMouseInTreemap,
focusedAncestorChain, focusedAncestorChain,
searchQuery, searchQuery,
...@@ -1005,8 +1015,8 @@ export function TreemapVisualizer({ ...@@ -1005,8 +1015,8 @@ export function TreemapVisualizer({
> >
<canvas <canvas
ref={canvasRef} ref={canvasRef}
width={canvasDimensions.width} width={dimensions.canvasWidth}
height={canvasDimensions.height} height={dimensions.canvasHeight}
onMouseMove={handleMouseMove} onMouseMove={handleMouseMove}
onMouseLeave={handleMouseLeave} onMouseLeave={handleMouseLeave}
onClick={handleClick} onClick={handleClick}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment