add scopeSelf for slots

nim-lang-cn · Dec 20, 2023 · d0252c5 · d0252c5
1 parent cd7f516
commit d0252c5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/happyx/private/macro_utils.nim b/src/happyx/private/macro_utils.nim
@@ -194,12 +194,12 @@ proc useComponent*(statement: NimNode, inCycle, inComponent: bool,
         newDotExpr(ident(componentName), ident"slot"),
         newLambda(
           newStmtList(
-            newVarStmt(ident"self", newDotExpr(ident"self", name)),
+            newVarStmt(ident"scopeSelf", newDotExpr(ident"scopeSelf", name)),
             buildHtmlProcedure(
               ident"div", componentSlot, inComponent, ident(componentName), inCycle, cycleTmpVar, compTmpVar, cycleVars
             ).add(newNimNode(nnkExprEqExpr).add(ident"onlyChildren", newLit(true))),
           ),
-          @[ident"TagRef", newIdentDefs(ident"self", ident"BaseComponent")]
+          @[ident"TagRef", newIdentDefs(ident"scopeSelf", ident"BaseComponent")]
         )
       ),
       if returnTagRef:

diff --git a/src/happyx/spa/renderer.nim b/src/happyx/spa/renderer.nim
@@ -70,7 +70,7 @@ when defined(js):
     BaseComponentObj* {.inheritable.} = object
       uniqCompId*: string
       isCreated*: bool
-      slot*: proc(self: BaseComponent): TagRef
+      slot*: proc(scopeSelf: BaseComponent): TagRef
       created*: ComponentEventHandler  ## Calls before first rendering
       exited*: ComponentEventHandler  ## Calls after last rendering
       rendered*: ComponentEventHandler  ## Calls after every rendering
@@ -91,7 +91,7 @@ else:
     BaseComponentObj* {.inheritable.} = object
       uniqCompId*: string
       isCreated*: bool
-      slot*: proc(self: BaseComponent): TagRef
+      slot*: proc(scopeSelf: BaseComponent): TagRef
       created*: ComponentEventHandler  ## Calls before first rendering
       exited*: ComponentEventHandler  ## Calls after last rendering
       rendered*: ComponentEventHandler  ## Calls after every rendering

diff --git a/tests/index11.html b/tests/index11.html
@@ -5,8 +5,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <div>
-    </div>
     <script src="testjs11.js"></script>
   </body>
 </html>
diff --git a/tests/testjs11.nim b/tests/testjs11.nim
@@ -60,7 +60,7 @@ var compWithoutArgs = use:
 
 appRoutes "app":
   "/":
-    tScript(type="text/javascript", `defer`=""): """
+    tScript(type="text/javascript", "defer"=""): """
       console.log("Hello from script");
       """
     component compWithoutArgs

diff --git a/tests/testjs4.nim b/tests/testjs4.nim
@@ -7,16 +7,18 @@ var
 
 app.routes:
   "/":
-    if darkMode:
-      tDiv(class="bg-gray-900 text-white px-8 py-24"):
-        "This page was visited"
-    else:
-      tDiv(class="bg-gray-200 text-black px-8 py-24"):
-        "This page was visited"
-    tButton:
-      "Toggle dark mode"
-      @click:
-        darkMode.val = not darkMode
-        echo darkMode
+    tDiv:
+      if darkMode:
+        tDiv(class="bg-gray-900 text-white px-8 py-24"):
+          "This page was visited"
+      else:
+        tDiv(class="bg-gray-200 text-black px-8 py-24"):
+          "This page was visited"
+      tButton:
+        "Toggle dark mode"
+        @click:
+          darkMode.val = not darkMode
+          echo darkMode
+          application.router()
 
 app.start()
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ @@
       </head>
       <body>
         <div id="app"></div>
-        <div>
-        </div>
         <script src="testjs11.js"></script>
       </body>
     </html>