Merge branch '44-cannot-use-css-custom-properties' into v1

back2dos · back2dos · commit bab49448b80b · 2025-12-17T09:48:18.000+01:00
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.3.6",
+  "version": "4.3.7",
   "resolveLibs": "scoped"
 }
diff --git a/haxe_libraries/coconut.ui.hxml b/haxe_libraries/coconut.ui.hxml
@@ -1,6 +1,6 @@
-# @install: lix --silent download "gh://github.com/MVCoconut/coconut.ui#08d710a4a62cc2fa744d16d8ff6b4cf7a08de230" into coconut.ui/0.12.0/github/08d710a4a62cc2fa744d16d8ff6b4cf7a08de230
+# @install: lix --silent download "gh://github.com/MVCoconut/coconut.ui#98a1c9d1a07ab54d9d0636f84a12c1969c345e2a" into coconut.ui/0.12.0/github/98a1c9d1a07ab54d9d0636f84a12c1969c345e2a
 -lib coconut.data
 -lib tink_anon
 -lib tink_hxx
--cp ${HAXE_LIBCACHE}/coconut.ui/0.12.0/github/08d710a4a62cc2fa744d16d8ff6b4cf7a08de230/src
+-cp ${HAXE_LIBCACHE}/coconut.ui/0.12.0/github/98a1c9d1a07ab54d9d0636f84a12c1969c345e2a/src
 -D coconut.ui=0.12.0
diff --git a/haxe_libraries/js-virtual-dom.hxml b/haxe_libraries/js-virtual-dom.hxml
diff --git a/haxe_libraries/tink_csss.hxml b/haxe_libraries/tink_csss.hxml
@@ -1,4 +1,4 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_csss#29ffeb6880a7bd8e6294b6bee1fd3150f5f1c72a" into tink_csss/0.2.3/github/29ffeb6880a7bd8e6294b6bee1fd3150f5f1c72a
+# @install: lix --silent download "gh://github.com/haxetink/tink_csss#92e741a48e378a6b2828e5c37dd6dab4a4678374" into tink_csss/0.2.3/github/92e741a48e378a6b2828e5c37dd6dab4a4678374
 -lib tink_parse
--cp ${HAXE_LIBCACHE}/tink_csss/0.2.3/github/29ffeb6880a7bd8e6294b6bee1fd3150f5f1c72a/src
+-cp ${HAXE_LIBCACHE}/tink_csss/0.2.3/github/92e741a48e378a6b2828e5c37dd6dab4a4678374/src
 -D tink_csss=0.2.3
diff --git a/haxe_libraries/tink_domspec.hxml b/haxe_libraries/tink_domspec.hxml
@@ -1,5 +1,5 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_domspec#d95c55518e3859356d42ec6f76505a5fe80397dc" into tink_domspec/0.3.1/github/d95c55518e3859356d42ec6f76505a5fe80397dc
+# @install: lix --silent download "gh://github.com/haxetink/tink_domspec#cfc8efdea3952e5fe3d5c75d9e4fefdd47890b5d" into tink_domspec/0.5.2/github/cfc8efdea3952e5fe3d5c75d9e4fefdd47890b5d
 -lib tink_macro
 -lib tink_svgspec
--cp ${HAXE_LIBCACHE}/tink_domspec/0.3.1/github/d95c55518e3859356d42ec6f76505a5fe80397dc/src
--D tink_domspec=0.3.1
+-cp ${HAXE_LIBCACHE}/tink_domspec/0.5.2/github/cfc8efdea3952e5fe3d5c75d9e4fefdd47890b5d/src
+-D tink_domspec=0.5.2
diff --git a/haxe_libraries/tink_hxx.hxml b/haxe_libraries/tink_hxx.hxml
@@ -1,6 +1,6 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_hxx#07cada55ff0b550b47f6e1ffb888be62d1e969c4" into tink_hxx/0.25.0/github/07cada55ff0b550b47f6e1ffb888be62d1e969c4
+# @install: lix --silent download "gh://github.com/haxetink/tink_hxx#7957298a38601751e13615b428947817dc10a213" into tink_hxx/0.25.0/github/7957298a38601751e13615b428947817dc10a213
 -lib html-entities
 -lib tink_anon
 -lib tink_parse
--cp ${HAXE_LIBCACHE}/tink_hxx/0.25.0/github/07cada55ff0b550b47f6e1ffb888be62d1e969c4/src
+-cp ${HAXE_LIBCACHE}/tink_hxx/0.25.0/github/7957298a38601751e13615b428947817dc10a213/src
 -D tink_hxx=0.25.0
