Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Resource variants of attr+prop Signal-based modifiers #158

Merged
merged 1 commit into from
Jan 24, 2023
Merged

Add Resource variants of attr+prop Signal-based modifiers #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions calico/src/main/scala/calico/html/HtmlAttr.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,15 @@ sealed class HtmlAttr[F[_], V] private[calico] (key: String, codec: Codec[V, Str
@inline def <--(vs: Signal[F, V]): SignalModifier[F, V] =
SignalModifier(key, codec, vs)

@inline def <--(vs: Resource[F, Signal[F, V]]): SignalResourceModifier[F, V] =
SignalResourceModifier(key, codec, vs)

@inline def <--(vs: Signal[F, Option[V]]): OptionSignalModifier[F, V] =
OptionSignalModifier(key, codec, vs)

@inline def <--(vs: Resource[F, Signal[F, Option[V]]]): OptionSignalResourceModifier[F, V] =
OptionSignalResourceModifier(key, codec, vs)

object HtmlAttr:
final class ConstantModifier[V] private[calico] (
private[calico] val key: String,
Expand All @@ -47,12 +53,24 @@ object HtmlAttr:
private[calico] val values: Signal[F, V]
)

final class SignalResourceModifier[F[_], V] private[calico] (
private[calico] val key: String,
private[calico] val codec: Codec[V, String],
private[calico] val values: Resource[F, Signal[F, V]]
)

final class OptionSignalModifier[F[_], V] private[calico] (
private[calico] val key: String,
private[calico] val codec: Codec[V, String],
private[calico] val values: Signal[F, Option[V]]
)

final class OptionSignalResourceModifier[F[_], V] private[calico] (
private[calico] val key: String,
private[calico] val codec: Codec[V, String],
private[calico] val values: Resource[F, Signal[F, Option[V]]]
)

private trait HtmlAttrModifiers[F[_]](using F: Async[F]):
import HtmlAttr.*

Expand All @@ -72,6 +90,15 @@ private trait HtmlAttrModifiers[F[_]](using F: Async[F]):
F.delay(e.setAttribute(m.key, m.codec.encode(v)))
}

inline given forSignalResourceHtmlAttr[E <: fs2.dom.Element[F], V]
: Modifier[F, E, SignalResourceModifier[F, V]] =
_forSignalHtmlAttr.asInstanceOf[Modifier[F, E, SignalResourceModifier[F, V]]]

private val _forSignalResourceHtmlAttr =
Modifier.forSignalResource[F, dom.Element, SignalResourceModifier[F, Any], Any](_.values) {
(m, e) => v => F.delay(e.setAttribute(m.key, m.codec.encode(v)))
}

inline given forOptionSignalHtmlAttr[E <: fs2.dom.Element[F], V]
: Modifier[F, E, OptionSignalModifier[F, V]] =
_forOptionSignalHtmlAttr.asInstanceOf[Modifier[F, E, OptionSignalModifier[F, V]]]
Expand All @@ -82,6 +109,17 @@ private trait HtmlAttrModifiers[F[_]](using F: Async[F]):
F.delay(v.fold(e.removeAttribute(m.key))(v => e.setAttribute(m.key, m.codec.encode(v))))
}

inline given forOptionSignalResourceHtmlAttr[E <: fs2.dom.Element[F], V]
: Modifier[F, E, OptionSignalResourceModifier[F, V]] =
_forOptionSignalHtmlAttr.asInstanceOf[Modifier[F, E, OptionSignalResourceModifier[F, V]]]

private val _forOptionSignalResourceHtmlAttr =
Modifier
.forSignalResource[F, dom.Element, OptionSignalResourceModifier[F, Any], Option[Any]](
_.values) { (m, e) => v =>
F.delay(v.fold(e.removeAttribute(m.key))(v => e.setAttribute(m.key, m.codec.encode(v))))
}

final class Aria[F[_]] private extends AriaAttrs[F]

private object Aria:
Expand Down
10 changes: 10 additions & 0 deletions calico/src/main/scala/calico/html/Modifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ private object Modifier:
tail.foreach(modify(_)).compile.drain.cedeBackground.void
}

def forSignalResource[F[_]: Async, E, M, V](signal: M => Resource[F, Signal[F, V]])(
mkModify: (M, E) => V => F[Unit]): Modifier[F, E, M] = (m, e) =>
signal(m).flatMap { sig =>
sig.getAndUpdates.flatMap { (head, tail) =>
val modify = mkModify(m, e)
Resource.eval(modify(head)) *>
tail.foreach(modify(_)).compile.drain.cedeBackground.void
}
}

private trait Modifiers[F[_]](using F: Async[F]):
inline given forUnit[E]: Modifier[F, E, Unit] =
_forUnit.asInstanceOf[Modifier[F, E, Unit]]
Expand Down
63 changes: 53 additions & 10 deletions calico/src/main/scala/calico/html/Prop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,16 @@ sealed class Prop[F[_], V, J] private[calico] (name: String, codec: Codec[V, J])
@inline def <--(vs: Signal[F, V]): SignalModifier[F, V, J] =
SignalModifier(name, codec, vs)

