uikit 3.12.3-dev.8ce29ae1a → 3.12.3-dev.8e3f8e19e

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.12.3-dev.8ce29ae1a",
+    "version": "3.12.3-dev.8e3f8e19e",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

package/src/js/api/state.js

@@ -4,7 +4,6 @@ import {
     data as getData,
     hasOwn,
     hyphenate,
-    includes,
     isArray,
     isFunction,
     isNumeric,
@@ -101,16 +100,11 @@ export default function (UIkit) {
                 }
             }
         }
-
-        if (hasUpdateOfType(this.$options.update, 'scroll')) {
-            registerScrollListener(this._uid, () => this.$emit('scroll'));
-        }
     };
 
     UIkit.prototype._unbindEvents = function () {
         this._events.forEach((unbind) => unbind());
         delete this._events;
-        unregisterScrollListener(this._uid);
     };
 
     UIkit.prototype._initObservers = function () {
@@ -314,32 +308,3 @@ function initPropsObserver(component) {
 
     return observer;
 }
-
-function hasUpdateOfType(updates = [], type) {
-    for (const { events = [] } of updates) {
-        if (includes(events, type)) {
-            return true;
-        }
-    }
-}
-
-const scrollListeners = new Map();
-let unbindScrollListener;
-function registerScrollListener(id, listener) {
-    unbindScrollListener =
-        unbindScrollListener ||
-        on(window, 'scroll', () => scrollListeners.forEach((listener) => listener()), {
-            passive: true,
-            capture: true,
-        });
-
-    scrollListeners.set(id, listener);
-}
-
-function unregisterScrollListener(id) {
-    scrollListeners.delete(id);
-    if (unbindScrollListener && !scrollListeners.size) {
-        unbindScrollListener();
-        unbindScrollListener = null;
-    }
-}

package/src/js/components/parallax.js

@@ -1,9 +1,10 @@
 import Resize from '../mixin/resize';
+import Scroll from '../mixin/scroll';
 import Parallax from '../mixin/parallax';
 import { css, parent, query, scrolledOver, toPx } from 'uikit-util';
 
 export default {
-    mixins: [Parallax, Resize],
+    mixins: [Parallax, Resize, Scroll],
 
     props: {
         target: String,

package/src/js/core/grid.js

@@ -1,5 +1,6 @@
 import Margin from './margin';
 import Class from '../mixin/class';
+import Scroll from '../mixin/scroll';
 import {
     addClass,
     children,
@@ -14,7 +15,7 @@ import {
 export default {
     extends: Margin,
 
-    mixins: [Class],
+    mixins: [Class, Scroll],
 
     name: 'grid',
 

package/src/js/core/scrollspy-nav.js

@@ -1,3 +1,4 @@
+import Scroll from '../mixin/scroll';
 import {
     $$,
     closest,
@@ -13,6 +14,8 @@ import {
 import { getTargetElement } from './scroll';
 
 export default {
+    mixins: [Scroll],
+
     props: {
         cls: String,
         closest: String,

package/src/js/core/scrollspy.js

@@ -1,3 +1,4 @@
+import Scroll from '../mixin/scroll';
 import {
     $$,
     css,
@@ -13,6 +14,8 @@ import {
 
 const stateKey = '_ukScrollspy';
 export default {
+    mixins: [Scroll],
+
     args: 'cls',
 
     props: {

package/src/js/core/sticky.js

@@ -1,6 +1,7 @@
 import Class from '../mixin/class';
 import Media from '../mixin/media';
 import Resize from '../mixin/resize';
+import Scroll from '../mixin/scroll';
 import {
     $,
     addClass,
@@ -33,7 +34,7 @@ import {
 } from 'uikit-util';
 
 export default {
-    mixins: [Class, Media, Resize],
+    mixins: [Class, Media, Resize, Scroll],
 
     props: {
         position: String,

package/src/js/mixin/scroll.js

@@ -0,0 +1,32 @@
+import { on } from 'uikit-util';
+
+export default {
+    connected() {
+        registerScrollListener(this._uid, () => this.$emit('scroll'));
+    },
+
+    disconnected() {
+        unregisterScrollListener(this._uid);
+    },
+};
+
+const scrollListeners = new Map();
+let unbindScrollListener;
+function registerScrollListener(id, listener) {
+    unbindScrollListener =
+        unbindScrollListener ||
+        on(window, 'scroll', () => scrollListeners.forEach((listener) => listener()), {
+            passive: true,
+            capture: true,
+        });
+
+    scrollListeners.set(id, listener);
+}
+
+function unregisterScrollListener(id) {
+    scrollListeners.delete(id);
+    if (unbindScrollListener && !scrollListeners.size) {
+        unbindScrollListener();
+        unbindScrollListener = null;
+    }
+}