uikit 3.18.2-dev.e1f7d3815 → 3.18.3-dev.003cb6c84

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

package/src/js/core/drop.js

@@ -432,7 +432,7 @@ export default {
 
             for (const [i, [axis, prop, start, end]] of dirs) {
                 if (this.axis === axis && includes([axis, true], this.stretch)) {
-                    const positionOffset = Math.abs(this.getPositionOffset(this.$el));
+                    const positionOffset = Math.abs(this.getPositionOffset());
                     const targetOffset = offset(this.target[i]);
                     const elOffset = offset(this.$el);
 

package/src/js/core/dropnav.js

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

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

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

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

@@ -1,4 +1,4 @@
-import { css, height, query } from 'uikit-util';
+import { css, query } from 'uikit-util';
 import { resize } from '../api/observables';
 
 export default {
@@ -20,7 +20,7 @@ export default {
 
     update: {
         read() {
-            return { height: height(this.target) };
+            return { height: this.target.offsetHeight };
         },
 
         write({ height }) {

package/src/js/core/navbar.js

@@ -1,4 +1,4 @@
-import { $$, addClass, css, hasClass, removeClass } from 'uikit-util';
+import { $$, addClass, css, hasClass, offset, removeClass } from 'uikit-util';
 import Dropnav from './dropnav';
 
 const clsNavbarTransparent = 'uk-navbar-transparent';
@@ -88,14 +88,9 @@ export default {
             }
         },
 
-        getDropbarOffset(el) {
-            const { offsetTop, offsetHeight } = this.navbarContainer;
-            return (
-                offsetTop +
-                (this.dropbarTransparentMode === 'behind'
-                    ? 0
-                    : offsetHeight + this.getDropdown(el)?.getPositionOffset(el))
-            );
+        getDropbarOffset(offsetTop) {
+            const { top, height } = offset(this.navbarContainer);
+            return top + (this.dropbarTransparentMode === 'behind' ? 0 : height + offsetTop);
         },
     },
 };

package/src/js/mixin/position.js

@@ -67,7 +67,7 @@ export default {
             restoreScrollPosition();
         },
 
-        getPositionOffset(element) {
+        getPositionOffset(element = this.$el) {
             return (
                 toPx(
                     this.offset === false ? css(element, '--uk-position-offset') : this.offset,
@@ -79,7 +79,7 @@ export default {
             );
         },
 
-        getShiftOffset(element) {
+        getShiftOffset(element = this.$el) {
             return this.align === 'center'
                 ? 0
                 : toPx(

package/src/js/mixin/slider-autoplay.js

@@ -54,7 +54,9 @@ export default {
                 if (
                     !(
                         this.stack.length ||
-                        (this.draggable && matches(this.$el, ':focus-within')) ||
+                        (this.draggable &&
+                            matches(this.$el, ':focus-within') &&
+                            !matches(this.$el, ':focus')) ||
                         (this.pauseOnHover && matches(this.$el, ':hover'))
                     )
                 ) {