js-maker integration part 1

This commit is contained in:
2026-06-01 20:18:21 +02:00
parent 231d30c561
commit d71f326d88
+211 -94
View File
@@ -398,10 +398,15 @@
(define-syntax with-id->el (define-syntax with-id->el
(syntax-rules () (syntax-rules (<-)
((_ <- id el e1 ...)
(js/expression (let ((el (send document getElementById (inject id))))
e1 ...)))
((_ id el e1 ...) ((_ id el e1 ...)
(js (let ((el (send document getElementById (eval id)))) (js (let ((el (send document getElementById (inject id))))
e1 ...))))) e1 ...)))
)
)
(define-syntax with-id (define-syntax with-id
(syntax-rules () (syntax-rules ()
@@ -427,9 +432,13 @@
(define-syntax with-selector (define-syntax with-selector
(syntax-rules () (syntax-rules ()
((_ selector func) ((_ selector func)
(format "return window.rkt_with_selector('~a', ~a)" (js
(esc-quote selector) (return (send window rkt_with_selector (inject selector) func))))
func)))) )
)
; (format "return window.rkt_with_selector('~a', ~a)"
; (esc-quote selector)
; func))))
(define (make-exts-filter list-of-pe) (define (make-exts-filter list-of-pe)
(define (mef pe) (define (mef pe)
@@ -794,7 +803,7 @@
(-> wv-win? symbol? (or/c string? xexpr?) symbol?) (-> wv-win? symbol? (or/c string? xexpr?) symbol?)
(if (string? html) (if (string? html)
(let ((r (webview-call-js wv (let ((r (webview-call-js wv
(with-id->el id el (with-id->el <- id el
(set! (js-dot el innerHTML) (eval html)) (set! (js-dot el innerHTML) (eval html))
#t)))) #t))))
;(with-id id el ;(with-id id el
@@ -808,7 +817,27 @@
(define/contract (webview-set-value! wv id val) (define/contract (webview-set-value! wv id val)
(-> wv-win? symbol? (or/c symbol? string? number? boolean? g:date? g:time? g:datetime? rgba?) symbol?) (-> wv-win? symbol? (or/c symbol? string? number? boolean? g:date? g:time? g:datetime? rgba?) symbol?)
(webview-run-js wv (webview-run-js wv
(with-id id el (with-id->el id el
(if (or
(= (js-dot el type) "checkbox")
(= (js-dot el type) "radio"))
(set! (js-dot el checked)
(inject
(if (eq? val #f) #f #t)))
(set! (js-dot el value)
(inject
(cond
((g:date? val) (date->string val))
((g:time? val) (time->string val))
((g:datetime? val) (datetime->string val))
((rgba? val) (rgba->hex val))
(else val)))))
)
)
)
#|
(with-id id el
((string-append ((string-append
"if (el.type == 'checkbox' || el.type == 'radio') {\n" "if (el.type == 'checkbox' || el.type == 'radio') {\n"
" el.checked = ~a;\n" " el.checked = ~a;\n"
@@ -831,19 +860,25 @@
) )
) )
) )
|#
(define/contract (webview-value wv id) (define/contract (webview-value wv id)
(-> wv-win? symbol? (or/c string? boolean?)) (-> wv-win? symbol? (or/c string? boolean?))
(let ((v (webview-call-js wv (let ((v (webview-call-js wv
(with-id id el (with-id->el <- id el
((string-append "let f = function() {\n" (if (or (= (js-dot el type) "checkbox")
" if (el.type == 'checkbox' || el.type == 'radio') {\n" (= (js-dot el type) "radio"))
" return '' + el.checked;\n" (js-dot el checked)
" } else {\n" (js-dot el value))))))
" return el.value;\n" ;(with-id id el
" }\n" ; ((string-append "let f = function() {\n"
"};\n")) ; " if (el.type == 'checkbox' || el.type == 'radio') {\n"
-> "f()")))) ; " return '' + el.checked;\n"
; " } else {\n"
; " return el.value;\n"
; " }\n"
; "};\n"))
; -> "f()"))))
(if (eq? v #f) (if (eq? v #f)
#f #f
v))) v)))
@@ -875,94 +910,151 @@
(let ((sel (if (symbol? id-or-selector) (let ((sel (if (symbol? id-or-selector)
(format "#~a" id-or-selector) (format "#~a" id-or-selector)
id-or-selector)) id-or-selector))
(cl (mk-js-array class)) ;(cl (mk-js-array class))
(cl (if (list? class) class (list class)))
) )
(webview-call-js wv (with-selector sel (webview-call-js wv (with-selector sel
(format (λ (id el)
(js-code (let ((cl (inject cl)))
"function(id, el) {" (send cl forEach
" let cl = ~a;" (λ (c)
" cl.forEach(function(c) {" (send (js-dot el classList) add c)
" el.classList.add(c);" )
" });" )
" return id;" id)))
"}") cl))) )
) )
) )
; (format
; (js-code
; "function(id, el) {"
; " let cl = ~a;"
; " cl.forEach(function(c) {"
; " el.classList.add(c);"
; " });"
; " return id;"
; "}") cl)))
; )
; )
(define/contract (webview-remove-class! wv id-or-selector class) (define/contract (webview-remove-class! wv id-or-selector class)
(-> wv-win? (or/c symbol? string?) (or/c symbol? string? list?) (or/c hash? boolean?)) (-> wv-win? (or/c symbol? string?) (or/c symbol? string? list?) (or/c hash? boolean?))
(let ((sel (if (symbol? id-or-selector) (let ((sel (if (symbol? id-or-selector)
(format "#~a" id-or-selector) (format "#~a" id-or-selector)
id-or-selector)) id-or-selector))
(cl (mk-js-array class)) (cl (if (list? class) class (list class)))
) )
(webview-call-js wv (webview-call-js wv
(with-selector sel (with-selector sel
(format (λ (id el)
(js-code (let ((cl (inject cl)))
"function(id, el) {" (send cl forEach
" let cl = ~a;" (λ (c)
" cl.forEach(function(c) {" (send (js-dot el classList) remove c))))
" el.classList.remove(c);" id)))
" });"
" return id;"
"}") cl))
)
) )
) )
; (with-selector sel
; (format
;; (js-code
; "function(id, el) {"
; " let cl = ~a;"
; " cl.forEach(function(c) {"
; " el.classList.remove(c);"
; " });"
; " return id;"
; "}") cl))
; )
; )
; )
(define/contract (webview-set-style! wv selector style-entries) (define/contract (webview-set-style! wv selector style-entries)
(-> wv-win? (or/c symbol? string?) (or/c kv? list-of-kv?) (or/c hash? boolean?)) (-> wv-win? (or/c symbol? string?) (or/c kv? list-of-kv?) (or/c hash? boolean?))
(let ((sel (if (symbol? selector) (let ((sel (if (symbol? selector)
(format "#~a" selector) (format "#~a" selector)
selector)) selector))
(cl (mk-js-array (if (kv? style-entries) ;(cl (mk-js-array (if (kv? style-entries)
(list style-entries) ; (list style-entries)
style-entries))) ; style-entries)))
(cl (if (kv? style-entries)
(list style-entries)
style-entries))
) )
(webview-call-js wv (webview-call-js wv
(with-selector sel (with-selector sel
(format (λ (id el)
(js-code (let ((cl (inject cl)))
"function(id, el) {" (send cl forEach
" let cl = ~a;" (λ (st)
" cl.forEach(function(st) {" (set! (js-ref
" el.style[st[0]] = st[1];" (js-dot el style)
" });" (js-ref st 0))
" return id;" (js-ref st 1))))
"}") cl)) id)))
) )
) )
) )
; (format
; (js-code
; "function(id, el) {"
; " let cl = ~a;"
; " cl.forEach(function(st) {"
; " el.style[st[0]] = st[1];"
; " });"
; " return id;"
; "}") cl))
; )
; )
; )
(define/contract (webview-get-style wv selector styles) (define/contract (webview-get-style wv selector styles)
(-> wv-win? (or/c symbol? string?) (or/c symbol? list-of-symbol?) (or/c list? hash?)) (-> wv-win? (or/c symbol? string?) (or/c symbol? list-of-symbol?) (or/c list? hash?))
(let ((sel (if (symbol? selector) (let ((sel (if (symbol? selector)
(format "#~a" selector) (format "#~a" selector)
selector)) selector))
(cl (mk-js-array (if (symbol? styles) (cl (if (symbol? styles)
(list styles) (list styles)
styles))) styles))
;(cl (mk-js-array (if (symbol? styles)
; (list styles)
; styles)))
) )
(let ((r (webview-call-js wv (let ((r (webview-call-js wv
(with-selector sel (with-selector sel
(format (λ (id el)
(js-code (let ((cl (inject cl))
"function(id, el) {" (r (make-hash)))
" let cl = ~a;" (send cl forEach
" let r = {};" (λ (st)
" cl.forEach(function(st) {" (let ((stl (send window getComputedStyle el)))
" let stl = window.getComputedStyle(el);" (set! (js-ref r st) (js-ref stl st)))))
" r[st] = stl[st];" (make-hash (list
" });" (list 'id id)
" return { id: id, style: r };" (list 'style r))))))
"}") cl)) )
))) ))
; (format
; (js-code
; "function(id, el) {"
; " let cl = ~a;"
; " let r = {};"
; " cl.forEach(function(st) {"
; " let stl = window.getComputedStyle(el);"
; " r[st] = stl[st];"
; " });"
; " return { id: id, style: r };"
; "}") cl))
; )))
(if (eq? r #f) (if (eq? r #f)
#f #f
(let ((h (hash-ref r 'with-ids))) (let ((h (hash-ref r 'with-ids)))
(let ((l (map (λ (e) (cons (string->symbol (hash-ref e 'id)) (hash-ref e 'style))) h))) (let ((l (map (λ (e)
(cons
(string->symbol (hash-ref e 'id))
(hash-ref e 'style))) h)))
(if (symbol? selector) (if (symbol? selector)
(cdr (car l)) (cdr (car l))
l)))) l))))
@@ -976,25 +1068,35 @@
(let ((sel (if (symbol? selector) (let ((sel (if (symbol? selector)
(format "#~a" selector) (format "#~a" selector)
selector)) selector))
(cl (mk-js-array (if (symbol? style-entries) (cl (if (symbol? style-entries)
(list style-entries) (list style-entries)
style-entries))) style-entries))
) )
(webview-call-js wv (webview-call-js wv
(with-selector sel (with-selector sel
(format (λ (id el)
(js-code (let ((cl (inject cl)))
"function(id, el) {" (send cl forEach
" let cl = ~a;" (λ (st)
" cl.forEach(function(st) {" (set! (js-ref
" el.style[st] = '';" (js-dot el style)
" });" st) "")))
" return id;" id))))
"}") cl)
)
)
) )
) )
; (format
; (js-code
; "function(id, el) {"
; " let cl = ~a;"
; " cl.forEach(function(st) {"
; " el.style[st] = '';"
; " });"
; " return id;"
; "}") cl)
; )
; )
; )
; )
(define/contract (webview-set-attr! wv selector attr-entries) (define/contract (webview-set-attr! wv selector attr-entries)
(-> wv-win? (or/c symbol? string?) (-> wv-win? (or/c symbol? string?)
@@ -1013,29 +1115,44 @@
([rgba? v] (rgba->hex v)) ([rgba? v] (rgba->hex v))
(else (format "~a" v)))) (else (format "~a" v))))
)) ae*)) )) ae*))
(cl (mk-js-array ae**)) ;(cl (mk-js-array ae**))
(cl ae**)
) )
(display cl)
(webview-call-js wv (webview-call-js wv
(with-selector sel (with-selector sel
(format (λ (id el)
(js-code (let ((cl (inject cl)))
"function(id, el) {" (send cl forEach
" let cl = ~a;" (λ (av)
" cl.forEach(function(av) {" (send el setAttribute (js-ref av 0)
" el.setAttribute(av[0], av[1]);" (js-ref av 1))))
" });" id))))
" return id;"
"}") cl))
)
) )
) )
; (with-selector sel
; (format
; (js-code
; "function(id, el) {"
; " let cl = ~a;"
; " cl.forEach(function(av) {"
; " el.setAttribute(av[0], av[1]);"
; " });"
; " return id;"
; "}") cl))
; )
; )
; )
(define/contract (webview-attr wv id attr) (define/contract (webview-attr wv id attr)
(-> wv-win? symbol? (or/c symbol? string?) (or/c string? boolean?)) (-> wv-win? symbol? (or/c symbol? string?) (or/c string? boolean?))
(let ((v (webview-call-js wv (let ((v (webview-call-js wv
(with-id id el (with-id->el <- id el
-> (format "el.getAttribute('~a');" attr)) (send el getAttribute (eval attr))))))
))) ;(with-id id el
; -> (format "el.getAttribute('~a');" attr))
;)))
(if (eq? v 'null) (if (eq? v 'null)
#f #f
v) v)