Handle nested complex fields

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js
index 9345e02..e671f53 100644
--- a/lib/docx/body-reader.js
+++ b/lib/docx/body-reader.js
@@ -20,7 +20,7 @@ function createBodyReader(options) {
 }
 
 function BodyReader(options) {
-    var fieldHyperlink = null;
+    var fieldHyperlinks = [];
     var currentInstrText = [];
     var relationships = options.relationships;
     var contentTypes = options.contentTypes;
@@ -148,8 +148,9 @@ function BodyReader(options) {
                     var properties = _.find(children, isRunProperties);
                     children = children.filter(negate(isRunProperties));
 
-                    if (fieldHyperlink !== null) {
-                        children = [new documents.Hyperlink(children, {href: fieldHyperlink})];
+                    var validFieldHyperlinks = _.compact(fieldHyperlinks);
+                    if (validFieldHyperlinks.length !== 0) {
+                        children = [new documents.Hyperlink(children, {href: _.last(validFieldHyperlinks)})];
                     }
 
                     return new documents.Run(children, properties);
@@ -159,12 +160,10 @@ function BodyReader(options) {
         "w:fldChar": function(element) {
             var type = element.attributes["w:fldCharType"];
             if (type === "end") {
-                fieldHyperlink = null;
+                fieldHyperlinks.pop();
             } else if (type === "separate") {
                 var hyperlink = parseHyperlinkFieldCode(currentInstrText.join(''));
-                if (hyperlink !== null) {
-                    fieldHyperlink = hyperlink;
-                }
+                fieldHyperlinks.push(hyperlink);
                 currentInstrText = [];
             }
             return emptyResult();