uikit 3.18.1 → 3.18.2-dev.ce74de00c

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.1",
+  "version": "3.18.2-dev.ce74de00c",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/dropnav.js

@@ -19,7 +19,6 @@ import {
     remove,
     selFocusable,
     toFloat,
-    toPx,
     Transition,
 } from 'uikit-util';
 import Class from '../mixin/class';
@@ -76,15 +75,6 @@ export default {
             return dropbar ? dropbar : (this._dropbar = $('<div></div>'));
         },
 
-        dropbarOffset({ target, targetY }, $el) {
-            const { offsetTop, offsetHeight } = query(targetY || target || $el, $el);
-            return offsetTop + offsetHeight + this.dropbarPositionOffset;
-        },
-
-        dropbarPositionOffset(_, $el) {
-            return toPx(css($el, '--uk-position-offset'));
-        },
-
         dropContainer(_, $el) {
             return this.container || $el;
         },
@@ -299,7 +289,7 @@ export default {
                             .map((el) => offset(el).bottom),
                     );
 
-                    css(this.dropbar, 'top', this.dropbarOffset);
+                    css(this.dropbar, 'top', this.getDropbarOffset(drop.$el));
                     this.transitionTo(
                         maxBottom - offset(this.dropbar).top + toFloat(css(target, 'marginBottom')),
                         target,
@@ -404,6 +394,12 @@ export default {
             return this.getDropdown(el) && hasClass(el, this.clsDrop);
         },
 
+        getDropbarOffset(el) {
+            const { $el, target, targetY } = this;
+            const { offsetTop, offsetHeight } = query(targetY || target || $el, $el);
+            return offsetTop + offsetHeight + this.getDropdown(el)?.getPositionOffset(el);
+        },
+
         initializeDropdowns() {
             this.$create(
                 'drop',

package/src/js/core/navbar.js

@@ -19,16 +19,6 @@ export default {
 
     computed: {
         navbarContainer: (_, $el) => $el.closest('.uk-navbar-container'),
-
-        dropbarOffset({ dropbarTransparentMode }) {
-            const { offsetTop, offsetHeight } = this.navbarContainer;
-            return (
-                offsetTop +
-                (dropbarTransparentMode === 'behind'
-                    ? 0
-                    : offsetHeight + this.dropbarPositionOffset)
-            );
-        },
     },
 
     watch: {
@@ -97,6 +87,16 @@ export default {
                 return drop.inset ? 'behind' : 'remove';
             }
         },
+
+        getDropbarOffset(el) {
+            const { offsetTop, offsetHeight } = this.navbarContainer;
+            return (
+                offsetTop +
+                (this.dropbarTransparentMode === 'behind'
+                    ? 0
+                    : offsetHeight + this.getDropdown(el)?.getPositionOffset(el))
+            );
+        },
     },
 };