From 78c105e838c2259ccdbf671811394a8e61beb091 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Sun, 15 Aug 2021 22:09:33 +0100 Subject: [PATCH 1/2] set canvas style to override problem 3rd party css move typecast for simplicity --- src/ol/dom.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ol/dom.js b/src/ol/dom.js index b035b8c599..aa2bafe83a 100644 --- a/src/ol/dom.js +++ b/src/ol/dom.js @@ -19,12 +19,16 @@ export function createCanvasContext2D( opt_canvasPool, opt_Context2DSettings ) { - const canvas = + const canvas = /** @type {HTMLCanvasElement} */ ( opt_canvasPool && opt_canvasPool.length ? opt_canvasPool.shift() : WORKER_OFFSCREEN_CANVAS ? new OffscreenCanvas(opt_width || 300, opt_height || 300) - : document.createElement('canvas'); + : document.createElement('canvas') + ); + if (canvas.style) { + canvas.style.all = 'initial'; + } if (opt_width) { canvas.width = opt_width; } @@ -32,9 +36,7 @@ export function createCanvasContext2D( canvas.height = opt_height; } //FIXME Allow OffscreenCanvasRenderingContext2D as return type - return /** @type {CanvasRenderingContext2D} */ ( - canvas.getContext('2d', opt_Context2DSettings) - ); + return canvas.getContext('2d', opt_Context2DSettings); } /** From d8244753057b7230b53abd00d6ee494d93d7bdc6 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Mon, 16 Aug 2021 10:27:41 +0100 Subject: [PATCH 2/2] set initial style after document.createElement --- src/ol/dom.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/ol/dom.js b/src/ol/dom.js index aa2bafe83a..1566831fda 100644 --- a/src/ol/dom.js +++ b/src/ol/dom.js @@ -19,14 +19,14 @@ export function createCanvasContext2D( opt_canvasPool, opt_Context2DSettings ) { - const canvas = /** @type {HTMLCanvasElement} */ ( - opt_canvasPool && opt_canvasPool.length - ? opt_canvasPool.shift() - : WORKER_OFFSCREEN_CANVAS - ? new OffscreenCanvas(opt_width || 300, opt_height || 300) - : document.createElement('canvas') - ); - if (canvas.style) { + /** @type {HTMLCanvasElement|OffscreenCanvas} */ + let canvas; + if (opt_canvasPool && opt_canvasPool.length) { + canvas = opt_canvasPool.shift(); + } else if (WORKER_OFFSCREEN_CANVAS) { + canvas = new OffscreenCanvas(opt_width || 300, opt_height || 300); + } else { + canvas = document.createElement('canvas'); canvas.style.all = 'initial'; } if (opt_width) { @@ -36,7 +36,9 @@ export function createCanvasContext2D( canvas.height = opt_height; } //FIXME Allow OffscreenCanvasRenderingContext2D as return type - return canvas.getContext('2d', opt_Context2DSettings); + return /** @type {CanvasRenderingContext2D} */ ( + canvas.getContext('2d', opt_Context2DSettings) + ); } /**