Merge pull request #968 from ecomfe/fix-measure-text

fix(platformApi): fix wrong expression for extracting the font size
ecomfe · Nov 13, 2022 · b952ca1 · b952ca1
2 parents 8914365 + b968b36
commit b952ca1
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 4 deletions.
diff --git a/src/core/platform.ts b/src/core/platform.ts
@@ -75,8 +75,8 @@ export const platformApi: Platform = {
                 text = text || '';
                 font = font || DEFAULT_FONT;
                 // Use font size if there is no other method can be used.
-                const res = /^([0-9]*?)px$/.exec(font);
-                const fontSize = +(res && res[1]) || DEFAULT_FONT_SIZE;
+                const res = /(\d+)px/.exec(font);
+                const fontSize = res && +res[1] || DEFAULT_FONT_SIZE;
                 let width = 0;
                 if (font.indexOf('mono') >= 0) {   // is monospace
                     width = fontSize * text.length;
@@ -103,7 +103,7 @@ export const platformApi: Platform = {
 
 export function setPlatformAPI(newPlatformApis: Partial<Platform>) {
     for (let key in platformApi) {
-        // Don't assign unkown methods.
+        // Don't assign unknown methods.
         if ((newPlatformApis as any)[key]) {
             (platformApi as any)[key] = (newPlatformApis as any)[key];
         }

diff --git a/test/ssr-measureText.html b/test/ssr-measureText.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Image</title>
+    <script src="./lib/config.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/zrender@5.4.0"></script>
+    <script>window.zrender540 = zrender;</script>
+    <script src="../dist/zrender.js"></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style>
+        body {
+            overflow: hidden;
+        }
+        .painter {
+            height: 50vh;
+        }
+    </style>
+</head>
+<body>
+    <script type="text/javascript">
+        // See also https://github.com/ecomfe/zrender/issues/947
+        // See also https://github.com/apache/echarts/issues/17326
+
+        // mock non-canvas environment
+        zrender.setPlatformAPI({
+            createCanvas: zrender.util.noop
+        });
+        zrender540.setPlatformAPI({
+            createCanvas: zrender540.util.noop
+        });
+
+        function createZr(zrender, painterIdx, indication) {
+            var zr = zrender.init(null, {
+                renderer: 'svg',
+                ssr: true,
+                width: document.documentElement.clientWidth,
+                height: document.documentElement.clientHeight / 2
+            });
+
+            zr.add(new zrender.Text({
+                style: {
+                    x: 100,
+                    y: 200,
+                    text: (indication || '') + 'ABCDEFG1234567',
+                    fontSize: 18
+                }
+            }));
+
+            function showBoundingRect() {
+                zr.storage.traverse(function (el) {
+                    if (el.type === 'text') {
+                        var rect = el.getBoundingRect();
+
+                        zr.add(new zrender.Rect({
+                            shape: rect,
+                            x: el.x,
+                            y: el.y,
+                            rotation: el.rotation,
+                            scaleX: el.scaleX,
+                            scaleY: el.scaleY,
+                            originX: el.originX,
+                            originY: el.originY,
+                            style: {
+                                fill: null,
+                                stroke: zrender.color.random(),
+                                lineWidth: 1
+                            }
+                        }));
+                    }
+                });
+            }
+
+            var painter = document.createElement('div');
+            painter.id = 'painter' + painterIdx;
+            painter.className = 'painter';
+            document.body.appendChild(painter);
+            function paint() {
+                painter.innerHTML = zr.painter.renderToString();
+            }
+
+            showBoundingRect();
+            paint();
+
+            window.addEventListener('resize', function () {
+                zr.resize({
+                    width: document.documentElement.clientWidth,
+                    height: document.documentElement.clientHeight / 2
+                });
+                paint();
+            });
+        }
+
+        createZr(zrender540, 0, 'BEFORE: ');
+        createZr(zrender, 1, 'AFTER: ');
+    </script>
+</body>
+</html>
diff --git a/test/ut/spec/core/platform.test.ts b/test/ut/spec/core/platform.test.ts
@@ -32,5 +32,9 @@ describe('platform', function() {
             createCanvas: oldCreateCanvas,
             measureText: oldMeasureText
         });
-    })
+    });
+
+    it('measureText should return correct width', function () {
+        expect(platform.platformApi.measureText('A', 'normal normal 18px sans-serif').width).toBe(12.06);
+    });
 });