uikit 3.16.27-dev.6592ba2c5 → 3.16.27-dev.fa3746952

package/package.json

@@ -2,7 +2,7 @@
   "name": "uikit",
   "title": "UIkit",
   "description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
-  "version": "3.16.27-dev.6592ba2c5",
+  "version": "3.16.27-dev.fa3746952",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/height-viewport.js

@@ -33,7 +33,9 @@ export default {
     // check for offsetTop change
     observe: [
         viewport({ filter: ({ expand }) => expand }),
-        resize({ target: ({ $el }) => scrollParents($el) }),
+        resize({
+            target: ({ $el }) => [$el, ...scrollParents($el)],
+        }),
     ],
 
     update: {
@@ -51,15 +53,19 @@ export default {
                 scrollElement === body ? scrollingElement : scrollElement,
             );
 
-            const isScrollingElement = scrollingElement === scrollElement || body === scrollElement;
-
-            // on mobile devices (iOS and Android) window.innerHeight !== 100vh
-            minHeight = `calc(${isScrollingElement ? '100vh' : `${viewportHeight}px`}`;
-
             if (this.expand) {
-                const diff = dimensions(scrollElement).height - dimensions(this.$el).height;
-                minHeight += ` - ${diff}px`;
+                minHeight = `${
+                    viewportHeight -
+                    (dimensions(scrollElement).height - dimensions(this.$el).height) -
+                    box
+                }px`;
             } else {
+                const isScrollingElement =
+                    scrollingElement === scrollElement || body === scrollElement;
+
+                // on mobile devices (iOS and Android) window.innerHeight !== 100vh
+                minHeight = `calc(${isScrollingElement ? '100vh' : `${viewportHeight}px`}`;
+
                 if (this.offsetTop) {
                     if (isScrollingElement) {
                         const top = offsetPosition(this.$el)[0] - offsetPosition(scrollElement)[0];
@@ -78,9 +84,9 @@ export default {
                 } else if (isString(this.offsetBottom)) {
                     minHeight += ` - ${dimensions(query(this.offsetBottom, this.$el)).height}px`;
                 }
-            }
 
-            minHeight += `${box ? ` - ${box}px` : ''})`;
+                minHeight += `${box ? ` - ${box}px` : ''})`;
+            }
 
             return { minHeight };
         },