From 786e20bf3a04effb68f8b8cbfa0bc37d22b8e3e9 Mon Sep 17 00:00:00 2001
From: Mike Nolan <tesses@tesses.net>
Date: Tue, 26 Mar 2024 12:45:36 -0500
Subject: [PATCH] Add query support

---
 Example/Example.csproj | 10 +++++-----
 Example/Program.cs     | 14 +++++++++++++-
 Ooui/Client.js         |  2 +-
 Ooui/UI.cs             |  2 ++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Example/Example.csproj b/Example/Example.csproj
index b3c5cd6..b2841e6 100644
--- a/Example/Example.csproj
+++ b/Example/Example.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\Ooui\Ooui.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\Ooui\Ooui.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Tesses.WebServer.EasyServer" Version="1.0.1" />
+  <ItemGroup>
+    <PackageReference Include="Tesses.WebServer.EasyServer" Version="1.0.1" />
   </ItemGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Example/Program.cs b/Example/Program.cs
index d005c66..18adf1d 100644
--- a/Example/Program.cs
+++ b/Example/Program.cs
@@ -9,5 +9,17 @@ btn.Click += (sender,e)=>{
     btn.Text = $"Clicked {++i} time(s)";
 };
 ui.Publish("/",btn);
-
+ui.Publish("/query",(ctx)=>{
+    Ooui.List list=new List();
+    foreach(var item in ctx.QueryParams)
+    {
+        foreach(var v in item.Value)
+        {
+            Ooui.ListItem listItem=new ListItem();
+            listItem.Text = $"{item.Key}: {v}";
+            list.AppendChild(listItem);
+        }
+    }
+    return list;
+});
 ui.StartServer(45252);
\ No newline at end of file
diff --git a/Ooui/Client.js b/Ooui/Client.js
index 1045e5e..d614aea 100644
--- a/Ooui/Client.js
+++ b/Ooui/Client.js
@@ -125,7 +125,7 @@ function connectWebSocket() {
     saveSize (initialSize);
 
     var wsArgs = (rootElementPath.indexOf("?") >= 0 ? "&" : "?") +
-        "w=" + initialSize.width + "&h=" + initialSize.height;
+        "w=" + initialSize.width + "&h=" + initialSize.height + window.location.search.replace('?','&');
 
     var proto = "ws";
     if (location.protocol == "https:") {
diff --git a/Ooui/UI.cs b/Ooui/UI.cs
index 3071a18..56039a2 100644
--- a/Ooui/UI.cs
+++ b/Ooui/UI.cs
@@ -489,6 +489,7 @@ namespace Ooui
             bool disposeElementWhenDone = true;
             try {
                 var context = UIContext.ForListenerContext (listenerContext, variables);
+                context.QueryParams = listenerContext.QueryParams;
                 element = elementHandler.GetElement (context);
                 disposeElementWhenDone = elementHandler.DisposeElementWhenDone;
 
@@ -609,6 +610,7 @@ namespace Ooui
 
     public class UIContext
     {
+        public Dictionary<string,List<string>> QueryParams {get;set;}=new Dictionary<string, List<string>>();
         readonly Dictionary<string, string> variables = new Dictionary<string, string> ();
 
         public string RequestUrl { get; }