From 41cb376a02d12f85eb1e4893425af15614c2e187 Mon Sep 17 00:00:00 2001
From: Aylur <k.demeter@protonmail.com>
Date: Sun, 9 Jun 2024 22:25:40 +0200
Subject: support deeply nested layout structures

js, jsx, lua now allows deeply nested layouts that contains Bindings
Variable.derive will be automatically constructed where needed
and Bindings in layouts will be bound automatically
it breaks compatibility with ags even more, but jsx should be preferred
imo anyway
---
 gjs/src/jsx/jsx-runtime.ts | 51 +++++++---------------------------------------
 1 file changed, 7 insertions(+), 44 deletions(-)

(limited to 'gjs/src/jsx')

diff --git a/gjs/src/jsx/jsx-runtime.ts b/gjs/src/jsx/jsx-runtime.ts
index 5e7f23b..e96f7c2 100644
--- a/gjs/src/jsx/jsx-runtime.ts
+++ b/gjs/src/jsx/jsx-runtime.ts
@@ -1,12 +1,5 @@
 import { Gtk } from "../imports.js"
 import * as Widget from "../widgets.js"
-import Binding from "../binding.js"
-
-function w(e: any) {
-    return e instanceof Gtk.Widget || e instanceof Binding
-        ? e
-        : Widget.Label({ label: String(e) })
-}
 
 export function jsx(
     ctor: keyof typeof ctors | typeof Gtk.Widget,
@@ -16,46 +9,16 @@ export function jsx(
 
     if (!Array.isArray(children))
         children = [children]
-    else
-        children = children.flat()
-
-    // <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])
-            props.centerWidget = w(children[1])
-        if (children[2])
-            props.endWidget = w(children[2])
-    }
-
-    else if (ctor === "overlay") {
-        const [child, ...overlays] = children
-        if (child)
-            props.child = child
-
-        props.overlays = overlays
-    }
 
-    else if (children.length === 1) {
-        props.child = w(children[0])
-        delete props.children
-    }
+    if (typeof ctor === "string")
+        return (ctors as any)[ctor](props, children)
 
-    else {
-        props.children = children.map(w)
-    }
+    if (children.length === 1)
+        props.child = children[0]
+    else if (children.length > 1)
+        props.children = children
 
-    return typeof ctor === "string"
-        ? (ctors as any)[ctor](props)
-        : new ctor(props)
+    return new ctor(props)
 }
 
 const ctors = {
-- 
cgit v1.2.3