coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'worktree-api-urls' into macros

Browse Source
This commit is contained in:
giles
2026-03-13 04:51:05 +00:00
parent 301bb8e585 846719908f
commit ae6c6d06a7
3 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
shared/sx/ref/adapter-dom.sx
View File

@@ -406,16 +406,19 @@
(dom-insert-after marker result))
;; Marker not yet in DOM (first run) — just save result
(set! initial-result result)))))
;; Return fragment: marker + initial render result
(let ((frag (create-fragment)))
(dom-append frag marker)
(when initial-result
(set! current-nodes
(if (dom-is-fragment? initial-result)
(dom-child-nodes initial-result)
(list initial-result)))
(dom-append frag initial-result))
frag))
;; Spread pass-through: spreads aren't DOM nodes, can't live
;; in fragments. Return directly so parent element merges attrs.
(if (spread? initial-result)
initial-result
(let ((frag (create-fragment)))
(dom-append frag marker)
(when initial-result
(set! current-nodes
(if (dom-is-fragment? initial-result)
(dom-child-nodes initial-result)
(list initial-result)))
(dom-append frag initial-result))
frag)))
;; Static if
(let ((cond-val (trampoline (eval-expr (nth expr 1) env))))
(if cond-val
@@ -453,10 +456,13 @@
(range 2 (len expr)))
(set! current-nodes (dom-child-nodes frag))
(set! initial-result frag))))))
(let ((frag (create-fragment)))
(dom-append frag marker)
(when initial-result (dom-append frag initial-result))
frag))
;; Spread pass-through
(if (spread? initial-result)
initial-result
(let ((frag (create-fragment)))
(dom-append frag marker)
(when initial-result (dom-append frag initial-result))
frag)))
;; Static when
(if (not (trampoline (eval-expr (nth expr 1) env)))
(create-fragment)
@@ -495,10 +501,13 @@
(dom-child-nodes result)
(list result)))
(set! initial-result result)))))))
(let ((frag (create-fragment)))
(dom-append frag marker)
(when initial-result (dom-append frag initial-result))
frag))
;; Spread pass-through
(if (spread? initial-result)
initial-result
(let ((frag (create-fragment)))
(dom-append frag marker)
(when initial-result (dom-append frag initial-result))
frag)))
;; Static cond
(let ((branch (eval-cond (rest expr) env)))
(if branch

10
shared/sx/templates/cssx.sx
View File

@@ -476,12 +476,10 @@
(classes (map (fn (r) (get r "cls")) valid))
(rules (map (fn (r) (get r "rule")) valid))
(_ (for-each (fn (rule) (collect! "cssx" rule)) rules)))
;; Return spread: injects class + data-tw onto parent element.
;; The if is inside make-spread's arg so it goes through eval-expr
;; (not render-to-dom), avoiding reactive-if wrapping in islands.
(make-spread (if (empty? classes)
{}
{"class" (join " " classes)
;; Return spread: injects class + data-tw onto parent element
(if (empty? classes)
nil
(make-spread {"class" (join " " classes)
"data-tw" (or tokens "")}))))