fix: hidden的text #59

karasjs · Aug 1, 2020 · db3215a · db3215a
1 parent 395e6c6
commit db3215a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/index.js b/index.js
diff --git a/index.js.map b/index.js.map
diff --git a/src/node/Text.js b/src/node/Text.js
@@ -203,22 +203,23 @@ class Text extends Node {
   }
 
   render(renderMode, ctx) {
-    const { isDestroyed, computedStyle } = this;
+    let vd = this.__virtualDom = {
+      type: 'text',
+      children: [],
+    };
+    const { isDestroyed, computedStyle, lineBoxes } = this;
     if(isDestroyed || computedStyle.display === 'none' || computedStyle.visibility === 'hidden') {
       return;
     }
     if(renderMode === mode.CANVAS) {
       ctx.font = css.setFontStyle(computedStyle);
       ctx.fillStyle = util.int2rgba(computedStyle.color);
     }
-    this.lineBoxes.forEach(item => {
+    lineBoxes.forEach(item => {
       item.render(renderMode, ctx, computedStyle);
     });
     if(renderMode === mode.SVG) {
-      this.__virtualDom = {
-        type: 'text',
-        children: this.lineBoxes.map(lineBox => lineBox.virtualDom),
-      };
+      vd.children = lineBoxes.map(lineBox => lineBox.virtualDom);
     }
   }
 

diff --git a/test/visibility-hidden-inherit-child-svg/test.js b/test/visibility-hidden-inherit-child-svg/test.js
@@ -6,7 +6,7 @@ module.exports = {
     browser
       .url('file://' + path.join(__dirname, 'index.html'))
       .waitForElementVisible('body', 1000)
-      .assert.value('input', '{"bb":[],"children":[{"bb":[],"children":[{},{"bb":[],"children":[{"type":"text","children":[{"type":"item","tagName":"text","props":[["x",8.90625],["y",14.484375],["fill","rgba(0,0,0,1)"],["font-family","arial"],["font-weight",400],["font-style","normal"],["font-size","16px"]],"content":"2"}]}],"opacity":1,"type":"dom"}],"opacity":1,"type":"dom"}],"opacity":1,"type":"dom","defs":[]}visible')
+      .assert.value('input', '{"bb":[],"children":[{"bb":[],"children":[{"type":"text","children":[]},{"bb":[],"children":[{"type":"text","children":[{"type":"item","tagName":"text","props":[["x",8.90625],["y",14.484375],["fill","rgba(0,0,0,1)"],["font-family","arial"],["font-weight",400],["font-style","normal"],["font-size","16px"]],"content":"2"}]}],"opacity":1,"type":"dom"}],"opacity":1,"type":"dom"}],"opacity":1,"type":"dom","defs":[]}visible')
       .end();
   }
 };
diff --git a/test/visibility-hidden-inherit-geom-svg/test.js b/test/visibility-hidden-inherit-geom-svg/test.js
@@ -6,7 +6,7 @@ module.exports = {
     browser
       .url('file://' + path.join(__dirname, 'index.html'))
       .waitForElementVisible('body', 1000)
-      .assert.value('input', '{"bb":[],"children":[{"bb":[],"children":[{},{"bb":[],"children":[],"opacity":1,"type":"geom"}],"opacity":1,"type":"dom"}],"opacity":1,"type":"dom","defs":[]}hidden')
+      .assert.value('input', '{"bb":[],"children":[{"bb":[],"children":[{"type":"text","children":[]},{"bb":[],"children":[],"opacity":1,"type":"geom"}],"opacity":1,"type":"dom"}],"opacity":1,"type":"dom","defs":[]}hidden')
       .end();
   }
 };