diff --git a/haxe_libraries/tink_macro.hxml b/haxe_libraries/tink_macro.hxml
@@ -1,4 +1,4 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_macro#40d7c2fbde362ed8273698626a31cfe35c001101" into tink_macro/0.23.0/github/40d7c2fbde362ed8273698626a31cfe35c001101
+# @install: lix --silent download "gh://github.com/haxetink/tink_macro#08249260f9f6d5c015dd1434ee68d199e960c0d4" into tink_macro/1.0.4/github/08249260f9f6d5c015dd1434ee68d199e960c0d4
 -lib tink_core
--cp ${HAXE_LIBCACHE}/tink_macro/0.23.0/github/40d7c2fbde362ed8273698626a31cfe35c001101/src
--D tink_macro=0.23.0
+-cp ${HAXE_LIBCACHE}/tink_macro/1.0.4/github/08249260f9f6d5c015dd1434ee68d199e960c0d4/src
+-D tink_macro=1.0.4
diff --git a/haxe_libraries/travix.hxml b/haxe_libraries/travix.hxml
@@ -1,7 +1,7 @@
-# @install: lix --silent download "gh://github.com/back2dos/travix#63b230b854c6f02cf2ac04bb758c09751f28b8e8" into travix/0.15.0/github/63b230b854c6f02cf2ac04bb758c09751f28b8e8
-# @post-install: cd ${HAXE_LIBCACHE}/travix/0.15.0/github/63b230b854c6f02cf2ac04bb758c09751f28b8e8 && haxe -cp src --run travix.PostDownload
-# @run: haxelib run-dir travix ${HAXE_LIBCACHE}/travix/0.15.0/github/63b230b854c6f02cf2ac04bb758c09751f28b8e8
+# @install: lix --silent download "haxelib:/travix#0.15.3" into travix/0.15.3/haxelib
+# @post-install: cd ${HAXE_LIBCACHE}/travix/0.15.3/haxelib && haxe -cp src --run travix.PostDownload
+# @run: haxelib run-dir travix "${HAXE_LIBCACHE}/travix/0.15.3/haxelib"
 -lib tink_cli
--cp ${HAXE_LIBCACHE}/travix/0.15.0/github/63b230b854c6f02cf2ac04bb758c09751f28b8e8/src
--D travix=0.15.0
+-cp ${HAXE_LIBCACHE}/travix/0.15.3/haxelib/src
+-D travix=0.15.3
 --macro travix.Macro.setup()
diff --git a/haxe_libraries/xDOM.hxml b/haxe_libraries/xDOM.hxml
@@ -1,5 +1,5 @@
--D xDOM=0.2.1
-# @install: lix --silent download "haxelib:/xDOM#0.2.1" into xDOM/0.2.1/haxelib
+# @install: lix --silent download "gh://github.com/back2dos/xdom#744a27e4fa6008483c766e1b855f189f3f8ab665" into xDOM/0.2.2/github/744a27e4fa6008483c766e1b855f189f3f8ab665
 -lib tink_csss
 -lib tink_domspec
--cp ${HAXE_LIBCACHE}/xDOM/0.2.1/haxelib/src
+-cp ${HAXE_LIBCACHE}/xDOM/0.2.2/github/744a27e4fa6008483c766e1b855f189f3f8ab665/src
+-D xDOM=0.2.2
diff --git a/haxelib.json b/haxelib.json
@@ -9,8 +9,8 @@
 	"contributors": [
 		"back2dos"
 	],
