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

perf: Do not recreate Vega card, but update instead - prevent flicker. #1475 #1534

Merged
merged 1 commit into from
Jul 11, 2022
Merged

perf: Do not recreate Vega card, but update instead - prevent flicker. #1475 #1534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions ui/src/vega.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import { B, Model, Rec, S, unpack, xid } from 'h2o-wave'
import { B, Model, Rec, S, unpack } from 'h2o-wave'
import React from 'react'
import { stylesheet } from 'typestyle'
import { Result } from 'vega-embed'
import { cards } from './layout'
import { formItemWidth } from './theme'
import { bond, debounce } from './ui'
Expand Down Expand Up @@ -66,6 +67,14 @@ export const
XVegaVisualization = ({ model }: { model: VegaVisualization }) => {
const
ref = React.useRef<HTMLDivElement>(null),
vegaRef = React.useRef<Result>(),
updateData = React.useCallback(async () => {
if (vegaRef.current && model.data) {
const changeset = (await import('vega')).changeset().remove(() => true).insert(unpack<any[]>(model.data))
// source_0 is default dataset for some reason in Vega.
vegaRef.current.view.change('source_0', changeset).run()
}
}, [model.data]),
init = React.useCallback(async () => {
const el = ref.current
if (!el) return
Expand All @@ -83,7 +92,7 @@ export const

if (data) spec.data = { values: data }
const { default: vegaEmbed } = await import('vega-embed')
vegaEmbed(el, spec, {
vegaRef.current = await vegaEmbed(el, spec, {
mode: model.grammar || 'vega-lite',
defaultStyle: false,
renderer: 'canvas',
Expand All @@ -100,15 +109,15 @@ export const
continuousHeight: height,
}
}
}).catch(console.error)
})
}, [model.data, model.grammar, model.specification]),
onResize = debounce(1000, init),
{ name, width = 'auto', height = 'auto' } = model,
style: React.CSSProperties = (width === 'auto' && height === 'auto')
? { flexGrow: 1 }
: { width: formItemWidth(width), height }

React.useEffect(() => { init() }, [init, model])
React.useEffect(() => { updateData() }, [updateData, model])
React.useEffect(() => {
init()
window.addEventListener('resize', onResize)
Expand Down Expand Up @@ -140,7 +149,7 @@ export const
<div data-test={name} className={css.card}>
<div className='wave-s12 wave-w6'>{title}</div>
<div className={css.body}>
<XVegaVisualization key={xid()} model={{ specification, data, grammar }} />
<XVegaVisualization model={{ specification, data, grammar }} />
</div>
</div>
)
Expand Down