working on v21 syntax #296

fix bind/intersect lazy reactiveExpression gen
starfederation · Dec 3, 2024 · 2ea15e4 · 2ea15e4
1 parent cec2c37
commit 2ea15e4
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/bundles/datastar.js b/bundles/datastar.js
diff --git a/bundles/datastar.js.map b/bundles/datastar.js.map
diff --git a/code/dotnet/sdk/src/Consts.fs b/code/dotnet/sdk/src/Consts.fs
diff --git a/code/go/site/routes_examples_disable_button.go b/code/go/site/routes_examples_disable_button.go
@@ -14,12 +14,10 @@ func setupExamplesDisableButton(examplesRouter chi.Router) error {
 		sse := datastar.NewSSE(w, r)
 
 		fragment := fmt.Sprintf(`<div>The time is %s</div>`, time.Now().UTC().Format(time.RFC3339))
-		sse.MergeFragments(fragment, datastar.WithMergeAppend())
+		sse.MergeFragments(fragment, datastar.WithSelectorID("container"), datastar.WithMergeAppend())
 
 		time.Sleep(1 * time.Second)
-		sse.MarshalAndMergeSignals(map[string]any{
-			"shouldDisable": false,
-		})
+		sse.MarshalAndMergeSignals(map[string]any{"shouldDisable": false})
 	})
 
 	return nil

diff --git a/code/go/site/routes_home.templ b/code/go/site/routes_home.templ
@@ -318,7 +318,7 @@ templ TodoRow(mode TodoViewMode, todo *Todo, i int, isEditing bool) {
 				data-on-click={ datastar.DeleteSSE("/api/todos/%d", i) }
 				data-testid={ fmt.Sprintf("delete_todo%d", i) }
 				data-indicator={ fetchingSignalName }
-				data-disabled={ "".value + fetchingSignalName }
+				data-disabled={ fetchingSignalName + ".value" }
 			>
 				@icon("material-symbols:close")
 			</button>

diff --git a/code/go/site/static/md/examples/disable_button.md b/code/go/site/static/md/examples/disable_button.md
@@ -20,7 +20,7 @@
 <div id="container" data-signals="{shouldDisable:false}">
   <button
     id="target"
-    data-on-click="shouldDisable.value = true;sse('/examples/disable_button/data')"
+    data-on-click="shouldDisable.value=true ; sse('/examples/disable_button/data')"
     data-bind-disabled="shouldDisable.value"
   >Click Me</button>
 </div>

diff --git a/code/php/sdk/src/Consts.php b/code/php/sdk/src/Consts.php
@@ -11,8 +11,8 @@ class Consts
 {
     public const DATASTAR_KEY = 'datastar';
     public const VERSION = '0.20.1';
-    public const VERSION_CLIENT_BYTE_SIZE = 32928;
-    public const VERSION_CLIENT_BYTE_SIZE_GZIP = 12036;
+    public const VERSION_CLIENT_BYTE_SIZE = 32940;
+    public const VERSION_CLIENT_BYTE_SIZE_GZIP = 12046;
 
     // The default duration for settling during merges. Allows for CSS transitions to complete.
     public const DEFAULT_SETTLE_DURATION = 300;

diff --git a/library/src/plugins/official/browser/attributes/intersects.ts b/library/src/plugins/official/browser/attributes/intersects.ts
@@ -14,12 +14,13 @@ export const Intersects: AttributePlugin = {
     type: PluginType.Attribute,
     name: "intersects",
     mods: new Set([ONCE, HALF, FULL]),
-    onLoad: ({ el, key, rawKey, mods, genRX: rx }) => {
+    onLoad: ({ el, key, rawKey, mods, genRX }) => {
         if (key.length) throw new Error("No key allowed");
         const options = { threshold: 0 };
         if (mods.has(FULL)) options.threshold = 1;
         else if (mods.has(HALF)) options.threshold = 0.5;
 
+        const rx = genRX();
         const observer = new IntersectionObserver((entries) => {
             entries.forEach((entry) => {
                 if (entry.isIntersecting) {

diff --git a/library/src/plugins/official/dom/attributes/bind.ts b/library/src/plugins/official/dom/attributes/bind.ts
@@ -14,7 +14,7 @@ export const Bind: AttributePlugin = {
     type: PluginType.Attribute,
     name: "bind",
     onLoad: (ctx) => {
-        const { el, value, genRX: rx, key, signals, effect } = ctx;
+        const { el, value, genRX, key, signals, effect } = ctx;
 
         let setFromSignal = () => {};
         let fromElementToSignal = () => {};
@@ -191,6 +191,7 @@ export const Bind: AttributePlugin = {
         } else {
             // tied to an attribute
             const kebabKey = kebabize(key);
+            const rx = genRX();
             setFromSignal = () => {
                 const value = rx();
                 let v: string;

diff --git a/sdk/go/consts.go b/sdk/go/consts.go