uikit 3.18.3-dev.003cb6c84 → 3.18.3-dev.454229dfd

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.18.3-dev.003cb6c84",
+  "version": "3.18.3-dev.454229dfd",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/dropnav.js

@@ -289,10 +289,7 @@ export default {
                             .map((el) => offset(el).bottom),
                     );
 
-                    offset(this.dropbar, {
-                        left: offset(this.dropbar).left,
-                        top: this.getDropbarOffset(drop.getPositionOffset()),
-                    });
+                    offset(this.dropbar, this.getDropbarOffset(drop.$el));
                     this.transitionTo(
                         maxBottom - offset(this.dropbar).top + toFloat(css(target, 'marginBottom')),
                         target,
@@ -398,10 +395,10 @@ export default {
             return includes(this.dropdowns, el) && hasClass(el, this.clsDrop);
         },
 
-        getDropbarOffset(offsetTop) {
+        getDropbarOffset(el) {
             const { $el, target, targetY } = this;
             const { top, height } = offset(query(targetY || target || $el, $el));
-            return top + height + offsetTop;
+            return { left: 0, top: top + height + this.getDropdown(el)?.getPositionOffset() };
         },
 
         initializeDropdowns() {

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

@@ -1,4 +1,4 @@
-import { $$, boxModelAdjust, css, dimensions, isVisible, pick } from 'uikit-util';
+import { $$, boxModelAdjust, css, isVisible, pick } from 'uikit-util';
 import { resize } from '../api/observables';
 import { getRows } from './margin';
 
@@ -50,7 +50,11 @@ function match(elements) {
     const max = Math.max(...heights);
 
     return {
-        heights: elements.map((el, i) => (heights[i].toFixed(2) === max.toFixed(2) ? '' : max)),
+        heights: elements.map((el, i) =>
+            heights[i].toFixed(2) === max.toFixed(2)
+                ? ''
+                : max - boxModelAdjust(el, 'height', 'content-box'),
+        ),
         elements,
     };
 }
@@ -62,7 +66,7 @@ function getHeight(element) {
         css(element, 'display', 'block', 'important');
     }
     css(element, 'minHeight', '');
-    const height = dimensions(element).height - boxModelAdjust(element, 'height', 'content-box');
+    const height = element.offsetHeight ?? element.clientHeight;
     css(element, style);
     return height;
 }

package/src/js/core/navbar.js

@@ -88,9 +88,16 @@ export default {
             }
         },
 
-        getDropbarOffset(offsetTop) {
+        getDropbarOffset(el) {
             const { top, height } = offset(this.navbarContainer);
-            return top + (this.dropbarTransparentMode === 'behind' ? 0 : height + offsetTop);
+            return {
+                left: 0,
+                top:
+                    top +
+                    (this.dropbarTransparentMode === 'behind'
+                        ? 0
+                        : height + this.getDropdown(el)?.getPositionOffset()),
+            };
         },
     },
 };