@trackunit/iris-app-runtime-core 1.18.19 → 1.18.20

package/index.cjs.js

@@ -598,10 +598,35 @@ const GeolocationRuntime = {
     },
 };
 
+const IRIS_APP_SCROLL_CONTAINER_ID = "single-spa-application:app";
+const hasScrollableOverflow = (style) => {
+    const overflows = [style.overflow, style.overflowX, style.overflowY];
+    return overflows.some(value => value === "auto" || value === "scroll");
+};
+const isActivelyScrollable = (element) => element.scrollTop !== 0 ||
+    element.scrollLeft !== 0 ||
+    element.scrollHeight > element.clientHeight + 1 ||
+    element.scrollWidth > element.clientWidth + 1;
+/**
+ * Scroll the host should restore when a modal closes.
+ *
+ * The iris app container is reported only when it can actually scroll
+ * (`overflow: auto|scroll`) and is a real scroll box. A height-constrained box
+ * with overflowing content has `scrollHeight > clientHeight` even when overflow
+ * is `visible`, and that box cannot hold a scroll offset, so falling through
+ * reports `window` instead — which older loaders and widgets still use.
+ */
+const getIrisAppScrollPosition = () => {
+    const container = document.getElementById(IRIS_APP_SCROLL_CONTAINER_ID);
+    if (container && hasScrollableOverflow(window.getComputedStyle(container)) && isActivelyScrollable(container)) {
+        return { scrollX: container.scrollLeft, scrollY: container.scrollTop };
+    }
+    return { scrollX: window.scrollX || 0, scrollY: window.scrollY || 0 };
+};
+
 const ModalDialogRuntime = {
     async openModal() {
-        const scrollX = window.scrollX || 0;
-        const scrollY = window.scrollY || 0;
+        const { scrollX, scrollY } = getIrisAppScrollPosition();
         const api = await getHostConnector();
         return api.openModal({ scrollX, scrollY });
     },

package/index.esm.js

@@ -596,10 +596,35 @@ const GeolocationRuntime = {
     },
 };
 
+const IRIS_APP_SCROLL_CONTAINER_ID = "single-spa-application:app";
+const hasScrollableOverflow = (style) => {
+    const overflows = [style.overflow, style.overflowX, style.overflowY];
+    return overflows.some(value => value === "auto" || value === "scroll");
+};
+const isActivelyScrollable = (element) => element.scrollTop !== 0 ||
+    element.scrollLeft !== 0 ||
+    element.scrollHeight > element.clientHeight + 1 ||
+    element.scrollWidth > element.clientWidth + 1;
+/**
+ * Scroll the host should restore when a modal closes.
+ *
+ * The iris app container is reported only when it can actually scroll
+ * (`overflow: auto|scroll`) and is a real scroll box. A height-constrained box
+ * with overflowing content has `scrollHeight > clientHeight` even when overflow
+ * is `visible`, and that box cannot hold a scroll offset, so falling through
+ * reports `window` instead — which older loaders and widgets still use.
+ */
+const getIrisAppScrollPosition = () => {
+    const container = document.getElementById(IRIS_APP_SCROLL_CONTAINER_ID);
+    if (container && hasScrollableOverflow(window.getComputedStyle(container)) && isActivelyScrollable(container)) {
+        return { scrollX: container.scrollLeft, scrollY: container.scrollTop };
+    }
+    return { scrollX: window.scrollX || 0, scrollY: window.scrollY || 0 };
+};
+
 const ModalDialogRuntime = {
     async openModal() {
-        const scrollX = window.scrollX || 0;
-        const scrollY = window.scrollY || 0;
+        const { scrollX, scrollY } = getIrisAppScrollPosition();
         const api = await getHostConnector();
         return api.openModal({ scrollX, scrollY });
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/iris-app-runtime-core",
-  "version": "1.18.19",
+  "version": "1.18.20",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "penpal": "^7.0.6",
-    "@trackunit/iris-app-runtime-core-api": "1.17.19"
+    "@trackunit/iris-app-runtime-core-api": "1.17.20"
   },
   "migrations": "./migrations.json",
   "module": "./index.esm.js",

package/src/getIrisAppScrollPosition.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Scroll the host should restore when a modal closes.
+ *
+ * The iris app container is reported only when it can actually scroll
+ * (`overflow: auto|scroll`) and is a real scroll box. A height-constrained box
+ * with overflowing content has `scrollHeight > clientHeight` even when overflow
+ * is `visible`, and that box cannot hold a scroll offset, so falling through
+ * reports `window` instead — which older loaders and widgets still use.
+ */
+export declare const getIrisAppScrollPosition: () => {
+    scrollX: number;
+    scrollY: number;
+};