uikit 3.11.2-dev.19d26d0f9 → 3.11.2-dev.244aa5c8c

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.19d26d0f9",
+  "version": "3.11.2-dev.244aa5c8c",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/drop.js

@@ -308,7 +308,7 @@ export default {
             if (active) {
 
                 if (delay && active.isDelaying) {
-                    this.showTimer = setTimeout(this.show, 10);
+                    this.showTimer = setTimeout(() => matches(target, ':hover') && this.show(), 10);
                     return;
                 }
 

package/src/js/core/navbar.js

@@ -137,7 +137,7 @@ export default {
 
             handler({current}) {
                 const active = this.getActive();
-                if (active && includes(active.mode, 'hover') && active.target && !within(active.target, current) && !active.tracker.movesTo(active.$el)) {
+                if (active && includes(active.mode, 'hover') && active.target && !within(active.target, current) && !active.isDelaying) {
                     active.hide(false);
                 }
             }
@@ -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,12 +1,13 @@
 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 {
 
     mixins: [Class, Media],
 
     props: {
+        position: String,
         top: null,
         bottom: Boolean,
         offset: String,
@@ -22,6 +23,7 @@ export default {
     },
 
     data: {
+        position: 'top',
         top: 0,
         bottom: false,
         offset: 0,
@@ -38,7 +40,18 @@ export default {
 
     computed: {
 
+        position({position}, $el) {
+            return position === 'auto'
+                ? (this.isFixed ? this.placeholder : $el).offsetHeight > getHeight(window)
+                    ? 'bottom'
+                    : 'top'
+                : position;
+        },
+
         offset({offset}, $el) {
+            if (this.position === 'bottom') {
+                offset += '+100vh-100%';
+            }
             return toPx(offset, 'height', $el);
         },
 
@@ -130,7 +143,7 @@ export default {
 
         {
 
-            read({height}, types) {
+            read({height, margin}, types) {
 
                 this.inactive = !this.matchMedia || !isVisible(this.$el);
 
@@ -138,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));
 
@@ -167,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);
@@ -302,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>
@@ -21,21 +21,20 @@
         <div class="uk-section uk-section-default">
             <div class="uk-container">
 
-                <div id="js-sticky-parallax-container" class="uk-position-relative uk-background-muted uk-text-center" style="height: 200vh">
-                    <div uk-sticky="bottom: #js-sticky-parallax-container; offset: 20vh">
+                <div id="js-sticky-parallax-container" class="uk-position-relative uk-background-muted uk-text-center" style="height: 300vh">
+                    <div class="uk-flex uk-flex-center uk-flex-middle" style="height: 100vh;" uk-sticky="bottom: #js-sticky-parallax-container">
+                        <div>
 
-                        <div class="uk-position-center">
-                            <div class="uk-flex">
-                                <div>
-                                    <h1 class="uk-heading-2xlarge" uk-parallax="target: #js-sticky-parallax-container; x: 0,-250,-250,0; easing: -1; start: 60vh; end: 100vh;">Sticky</h1>
-                                </div>
-                                <div>
-                                    <h1 class="uk-heading-2xlarge" uk-parallax="target: #js-sticky-parallax-container; x: 0,250,250,0; easing: -1; start: 60vh; end: 100vh;">Parallax</h1>
-                                </div>
+                            <img class="uk-position-relative uk-position-z-index" src="images/size-v.jpg" alt="" width="400" height="800" style="max-width: 50vw" uk-parallax="target: #js-sticky-parallax-container; y: 0,-250; easing: -1; start: 100vh; end: 100vh;">
+
+                            <div style="margin-top: -200px">
+                                <h1 class="uk-heading-2xlarge">
+                                    <span class="uk-display-inline-block" uk-parallax="target: #js-sticky-parallax-container; x: 0,-15vw,-7vw,0; easing: -1; start: 60vh; end: 100vh;">Sticky</span>
+                                    <br><span class="uk-display-inline-block" uk-parallax="target: #js-sticky-parallax-container; x: 0,10vw,5vw,0; easing: -1; start: 60vh; end: 100vh;">Parallax</span>
+                                </h1>
                             </div>
-                        </div>
 
-                        <img class="uk-position-relative uk-position-z-index" src="images/size-v.jpg" alt="" width="400" height="800">
+                        </div>
 
                     </div>
                 </div>
@@ -117,7 +116,7 @@
 
         <div class="uk-section uk-section-default">
 
-            <div id="js-sticky-parallax-viewport" class="uk-child-width-1-3 uk-text-center" uk-grid>
+            <div id="js-sticky-parallax-viewport" class="uk-child-width-1-2 uk-child-width-1-3@s uk-text-center" uk-grid>
                 <div>
 
                     <img class="uk-margin-large" src="images/photo.jpg" alt="" width="1800" height="1200">
@@ -125,13 +124,15 @@
                     <img class="uk-margin-large" src="images/photo2.jpg" alt="" width="1800" height="1200">
                     <img class="uk-margin-large" src="images/photo.jpg" alt="" width="1800" height="1200">
                     <img class="uk-margin-large" src="images/photo3.jpg" alt="" width="1800" height="1200">
+                    <img class="uk-margin-large" src="images/photo2.jpg" alt="" width="1800" height="1200">
+                    <img class="uk-margin-large" src="images/photo.jpg" alt="" width="1800" height="1200">
 
                 </div>
                 <div>
 
-                    <div class="uk-tile 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>
     
@@ -140,13 +141,15 @@
                     </div>
 
                 </div>
-                <div>
+                <div class="uk-visible@s">
 
                     <img class="uk-margin-large" src="images/photo2.jpg" alt="" width="1800" height="1200">
                     <img class="uk-margin-large" src="images/photo.jpg" alt="" width="1800" height="1200">
                     <img class="uk-margin-large" src="images/photo3.jpg" alt="" width="1800" height="1200">
                     <img class="uk-margin-large" src="images/photo2.jpg" alt="" width="1800" height="1200">
                     <img class="uk-margin-large" src="images/photo.jpg" alt="" width="1800" height="1200">
+                    <img class="uk-margin-large" src="images/photo3.jpg" alt="" width="1800" height="1200">
+                    <img class="uk-margin-large" src="images/photo2.jpg" alt="" width="1800" height="1200">
 
                 </div>
             </div>
@@ -155,10 +158,10 @@
 
         <div class="uk-section uk-section-default">
 
-            <div id="js-sticky-parallax-images" class="uk-child-width-1-3" style="height: 250vh" uk-grid>
-                <div class="uk-background-muted uk-width-expand">
+            <div id="js-sticky-parallax-images" style="height: 250vh" uk-grid>
+                <div class="uk-width-expand">
         
-                    <div style="height: 100vh;" uk-sticky="bottom: #js-sticky-parallax-images">
+                    <div class="uk-background-muted" style="height: 100vh;" uk-sticky="bottom: #js-sticky-parallax-images">
                         <div uk-parallax="target: #js-sticky-parallax-images; y: 55vh, 45vh;">
                             <img class="uk-position-center-left" src="images/photo.jpg" alt="" width="1800" height="1200">
                             <img class="uk-position-center-left" src="images/photo2.jpg" alt="" width="1800" height="1200" uk-parallax="target: #js-sticky-parallax-images; start: 125vh; end: 100% + 100vh - 135vh; opacity: 0,1">
@@ -167,12 +170,12 @@
                     </div>
 
                 </div>
-                <div class="uk-width-small">
-                    <div class="uk-position-relative uk-background-muted" style="height: 75vh"><div class="uk-position-bottom-center">75vh</div></div>
-                    <div class="uk-position-relative uk-background-primary uk-light" style="height: 50vh"><div class="uk-position-bottom-center">125vh</div></div>
-                    <div class="uk-position-relative uk-background-secondary uk-light" style="height: 50vh"><div class="uk-position-bottom-center">175vh</div></div>
-                    <div class="uk-position-relative uk-background-muted" style="height: 50vh"><div class="uk-position-bottom-center">225vh</div></div>
-                    <div class="uk-position-relative uk-background-primary uk-light" style="height: 25vh"><div class="uk-position-bottom-center">250vh</div></div>
+                <div class="uk-width-auto uk-text-small">
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-muted" style="height: 75vh">75vh</div>
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-primary uk-light" style="height: 50vh">125vh</div>
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-secondary uk-light" style="height: 50vh">175vh</div>
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-muted" style="height: 50vh">225vh</div>
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-primary uk-light" style="height: 25vh">250vh</div>
                 </div>
                 <div class="uk-width-expand">
 
@@ -183,7 +186,7 @@
 
                             <h1>Sticky Parallax Images 1</h1>
                             
-                            <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.</p>
+                            <p class="uk-visible@s">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.</p>
 
                         </div>
                     </div>
@@ -193,7 +196,7 @@
 
                             <h1>Sticky Parallax Images 2</h1>
 
-                            <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.</p>
+                            <p class="uk-visible@s">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.</p>
 
                         </div>
                     </div>
@@ -203,7 +206,7 @@
 
                             <h1>Sticky Parallax Images 3</h1>
 
-                            <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.</p>
+                            <p class="uk-visible@s">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.</p>
 
                         </div>
                     </div>
@@ -215,10 +218,10 @@
 
         <div class="uk-section uk-section-default">
 
-            <div id="js-sticky-parallax-images-all" class="uk-child-width-1-3" style="height: 250vh" uk-grid>
-                <div class="uk-background-muted uk-width-expand">
+            <div id="js-sticky-parallax-images-all" style="height: 250vh" uk-grid>
+                <div class="uk-width-expand">
 
-                    <div style="height: 100vh;" uk-sticky="bottom: #js-sticky-parallax-images-all">
+                    <div class="uk-background-muted" style="height: 100vh;" uk-sticky="bottom: #js-sticky-parallax-images-all">
                         <div uk-parallax="target: #js-sticky-parallax-images-all; y: 55vh, 45vh;">
                             <img class="uk-position-center-left" src="images/photo.jpg" alt="" width="1800" height="1200">
                             <img class="uk-position-center-left" src="images/photo2.jpg" alt="" width="1800" height="1200" uk-parallax="target: #js-sticky-parallax-images-all; start: 150vh; end: 100% + 100vh - 160vh; opacity: 0,1">
@@ -227,11 +230,11 @@
                     </div>
 
                 </div>
-                <div class="uk-width-small">
-                    <div class="uk-position-relative uk-background-muted" style="height: 100vh"><div class="uk-position-bottom-center">100vh</div></div>
-                    <div class="uk-position-relative uk-background-primary uk-light" style="height: 50vh"><div class="uk-position-bottom-center">150vh</div></div>
-                    <div class="uk-position-relative uk-background-secondary uk-light" style="height: 50vh"><div class="uk-position-bottom-center">200vh</div></div>
-                    <div class="uk-position-relative uk-background-muted" style="height: 50vh"><div class="uk-position-bottom-center">250vh</div></div>
+                <div class="uk-width-auto uk-text-small">
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-muted" style="height: 100vh">100vh</div>
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-primary uk-light" style="height: 50vh">150vh</div>
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-secondary uk-light" style="height: 50vh">200vh</div>
+                    <div class="uk-flex uk-flex-center uk-flex-bottom uk-background-muted" style="height: 50vh">250vh</div>
                 </div>
                 <div class="uk-width-expand">
 
@@ -242,7 +245,7 @@
 
                                     <h1>Sticky Parallax Images All 1</h1>
 
-                                    <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.</p>
+                                    <p class="uk-visible@s">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.</p>
 
                                 </div>
                             </div>
@@ -251,7 +254,7 @@
 
                                     <h1>Sticky Parallax Images All 2</h1>
 
-                                    <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.</p>
+                                    <p class="uk-visible@s">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.</p>
 
                                 </div>
                             </div>
@@ -259,7 +262,7 @@
 
                                 <h1>Sticky Parallax Images All 3</h1>
 
-                                <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.</p>
+                                <p class="uk-visible@s">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.</p>
 
                             </div>
                         </div>

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>
@@ -84,6 +95,12 @@
                         </tr>
                     </thead>
                     <tbody>
+                        <tr>
+                            <td><code>position</code></td>
+                            <td>`top`|`bottom`|`auto`</td>
+                            <td>`top`</td>
+                            <td>The position the element should be stuck to. With position `auto` the element sticks to the top of the viewport if it's smaller than the viewport, otherwise it sticks to the top.</td>
+                        </tr>
                         <tr>
                             <td><code>top</code></td>
                             <td>Number|Viewport Height|CSS Selector</td>
@@ -100,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>