From 8ea58bef2ce3f66dcf32c12713569d3dcb70f06d Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Sat, 27 Apr 2024 14:29:48 +1000
Subject: [PATCH] Support window as second parameter

---
 v3/examples/binding/GreetService.go              |  5 +++++
 .../binding/assets/bindings/main/GreetService.js | 10 ++++++++++
 v3/examples/binding/assets/index.html            | 16 +++++++++-------
 v3/pkg/application/messageprocessor_call.go      | 12 ++++++------
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/v3/examples/binding/GreetService.go b/v3/examples/binding/GreetService.go
index 5db04472..121004b6 100644
--- a/v3/examples/binding/GreetService.go
+++ b/v3/examples/binding/GreetService.go
@@ -19,3 +19,8 @@ func (*GreetService) GreetWithCtx(ctx context.Context, name string) string {
 	win := ctx.Value("window").(application.Window)
 	return "[ctx] Hello " + name + " on " + win.Name()
 }
+
+// GreetWithCtx greets a person
+func (*GreetService) GreetWithBoth(_ context.Context, win application.Window, name string) string {
+	return "[ctx+win] Hello " + name + " on " + win.Name()
+}
diff --git a/v3/examples/binding/assets/bindings/main/GreetService.js b/v3/examples/binding/assets/bindings/main/GreetService.js
index ccf066e1..80f826c7 100644
--- a/v3/examples/binding/assets/bindings/main/GreetService.js
+++ b/v3/examples/binding/assets/bindings/main/GreetService.js
@@ -26,3 +26,13 @@ export async function Greet(name) {
 export async function GreetWithCtx(name) {
 	return Call.ByName("main.GreetService.GreetWithCtx", ...Array.prototype.slice.call(arguments, 0));
 }
+
+/**
+ * GreetPerson greets a person
+ * @function GreetWithBoth
+ * @param name {string}
+ * @returns {Promise<string>}
+ **/
+export async function GreetWithBoth(name) {
+	return Call.ByName("main.GreetService.GreetWithBoth", ...Array.prototype.slice.call(arguments, 0));
+}
diff --git a/v3/examples/binding/assets/index.html b/v3/examples/binding/assets/index.html
index b76ba49f..34eacc36 100644
--- a/v3/examples/binding/assets/index.html
+++ b/v3/examples/binding/assets/index.html
@@ -83,17 +83,19 @@
 <script type="module">
     import * as GreetService from "./bindings/main/GreetService.js";
 
-    let useCtx = false;
+    let state = 0;
     async function greet() {
-        if( useCtx ) {
-            document.getElementById("result").innerHTML =
-                await GreetService.GreetWithCtx(document.getElementById("name").value);
-            useCtx = false;
-        } else {
+        if(state % 3 === 0) {
             document.getElementById("result").innerHTML =
                 await GreetService.Greet(document.getElementById("name").value);
-            useCtx = true;
+        } else if(state % 3 === 1) {
+            document.getElementById("result").innerHTML =
+                await GreetService.GreetWithCtx(document.getElementById("name").value);
+        } else {
+            document.getElementById("result").innerHTML =
+                await GreetService.GreetWithBoth(document.getElementById("name").value);
         }
+        state++;
     }
 
     document.getElementById("greet-btn").onclick = greet;
diff --git a/v3/pkg/application/messageprocessor_call.go b/v3/pkg/application/messageprocessor_call.go
index 006ea270..a40a23fd 100644
--- a/v3/pkg/application/messageprocessor_call.go
+++ b/v3/pkg/application/messageprocessor_call.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"reflect"
 )
 
 const (
@@ -105,12 +106,11 @@ func (m *MessageProcessor) processCallMethod(method int, rw http.ResponseWriter,
 				m.l.Unlock()
 			}()
 
-			// Check if the first bound method parameter is a Window interface
-			if len(boundMethod.Inputs) > 0 {
-				if boundMethod.Inputs[0].ReflectType.String() == "application.Window" {
-					// Prepend the options.Args with the current window
-					options.Args = append([]interface{}{window}, options.Args...)
-				}
+			// Check if the first or second bound method parameter is a Window interface
+			if len(boundMethod.Inputs) > 1 && (boundMethod.Inputs[0].ReflectType == reflect.TypeFor[Window]() ||
+				boundMethod.Inputs[1].ReflectType == reflect.TypeFor[Window]()) {
+				// Prepend the options.Args with the current window
+				options.Args = append([]interface{}{window}, options.Args...)
 			}
 			result, err := boundMethod.Call(ctx, options.Args)
 			if err != nil {