uikit 3.11.2-dev.ada192797 → 3.11.2-dev.bbaa4362f

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.11.2-dev.ada192797",
+  "version": "3.11.2-dev.bbaa4362f",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/navbar.js

@@ -301,7 +301,11 @@ export default {
 
                 const active = this.getActive();
 
-                if (matches(this.dropbar, ':hover') && active && active.$el === $el) {
+                if (matches(this.dropbar, ':hover')
+                    && active
+                    && active.$el === $el
+                    && !this.toggles.some(el => active.target !== el && matches(el, ':focus'))
+                ) {
                     e.preventDefault();
                 }
             }

package/src/js/core/sticky.js

@@ -1,6 +1,6 @@
 import Class from '../mixin/class';
 import Media from '../mixin/media';
-import {$, addClass, after, Animation, assign, clamp, css, dimensions, fastdom, height as getHeight, getScrollingElement, hasClass, isNumeric, isString, isVisible, noop, offset, offsetPosition, parent, query, remove, removeClass, replaceClass, scrollTop, toggleClass, toPx, trigger, within} from 'uikit-util';
+import {$, addClass, after, Animation, clamp, css, dimensions, fastdom, height as getHeight, getScrollingElement, hasClass, isNumeric, isString, isVisible, noop, offset, offsetPosition, parent, query, remove, removeClass, replaceClass, scrollTop, toggleClass, toPx, trigger, within} from 'uikit-util';
 
 export default {
 
@@ -42,7 +42,7 @@ export default {
 
         position({position}, $el) {
             return position === 'auto'
-                ? offset(this.isFixed ? this.placeholder : $el) > getHeight(window)
+                ? (this.isFixed ? this.placeholder : $el).offsetHeight > getHeight(window)
                     ? 'bottom'
                     : 'top'
                 : position;
@@ -143,7 +143,7 @@ export default {
 
         {
 
-            read({height}, types) {
+            read({height, margin}, types) {
 
                 this.inactive = !this.matchMedia || !isVisible(this.$el);
 
@@ -151,13 +151,19 @@ export default {
                     return false;
                 }
 
-                if (this.isActive && types.has('resize')) {
+                const hide = this.isActive && types.has('resize');
+                if (hide) {
                     this.hide();
+                }
+
+                if (!this.isActive) {
                     height = this.$el.offsetHeight;
-                    this.show();
+                    margin = css(this.$el, 'margin');
                 }
 
-                height = this.isActive ? height : this.$el.offsetHeight;
+                if (hide) {
+                    this.show();
+                }
 
                 const overflow = Math.max(0, height + this.offset - getHeight(window));
 
@@ -180,17 +186,17 @@ export default {
                     topOffset,
                     offsetParentTop,
                     height,
+                    margin,
                     width: dimensions(isVisible(this.widthElement) ? this.widthElement : this.$el).width,
-                    top: offsetPosition(this.placeholder)[0],
-                    margins: css(this.$el, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])
+                    top: offsetPosition(this.placeholder)[0]
                 };
             },
 
-            write({height, margins}) {
+            write({height, margin}) {
 
                 const {placeholder} = this;
 
-                css(placeholder, assign({height}, margins));
+                css(placeholder, {height, margin});
 
                 if (!within(placeholder, document)) {
                     after(this.$el, placeholder);
@@ -315,7 +321,7 @@ export default {
 
             const {width, scroll = 0, overflow, overflowScroll = 0, start, end, topOffset, height, offsetParentTop} = this._data;
             const active = start !== 0 || scroll > start;
-            let top = Math.max(0, this.offset);
+            let top = this.offset;
             let position = 'fixed';
 
             if (scroll > end) {

package/tests/sticky-parallax.html

@@ -8,9 +8,9 @@
         <script src="js/test.js"></script>
     </head>
 
-    <body style="padding-bottom: 1100px;">
+    <body style="padding-bottom: 100vh;">
 
-        <div class="uk-section uk-section-primary uk-position-z-index-negative uk-flex uk-flex-center uk-flex-middle uk-text-center" uk-sticky="bottom: +* +*" uk-height-viewport>
+        <div class="uk-section uk-section-primary uk-position-z-index-negative uk-flex uk-flex-center uk-flex-middle uk-text-center" uk-sticky="position: auto; bottom: +* +*" uk-height-viewport>
             <div class="uk-container">
 
                 <h1 class="uk-heading-2xlarge">Sticky Section</h1>
@@ -130,9 +130,9 @@
                 </div>
                 <div>
 
-                    <div class="uk-tile uk-tile-large uk-tile-muted uk-text-center" style="height: 100vh" uk-sticky="bottom: #js-sticky-parallax-viewport">
+                    <div class="uk-background-muted uk-text-center" style="height: 100vh" uk-sticky="bottom: #js-sticky-parallax-viewport">
 
-                        <div uk-parallax="target: #js-sticky-parallax-viewport; start: 100vh; end: 100vh; y: 0, 35vh; easing: 0">
+                        <div uk-parallax="target: #js-sticky-parallax-viewport; start: 100vh; end: 100vh; y: 10vh, 80vh; easing: 0">
 
                             <h1 class="uk-margin-remove">Sticky Parallax Viewport</h1>
     

package/tests/sticky.html

@@ -57,14 +57,25 @@
                     </div>
 
                     <p id="hash" class="uk-margin-large">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+
+                    <div class="viewport uk-margin">
+                        <div class="uk-grid uk-child-width-1-6" uk-height-viewport>
+                            <div>
+
+                                <div class="uk-card uk-card-primary uk-card-body" uk-sticky="position: bottom; bottom: !.viewport">Sticky bottom</div>
+
+                            </div>
+                        </div>
+                    </div>
+
                 </div>
                 <div class="uk-width-1-6">
                     <div class="viewport" style="min-height: 200vh;">
                         <div>
-                            <div class="uk-card uk-card-primary uk-card-body" style="height: 120vh" uk-sticky="bottom: !.viewport">
+                            <div class="uk-card uk-card-primary uk-card-body" uk-sticky="bottom: !.viewport">
                                 <p>Oversized Content</p>
 
-                                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+                                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua</p>
                             </div>
                         </div>
                     </div>
@@ -106,7 +117,7 @@
                             <td><code>offset</code></td>
                             <td>String</td>
                             <td>0</td>
-                            <td>The offset the Sticky should be fixed to.</td>
+                            <td>The offset the Sticky should be fixed to. It supports basic mathematics operands + and -. (e.g. 50vh + 50%)</td>
                         </tr>
                         <tr>
                             <td><code>animation</code></td>