fix: Internal links and TOC links not working when the document URL h…

…as %-encoded characters Fixes #662
vivliostyle · Sep 30, 2020 · bdabb71 · bdabb71 · vercel · Sep 30, 2020
1 parent 47ad0a1
commit bdabb71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/packages/core/src/vivliostyle/counters.ts b/packages/core/src/vivliostyle/counters.ts
@@ -102,7 +102,7 @@ class CounterListener implements CssCascade.CounterListener {
    */
   countersOfId(id: string, counters: CssCascade.CounterValues) {
     id = this.counterStore.documentURLTransformer.transformFragment(
-      encodeURIComponent(id),
+      id,
       this.baseURL,
     );
     this.counterStore.countersById[id] = counters;

diff --git a/packages/core/src/vivliostyle/epub.ts b/packages/core/src/vivliostyle/epub.ts
@@ -791,9 +791,7 @@ export class OPFDoc {
        */
       transformFragment(fragment: string, baseURL: string): string {
         const url = baseURL + (fragment ? `#${fragment}` : "");
-        return (
-          transformedIdPrefix + Base.escapeNameStrToHex(decodeURI(url), ":")
-        );
+        return transformedIdPrefix + Base.escapeNameStrToHex(url, ":");
       }
 
       /**
@@ -803,7 +801,7 @@ export class OPFDoc {
         const r = url.match(/^([^#]*)#?(.*)$/);
         if (r) {
           const path = r[1] || baseURL;
-          const fragment = r[2];
+          const fragment = decodeURIComponent(r[2]);
           if (path) {
             if (self.items.some((item) => item.src === path)) {
               return `#${this.transformFragment(fragment, path)}`;

diff --git a/packages/core/src/vivliostyle/vgen.ts b/packages/core/src/vivliostyle/vgen.ts
@@ -1117,7 +1117,7 @@ export class ViewFactory
               // (only first time).
               if (firstTime) {
                 attributeValue = this.documentURLTransformer.transformFragment(
-                  encodeURIComponent(attributeValue),
+                  attributeValue,
                   this.xmldoc.url,
                 );
                 result.setAttribute(attributeName, attributeValue);