Merge pull request #275 from CodeSmith32/main

Proper dataurl charset handling
cyntler · Jun 28, 2024 · 85d4dad · 85d4dad
2 parents ad41662 + 94df695
commit 85d4dad
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/renderers/html/index.tsx b/src/renderers/html/index.tsx
@@ -6,8 +6,24 @@ import { dataURLFileLoader } from "../../utils/fileLoaders";
 const HTMLRenderer: DocRenderer = ({ mainState: { currentDocument } }) => {
   useEffect(() => {
     const b64String = currentDocument?.fileData as string;
-    const bodyBase64 = b64String?.replace("data:text/html;base64,", "") || "";
-    const body: string = window.atob(bodyBase64);
+
+    let encoding = "";
+    const bodyBase64 =
+      b64String?.replace(
+        /^data:text\/html;(?:charset=([^;]*);)?base64,/,
+        (_, charset) => {
+          encoding = charset;
+          return "";
+        },
+      ) || "";
+    let body: string = window.atob(bodyBase64);
+
+    if (encoding) {
+      // decode charset
+      const buffer = new Uint8Array(body.length);
+      for (let i = 0; i < body.length; i++) buffer[i] = body.charCodeAt(i);
+      body = new TextDecoder(encoding).decode(buffer);
+    }
 
     const iframeCont = document.getElementById(
       "html-body",