Merge pull request #1310 from Alanscut/issue_1299

Fix cell.text return an empty object when cell is empty
exceljs · Jun 2, 2020 · 41f5bbe · 41f5bbe
2 parents 4a3ccf0 + 33e84bb
commit 41f5bbe
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/lib/xlsx/xform/strings/shared-string-xform.js b/lib/xlsx/xform/strings/shared-string-xform.js
@@ -31,10 +31,13 @@ class SharedStringXform extends BaseXform {
   render(xmlStream, model) {
     xmlStream.openNode(this.tag);
     if (model && model.hasOwnProperty('richText') && model.richText) {
-      const {r} = this.map;
-      model.richText.forEach(text => {
-        r.render(xmlStream, text);
-      });
+      if (model.richText.length) {
+        model.richText.forEach(text => {
+          this.map.r.render(xmlStream, text);
+        });
+      } else {
+        this.map.t.render(xmlStream, '');
+      }
     } else if (model !== undefined && model !== null) {
       this.map.t.render(xmlStream, model);
     }

diff --git a/spec/unit/xlsx/xform/strings/shared-string-xform.spec.js b/spec/unit/xlsx/xform/strings/shared-string-xform.spec.js
@@ -1,4 +1,4 @@
-const testXformHelper = require('./../test-xform-helper');
+const testXformHelper = require('../test-xform-helper');
 
 const SharedStringXform = verquire('xlsx/xform/strings/shared-string-xform');
 
@@ -52,6 +52,18 @@ const expectations = [
     },
     tests: ['render', 'renderIn', 'parse'],
   },
+  {
+    title: 'richText is empty',
+    create() {
+      return new SharedStringXform();
+    },
+    preparedModel: {
+      richText: [],
+    },
+    xml: '<si><t></t></si>',
+    parsedModel: '',
+    tests: ['parse'],
+  },
   {
     title: 'text + phonetic',
     create() {