Merge pull request #967 from eyelidlessness/fix/draw-widget-load-inst…

…ance-attachments

Fix: ensure instance attachments are loaded in draw widget

CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [7.2.2] - 2023-03-23
+
+-   Fix: ensure instance attachments are loaded in draw widget (#967)
+
 ## [7.2.1] - 2023-03-21
 
 -   Fix: revert jQuery upgrade to address regressions accessing jQuery extensions in Enketo Express (#964)

package.json

@@ -2,7 +2,7 @@
     "name": "enketo-core",
     "description": "Extensible Enketo form engine",
     "homepage": "https://enketo.org",
-    "version": "7.2.1",
+    "version": "7.2.2",
     "license": "Apache-2.0",
     "os": [
         "darwin",

src/widget/draw/draw-widget.js

@@ -357,18 +357,28 @@ class DrawWidget extends Widget {
             return '';
         }
 
+        let fileOrURL = file;
+
+        if (typeof file === 'string') {
+            try {
+                fileOrURL = await fileManager.getFileUrl(file);
+            } catch {
+                // Ignore error, attempt to load
+            }
+        }
+
         try {
             if (
-                typeof file === 'string' &&
-                file.startsWith('jr://') &&
+                typeof fileOrURL === 'string' &&
+                fileOrURL.startsWith('jr://') &&
                 this.element.dataset.loadedUrl
             ) {
-                file = this.element.dataset.loadedUrl;
+                fileOrURL = this.element.dataset.loadedUrl;
             }
 
             this.pad.reset();
 
-            await this.pad.setBaseImage(file);
+            await this.pad.setBaseImage(fileOrURL);
 
             return this.pad.toObjectURL();
         } catch {