Skip to content

Updated to scalatags 0.6.0 #1

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

Open
hkirk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to scalatags 0.6.0 #1

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
12 changes: 6 additions & 6 deletions base/src/main/scala/solarsystemscalemodel/main/MainJSApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

package solarsystemscalemodel.main

import org.scalajs.dom.Element
import solarsystemscalemodel.core.{UOM, MeasurementSystem, Distance, ModelSolarSystem}
import solarsystemscalemodel.core.ModelSolarSystem._
import solarsystemscalemodel.core.{Distance, MeasurementSystem, ModelSolarSystem, UOM}

import scala.scalajs.js
import scala.scalajs.js.annotation.{JSExport, JSName}
import scalatags.Text.short

/**
* Renders a ModelSolarSystem.Model to a virtual DOM using Mithril.
Expand Down Expand Up @@ -56,9 +56,8 @@ object MainJSApp extends js.JSApp {
def isSun = name == "Sun"
}
import solarsystemscalemodel.mithril.MithrilBundle.attrs._
import solarsystemscalemodel.mithril.MithrilBundle.short._
import solarsystemscalemodel.mithril.MithrilBundle.tags._
import solarsystemscalemodel.mithril.MithrilBundle.short.SeqFrag
import solarsystemscalemodel.mithril.MithrilBundle.short.{SeqFrag, _}

@JSExport
def view() = {
def createDistanceInput(planet:CelestialBody, setting:Measurement, distance:Distance) = {
Expand Down Expand Up @@ -119,7 +118,7 @@ object MainJSApp extends js.JSApp {
},
state.model.measurementSystem.units.map { unit => option(value:=unit.name,unit.name) })
}

def textInput(distanceInput:DistanceInput) = {
val onInputFunction = { (event: js.Dynamic) => {
val text = event.target.value.asInstanceOf[String]
Expand All @@ -138,3 +137,4 @@ object MainJSApp extends js.JSApp {
}

}

282 changes: 162 additions & 120 deletions base/src/main/scala/solarsystemscalemodel/mithril/MithrilBundle.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package solarsystemscalemodel.mithril


import scala.language.implicitConversions
import scala.scalajs.js
import scala.scalajs.js.{Dictionary}
import scalatags.stylesheet.{StyleSheetFrag, Cls}
import scalatags.{Companion, DataConverters}
import scala.scalajs.js.{Dictionary, Function}
import scalatags.generic._
import scala.language.implicitConversions

//A Mithril implementation of scalatags (based on the scalatags DOM implemention)
import scalatags.stylesheet.{Cls, StyleSheetFrag}
import scalatags.{Companion, DataConverters, Escaping}

/**
* A mutable datastructure which represents an html element
*/
* A Mithril implementation of scalatags (based on the scalatags DOM implemention)
*
* A mutable datastructure which represents an html element
*/
class MithrilBuilder(uri:String, tag:String) {

private val attributes = Dictionary.empty[js.Any]
Expand Down Expand Up @@ -64,127 +64,169 @@ object MithrilElement {
object MithrilBundle extends Bundle[MithrilBuilder, MithrilElement, MithrilNode]
with Aliases[MithrilBuilder, MithrilElement, MithrilNode]{

trait MithrilAttributes extends Util {
//A mithril specific attribute used to ensure the correct elements are altered when elements are removed or added
val key = attr("key")
//A mithril specific attribute which provide a hook into element creation on the dom
val config = attr("config")
}

trait Aggregate extends scalatags.generic.Aggregate[MithrilBuilder, MithrilElement, MithrilNode]{
type StringFrag = MithrilBundle.StringFrag
type RawFrag = MithrilBundle.RawFrag
type HtmlTag = MithrilBundle.TypedTag[MithrilElement]
type SvgTag = MithrilBundle.TypedTag[MithrilElement]
type Tag = MithrilBundle.TypedTag[MithrilElement]
val RawFrag = MithrilBundle.RawFrag
val StringFrag = MithrilBundle.StringFrag
val HtmlTag = MithrilBundle.TypedTag
val SvgTag = MithrilBundle.TypedTag
val Tag = MithrilBundle.TypedTag

def StyleFrag(s: StylePair[MithrilBuilder, _]): StyleSheetFrag = ???

def ClsModifier(s: Cls): Modifier = ???

def genericAttr[T] = new MithrilBundle.GenericAttr[T]

def genericStyle[T] = new MithrilBundle.GenericStyle[T]

def genericPixelStyle[T](implicit ev: StyleValue[T]): PixelStyleValue[T] = new MithrilBundle.GenericPixelStyle[T](ev)

def genericPixelStylePx[T](implicit ev: StyleValue[String]): PixelStyleValue[T] = new MithrilBundle.GenericPixelStylePx[T](ev)

implicit def stringFrag(v: String): StringFrag = new MithrilBundle.StringFrag(v)

def raw(s: String) = RawFrag(s)
}

trait TagFactory extends scalatags.generic.Util[MithrilBuilder, MithrilElement, MithrilNode]{
def tag(s: String, void: Boolean = false): ConcreteHtmlTag[MithrilElement] = {
typedTag[MithrilElement](s, void)
}
def typedTag[T <: MithrilElement](s: String, void: Boolean = false)
(implicit ns: Namespace): ConcreteHtmlTag[T] = {
if (!Escaping.validTag(s))
throw new IllegalArgumentException(
s"Illegal tag name: $s is not a valid XML tag name"
)
makeAbstractTypedTag[T](s, void, ns)
}
}


trait Cap extends Util with TagFactory { self =>
type ConcreteHtmlTag[T <: MithrilElement] = TypedTag[T]

protected[this] implicit def stringAttrX = new GenericAttr[String]
protected[this] implicit def stringStyleX = new GenericStyle[String]
protected[this] implicit def stringPixelStyleX = new GenericPixelStyle[String](stringStyleX)
implicit def UnitFrag(u: Unit): StringFrag = new MithrilBundle.StringFrag("")
def makeAbstractTypedTag[T <: MithrilElement](tag: String, void: Boolean, namespaceConfig: Namespace): TypedTag[T] = {
TypedTag(tag, Nil, void, namespaceConfig)
}

implicit class SeqFrag[A](xs: Seq[A])(implicit ev: A => Frag) extends Frag {
def applyTo(t: MithrilBuilder): Unit = xs.foreach(_.applyTo(t))
def render: MithrilElement = {
MithrilElement.fragment(xs.map(_.render))
}
}
}

case class StringFrag(v: String) extends MtFrag {
def render: MithrilElement = MithrilElement.text(v)
override def applyTo(builder: MithrilBuilder) { builder.appendText(v) }
}

case class RawFrag(v: String) extends Modifier{
def applyTo(builder: MithrilBuilder): Unit = {
builder.addRaw(v)
}
}

class GenericAttr[T] extends AttrValue[T] {
def apply(builder: MithrilBuilder, attribute: Attr, value: T): Unit = {
builder.setAttribute(attribute.name, value.asInstanceOf[js.Any])
}
}

class GenericStyle[T] extends StyleValue[T] {
def apply(builder: MithrilBuilder, s: Style, v: T): Unit = {
builder.setStyleProperty(s.cssName, v.toString)
}
}

class GenericPixelStyle[T](ev: StyleValue[T]) extends PixelStyleValue[T]{
def apply(s: Style, v: T) = StylePair(s, v, ev)
}

class GenericPixelStylePx[T](ev: StyleValue[String]) extends PixelStyleValue[T]{
def apply(s: Style, v: T) = StylePair(s, v + "px", ev)
}

case class TypedTag[+Output <: MithrilElement](tag: String = "",
modifiers: List[Seq[Modifier]],
void: Boolean = false,
namespace: Namespace)
extends scalatags.generic.TypedTag[MithrilBuilder, Output, MithrilNode]
with MtFrag {
protected[this] type Self = TypedTag[Output]

/**
* Trivial override, not strictly necessary, but it makes IntelliJ happy...
*/
def apply(xs: Modifier*): TypedTag[Output] = {
this.copy(tag = tag, void = void, modifiers = xs :: modifiers)
}

override def toString = render.toString

def render: Output = {
val elem = new MithrilBuilder(namespace.uri, tag)
build(elem)
elem.build.asInstanceOf[Output]
}
}
object attrs extends MithrilBundle.Cap with Attrs
object tags extends MithrilBundle.Cap with solarsystemscalemodel.mithril.Tags
object tags2 extends MithrilBundle.Cap with solarsystemscalemodel.mithril.Tags2
object styles extends MithrilBundle.Cap with Styles
object styles2 extends MithrilBundle.Cap with Styles2
object svgTags extends MithrilBundle.Cap with solarsystemscalemodel.mithril.SvgTags
object svgAttrs extends MithrilBundle.Cap with SvgAttrs
object implicits extends Aggregate
trait MithrilAttributes extends Util {
val key = "key".attr //A mithril specific attribute used to ensure the correct elements are altered when
//elements are removed or added
val config = "config".attr //A mithril specific attribute which provide a hook into element creation on the dom
}
object all
extends Cap
with Attrs
with Styles
with solarsystemscalemodel.mithril.Tags
with DataConverters
with Aggregate
with MithrilAttributes
with LowPriorityImplicits
object short
extends Cap
with Util
with DataConverters
with AbstractShort
with Aggregate
with MithrilAttributes
with LowPriorityImplicits{
object * extends Cap with Attrs with Styles
}
trait Aggregate extends scalatags.generic.Aggregate[MithrilBuilder,MithrilElement,MithrilNode]{
def StyleFrag(s: StylePair[MithrilBuilder, _]): StyleSheetFrag = ???
def ClsModifier(s: Cls): Modifier = ???
def genericAttr[T] = new MithrilBundle.GenericAttr[T]
def genericStyle[T] = new MithrilBundle.GenericStyle[T]
def genericPixelStyle[T](implicit ev: StyleValue[T]): PixelStyleValue[T] = new MithrilBundle.GenericPixelStyle[T](ev)
def genericPixelStylePx[T](implicit ev: StyleValue[String]): PixelStyleValue[T] = new MithrilBundle.GenericPixelStylePx[T](ev)
implicit def stringFrag(v: String) = new MithrilBundle.StringFrag(v)
val RawFrag = MithrilBundle.RawFrag
val StringFrag = MithrilBundle.StringFrag
type StringFrag = MithrilBundle.StringFrag
type RawFrag = MithrilBundle.RawFrag
def raw(s: String) = RawFrag(s)
type HtmlTag = MithrilBundle.TypedTag[MithrilElement]
val HtmlTag = MithrilBundle.TypedTag
type SvgTag = MithrilBundle.TypedTag[MithrilElement]
val SvgTag = MithrilBundle.TypedTag
type Tag = MithrilBundle.TypedTag[MithrilElement]
val Tag = MithrilBundle.TypedTag
}
trait Cap extends Util{ self =>
type ConcreteHtmlTag[T <: MithrilElement] = TypedTag[T]
protected[this] implicit def stringAttrX = new GenericAttr[String]
protected[this] implicit def stringStyleX = new GenericStyle[String]
protected[this] implicit def stringPixelStyleX = new GenericPixelStyle[String](stringStyleX)
implicit def UnitFrag(u: Unit) = new MithrilBundle.StringFrag("")
def makeAbstractTypedTag[T <: MithrilElement](tag: String, void: Boolean, namespaceConfig: Namespace): TypedTag[T] = {
TypedTag(tag, Nil, void, namespaceConfig)
}
implicit class SeqFrag[A <% Frag](xs: Seq[A]) extends Frag {
def applyTo(t: MithrilBuilder): Unit = xs.foreach(_.applyTo(t))
def render: MithrilElement = {
MithrilElement.fragment(xs.map(_.render))
}
}
}
object StringFrag extends Companion[StringFrag]
case class StringFrag(v: String) extends MtFrag {
def render: MithrilElement = MithrilElement.text(v)
override def applyTo(builder: MithrilBuilder) { builder.appendText(v) }
}
object RawFrag extends Companion[RawFrag]
case class RawFrag(v: String) extends Modifier{
def applyTo(builder: MithrilBuilder): Unit = {
builder.addRaw(v)
}
}
class GenericAttr[T] extends AttrValue[T]{
def apply(builder:MithrilBuilder, attribute: Attr, value: T): Unit = {
builder.setAttribute(attribute.name, value.asInstanceOf[js.Any])
}
}
class GenericStyle[T] extends StyleValue[T]{
def apply(builder:MithrilBuilder, s: Style, v: T): Unit = {
builder.setStyleProperty(s.cssName, v.toString)

object implicits extends Aggregate with DataConverters

object all
extends Cap
with Attrs
with Styles
with solarsystemscalemodel.mithril.Tags
with DataConverters
with Aggregate
with MithrilAttributes
with LowPriorityImplicits

object short
extends Cap
with DataConverters
with solarsystemscalemodel.mithril.Tags
with AbstractShort
with Aggregate
with MithrilAttributes
with LowPriorityImplicits{

object * extends Cap with Attrs with Styles
}
}
class GenericPixelStyle[T](ev: StyleValue[T]) extends PixelStyleValue[T]{
def apply(s: Style, v: T) = StylePair(s, v, ev)
}
class GenericPixelStylePx[T](ev: StyleValue[String]) extends PixelStyleValue[T]{
def apply(s: Style, v: T) = StylePair(s, v + "px", ev)
}
case class TypedTag[+Output <: MithrilElement](tag: String = "",
modifiers: List[Seq[Modifier]],
void: Boolean = false,
namespace: Namespace)
extends scalatags.generic.TypedTag[MithrilBuilder, Output, MithrilNode]
with MtFrag {
protected[this] type Self = TypedTag[Output]
def render: Output = {
val elem = new MithrilBuilder(namespace.uri, tag)
build(elem)
elem.build.asInstanceOf[Output]
}

/**
* Trivial override, not strictly necessary, but it makes IntelliJ happy...
*/
def apply(xs: Modifier*): TypedTag[Output] = {
this.copy(tag = tag, void = void, modifiers = xs :: modifiers)
}
override def toString = render.toString
}

object StringFrag extends Companion[StringFrag]
object RawFrag extends Companion[RawFrag]
}
trait LowPriorityImplicits {
implicit def bindJsAnyLike[T <% js.Function] = new scalatags.generic.AttrValue[MithrilBuilder, T]{
def apply(builder: MithrilBuilder, a: scalatags.generic.Attr, f: T): Unit = {
builder.setAttribute(a.name, f)
}
implicit def bindJsAnyLike[T](implicit ev$1: T => Function) = new scalatags.generic.AttrValue[MithrilBuilder, T]{
def apply(builder: MithrilBuilder, a: scalatags.generic.Attr, f: T): Unit = {
builder.setAttribute(a.name, f)
}
}
}
Loading