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

Add set canvas element #534

Merged
merged 7 commits into from
May 30, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Do not calculate disabled markers to the color normalization.
- More precise TS type for transform matrix in event handlers.
- Add missing canvas change function in htmlcanvas plugin.
- On split charts the first range was not part of the separation calculation.
- When the first marker was disabled it was calculated as an enabled marker on the XY normalization.

Expand Down
36 changes: 27 additions & 9 deletions src/apps/weblib/ts-api/plugins/htmlcanvas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export type Event<T> = Events.Event<T> & {
export interface HtmlCanvasApi extends PluginApi {
/** Returns the underlying canvas element. */
get element(): HTMLCanvasElement
/** Update the underlying canvas element. */
set element(element: HTMLCanvasElement)
/** Returns the actual canvas context */
get context(): CanvasRenderingContext2D
clientToCanvas(clientPos: Geom.Point): Geom.Point
Expand All @@ -29,9 +31,9 @@ export class HtmlCanvas implements Plugin, HtmlCanvasAlternative {
private _container?: HTMLElement
private _offscreenCanvas: HTMLCanvasElement
private _offscreenContext: CanvasRenderingContext2D
private _mainCanvas: HTMLCanvasElement
private _context: CanvasRenderingContext2D
private _resizeObserver: ResizeObserver
private _mainCanvas!: HTMLCanvasElement
simzer marked this conversation as resolved.
Show resolved Hide resolved
private _context!: CanvasRenderingContext2D
private _resizeObserver!: ResizeObserver
private _resizeHandler: () => void
private _prevUpdateHash: string = ''
private _scaleFactor: number = 1
Expand All @@ -41,8 +43,15 @@ export class HtmlCanvas implements Plugin, HtmlCanvasAlternative {
meta = { name: 'htmlCanvas' }

get api(): HtmlCanvasApi {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const self = this
return {
element: this.element,
get element(): HTMLCanvasElement {
return self._mainCanvas
},
set element(newCanvasElement: HTMLCanvasElement) {
self._setCanvas(newCanvasElement)
},
context: this.context,
clientToCanvas: this._clientToCanvas.bind(this),
canvasToClient: this._canvasToClient.bind(this)
Expand Down Expand Up @@ -102,20 +111,25 @@ export class HtmlCanvas implements Plugin, HtmlCanvasAlternative {
}

constructor(options: CanvasOptions) {
this._mainCanvas = this._toCanvasElement(options.element)
this._offscreenCanvas = document.createElement<'canvas'>('canvas')
const offCtx = this._offscreenCanvas.getContext('2d')
if (!offCtx) throw Error('Cannot get rendering context of internal canvas')
this._offscreenContext = offCtx
this._resizeHandler = (): void => {
this._update(true)
}
this._setCanvas(options.element)
window.addEventListener('resize', this._resizeHandler)
}

private _setCanvas(element: HTMLElement): void {
this._mainCanvas = this._toCanvasElement(element)
this._prevUpdateHash = ''
const ctx = this._mainCanvas.getContext('2d')
if (!ctx) throw Error('Cannot get rendering context of canvas')
this._context = ctx
this._calcSize()
this._resizeObserver = this._createResizeObserverFor(this._mainCanvas)
this._resizeHandler = (): void => {
this._update(true)
}
window.addEventListener('resize', this._resizeHandler)
}

unregister(): void {
Expand All @@ -128,6 +142,10 @@ export class HtmlCanvas implements Plugin, HtmlCanvasAlternative {
return this._mainCanvas
}

set element(element: HTMLCanvasElement) {
this._setCanvas(element)
}

get context(): CanvasRenderingContext2D {
return this._offscreenContext
}
Expand Down