uikit 3.17.8 → 3.17.9-dev.4104d2f00

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.17.8",
+  "version": "3.17.9-dev.4104d2f00",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/api/instance.js

@@ -1,4 +1,4 @@
-import { $, remove, within } from 'uikit-util';
+import { remove, within } from 'uikit-util';
 import { attachToElement, createComponent, detachFromElement, getComponent } from './component';
 import { update } from './global';
 import { callConnected, callDisconnected, callHook } from './hooks';
@@ -60,6 +60,7 @@ export default function (App) {
     });
 }
 
+const ids = Object.create(null);
 export function generateId(instance, el = instance.$el, postfix = '') {
     if (el.id) {
         return el.id;
@@ -67,9 +68,11 @@ export function generateId(instance, el = instance.$el, postfix = '') {
 
     let id = `${instance.$options.id}-${instance._uid}${postfix}`;
 
-    if ($(`#${id}`)) {
+    if (ids[id]) {
         id = generateId(instance, el, `${postfix}-2`);
     }
 
+    ids[id] = true;
+
     return id;
 }

package/src/js/api/props.js

@@ -1,4 +1,12 @@
-import { camelize, data as getData, hasOwn, hyphenate, isUndefined, startsWith } from 'uikit-util';
+import {
+    camelize,
+    data as getData,
+    hasOwn,
+    hyphenate,
+    isUndefined,
+    memoize,
+    startsWith,
+} from 'uikit-util';
 import { registerObserver } from './observer';
 import { coerce, parseOptions } from './options';
 
@@ -60,6 +68,15 @@ function notIn(options, key) {
     return options.every((arr) => !arr || !hasOwn(arr, key));
 }
 
+const getAttributes = memoize((id, props) => {
+    const attributes = Object.keys(props);
+    const filter = attributes
+        .concat(id)
+        .map((key) => [hyphenate(key), `data-${hyphenate(key)}`])
+        .flat();
+    return { attributes, filter };
+});
+
 export function initPropsObserver(instance) {
     const { $options, $props } = instance;
     const { id, props, el } = $options;
@@ -68,8 +85,7 @@ export function initPropsObserver(instance) {
         return;
     }
 
-    const attributes = Object.keys(props);
-    const filter = attributes.map((key) => hyphenate(key)).concat(id);
+    const { attributes, filter } = getAttributes(id, props);
 
     const observer = new MutationObserver((records) => {
         const data = getProps($options);
@@ -87,7 +103,7 @@ export function initPropsObserver(instance) {
 
     observer.observe(el, {
         attributes: true,
-        attributeFilter: filter.concat(filter.map((key) => `data-${key}`)),
+        attributeFilter: filter,
     });
 
     registerObserver(instance, observer);

package/src/js/util/lang.js

@@ -276,5 +276,5 @@ export function getIndex(i, elements, current = 0, finite = false) {
 
 export function memoize(fn) {
     const cache = Object.create(null);
-    return (key) => cache[key] || (cache[key] = fn(key));
+    return (key, ...args) => cache[key] || (cache[key] = fn(key, ...args));
 }