uikit 3.15.16-dev.67856a2ee → 3.15.16-dev.dc520a80d

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.15.16-dev.67856a2ee",
+    "version": "3.15.16-dev.dc520a80d",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

package/src/js/components/internal/slider-transitioner.js

@@ -11,6 +11,7 @@ import {
     isRtl,
     noop,
     position,
+    sumBy,
     Transition,
     trigger,
 } from 'uikit-util';
@@ -147,7 +148,7 @@ export function getMax(list) {
 }
 
 export function getWidth(list) {
-    return children(list).reduce((right, el) => dimensions(el).width + right, 0);
+    return sumBy(children(list), (el) => dimensions(el).width);
 }
 
 function centerEl(el, list) {

package/src/js/core/accordion.js

@@ -12,6 +12,7 @@ import {
     includes,
     index,
     scrollParents,
+    sumBy,
     toFloat,
     toggleClass,
     Transition,
@@ -168,10 +169,9 @@ async function transition(el, show, { content, duration, velocity, transition })
     await Transition.cancel(wrapper);
     hide(content, false);
 
-    const endHeight =
-        toFloat(css(content, 'height')) +
-        toFloat(css(content, 'marginTop')) +
-        toFloat(css(content, 'marginBottom'));
+    const endHeight = sumBy(['height', 'paddingBottom', 'marginTop', 'marginBottom'], (prop) =>
+        css(content, prop)
+    );
     const percent = currentHeight / endHeight;
     duration = (velocity * endHeight + duration) * (show ? 1 - percent : percent);
     css(wrapper, 'height', currentHeight);

package/src/js/core/grid.js

@@ -8,6 +8,7 @@ import {
     hasClass,
     scrolledOver,
     sortBy,
+    sumBy,
     toFloat,
     toggleClass,
 } from 'uikit-util';
@@ -66,7 +67,7 @@ export default {
                 let translates = false;
 
                 const nodes = children(this.$el);
-                const columnHeights = getColumnHeights(columns);
+                const columnHeights = columns.map((column) => sumBy(column, 'offsetHeight'));
                 const margin = getMarginTop(nodes, this.margin) * (rows.length - 1);
                 const elHeight = Math.max(...columnHeights) + margin;
 
@@ -158,7 +159,3 @@ function getMarginTop(nodes, cls) {
 
     return toFloat(node ? css(node, 'marginTop') : css(nodes[0], 'paddingLeft'));
 }
-
-function getColumnHeights(columns) {
-    return columns.map((column) => column.reduce((sum, el) => sum + el.offsetHeight, 0));
-}

package/src/js/core/sticky.js

@@ -17,6 +17,7 @@ import {
     isString,
     isVisible,
     noop,
+    observeResize,
     offsetPosition,
     parent,
     query,
@@ -88,6 +89,8 @@ export default {
             $('<div class="uk-sticky-placeholder"></div>');
         this.isFixed = false;
         this.setActive(false);
+
+        this.registerObserver(observeResize(this.$el, () => !this.isFixed && this.$emit('resize')));
     },
 
     disconnected() {

package/src/js/mixin/modal.js

@@ -9,6 +9,7 @@ import {
     includes,
     isFocusable,
     last,
+    matches,
     noop,
     on,
     once,
@@ -72,23 +73,11 @@ export default {
             name: 'click',
 
             delegate() {
-                return this.selClose;
+                return `${this.selClose},a[href*="#"]`;
             },
 
             handler(e) {
-                e.preventDefault();
-                this.hide();
-            },
-        },
-
-        {
-            name: 'click',
-
-            delegate() {
-                return 'a[href*="#"]';
-            },
-
-            handler({ current, defaultPrevented }) {
+                const { current, defaultPrevented } = e;
                 const { hash } = current;
                 if (
                     !defaultPrevented &&
@@ -98,6 +87,9 @@ export default {
                     $(hash, document.body)
                 ) {
                     this.hide();
+                } else if (matches(current, this.selClose)) {
+                    e.preventDefault();
+                    this.hide();
                 }
             },
         },

package/src/js/util/dimensions.js

@@ -9,6 +9,7 @@ import {
     isUndefined,
     isWindow,
     memoize,
+    sumBy,
     toFloat,
     toNode,
     toWindow,
@@ -149,15 +150,12 @@ function dimension(prop) {
 
 export function boxModelAdjust(element, prop, sizing = 'border-box') {
     return css(element, 'boxSizing') === sizing
-        ? dirs[prop]
-              .map(ucfirst)
-              .reduce(
-                  (value, prop) =>
-                      value +
-                      toFloat(css(element, `padding${prop}`)) +
-                      toFloat(css(element, `border${prop}Width`)),
-                  0
-              )
+        ? sumBy(
+              dirs[prop].map(ucfirst),
+              (prop) =>
+                  toFloat(css(element, `padding${prop}`)) +
+                  toFloat(css(element, `border${prop}Width`))
+          )
         : 0;
 }
 
@@ -177,23 +175,22 @@ export function toPx(value, property = 'width', element = window, offsetDim = fa
         return toFloat(value);
     }
 
-    return parseCalc(value).reduce((result, value) => {
+    return sumBy(parseCalc(value), (value) => {
         const unit = parseUnit(value);
-        if (unit) {
-            value = percent(
-                unit === 'vh'
-                    ? getViewportHeight()
-                    : unit === 'vw'
-                    ? width(toWindow(element))
-                    : offsetDim
-                    ? element[`offset${ucfirst(property)}`]
-                    : dimensions(element)[property],
-                value
-            );
-        }
 
-        return result + toFloat(value);
-    }, 0);
+        return unit
+            ? percent(
+                  unit === 'vh'
+                      ? getViewportHeight()
+                      : unit === 'vw'
+                      ? width(toWindow(element))
+                      : offsetDim
+                      ? element[`offset${ucfirst(property)}`]
+                      : dimensions(element)[property],
+                  value
+              )
+            : value;
+    });
 }
 
 const calcRe = /-?\d+(?:\.\d+)?(?:v[wh]|%|px)?/g;

package/src/js/util/lang.js

@@ -168,6 +168,13 @@ export function sortBy(array, prop) {
         );
 }
 
+export function sumBy(array, iteratee) {
+    return array.reduce(
+        (sum, item) => sum + toFloat(isFunction(iteratee) ? iteratee(item) : item[iteratee]),
+        0
+    );
+}
+
 export function uniqueBy(array, prop) {
     const seen = new Set();
     return array.filter(({ [prop]: check }) => (seen.has(check) ? false : seen.add(check)));