solid-panes 3.6.2 → 3.6.3-2095f8a9

package/src/humanReadablePane.js

@@ -45,7 +45,7 @@ const humanReadablePane = {
 
     // This data could come from a fetch OR from ldp container
     const hasContentTypeIn2 = function (kb, x, displayables) {
-      const t = kb.findTypeURIs(subject)
+      const t = kb.findTypeURIs(x)
       for (let k = 0; k < displayables.length; k++) {
         if (Util.mediaTypeClass(displayables[k]).uri in t) {
           return true
@@ -75,7 +75,7 @@ const humanReadablePane = {
     const kb = context.session.store
 
     const cts = kb.fetcher.getHeader(subject.doc(), 'content-type')
-    const ct = cts ? cts[0] : null
+    const ct = cts ? cts[0].split(';', 1)[0].trim() : null // remove content-type parameters
     if (ct) {
       // console.log('humanReadablePane: c-t:' + ct)
     } else {
@@ -87,6 +87,22 @@ const humanReadablePane = {
     const element = ct === 'text/markdown' ? 'DIV' : 'IFRAME'
     const frame = myDocument.createElement(element)
 
+    const setIframeAttributes = (frame, blob, lines) => {
+      frame.setAttribute('src', URL.createObjectURL(blob));
+      frame.setAttribute('type', blob.type);
+      frame.setAttribute('class', 'doc');
+      frame.setAttribute('style', `border: 1px solid; padding: 1em; height: ${lines}em; width: 800px; resize: both; overflow: auto;`);
+
+      // Apply sandbox attribute only for HTML files
+      // @@ Note below - if we set ANY sandbox, then Chrome and Safari won't display it if it is PDF.
+      // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe
+      // You can't have any sandbox and allow plugins.
+      // We could sandbox only HTML files I suppose.
+      if (blob.type === 'text/html' || blob.type === 'application/xhtml+xml') {
+        frame.setAttribute('sandbox', 'allow-scripts allow-same-origin');
+      }
+    };
+
     // render markdown to html
     const markdownHtml = function () {
       kb.fetcher.webOperation('GET', subject.uri).then(response => {
@@ -97,39 +113,32 @@ const humanReadablePane = {
         frame.innerHTML = clean
         frame.setAttribute('class', 'doc')
         frame.setAttribute('style', `border: 1px solid; padding: 1em; height: ${lines}em; width: 800px; resize: both; overflow: auto;`)
+      }).catch(error => {
+        console.error('Error fetching markdown content:', error)
+        frame.innerHTML = '<p>Error loading content</p>'
       })
     }
 
     if (ct === 'text/markdown') {
       markdownHtml()
     } else {
-      // get with authenticated fetch
-      kb.fetcher._fetch(subject.uri)
-        .then(function(response) {
-          return response.blob()
-        })
-        .then(function(blob) {
-          const objectURL = URL.createObjectURL(blob)
-          frame.setAttribute('src', objectURL)
-          frame.setAttribute('type', blob.type)
-          frame.setAttribute('class', 'doc')
-          return blob.type.startsWith('text') ? blob.text() : ''
-        })
-        .then(function(blobText) {
-          const newLines = blobText.includes('<script src="https://dokie.li/scripts/dokieli.js">') ? -10 : 5
-          const lines = Math.min(30, blobText.split(/\n/).length + newLines)
-          frame.setAttribute('style', `border: 1px solid; padding: 1em; height:${lines}em; width:800px; resize: both; overflow: auto;`)
-        })
+    // Fetch and process the blob
+    kb.fetcher._fetch(subject.uri)
+      .then(response => response.blob())
+      .then(blob => {
+        const blobTextPromise = blob.type.startsWith('text') ? blob.text() : Promise.resolve('')
+        return blobTextPromise.then(blobText => ({ blob, blobText }))
+      })
+      .then(({ blob, blobText }) => {
+        const newLines = blobText.includes('<script src="https://dokie.li/scripts/dokieli.js">') ? -10 : 5
+        const lines = Math.min(30, blobText.split(/\n/).length + newLines)
+        setIframeAttributes(frame, blob, lines)
+      })
+      .catch(err => {
+        console.log('Error fetching or processing blob:', err)
+      })
     }
 
-    // @@ Note below - if we set ANY sandbox, then Chrome and Safari won't display it if it is PDF.
-    // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe
-    // You can't have any sandbox and allow plugins.
-    // We could sandbox only HTML files I suppose.
-    // HTML5 bug: https://lists.w3.org/Archives/Public/public-html/2011Jun/0330.html
-
-    // iframe.setAttribute('sandbox', 'allow-same-origin allow-forms'); // allow-scripts ?? no documents should be static
-
     const tr = myDocument.createElement('TR')
     tr.appendChild(frame)
     div.appendChild(tr)

package/src/versionInfo.ts

@@ -1,26 +1,32 @@
 export default {
-buildTime: "2025-02-05T10:12:21Z",
-commit: "65d80a4a704e8b79647cd2bc4b9985e9659a326e",
+buildTime: "2025-08-12T10:14:46Z",
+commit: "2095f8a973ba142b9e67784c75404bc3b0448394",
 npmInfo:
 {
-  'solid-panes': '3.6.2',
+  'solid-panes': '3.6.3',
   npm: '8.19.4',
-  node: '16.20.2',
-  v8: '9.4.146.26-node.26',
-  uv: '1.43.0',
-  zlib: '1.2.11',
-  brotli: '1.0.9',
-  ares: '1.19.1',
-  modules: '93',
-  nghttp2: '1.47.0',
-  napi: '8',
-  llhttp: '6.0.11',
-  openssl: '1.1.1v+quic',
-  cldr: '41.0',
-  icu: '71.1',
-  tz: '2022f',
-  unicode: '14.0',
-  ngtcp2: '0.8.1',
-  nghttp3: '0.7.0'
+  node: '20.19.4',
+  acorn: '8.14.0',
+  ada: '2.9.2',
+  ares: '1.34.5',
+  brotli: '1.1.0',
+  cjs_module_lexer: '1.4.1',
+  cldr: '47.0',
+  icu: '77.1',
+  llhttp: '9.2.1',
+  modules: '115',
+  napi: '9',
+  nghttp2: '1.61.0',
+  nghttp3: '0.7.0',
+  ngtcp2: '1.1.0',
+  openssl: '3.0.15+quic',
+  simdutf: '6.4.2',
+  tz: '2025b',
+  undici: '6.21.2',
+  unicode: '16.0',
+  uv: '1.46.0',
+  uvwasi: '0.0.21',
+  v8: '11.3.244.8-node.29',
+  zlib: '1.3.0.1-motley-82a5fec'
 }
 };