From 15285a17bf447c5185dfbb92d9a4bd2670a4e44e Mon Sep 17 00:00:00 2001
From: Aylur <k.demeter@protonmail.com>
Date: Fri, 7 Jun 2024 20:38:02 +0200
Subject: fix: jsx edge cases

---
 gjs/src/jsx/jsx-runtime.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'gjs/src/jsx')

diff --git a/gjs/src/jsx/jsx-runtime.ts b/gjs/src/jsx/jsx-runtime.ts
index 41aa447..5e7f23b 100644
--- a/gjs/src/jsx/jsx-runtime.ts
+++ b/gjs/src/jsx/jsx-runtime.ts
@@ -3,10 +3,9 @@ import * as Widget from "../widgets.js"
 import Binding from "../binding.js"
 
 function w(e: any) {
-    if (e instanceof Gtk.Widget || e instanceof Binding)
-        return e
-
-    return Widget.Label({ label: String(e) })
+    return e instanceof Gtk.Widget || e instanceof Binding
+        ? e
+        : Widget.Label({ label: String(e) })
 }
 
 export function jsx(
@@ -20,7 +19,15 @@ export function jsx(
     else
         children = children.flat()
 
-    if (ctor === "centerbox") {
+    // <box children={Binding} /> and <box>{Binding}</box>
+    if (ctor === "box" && children.length === 1 && children[0] instanceof Binding) {
+        props.children = children[0]
+    }
+
+    // TODO: handle array of Binding
+    // is there a usecase?
+
+    else if (ctor === "centerbox") {
         if (children[0])
             props.startWidget = w(children[0])
         if (children[1])
@@ -29,7 +36,7 @@ export function jsx(
             props.endWidget = w(children[2])
     }
 
-    else if (ctor == "overlay") {
+    else if (ctor === "overlay") {
         const [child, ...overlays] = children
         if (child)
             props.child = child
-- 
cgit v1.2.3