change postMessage to callback in libfilepicker, fix 100% reject bug

Author: ProgrammerIn-wonderland

apps/fsapp.app/operations.js

@@ -217,8 +217,8 @@ async function selectAction(selected) {
                     .getAttribute("data-path")
                     .replace(/(\/)\1+/g, "$1"),
             };
-
-            window.parent.postMessage(fileData, "*");
+            window.callback({ data: fileData });
+            // window.parent.postMessage(fileData, "*");
         }
     } else if (selected.length > 1 && filePicker.multiple) {
         let dataPaths = [];
@@ -237,8 +237,8 @@ async function selectAction(selected) {
             id: filePicker.id,
             filePath: dataPaths,
         };
-
-        window.parent.postMessage(fileData, "*");
+        window.callback({ data: fileData });
+        // window.parent.postMessage(fileData, "*");
     } else if (selected.length == 0) {
         if (filePicker.type == "dir") {
             let fileData = {
@@ -249,7 +249,7 @@ async function selectAction(selected) {
                     .getAttribute("data-current-path"),
             };
 
-            window.parent.postMessage(fileData, "*");
+            window.callback({ data: fileData });
         }
     }
 }

apps/libfilepicker.lib/handler.js

@@ -35,22 +35,26 @@ export function selectFile(options) {
                 let receivedData = event.data;
                 let filePath = receivedData.filePath;
 
-                parent.removeEventListener("message", handleMessage);
+                // parent.removeEventListener("message", handleMessage);
 
                 picker.close();
                 resolve(filePath);
             }
         }
-        parent.addEventListener("message", handleMessage);
+        // parent.addEventListener("message", handleMessage);
         picker.content.appendChild(iframe);
         Object.assign(iframe.contentWindow, {
             anura,
             AliceWM,
             ExternalApp,
             LocalFS,
             instance: options.app,
+            callback: handleMessage,
             instanceWindow: picker,
         });
+        picker.onclose = () => {
+            reject("User cancelled");
+        };
     });
 }
 
@@ -65,10 +69,6 @@ export function selectFolder(options) {
         let picker = anura.wm.create(options.app, "Select a Folder...");
         let id = crypto.randomUUID();
 
-        picker.onclose = () => {
-            reject("User cancelled");
-        };
-
         let iframe = document.createElement("iframe");
         iframe.style =
             "top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0;";
@@ -91,20 +91,21 @@ export function selectFolder(options) {
                 let receivedData = event.data;
                 let filePath = receivedData.filePath;
 
-                parent.removeEventListener("message", handleMessage);
+                // parent.removeEventListener("message", handleMessage);
 
                 picker.close();
                 resolve(filePath);
             }
         }
-        parent.addEventListener("message", handleMessage);
+        // parent.addEventListener("message", handleMessage);
         picker.content.appendChild(iframe);
         Object.assign(iframe.contentWindow, {
             anura,
             AliceWM,
             ExternalApp,
             LocalFS,
             instance: options.app,
+            callback: handleMessage,
             instanceWindow: picker,
         });
     });