add display property to XLSX hyperlinks (#2791)

phaseOne · web-flow · commit 1ca49a50bd22 · 2022-09-23T13:36:38.000-04:00
Resolves import bug in Google Sheets
diff --git a/bits/67_wsxml.js b/bits/67_wsxml.js
@@ -299,7 +299,10 @@ function write_ws_xml_cell(cell/*:Cell*/, ref, ws, opts/*::, idx, wb*/)/*:string
 		var ff = cell.F && cell.F.slice(0, ref.length) == ref ? {t:"array", ref:cell.F} : null;
 		v = writextag('f', escapexml(cell.f), ff) + (cell.v != null ? v : "");
 	}
-	if(cell.l) ws['!links'].push([ref, cell.l]);
+	if(cell.l) {
+		cell.l.display = escapexml(vv);
+		ws['!links'].push([ref, cell.l]);
+	}
 	if(cell.D) o.cm = 1;
 	return writextag('c', v, o);
 }
@@ -609,6 +612,7 @@ function write_ws_xml(idx/*:number*/, opts, wb/*:Workbook*/, rels)/*:string*/ {
 			}
 			if((relc = l[1].Target.indexOf("#")) > -1) rel.location = escapexml(l[1].Target.slice(relc+1));
 			if(l[1].Tooltip) rel.tooltip = escapexml(l[1].Tooltip);
+			rel.display = l[1].display;
 			o[o.length] = writextag("hyperlink",null,rel);
 		});
 		o[o.length] = "</hyperlinks>";

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,10 @@ function write_ws_xml_cell(cell/:Cell/, ref, ws, opts/::, idx, wb/)/*:string`
`299`	`299`	`var ff = cell.F && cell.F.slice(0, ref.length) == ref ? {t:"array", ref:cell.F} : null;`
`300`	`300`	`v = writextag('f', escapexml(cell.f), ff) + (cell.v != null ? v : "");`
`301`	`301`	`}`
`302`		`- if(cell.l) ws['!links'].push([ref, cell.l]);`
	`302`	`+ if(cell.l) {`
	`303`	`+ cell.l.display = escapexml(vv);`
	`304`	`+ ws['!links'].push([ref, cell.l]);`
	`305`	`+ }`
`303`	`306`	`if(cell.D) o.cm = 1;`
`304`	`307`	`return writextag('c', v, o);`
`305`	`308`	`}`
`@@ -609,6 +612,7 @@ function write_ws_xml(idx/:number/, opts, wb/:Workbook/, rels)/:string/ {`
`609`	`612`	`}`
`610`	`613`	`if((relc = l[1].Target.indexOf("#")) > -1) rel.location = escapexml(l[1].Target.slice(relc+1));`
`611`	`614`	`if(l[1].Tooltip) rel.tooltip = escapexml(l[1].Tooltip);`
	`615`	`+ rel.display = l[1].display;`
`612`	`616`	`o[o.length] = writextag("hyperlink",null,rel);`
`613`	`617`	`});`
`614`	`618`	`o[o.length] = "</hyperlinks>";`