uikit 3.16.4-dev.8705d5334 → 3.16.4-dev.e94c10076

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.16.4-dev.8705d5334",
+  "version": "3.16.4-dev.e94c10076",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/cover.js

@@ -1,8 +1,9 @@
 import Video from './video';
-import { css, Dimensions, observeResize, parent } from 'uikit-util';
+import { css, Dimensions, parent } from 'uikit-util';
+import Resize from '../mixin/resize';
 
 export default {
-    mixins: [Video],
+    mixins: [Resize, Video],
 
     props: {
         width: Number,
@@ -19,20 +20,14 @@ export default {
         },
     },
 
-    connected() {
-        const parentEl = getPositionedParent(this.$el) || parent(this.$el);
-        this.registerObserver(
-            observeResize(parentEl, () => {
-                this.parentDim = getCoverDimensions(parentEl);
-                this.$emit('resize');
-            })
-        );
+    resizeTargets() {
+        return [this.$el, getPositionedParent(this.$el) || parent(this.$el)];
     },
 
     update: {
         read() {
             const { ratio, cover } = Dimensions;
-            const { $el, width, height, parentDim } = this;
+            const { $el, width, height } = this;
 
             let dim = { width, height };
 
@@ -51,11 +46,12 @@ export default {
                 }
             }
 
-            if (!parentDim) {
-                return false;
-            }
-
-            const coverDim = cover(dim, parentDim);
+            const { offsetHeight: coverHeight, offsetWidth: coverWidth } =
+                getPositionedParent($el) || parent($el);
+            const coverDim = cover(dim, {
+                width: coverWidth + (coverWidth % 2 ? 1 : 0),
+                height: coverHeight + (coverHeight % 2 ? 1 : 0),
+            });
 
             if (!coverDim.width || !coverDim.height) {
                 return false;
@@ -72,14 +68,6 @@ export default {
     },
 };
 
-function getCoverDimensions(el) {
-    const { offsetHeight, offsetWidth } = el;
-    return {
-        width: offsetWidth + (offsetWidth % 2 ? 1 : 0),
-        height: offsetHeight + (offsetHeight % 2 ? 1 : 0),
-    };
-}
-
 function getPositionedParent(el) {
     while ((el = parent(el))) {
         if (css(el, 'position') !== 'static') {

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

@@ -55,7 +55,6 @@ function match(elements) {
         return { heights: [''], elements };
     }
 
-    css(elements, 'minHeight', '');
     let heights = elements.map(getHeight);
     const max = Math.max(...heights);
 
@@ -66,16 +65,19 @@ function match(elements) {
 }
 
 function getHeight(element) {
-    let style = false;
+    let display = false;
+    const minHeight = element.style.minHeight;
     if (!isVisible(element)) {
-        style = element.style.display;
+        display = element.style.display;
         css(element, 'display', 'block', 'important');
     }
 
+    css(element, 'minHeight', '');
     const height = dimensions(element).height - boxModelAdjust(element, 'height', 'content-box');
+    css(element, 'minHeight', minHeight);
 
-    if (style !== false) {
-        css(element, 'display', style);
+    if (display !== false) {
+        css(element, 'display', display);
     }
 
     return height;