-	"version": "0.10.0",
-	"releasenote": "Adjust to latest coconut.diffing and expose hydration.",
+	"version": "0.10.1",
+	"releasenote": "Fix raw tag.",
 	"tags": [
 		"ui",
 		"js",
diff --git a/src/coconut/vdom/Html.hx b/src/coconut/vdom/Html.hx
@@ -65,13 +65,13 @@ private class HtmlFragment extends Factory<HtmlFragmentAttr, Node, Element> {
 
   public function create(a:HtmlFragmentAttr):Element {
     var ret = document.createElement(tag);
-    ret.className = a.className;
+    ret.className = a.className != null ? a.className : "";
     ret.innerHTML = a.content;
     return ret;
   }
 
-  public function update(w:Element, old:HtmlFragmentAttr, nu:HtmlFragmentAttr) {
-    w.className = nu.className;
+  public function update(w:Element, nu:HtmlFragmentAttr, old:HtmlFragmentAttr) {
+    w.className = nu.className != null ? nu.className : "";
     if (old.content != nu.content)
       w.innerHTML = nu.content;
   }
@@ -194,8 +194,8 @@ private class Elt<Attr:{}> extends Factory<Attr, Node, Element> {
     ELEMENTS.update(target, nu, old);
 
   static final ELEMENTS = new Updater<Element, {}>(
-    // (target, field) -> '$target.removeAttribute("$field")',
-    (target, field) -> '$target.$field = null',
+    (target, field) -> '$target.removeAttribute("$field")',
+    (target, field, value) -> '$target.$field = $value',
     {
       className: function (t:Element, _, v:String, _) if (!(cast v)) t.removeAttribute('class') else t.className = v,
       style: function (t:Element, _, nu, old) updateStyle(t.style, nu, old),
@@ -231,11 +231,12 @@ private class Elt<Attr:{}> extends Factory<Attr, Node, Element> {
     }
   }
 
-  static final STYLES = new Updater<CSSStyleDeclaration, tink.domspec.Style>(
-    (target, field) -> '$target.$field = null',
-    null,
-    (_, _) -> null
-  );
+	static final STYLES = new Updater<CSSStyleDeclaration, tink.domspec.Style>(
+		(target, field) -> if (field.contains('-')) '$target.removeProperty("$field")' else '$target.$field = null',
+		(target, field, value) -> if (field.contains('-')) 'target.setProperty("$field", $value)' else '$target.$field = $value',
+		null,
+		(_, _) -> null
+	);
 
   static function updateStyle(target:CSSStyleDeclaration, newVal:tink.domspec.Style, ?oldVal:tink.domspec.Style)
     STYLES.update(target, newVal, oldVal);
@@ -246,117 +247,127 @@ private class Elt<Attr:{}> extends Factory<Attr, Node, Element> {
 private typedef Rules<Target> = haxe.DynamicAccess<(target:Target, field:String, nu:Dynamic, old:Null<Dynamic>)->Void>;
 
 private class Updater<Target:{}, Value:{}> {//TODO: extract to coconut.diffing
-  final unset:(target:String, field:String)->String;
-  final rules:Rules<Target>;
-  final getRule:(rules:Rules<Target>, field:String)->Null<String>;
-  public function new(unset, rules, getRule) {
-    this.unset = unset;
-    this.rules = rules;
-    this.getRule = getRule;
-  }
-
-  public function update(target:Target, newVal:Value, ?oldVal:Value) {
-    if (newVal != null)
-      getApplicator(newVal)(target, newVal, oldVal);
-
-    if (oldVal != null)
-      getDeleter(oldVal, newVal)(target);
-  }
-
-  final applicators = new js.lib.Map<String, (target:Target, nu:Value, ?old:Value)->Void>();
-  function getApplicator(obj:{}) {
-    var props = getFields(obj);
-    var key = props.toString();
-    var apply = applicators.get(key);
-
-    if (apply == null) {
-      var source = 'if (old) {';
-
-      function add(prefix) {
-        for (p in props)
-          source += '\n  ${prefix(p)}' + switch getRule(rules, p) {
-            case null: 'if (nu.$p == null) { ${unset('target', p)} } else target.$p = nu.$p;';
-            case rule: 'this.$rule(target, "$p", nu.$p, old && old.$p);';
-          }
-      }
-
-      add(p -> 'if (nu.$p !== old.$p) ');
-
-      source += '\n} else {';
-
-      add(p -> '');
-
-      source += '\n}';
-      apply = cast new js.lib.Function('target', 'nu', 'old', source).bind(rules);
-      applicators.set(key, apply);
-    }
-
-    return apply;
-  }
-
-  function noop(target:Target) {}
-  final deleters = new js.lib.Map<String, (target:Target)->Void>();
-  function getDeleter(old:{}, ?nu:{}) {
-
-    function forFields(fields:haxe.ds.ReadOnlyArray<String>) {
-      var key = fields.toString();
-      var ret = deleters.get(key);
-      if (ret == null) {
-        var body = '';
-        for (f in fields)
-          body += '\n' + switch getRule(rules, f) {
+	final unset:(target:String, field:String)->String;
+	final set:(target:String, field:String, value:String)->String;
+	final rules:Rules<Target>;
+	final getRule:(rules:Rules<Target>, field:String)->Null<String>;
+	public function new(unset, set, rules, getRule) {
+		this.unset = unset;
+		this.set = set;
+		this.rules = rules;
+		this.getRule = getRule;
+	}
+
+	static public function get(target, property:String)
+		return switch property.indexOf('-') {
+			case -1: '$target.$property';
+			default: '$target["$property"]';
+		}
+
+	public function update(target:Target, newVal:Value, ?oldVal:Value) {
+		if (newVal != null)
+			getApplicator(newVal)(target, newVal, oldVal);
+
+		if (oldVal != null)
+			getDeleter(oldVal, newVal)(target);
+	}
+
+	final applicators = new js.lib.Map<String, (target:Target, nu:Value, ?old:Value)->Void>();
+	function getApplicator(obj:{}) {
+		var props = getFields(obj);
+		var key = props.toString();
+		var apply = applicators.get(key);
+
+		if (apply == null) {
+			var source = 'if (old) {';
+
+			function add(prefix) {
+				for (p in props)
+					source += '\n  ${prefix(p)}' + switch getRule(rules, p) {
+						case null:
+							var nu = get('nu', p);
+							'if ($nu == null) { ${unset('target', p)} } else ${set('target', p, nu)}';
+						case rule: 'this.$rule(target, "$p", ${get('nu', p)}, old && ${get('old', p)});';
+					}
+			}
+
+			add(p -> 'if (${get('nu', p)} !== ${get('old', p)}) ');
+
+			source += '\n} else {';
+
+			add(p -> '');
+
+			source += '\n}';
+			apply = cast new js.lib.Function('target', 'nu', 'old', source).bind(rules);
+			applicators.set(key, apply);
+		}
+
+		return apply;
+	}
+
+	function noop(target:Target) {}
+	final deleters = new js.lib.Map<String, (target:Target)->Void>();
+	function getDeleter(old:{}, ?nu:{}) {
+
+		function forFields(fields:haxe.ds.ReadOnlyArray<String>) {
+			var key = fields.toString();
+			var ret = deleters.get(key);
+			if (ret == null) {
+				var body = '';
+				for (f in fields)
+					body += '\n' + switch getRule(rules, f) {
             case null: unset('target', f);
             case rule: 'this.$rule(target, "$f", null);';
           }
         deleters.set(key, ret = cast new js.lib.Function('target', body).bind(rules));
-      }
-      return ret;
-    }
-
-    return
-      if (nu == null)
-        forFields(getFields(old));
-      else {
-        var oldFields = getFields(old),
-            nuFields = getFields(nu);
-
-        var nuKey = nuFields.toString(),
-            oldKey = oldFields.toString();
-
-        if (nuKey == oldKey) noop;
-        else {
-          var key = '${nuKey}:${oldKey}';
-          var ret = deleters.get(key);
-
-          if (ret == null)
-            deleters.set(key, ret = forFields([for (f in oldFields) if (!nuFields.contains(f)) f]));
-
-          ret;
-        }
-      }
-  }
-
-  static function getFields(o:{}) {
-    var ret = js.lib.Object.getOwnPropertyNames(o);
-    switch ret {
-      case [], [_]:
-      case [a, b]:
-        if (a > b) {
-          ret[0] = b;
-          ret[1] = a;
-        }
-      default:
-        (cast ret).sort();
-    }
-    return ret;
-    // TODO: check the caching attempt below again. Thus far profiling suggested this causes a slow down.
-    // var ret:haxe.ds.ReadOnlyArray<String> = untyped o._coco_keys;
-    // if (ret == null) {
-    //   ret = untyped Object.getOwnPropertyNames(o).sort();
-    //   js.lib.Object.defineProperty(o, '_coco_keys', { value: ret, enumerable: false });
-    //   var joined = ret.toString();
-    //   untyped ret.toString = function () return joined;
-    // }
-    // return ret;
-  }
+			}
+			return ret;
+		}
+
+		return
+			if (nu == null)
+				forFields(getFields(old));
+			else {
+				var oldFields = getFields(old),
+						nuFields = getFields(nu);
+
+				var nuKey = nuFields.toString(),
+						oldKey = oldFields.toString();
+
+				if (nuKey == oldKey) noop;
+				else {
+					var key = '${nuKey}:${oldKey}';
+					var ret = deleters.get(key);
+
+					if (ret == null)
+						deleters.set(key, ret = forFields([for (f in oldFields) if (!nuFields.contains(f)) f]));
+
+					ret;
+				}
+			}
+	}
+
+	static function getFields(o:{}) {
+		var ret = js.lib.Object.getOwnPropertyNames(o);
+		switch ret {
+			case [], [_]:
+			case [a, b]:
+				if (a > b) {
+					ret[0] = b;
+					ret[1] = a;
+				}
+			default:
+				(cast ret).sort();
+		}
+		return ret;
+		// TODO: check the caching attempt below again. Thus far profiling suggested this causes a slow down.
+		// var ret:haxe.ds.ReadOnlyArray<String> = untyped o._coco_keys;
+		// if (ret == null) {
+		//   ret = untyped Object.getOwnPropertyNames(o).sort();
+		//   js.lib.Object.defineProperty(o, '_coco_keys', { value: ret, enumerable: false });
+		//   var joined = ret.toString();
+		//   untyped ret.toString = function () return joined;
+		// }
+		// return ret;
+	}
 }
diff --git a/tests/Issue44.hx b/tests/Issue44.hx
diff --git a/tests/RunTests.hx b/tests/RunTests.hx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "version": "4.3.6",`
	`2`	`+ "version": "4.3.7",`
`3`	`3`	`"resolveLibs": "scoped"`
`4`	`4`	`}`