kt.js 0.14.6 → 0.15.0

package/dist/jsx-runtime.mjs

@@ -53,12 +53,6 @@ const ktEventHandlers = {
 
 const defaultHandler = (element, key, value) => element.setAttribute(key, value);
 function attrIsObject(element, attr) {
-    // & deal k-if first
-    if ('k-if' in attr) {
-        if (!attr['k-if']) {
-            return false;
-        }
-    }
     const classValue = attr.class;
     const style = attr.style;
     if (classValue !== undefined) {
@@ -75,39 +69,31 @@ function attrIsObject(element, attr) {
         }
     }
     for (const key in attr) {
-        if (key === 'class' || key === 'style' || key === 'k-if') {
+        if (key === 'class' || key === 'style' || key === 'children' || key === 'k-if' || key === 'ref') {
             continue;
         }
         const o = attr[key];
-        // force register on:xxx as an event handler
-        // !if o is not valid, the throwing job will be done by `on`, not kt.js
         // # special handling for kt.js specific events
         const ktEvent = ktEventHandlers[key];
         if (ktEvent) {
             ktEvent(element, o);
-            continue;
         }
-        // # normal event handler
-        if (key.startsWith('on:')) {
+        // normal event handler
+        else if (key.startsWith('on:')) {
             element.addEventListener(key.slice(3), o); // chop off the `@`
-            continue;
-        }
-        if (typeof o === 'function') {
-            (handlers[key] || defaultHandler)(element, key, o());
         }
+        // normal attributes
         else {
             (handlers[key] || defaultHandler)(element, key, o);
         }
     }
-    return true;
 }
 function applyAttr(element, attr) {
     if (typeof attr === 'string') {
         element.className = attr;
-        return true;
     }
     else if (typeof attr === 'object' && attr !== null) {
-        return attrIsObject(element, attr);
+        attrIsObject(element, attr);
     }
     else {
         throw new Error('kt.js: attr must be an object/string.');
@@ -215,7 +201,7 @@ function applyContent(element, content) {
  * ## About
  * @package @ktjs/core
  * @author Kasukabe Tsumugi <futami16237@gmail.com>
- * @version 0.14.6 (Last Update: 2026.01.17 11:35:33.824)
+ * @version 0.15.0 (Last Update: 2026.01.24 00:25:38.464)
  * @license MIT
  * @link https://github.com/baendlorel/kt.js
  * @link https://baendlorel.github.io/ Welcome to my site!
@@ -229,68 +215,43 @@ const h = ((tag, attr = '', content = '') => {
     // * start creating the element
     const element = document.createElement(tag);
     // * Handle content
-    const kif = applyAttr(element, attr);
-    if (!kif) {
-        return document.createComment('k-if');
-    }
+    applyAttr(element, attr);
     applyContent(element, content);
     return element;
 });
 
+const dummyRef = { value: null };
 /**
  * @param tag html tag or function component
  * @param props properties/attributes
  */
+// todo 加入对k-if的全面支持
 function jsx(tag, props = {}) {
-    const ref = props.ref?.isKT ? props.ref : null;
-    if (ref) {
-        delete props.ref;
+    const ref = props.ref?.isKT ? props.ref : dummyRef;
+    let el;
+    const redraw = (newProps) => {
+        props = newProps ? { ...props, ...newProps } : props;
+        const old = el;
+        el = jsx(tag, props);
+        old.replaceWith(el);
+        return el;
+    };
+    if ('k-if' in props && !props['k-if']) {
+        el = document.createComment('k-if');
+        ref.value = el;
+        el.redraw = redraw;
+        return el;
     }
     // Handle function components
     if (typeof tag === 'function') {
-        let el = tag(props);
-        if (!el.redraw) {
-            el.redraw = (newProps) => {
-                props = newProps ? { ...props, ...newProps } : props;
-                // $ same as below
-                const old = el;
-                el = tag(props);
-                el.redraw = old.redraw; // inherit redraw
-                if (ref) {
-                    ref.value = el;
-                }
-                old.replaceWith(el);
-                return el;
-            };
-        }
-        if (ref) {
-            ref.value = el;
-        }
-        return el;
+        el = tag(props);
     }
     else {
-        // & deal children here
-        let children = props.children;
-        delete props.children;
-        let el = h(tag, props, children);
-        if (ref) {
-            ref.value = el;
-        }
-        el.redraw = (newProps, newChildren) => {
-            props = newProps ? { ...props, ...newProps } : props;
-            children = (newChildren ?? children);
-            // $ same as above
-            const old = el;
-            el = h(tag, props, children);
-            el.redraw = old.redraw; // inherit redraw
-            if (ref) {
-                ref.value = el;
-            }
-            old.replaceWith(el);
-            return el;
-        };
-        return el;
+        el = h(tag, props, props.children);
     }
+    el.redraw ??= redraw;
+    ref.value = el;
+    return el;
 }
 /**
  * Fragment support - returns an array of children
@@ -343,20 +304,20 @@ const jsxs = jsx;
  * }
  * ```
  * Then the returned element has a `redraw` method to redraw itself with new values.
- * @param creator
+ * @param creator a simple creator function that returns an element
  * @returns created element
  */
 function createRedrawable(creator) {
-    let element = creator();
+    let el = creator();
     const redraw = () => {
-        const old = element;
-        element = creator();
-        old.replaceWith(element);
-        element.redraw = redraw;
-        return element;
+        const old = el;
+        el = creator();
+        old.replaceWith(el);
+        el.redraw = redraw;
+        return el;
     };
-    element.redraw = redraw;
-    return element;
+    el.redraw = redraw;
+    return el;
 }
 
 export { Fragment, h as createElement, createRedrawable, h, jsx, jsxDEV, jsxs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kt.js",
-  "version": "0.14.6",
+  "version": "0.15.0",
   "author": {
     "name": "Kasukabe Tsumugi",
     "email": "futami16237@gmail.com"
@@ -41,7 +41,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@ktjs/core": "0.14.6",
+    "@ktjs/core": "0.15.0",
     "@ktjs/shortcuts": "0.7.3"
   },
   "scripts": {