Merge pull request #155 from armanbilge/pr/i132

Add `HtmlTag#withSelf`, restore debounce example
armanbilge · Jan 22, 2023 · 873ede1 · 873ede1
2 parents e88ef0d + 577b787
commit 873ede1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/calico/src/main/scala/calico/html/HtmlTag.scala b/calico/src/main/scala/calico/html/HtmlTag.scala
@@ -29,7 +29,7 @@ final class HtmlTag[F[_], E] private[calico] (name: String, void: Boolean)(using
   def apply[M](modifier: M)(using M: Modifier[F, E, M]): Resource[F, E] =
     build.toResource.flatTap(M.modify(modifier, _))
 
-  def apply[M](mkModifier: E => M)(using M: Modifier[F, E, M]): Resource[F, E] =
+  def withSelf[M](mkModifier: E => M)(using M: Modifier[F, E, M]): Resource[F, E] =
     build.toResource.flatTap(e => M.modify(mkModifier(e), e))
 
   def apply[M <: Tuple](modifiers: M)(
@@ -38,7 +38,7 @@ final class HtmlTag[F[_], E] private[calico] (name: String, void: Boolean)(using
       [a] => (r: Resource[F, E], m: Modifier[F, E, a], a: a) => r.flatTap(m.modify(a, _))
     }
 
-  def apply[M <: Tuple](mkModifiers: E => M)(
+  def withSelf[M <: Tuple](mkModifiers: E => M)(
       using inst: K0.ProductInstances[Modifier[F, E, _], M]): Resource[F, E] =
     build.toResource.flatTap { e =>
       inst.foldLeft(mkModifiers(e))(Resource.pure(e)) {

diff --git a/docs/counter.md b/docs/counter.md
@@ -20,7 +20,7 @@ def Counter(label: String, initialStep: Int) =
       div(
         p(
           "Step: ",
-          select { self =>
+          select.withSelf { self =>
             (
               allowedSteps.map(step => option(value := step.toString, step.toString)),
               value <-- step.map(_.toString),

diff --git a/docs/hello-world.md b/docs/hello-world.md
@@ -13,7 +13,7 @@ import fs2.concurrent.*
 val app = SignallingRef[IO].of("world").toResource.flatMap { name =>
   div(
     label("Your name: "),
-    input { self =>
+    input.withSelf { self =>
       (
         placeholder := "Enter your name here",
         // here, input events are run through the given Pipe

diff --git a/docs/index.md b/docs/index.md
@@ -70,7 +70,7 @@ import fs2.concurrent.*
 val component = SignallingRef[IO].of("world").toResource.flatMap { name =>
   div(
     label("Your name: "),
-    input { self =>
+    input.withSelf { self =>
       (
         placeholder := "Enter your name here",
         // here, input events are run through the given Pipe

diff --git a/docs/time.md b/docs/time.md
@@ -64,7 +64,7 @@ app.renderInto(node.asInstanceOf[fs2.dom.Node[IO]]).allocated.unsafeRunAndForget
 
 ## Debounce
 
-```scala
+```scala mdoc:js
 import calico.*
 import calico.html.io.{*, given}
 import calico.syntax.*
@@ -89,7 +89,7 @@ val app = Channel.unbounded[IO, String].toResource.flatMap { emailCh =>
     div(
       span(
         label("Your email: "),
-        input { self =>
+        input.withSelf { self =>
           onInput --> (_.evalMap(_ => self.value.get).through(emailCh.sendAll))
         }
       ),

diff --git a/todo-mvc/src/main/scala/todomvc/TodoMvc.scala b/todo-mvc/src/main/scala/todomvc/TodoMvc.scala
@@ -70,7 +70,7 @@ object TodoMvc extends IOWebApp:
   }
 
   def TodoInput(store: TodoStore) =
-    input { self =>
+    input.withSelf { self =>
       (
         cls := "new-todo",
         placeholder := "What needs to be done?",
@@ -96,7 +96,7 @@ object TodoMvc extends IOWebApp:
         children <-- editing.map {
           case true =>
             List(
-              input { self =>
+              input.withSelf { self =>
                 val endEdit = self.value.get.flatMap { text =>
                   todo.update(_.map(_.copy(text = text))) *> editing.set(false)
                 }
@@ -113,7 +113,7 @@ object TodoMvc extends IOWebApp:
             )
           case false =>
             List(
-              input { self =>
+              input.withSelf { self =>
                 (
                   cls := "toggle",
                   typ := "checkbox",