@estjs/template 0.0.16-beta.6 → 0.0.16-beta.8

package/dist/template.dev.esm.js

@@ -852,12 +852,14 @@ var Component = class {
     if (!root) return;
     this.releaseSpecialProps();
     for (const key of Object.getOwnPropertyNames(props)) {
-      const value = readProp(props, key);
       if (key === REF_KEY) {
+        const value = readProp(props, key);
         this.rootRefCleanup = this.bindRootRef(value, root);
         continue;
       }
-      if (isOn(key) && isFunction(value)) {
+      if (isOn(key)) {
+        const value = readProp(props, key);
+        if (!isFunction(value)) continue;
         const eventName = key.slice(2).toLowerCase();
         this.rootEventCleanups.push(addEvent(root, eventName, value));
       }
@@ -1291,8 +1293,9 @@ function omitProps(target, keys) {
 
 // src/components/Fragment.ts
 function Fragment(props) {
-  if (!props || props.children == null) return null;
-  return props.children;
+  const children = props == null ? void 0 : props.children;
+  if (children == null) return null;
+  return children;
 }
 Fragment[FRAGMENT_COMPONENT] = true;
 function isFragment(node) {
@@ -1816,7 +1819,7 @@ function For(props) {
     if (isFunction(input)) return (_b = input()) != null ? _b : [];
     return input != null ? input : [];
   };
-  const getKey = (item) => keyFn ? keyFn(item) : item;
+  const getKey = (item, index) => keyFn ? keyFn(item, index) : item;
   const normalizeNodes = (value) => {
     if (Array.isArray(value)) {
       const nodes = [];
@@ -1851,14 +1854,14 @@ function For(props) {
     }
     fallbackNodes = [];
   };
-  const renderItem = (item, index, parent, before) => {
+  const renderItem = (item, index, parent, before, key = getKey(item, index)) => {
     const parentScope = getActiveScope();
     const scope = createScope(parentScope);
     let mountedNodes = [];
     runWithScope(scope, () => {
       mountedNodes = mountValue(renderFn(item, index), parent, before);
     });
-    return { key: getKey(item), item, nodes: mountedNodes, scope };
+    return { key, item, nodes: mountedNodes, scope };
   };
   const disposeItem = (entry) => {
     disposeScope(entry.scope);
@@ -1927,7 +1930,7 @@ function For(props) {
     let maxOldSeen = 0;
     const newKeys = new Array(newLen);
     for (let i = 0; i < newLen; i++) {
-      newKeys[i] = getKey(newItems[i]);
+      newKeys[i] = getKey(newItems[i], i);
     }
     for (let i = 0; i < newLen; i++) {
       const item = newItems[i];
@@ -1944,11 +1947,11 @@ function For(props) {
         } else {
           if (!batchFragment) batchFragment = document.createDocumentFragment();
           disposeItem(reused);
-          newEntries[i] = renderItem(item, i, batchFragment, null);
+          newEntries[i] = renderItem(item, i, batchFragment, null, key);
         }
       } else {
         if (!batchFragment) batchFragment = document.createDocumentFragment();
-        newEntries[i] = renderItem(item, i, batchFragment, null);
+        newEntries[i] = renderItem(item, i, batchFragment, null, key);
       }
     }
     for (const list of oldKeyMap.values()) {