ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12214 from ahocevar/avoid-flex-layout

Browse Source 
Do not set invalid style
This commit is contained in:
Andreas Hocevar
2021-04-17 00:08:31 +02:00
committed by GitHub
parent 1554bc4cc2 7ec5cbffe9
commit 72f5b34189
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas.js
+16 -12
View File
@@ -289,7 +289,7 @@ export const measureTextHeight = (function () {
/** /**
* @type {HTMLDivElement} * @type {HTMLDivElement}
*/ */
let div; let measureElement;
return function (fontSpec) { return function (fontSpec) {
let height = textHeights[fontSpec]; let height = textHeights[fontSpec];
if (height == undefined) { if (height == undefined) {
@@ -303,18 +303,22 @@ export const measureTextHeight = (function () {
lineHeight * lineHeight *
(metrics.actualBoundingBoxAscent + metrics.actualBoundingBoxDescent); (metrics.actualBoundingBoxAscent + metrics.actualBoundingBoxDescent);
} else { } else {
if (!div) { if (!measureElement) {
div = document.createElement('div'); measureElement = document.createElement('div');
div.innerHTML = 'M'; measureElement.innerHTML = 'M';
div.style.margin = '0 !important'; measureElement.style.minHeight = '0';
div.style.padding = '0 !important'; measureElement.style.maxHeight = 'none';
div.style.position = 'absolute !important'; measureElement.style.height = 'auto';
div.style.left = '-99999px !important'; measureElement.style.padding = '0';
measureElement.style.border = 'none';
measureElement.style.position = 'absolute';
measureElement.style.display = 'block';
measureElement.style.left = '-99999px';
} }
div.style.font = fontSpec; measureElement.style.font = fontSpec;
document.body.appendChild(div); document.body.appendChild(measureElement);
height = div.offsetHeight; height = measureElement.offsetHeight;
document.body.removeChild(div); document.body.removeChild(measureElement);
} }
textHeights[fontSpec] = height; textHeights[fontSpec] = height;
} }