@inline def <--(vs: Resource[F, Signal[F, V]]): SignalResourceModifier[F, V, J] =
SignalResourceModifier(name, codec, vs)

@inline def <--(vs: Signal[F, Option[V]]): OptionSignalModifier[F, V, J] =
OptionSignalModifier(name, codec, vs)

@inline def <--(
vs: Resource[F, Signal[F, Option[V]]]): OptionSignalResourceModifier[F, V, J] =
OptionSignalResourceModifier(name, codec, vs)

object Prop:
final class ConstantModifier[V, J] private[calico] (
private[calico] val name: String,
Expand All @@ -53,44 +60,80 @@ object Prop:
private[calico] val values: Signal[F, V]
)

final class SignalResourceModifier[F[_], V, J] private[calico] (
private[calico] val name: String,
private[calico] val codec: Codec[V, J],
private[calico] val values: Resource[F, Signal[F, V]]
)

final class OptionSignalModifier[F[_], V, J] private[calico] (
private[calico] val name: String,
private[calico] val codec: Codec[V, J],
private[calico] val values: Signal[F, Option[V]]
)

final class OptionSignalResourceModifier[F[_], V, J] private[calico] (
private[calico] val name: String,
private[calico] val codec: Codec[V, J],
private[calico] val values: Resource[F, Signal[F, Option[V]]]
)

private trait PropModifiers[F[_]](using F: Async[F]):
import Prop.*

private inline def setProp[N, V, J](node: N, value: V, name: String, codec: Codec[V, J]) =
F.delay(node.asInstanceOf[js.Dictionary[J]](name) = codec.encode(value))
private inline def setProp[N, V, J](node: N, name: String, codec: Codec[V, J]) =
(value: V) =>
F.delay {
node.asInstanceOf[js.Dictionary[J]](name) = codec.encode(value)
()
}

private inline def setPropOption[N, V, J](node: N, name: String, codec: Codec[V, J]) =
(value: Option[V]) =>
F.delay {
val dict = node.asInstanceOf[js.Dictionary[Any]]
value.fold(dict -= name)(v => dict(name) = codec.encode(v))
()
}

inline given forConstantProp[N, V, J]: Modifier[F, N, ConstantModifier[V, J]] =
_forConstantProp.asInstanceOf[Modifier[F, N, ConstantModifier[V, J]]]

private val _forConstantProp: Modifier[F, Any, ConstantModifier[Any, Any]] =
(m, n) => Resource.eval(setProp(n, m.value, m.name, m.codec))
(m, n) => Resource.eval(setProp(n, m.name, m.codec).apply(m.value))

inline given forSignalProp[N, V, J]: Modifier[F, N, SignalModifier[F, V, J]] =
_forSignalProp.asInstanceOf[Modifier[F, N, SignalModifier[F, V, J]]]

private val _forSignalProp =
Modifier.forSignal[F, Any, SignalModifier[F, Any, Any], Any](_.values) { (m, n) => v =>
setProp(n, v, m.name, m.codec)
Modifier.forSignal[F, Any, SignalModifier[F, Any, Any], Any](_.values) { (m, n) =>
setProp(n, m.name, m.codec)
}

inline given forSignalResourceProp[N, V, J]: Modifier[F, N, SignalResourceModifier[F, V, J]] =
_forSignalResourceProp.asInstanceOf[Modifier[F, N, SignalResourceModifier[F, V, J]]]

private val _forSignalResourceProp =
Modifier.forSignalResource[F, Any, SignalResourceModifier[F, Any, Any], Any](_.values) {
(m, n) => setProp(n, m.name, m.codec)
}

inline given forOptionSignalProp[N, V, J]: Modifier[F, N, OptionSignalModifier[F, V, J]] =
_forOptionSignalProp.asInstanceOf[Modifier[F, N, OptionSignalModifier[F, V, J]]]

private val _forOptionSignalProp =
Modifier.forSignal[F, Any, OptionSignalModifier[F, Any, Any], Option[Any]](_.values) {
(m, n) => v =>
F.delay {
val dict = n.asInstanceOf[js.Dictionary[Any]]
v.fold(dict -= m.name)(v => dict(m.name) = m.codec.encode(v))
}
(m, n) => setPropOption(n, m.name, m.codec)
}

inline given forOptionSignalResourceProp[N, V, J]
: Modifier[F, N, OptionSignalResourceModifier[F, V, J]] =
_forOptionSignalProp.asInstanceOf[Modifier[F, N, OptionSignalResourceModifier[F, V, J]]]

private val _forOptionSignalResourceProp =
Modifier.forSignalResource[F, Any, OptionSignalResourceModifier[F, Any, Any], Option[Any]](
_.values) { (m, n) => setPropOption(n, m.name, m.codec) }

final class EventProp[F[_], E] private[calico] (key: String):
import EventProp.*
inline def -->(sink: Pipe[F, E, Nothing]): PipeModifier[F, E] = PipeModifier(key, sink)
Expand Down