@saltcorn/mobile-app 1.0.0-beta.17 → 1.0.0-beta.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.18",
   "description": "Apache Cordova application with @saltcorn/markup",
   "main": "index.js",
   "scripts": {

package/www/js/utils/global_utils.js

@@ -326,6 +326,23 @@ function handleOpenModal() {
   return result;
 }
 
+function isModalOpen() {
+  const iframe = document.getElementById("content-iframe");
+  if (!iframe) return false;
+  const openModal = iframe.contentWindow.$("#scmodal.modal.show");
+  return openModal.length > 0;
+}
+
+function replaceModalContent(content) {
+  const iframe = document.getElementById("content-iframe");
+  if (!iframe) throw new Error("No iframe found");
+  const openModal = iframe.contentWindow.$("#scmodal.modal.show");
+  if (openModal.length === 0) throw new Error("No modal open");
+  const modalBody = openModal.find(".modal-body");
+  if (modalBody.length === 0) throw new Error("No modal content");
+  modalBody.html(content);
+}
+
 function isHtmlFile() {
   const iframe = document.getElementById("content-iframe");
   return iframe.getAttribute("is-html-file") === "true";
@@ -334,8 +351,9 @@ function isHtmlFile() {
 async function handleRoute(route, query, files, data) {
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
   let routeAdded = false;
+  const isModal = isModalOpen();
   try {
-    clearContentDiv();
+    if (!isModal) clearContentDiv();
     if (
       mobileConfig.networkState === "none" &&
       mobileConfig.allowOfflineMode &&
@@ -377,7 +395,9 @@ async function handleRoute(route, query, files, data) {
           );
         }
       } else if (page.content) {
-        if (!page.replaceIframe) await replaceIframeInnerContent(page.content);
+        if (isModal) replaceModalContent(page.content);
+        else if (!page.replaceIframe)
+          await replaceIframeInnerContent(page.content);
         else await replaceIframe(page.content, page.isFile);
       } else {
         showAlerts([