Various mime rendering fixes

philippjfr · philippjfr · commit 0b6fe086639f · 2022-04-22T23:50:30.000+02:00
diff --git a/pyscriptjs/src/interpreter.ts b/pyscriptjs/src/interpreter.ts
@@ -29,7 +29,7 @@ MIME_METHODS = {
 }
 
 def render_image(mime, value, meta):
-    data = f'{mime};base64,{value}'
+    data = f'data:{mime};charset=utf-8;base64,{value}'
     attrs = ' '.join(['{k}="{v}"' for k, v in meta.items()])
     return f'<img src="{data}" {attrs}</img>'
 
@@ -68,7 +68,13 @@ def format_mime(obj):
     """
     Formats object using _repr_x_ methods.
     """
-    format_dict, md_dict = eval_formatter(obj, '_repr_mimebundle_')
+
+    mimebundle = eval_formatter(obj, '_repr_mimebundle_')
+    if isinstance(mimebundle, tuple):
+        format_dict, md_dict = mimebundle
+    else:
+        format_dict = mimebundle
+        md_dict = {}
 
     output, not_available = None, []
     for method, mime_type in reversed(MIME_METHODS.items()):
@@ -113,9 +119,9 @@ class PyScript:
 
         element = document.getElementById(element_id)
         html, mime_type = format_mime(value)
-        if mime_type == 'application/javascript':
+        if mime_type in ('application/javascript', 'text/html'):
             scriptEl = document.createRange().createContextualFragment(html)
-            element.children = [scriptEl]
+            element.appendChild(scriptEl)
         else:
             element.innerHTML = html
 
diff --git a/pyscriptjs/src/pyscript.py b/pyscriptjs/src/pyscript.py
@@ -20,7 +20,7 @@
 }
 
 def render_image(mime, value, meta):
-    data = f'{mime};base64,{value}'
+    data = f'data:{mime};charset=utf-8;base64,{value}'
     attrs = ' '.join(['{k}="{v}"' for k, v in meta.items()])
     return f'<img src="{data}" {attrs}</img>'
 
@@ -59,7 +59,13 @@ def format_mime(obj):
     """
     Formats object using _repr_x_ methods.
     """
-    format_dict, md_dict = eval_formatter(obj, '_repr_mimebundle_')
+
+    mimebundle = eval_formatter(obj, '_repr_mimebundle_')
+    if isinstance(mimebundle, tuple):
+        format_dict, md_dict = mimebundle
+    else:
+        format_dict = mimebundle
+        md_dict = {}
 
     output, not_available = None, []
     for method, mime_type in reversed(MIME_METHODS.items()):
@@ -104,9 +110,9 @@ def write(element_id, value, append=False, exec_id=0):
 
         element = document.getElementById(element_id)
         html, mime_type = format_mime(value)
-        if mime_type == 'application/javascript':
+        if mime_type in ('application/javascript', 'text/html'):
             scriptEl = document.createRange().createContextualFragment(html)
-            element.children = [scriptEl]
+            element.appendChild(scriptEl)
         else:
             element.innerHTML = html
 
