diff --git a/.scalafix.conf b/.scalafix.conf new file mode 100644 index 00000000..117f8ed2 --- /dev/null +++ b/.scalafix.conf @@ -0,0 +1,25 @@ +rules = [ + OrganizeImports, + RemoveUnused +] + +RemoveUnused { + imports = false +} + +OrganizeImports { + expandRelative = true + groupedImports = Merge + groupExplicitlyImportedImplicitsSeparately = false + groups = [ + "java.", + "javax.", + "scala.", + "akka.", + "*", + "io.kinoplan." + ] + importSelectorsOrder = Ascii + importsOrder = SymbolsFirst + removeUnused = true +} diff --git a/build.sbt b/build.sbt index 2d9a19d6..0a976278 100755 --- a/build.sbt +++ b/build.sbt @@ -31,7 +31,7 @@ lazy val muiColorsGenerator = taskKey[Seq[File]]("mui-colors-generator") lazy val core = (project in file("core")) .dependsOn(bridge) .configure(Settings.publishArtifactSettings) - .settings(commonSettings).settings( + .configure(commonSettings).settings( name := "scalajs-react-material-ui-core", scalaJSUseMainModuleInitializer := false, npmDependencies in Compile ++= Settings.npmDependenciesCore.value, @@ -42,14 +42,14 @@ lazy val core = (project in file("core")) (npmInstallDependencies in Compile).value ), sourceGenerators in Compile += muiColorsGenerator.taskValue -).enablePlugins(ScalaJSBundlerPlugin) +) lazy val muiIconsGenerator = taskKey[Seq[File]]("mui-icons-generator") lazy val icons = (project in file("icons")) .dependsOn(bridge) .configure(Settings.publishArtifactSettings) - .settings(commonSettings).settings( + .configure(commonSettings).settings( name := "scalajs-react-material-ui-icons", scalaJSUseMainModuleInitializer := false, npmDependencies in Compile ++= Settings.npmDependenciesIcons.value, @@ -60,21 +60,21 @@ lazy val icons = (project in file("icons")) (npmInstallDependencies in Compile).value ), sourceGenerators in Compile += muiIconsGenerator.taskValue -).enablePlugins(ScalaJSBundlerPlugin) +) lazy val lab = (project in file("lab")) .dependsOn(bridge) .configure(Settings.publishArtifactSettings) - .settings(commonSettings).settings( + .configure(commonSettings).settings( name := "scalajs-react-material-ui-lab", scalaJSUseMainModuleInitializer := false, npmDependencies in Compile ++= Settings.npmDependenciesLab.value, npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap, libraryDependencies ++= Settings.scalajsDependenciesLib.value -).enablePlugins(ScalaJSBundlerPlugin) +) lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge) - .settings(commonSettings).settings( + .configure(commonSettings).settings( scalaJSUseMainModuleInitializer := true, scalaJSLinkerConfig ~= (_.withSourceMap(false)), stUseScalaJsDom := false, @@ -88,19 +88,20 @@ lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge) yarnExtraArgs := Seq("--silent"), webpackConfigFile in fastOptJS := Some(baseDirectory.value / "dev.webpack.config.js"), skip in publish := true -).enablePlugins(ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin) +).enablePlugins(ScalablyTypedConverterPlugin) lazy val bridge = (project in file("utils/bridge")) .configure(Settings.publishArtifactSettings) - .settings(commonSettings).settings( + .configure(commonSettings).settings( name := "scalajs-react-bridge", scalaJSUseMainModuleInitializer := false, npmDependencies in Compile ++= Settings.npmDependenciesBridge.value, npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap, - libraryDependencies ++= Settings.scalajsDependenciesBridge.value -).enablePlugins(ScalaJSBundlerPlugin, BridgeGeneratorPlugin) + libraryDependencies ++= Settings.scalajsDependenciesLib.value +).enablePlugins(BridgeGeneratorPlugin) -lazy val commonSettings = Seq( +lazy val commonSettings: Project => Project = + _.enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin).settings( crossScalaVersions := Seq("2.12.11", "2.13.3"), scalaVersion := crossScalaVersions.value.last, description := Settings.description, @@ -110,7 +111,6 @@ lazy val commonSettings = Seq( version in startWebpackDevServer := Settings.versions.bundler.webpackDev, webpackCliVersion := Settings.versions.bundler.webpackCli, javacOptions ++= Settings.javacOptions, - scalacOptions ++= Settings.scalacOptions, scalacOptions ~= (_.filterNot( Set( "-Wdead-code", diff --git a/commands.sbt b/commands.sbt index 54987b91..0b5e0bfc 100644 --- a/commands.sbt +++ b/commands.sbt @@ -1 +1,2 @@ +addCommandAlias("fix", "; all compile:scalafix") addCommandAlias("runDev", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer") diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAppBar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAppBar.scala index c5dc5073..03cbbe9b 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAppBar.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAppBar.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey + object MuiAppBar extends ReactBridgeComponent with MuiAppBarExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAvatar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAvatar.scala index 174b2e17..f2bee9f5 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAvatar.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiAvatar.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiAvatar extends ReactBridgeComponent with MuiAvatarExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBackdrop.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBackdrop.scala index 6ffa20ab..f3cd9b7b 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBackdrop.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBackdrop.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiBackdrop extends ReactBridgeComponent with MuiBackdropExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBadge.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBadge.scala index b53b9eca..8533c947 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBadge.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBadge.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.VdomNode + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiBadge extends ReactBridgeComponent with MuiBadgeExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigation.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigation.scala index 3106623e..45e653c3 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigation.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigation.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.ReactEvent - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.ReactEvent + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiBottomNavigation extends ReactBridgeComponent with MuiBottomNavigationExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigationAction.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigationAction.scala index a4a23414..388747c1 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigationAction.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiBottomNavigationAction.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiBottomNavigationAction extends ReactBridgeComponent with MuiBottomNavigationActionExtensions { override protected lazy val componentValue: js.Object = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButton.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButton.scala index 6f6c824a..1f60da42 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButton.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButton.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiButton extends ReactBridgeComponent with MuiButtonExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButtonBase.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButtonBase.scala index 5a9b87e1..a928aa72 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButtonBase.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiButtonBase.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiButtonBase extends ReactBridgeComponent with MuiButtonBaseExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCard.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCard.scala index b6261ea9..7b9917c8 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCard.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCard.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} +import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey + object MuiCard extends ReactBridgeComponent with MuiCardExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActionArea.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActionArea.scala index 502a6c91..78bcf5d7 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActionArea.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActionArea.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiCardActionArea extends ReactBridgeComponent with MuiCardActionAreaExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActions.scala index 95e9a796..7c193395 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardActions.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiCardActions extends ReactBridgeComponent with MuiCardActionsExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardContent.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardContent.scala index e45483f7..5fd38a7b 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardContent.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardContent.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiCardContent extends ReactBridgeComponent with MuiCardContentExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardHeader.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardHeader.scala index d04dff5d..ff898771 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardHeader.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardHeader.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiCardHeader extends ReactBridgeComponent with MuiCardHeaderExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardMedia.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardMedia.scala index 2138a8ba..8b31327a 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardMedia.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCardMedia.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiCardMedia extends ReactBridgeComponent with MuiCardMediaExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCheckbox.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCheckbox.scala index 70ac152a..7bb4d00d 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCheckbox.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCheckbox.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.all._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.all._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiCheckbox extends ReactBridgeComponent with MuiCheckboxExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala index c9ce5009..ee9b7a16 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiChip.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} +import scala.scalajs.js +import scala.scalajs.js.annotation.JSImport + import japgolly.scalajs.react.ReactEvent import japgolly.scalajs.react.raw.React import japgolly.scalajs.react.vdom.html_<^._ -import scala.scalajs.js -import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} object MuiChip extends ReactBridgeComponent with MuiChipExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCircularProgress.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCircularProgress.scala index 642f55f5..a35399ba 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCircularProgress.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCircularProgress.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiCircularProgress extends ReactBridgeComponent with MuiCircularProgressExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiClickAwayListener.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiClickAwayListener.scala index 6d5203d2..d1b6ea17 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiClickAwayListener.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiClickAwayListener.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.ReactEventFromHtml - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEventFromHtml + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiClickAwayListener extends ReactBridgeComponent with MuiClickAwayListenerExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCollapse.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCollapse.scala index 4aea5882..35895074 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCollapse.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCollapse.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiCollapse extends ReactBridgeComponent with MuiCollapseExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCssBaseline.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCssBaseline.scala index e9e96cb7..c00e965d 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCssBaseline.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiCssBaseline.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiCssBaseline extends ReactBridgeComponent { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialog.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialog.scala index 4566aad8..3eb068ca 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialog.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialog.scala @@ -1,13 +1,14 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.ReactEvent -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEvent +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiDialog extends ReactBridgeComponent with MuiDialogExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogActions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogActions.scala index a8a5c6f4..d0e8c270 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogActions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogActions.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiDialogActions extends ReactBridgeComponent with MuiDialogActionsExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContent.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContent.scala index f298abe2..8ffd02dc 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContent.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContent.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiDialogContent extends ReactBridgeComponent with MuiDialogContentExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContentText.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContentText.scala index a401a8ef..c771bbfd 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContentText.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogContentText.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiDialogContentText extends ReactBridgeComponent with MuiDialogContentTextExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogTitle.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogTitle.scala index 4b0b7038..38b957a3 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogTitle.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDialogTitle.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiDialogTitle extends ReactBridgeComponent with MuiDialogTitleExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDivider.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDivider.scala index a66ae31b..ce7cbfd2 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDivider.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDivider.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiDivider extends ReactBridgeComponent with MuiDividerExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDrawer.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDrawer.scala index e3780ef8..488f32bf 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDrawer.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiDrawer.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.ReactEventFromHtml - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEventFromHtml + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiDrawer extends ReactBridgeComponent with MuiDrawerExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanel.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanel.scala index 6661588c..7970d9eb 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanel.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanel.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey + object MuiExpansionPanel extends ReactBridgeComponent with MuiExpansionPanelExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelActions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelActions.scala index 59d16130..8ad34cb6 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelActions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelActions.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiExpansionPanelActions extends ReactBridgeComponent with MuiExpansionPanelActionsExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelDetails.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelDetails.scala index 17ee078d..0282e736 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelDetails.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelDetails.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiExpansionPanelDetails extends ReactBridgeComponent with MuiExpansionPanelDetailsExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelSummary.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelSummary.scala index ee2bf666..1b23f21e 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelSummary.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiExpansionPanelSummary.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiExpansionPanelSummary extends ReactBridgeComponent with MuiExpansionPanelSummaryExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFab.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFab.scala index 636c63a3..0f2f7582 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFab.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFab.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiFab extends ReactBridgeComponent with MuiFabExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFade.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFade.scala index 7f22255a..a3ccacf2 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFade.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFade.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiFade extends ReactBridgeComponent with MuiFadeExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFilledInput.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFilledInput.scala index c464a317..2899995f 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFilledInput.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFilledInput.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiFilledInput extends ReactBridgeComponent with MuiFilledInputExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControl.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControl.scala index 31cc4fe7..686816ed 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControl.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControl.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiFormControl extends ReactBridgeComponent with MuiFormControlExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControlLabel.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControlLabel.scala index 7bcde69f..70d31b60 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControlLabel.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormControlLabel.scala @@ -1,14 +1,15 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.raw.React -import japgolly.scalajs.react.ReactEvent -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEvent +import japgolly.scalajs.react.raw.React +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiFormControlLabel extends ReactBridgeComponent with MuiFormControlLabelExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormGroup.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormGroup.scala index 0c4170b9..ab3e847d 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormGroup.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormGroup.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiFormGroup extends ReactBridgeComponent with MuiFormGroupExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormHelperText.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormHelperText.scala index ff49d083..9095a7c9 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormHelperText.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormHelperText.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiFormHelperText extends ReactBridgeComponent with MuiFormHelperTextExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormLabel.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormLabel.scala index b4a63a64..c6b5c56c 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormLabel.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiFormLabel.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiFormLabel extends ReactBridgeComponent with MuiFormLabelExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrid.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrid.scala index bcb04268..630bf5e6 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrid.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrid.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiGrid extends ReactBridgeComponent with MuiGridExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridList.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridList.scala index 1497144b..7b93baff 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridList.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridList.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiGridList extends ReactBridgeComponent with MuiGridListExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTile.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTile.scala index ed735f1b..20eb6412 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTile.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTile.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiGridListTile extends ReactBridgeComponent with MuiGridListTileExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTileBar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTileBar.scala index 31cd5b3b..bb2ef27a 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTileBar.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGridListTileBar.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiGridListTileBar extends ReactBridgeComponent with MuiGridListTileBarExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrow.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrow.scala index ac05aab1..317361ed 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrow.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiGrow.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiGrow extends ReactBridgeComponent with MuiGrowExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiHidden.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiHidden.scala index ea31c12c..751ee99e 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiHidden.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiHidden.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiHidden extends ReactBridgeComponent with MuiHiddenExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIcon.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIcon.scala index e2046ebd..e64914b7 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIcon.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIcon.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiIcon extends ReactBridgeComponent with MuiIconExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIconButton.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIconButton.scala index 2a0df45c..7c4dffdb 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIconButton.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiIconButton.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiIconButton extends ReactBridgeComponent with MuiIconButtonExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInput.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInput.scala index 92c780a9..7815eb6f 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInput.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInput.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiInput extends ReactBridgeComponent with MuiInputExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputAdornment.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputAdornment.scala index 2940f630..ee17acd5 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputAdornment.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputAdornment.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiInputAdornment extends ReactBridgeComponent with MuiInputAdornmentExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputBase.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputBase.scala index 5d0bd3c8..56984fb2 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputBase.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputBase.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiInputBase extends ReactBridgeComponent with MuiInputBaseExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputLabel.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputLabel.scala index 70d7c793..903d6856 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputLabel.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiInputLabel.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiInputLabel extends ReactBridgeComponent with MuiInputLabelExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLinearProgress.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLinearProgress.scala index bdb2e474..00e9db19 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLinearProgress.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLinearProgress.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiLinearProgress extends ReactBridgeComponent with MuiLinearProgressExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLink.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLink.scala index c385fcd1..a2bd71fc 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLink.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiLink.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiLink extends ReactBridgeComponent with MuiLinkExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiList.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiList.scala index f3289339..392fde15 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiList.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiList.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiList extends ReactBridgeComponent with MuiListExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItem.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItem.scala index b487bc18..219be2f3 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItem.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItem.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiListItem extends ReactBridgeComponent with MuiListItemExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemAvatar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemAvatar.scala index 00b00c48..e7160c33 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemAvatar.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemAvatar.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiListItemAvatar extends ReactBridgeComponent with MuiListItemAvatarExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemIcon.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemIcon.scala index 13445bd5..72f34088 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemIcon.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemIcon.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiListItemIcon extends ReactBridgeComponent with MuiListItemIconExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemSecondaryAction.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemSecondaryAction.scala index 18603cf0..e07330b7 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemSecondaryAction.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemSecondaryAction.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiListItemSecondaryAction extends ReactBridgeComponent with MuiListItemSecondaryActionExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemText.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemText.scala index 6ff12d4f..9899ecaa 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemText.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListItemText.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiListItemText extends ReactBridgeComponent with MuiListItemTextExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListSubheader.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListSubheader.scala index 51c5b2dc..f38b1cb9 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListSubheader.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiListSubheader.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiListSubheader extends ReactBridgeComponent with MuiListSubheaderExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenu.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenu.scala index 09a9a9d2..c9c862d8 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenu.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenu.scala @@ -1,14 +1,15 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin -import japgolly.scalajs.react.ReactEvent -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEvent +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin + object MuiMenu extends ReactBridgeComponent with MuiMenuExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuItem.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuItem.scala index 6fab59e1..cd163dbb 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuItem.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuItem.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiMenuItem extends ReactBridgeComponent with MuiMenuItemExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuList.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuList.scala index c0f17909..afad2576 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuList.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMenuList.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^.VdomNode + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiMenuList extends ReactBridgeComponent with MuiListExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMobileStepper.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMobileStepper.scala index defa973b..84ac8d73 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMobileStepper.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiMobileStepper.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey + object MuiMobileStepper extends ReactBridgeComponent with MuiMobileStepperExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiModal.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiModal.scala index a3b96a39..e34636f1 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiModal.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiModal.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.ReactEvent - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.ReactEvent + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiModal extends ReactBridgeComponent with MuiModalExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNativeSelect.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNativeSelect.scala index ba8331e4..1bb95c17 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNativeSelect.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNativeSelect.scala @@ -1,13 +1,14 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.raw.React -import japgolly.scalajs.react.vdom.html_<^.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.raw.React +import japgolly.scalajs.react.vdom.html_<^.VdomNode + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiNativeSelect extends ReactBridgeComponent with MuiNativeSelectExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNoSsr.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNoSsr.scala index f088bcbf..44510491 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNoSsr.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiNoSsr.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiNoSsr extends ReactBridgeComponent { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiOutlinedInput.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiOutlinedInput.scala index 145d81b4..808ffa5c 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiOutlinedInput.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiOutlinedInput.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiOutlinedInput extends ReactBridgeComponent with MuiOutlinedInputExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPaper.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPaper.scala index 5f7cf957..6fdea126 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPaper.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPaper.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiPaper extends ReactBridgeComponent with MuiPaperExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopover.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopover.scala index 0cd08e21..b355bc1d 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopover.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopover.scala @@ -1,14 +1,15 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin -import japgolly.scalajs.react.ReactEvent -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEvent +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin + object MuiPopover extends ReactBridgeComponent with MuiPopoverExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopper.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopper.scala index ced47c05..107534d4 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopper.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPopper.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiPopper extends ReactBridgeComponent with MuiPopperExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPortal.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPortal.scala index ae79e852..5ad75a53 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPortal.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiPortal.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiPortal extends ReactBridgeComponent { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadio.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadio.scala index 4c4f3b49..7bc34537 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadio.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadio.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiRadio extends ReactBridgeComponent with MuiRadioExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadioGroup.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadioGroup.scala index 26272c90..2a4b5719 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadioGroup.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRadioGroup.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiRadioGroup extends ReactBridgeComponent with MuiRadioGroupExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRootRef.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRootRef.scala index 4b754fdd..f141417c 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRootRef.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiRootRef.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiRootRef extends ReactBridgeComponent { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSelect.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSelect.scala index 782c4975..b215c467 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSelect.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSelect.scala @@ -1,13 +1,14 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import scala.scalajs.js +import scala.scalajs.js.annotation.JSImport +import scala.scalajs.js.| + import japgolly.scalajs.react.ReactEventFromInput import japgolly.scalajs.react.raw.React import japgolly.scalajs.react.vdom.html_<^.VdomNode -import scala.scalajs.js -import scala.scalajs.js.annotation.JSImport -import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} object MuiSelect extends ReactBridgeComponent with MuiSelectExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSlide.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSlide.scala index f400416b..3796e8a0 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSlide.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSlide.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiSlide extends ReactBridgeComponent with MuiSlideExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbar.scala index 5d60184c..4e742da2 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbar.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbar.scala @@ -1,14 +1,15 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin +import scala.scalajs.js +import scala.scalajs.js.annotation.JSImport +import scala.scalajs.js.| + import japgolly.scalajs.react.ReactEvent import japgolly.scalajs.react.vdom.html_<^._ import org.scalajs.dom.html -import scala.scalajs.js -import scala.scalajs.js.annotation.JSImport -import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin object MuiSnackbar extends ReactBridgeComponent with MuiSnackbarExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbarContent.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbarContent.scala index 3fc895dc..1481b6a7 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbarContent.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSnackbarContent.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiSnackbarContent extends ReactBridgeComponent with MuiSnackbarContentExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStep.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStep.scala index ee899945..01c1e2ee 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStep.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStep.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiStep extends ReactBridgeComponent with MuiStepExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepButton.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepButton.scala index 35d0c89c..9721b369 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepButton.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepButton.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiStepButton extends ReactBridgeComponent with MuiStepButtonExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepConnector.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepConnector.scala index 826e86a1..d4852f02 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepConnector.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepConnector.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiStepConnector extends ReactBridgeComponent with MuiStepConnectorExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepContent.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepContent.scala index f8f778c0..3842ec5b 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepContent.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepContent.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiStepContent extends ReactBridgeComponent with MuiStepContentExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepIcon.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepIcon.scala index 10282e2f..b309197f 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepIcon.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepIcon.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiStepIcon extends ReactBridgeComponent with MuiStepIconExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepLabel.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepLabel.scala index 7c60b506..2850ae77 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepLabel.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepLabel.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiStepLabel extends ReactBridgeComponent with MuiStepLabelExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepper.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepper.scala index e464ac96..45c05325 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepper.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiStepper.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey -import japgolly.scalajs.react.raw.React - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.raw.React + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import io.kinoplan.scalajs.react.material.ui.core.internal.PaperClassKey + object MuiStepper extends ReactBridgeComponent with MuiStepperExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSvgIcon.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSvgIcon.scala index 65ed06a2..b087524a 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSvgIcon.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSvgIcon.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiSvgIcon extends ReactBridgeComponent with MuiSvgIconExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwipeableDrawer.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwipeableDrawer.scala index c5be0b4d..1e1dc465 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwipeableDrawer.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwipeableDrawer.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.ReactEventFromHtml - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEventFromHtml + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiSwipeableDrawer extends ReactBridgeComponent with MuiSwipeableDrawerExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwitch.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwitch.scala index ced6eb11..2f8410a2 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwitch.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiSwitch.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiSwitch extends ReactBridgeComponent with MuiSwitchExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTab.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTab.scala index 06e129df..997c4518 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTab.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTab.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiTab extends ReactBridgeComponent with MuiTabExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTable.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTable.scala index 4ce30393..3041ee65 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTable.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTable.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTable extends ReactBridgeComponent with MuiTableExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableBody.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableBody.scala index 409687ea..7803b4f6 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableBody.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableBody.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTableBody extends ReactBridgeComponent with MuiTableBodyExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableCell.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableCell.scala index 36817246..d2324c1d 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableCell.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableCell.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTableCell extends ReactBridgeComponent with MuiTableCellExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableFooter.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableFooter.scala index 0ae6213f..a3cdfdae 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableFooter.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableFooter.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTableFooter extends ReactBridgeComponent with MuiTableFooterExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableHead.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableHead.scala index 62751248..3184e906 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableHead.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableHead.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTableHead extends ReactBridgeComponent with MuiTableHeadExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTablePagination.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTablePagination.scala index d9ad6b63..72449904 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTablePagination.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTablePagination.scala @@ -1,14 +1,15 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import io.kinoplan.scalajs.react.material.ui.html.ReactEventFromNumberInput -import japgolly.scalajs.react.ReactEvent -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.ReactEvent +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} +import io.kinoplan.scalajs.react.material.ui.html.ReactEventFromNumberInput + object MuiTablePagination extends ReactBridgeComponent with MuiTablePaginationExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableRow.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableRow.scala index 8b5aa8b5..79cc8e9a 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableRow.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableRow.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTableRow extends ReactBridgeComponent with MuiTableRowExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableSortLabel.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableSortLabel.scala index b6f03419..cc8ebd52 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableSortLabel.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTableSortLabel.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTableSortLabel extends ReactBridgeComponent with MuiTableSortLabelExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTabs.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTabs.scala index 2d58a34e..2c3a17b3 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTabs.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTabs.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.ReactEvent - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.ReactEvent + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTabs extends ReactBridgeComponent with MuiTabsExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTextField.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTextField.scala index 400513aa..27aa521c 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTextField.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTextField.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^._ - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.html_<^._ + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTextField extends ReactBridgeComponent with MuiTextFieldExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiToolbar.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiToolbar.scala index a271d2ff..8706dc24 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiToolbar.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiToolbar.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiToolbar extends ReactBridgeComponent with MuiToolbarExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTooltip.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTooltip.scala index 2a842118..6172e730 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTooltip.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTooltip.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import scala.scalajs.js +import scala.scalajs.js.annotation.JSImport + import japgolly.scalajs.react.ReactEventFromHtml import japgolly.scalajs.react.vdom.html_<^._ -import scala.scalajs.js -import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} object MuiTooltip extends ReactBridgeComponent with MuiTooltipExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTouchRipple.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTouchRipple.scala index e2a70b9f..de9ac950 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTouchRipple.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTouchRipple.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiTouchRipple extends ReactBridgeComponent with MuiTouchRippleExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTypography.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTypography.scala index fe72a338..05a4695c 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTypography.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiTypography.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiTypography extends ReactBridgeComponent with MuiTypographyExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiZoom.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiZoom.scala index 4bbf23df..0fc86dbe 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiZoom.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/MuiZoom.scala @@ -1,12 +1,13 @@ package io.kinoplan.scalajs.react.material.ui.core -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import org.scalajs.dom.html - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import org.scalajs.dom.html + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiZoom extends ReactBridgeComponent { override protected lazy val componentValue: js.Function = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/internal/package.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/internal/package.scala index 156ad0b8..2aa3a059 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/internal/package.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/internal/package.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core -import japgolly.scalajs.react.vdom.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.VdomNode + package object internal { @JSImport("@material-ui/core/internal/svg-icons/ArrowDropDown", JSImport.Default) @js.native diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/package.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/package.scala index 6d39bd03..00050d47 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/package.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/package.scala @@ -1,13 +1,13 @@ package io.kinoplan.scalajs.react.material.ui -import japgolly.scalajs.react.raw.SyntheticEvent -import japgolly.scalajs.react.{Callback, ReactEventTypes} -import org.scalajs.dom.raw.HTMLElement - import scala.scalajs.js import scala.scalajs.js.annotation.JSGlobal import scala.scalajs.js.| +import japgolly.scalajs.react.{Callback, ReactEventTypes} +import japgolly.scalajs.react.raw.SyntheticEvent +import org.scalajs.dom.raw.HTMLElement + package object core { type JsFun0 = js.Function0[Callback] type OptJsFun1[A] = js.Function1[A, Unit] diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Breakpoints.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Breakpoints.scala index 434d8543..b2e30e0e 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Breakpoints.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Breakpoints.scala @@ -1,8 +1,8 @@ package io.kinoplan.scalajs.react.material.ui.core.styles import scala.scalajs.js -import scala.scalajs.js.| import scala.scalajs.js.JSConverters._ +import scala.scalajs.js.| @js.native trait Breakpoints extends js.Object { diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/MuiThemeProvider.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/MuiThemeProvider.scala index ce668e72..cc43e513 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/MuiThemeProvider.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/MuiThemeProvider.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core.styles -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.{JSGlobal, JSImport} import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiThemeProvider extends ReactBridgeComponent { override protected lazy val componentValue: js.Object = RawComponent diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Palette.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Palette.scala index 270d0d81..6d1ed185 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Palette.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Palette.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core.styles -import io.kinoplan.scalajs.react.material.ui.core.colors.{Color, CommonColors} - import scala.scalajs.js import scala.scalajs.js.JSConverters._ import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.material.ui.core.colors.{Color, CommonColors} + @js.native trait Palette extends js.Object { def common: CommonColors = js.native diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteColor.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteColor.scala index 7a5c4c26..63f7ba26 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteColor.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteColor.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.core.styles -import io.kinoplan.scalajs.react.material.ui.core.colors.Color - import scala.scalajs.js import scala.scalajs.js.JSConverters._ +import io.kinoplan.scalajs.react.material.ui.core.colors.Color + @js.native trait PaletteColor extends Color { def light: String = js.native diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteOptions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteOptions.scala index 50fd0c98..f976f4a8 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteOptions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/PaletteOptions.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core.styles -import io.kinoplan.scalajs.react.material.ui.core.colors.{Color, ColorPartial, CommonColorsPartial} - import scala.scalajs.js import scala.scalajs.js.JSConverters._ import scala.scalajs.js.| +import io.kinoplan.scalajs.react.material.ui.core.colors.{Color, ColorPartial, CommonColorsPartial} + @js.native trait PaletteOptions extends js.Object { def primary: js.UndefOr[PaletteColorOptions | ColorPartial | Color] = js.native diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala index 5753ff47..f208f9c2 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.core -import japgolly.scalajs.react.vdom.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.vdom.VdomNode + package object styles { @JSImport("@material-ui/core/styles/colorManipulator.js", JSImport.Default) @js.native diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/utils/MuiSvgIconCustom.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/utils/MuiSvgIconCustom.scala index 0fd9f65c..124853c3 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/utils/MuiSvgIconCustom.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/utils/MuiSvgIconCustom.scala @@ -1,10 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.utils -import io.kinoplan.scalajs.react.bridge.WithPropsAndTagsMods -import io.kinoplan.scalajs.react.material.ui.core.{ComponentPropType, MuiSvgIcon, MuiSvgIconExtensions} +import scala.scalajs.js + import japgolly.scalajs.react.vdom.TagMod import japgolly.scalajs.react.vdom.all._ -import scala.scalajs.js + +import io.kinoplan.scalajs.react.bridge.WithPropsAndTagsMods +import io.kinoplan.scalajs.react.material.ui.core.{ComponentPropType, MuiSvgIcon, MuiSvgIconExtensions} case class MuiSvgIconCustom(attrs: TagMod*) extends MuiSvgIconExtensions { def apply( diff --git a/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0+1-5e41edb4+20201105-1130-SNAPSHOT.jar b/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0+1-5e41edb4+20201105-1130-SNAPSHOT.jar new file mode 100644 index 00000000..8ab9f17d Binary files /dev/null and b/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0+1-5e41edb4+20201105-1130-SNAPSHOT.jar differ diff --git a/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0.jar b/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0.jar deleted file mode 100644 index e3a2a0ba..00000000 Binary files a/demo/lib/scalajs-react-material-ui-icons_sjs1_2.13-0.1.0.jar and /dev/null differ diff --git a/demo/src/main/scala/io/kinoplan/demo/AppCSS.scala b/demo/src/main/scala/io/kinoplan/demo/AppCSS.scala index dcf1d976..f01cccc4 100755 --- a/demo/src/main/scala/io/kinoplan/demo/AppCSS.scala +++ b/demo/src/main/scala/io/kinoplan/demo/AppCSS.scala @@ -1,5 +1,8 @@ package io.kinoplan.demo +import scalacss.ScalaCssReactImplicits +import scalacss.internal.mutable.StyleSheetRegistry + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles._ import io.kinoplan.demo.styles.demos.AppBar._ @@ -32,8 +35,6 @@ import io.kinoplan.demo.styles.labs.Slider.{DefaultDisabledSliderStyle, DefaultS import io.kinoplan.demo.styles.labs.SpeedDial.DefaultSpeedDialStyle import io.kinoplan.demo.styles.labs.ToggleButton.DefaultToggleButtonStyle import io.kinoplan.demo.utils.CSSUtils -import scalacss.ScalaCssReactImplicits -import scalacss.internal.mutable.StyleSheetRegistry object AppCSS extends ScalaCssReactImplicits { val registry = new StyleSheetRegistry diff --git a/demo/src/main/scala/io/kinoplan/demo/AppMain.scala b/demo/src/main/scala/io/kinoplan/demo/AppMain.scala index b705f3c4..493f7657 100755 --- a/demo/src/main/scala/io/kinoplan/demo/AppMain.scala +++ b/demo/src/main/scala/io/kinoplan/demo/AppMain.scala @@ -1,8 +1,9 @@ package io.kinoplan.demo -import io.kinoplan.demo.router.AppRouter import org.scalajs.dom +import io.kinoplan.demo.router.AppRouter + object AppMain { def main(args: Array[String]): Unit = { val root = dom.document.getElementById("root") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/ComponentContainer.scala b/demo/src/main/scala/io/kinoplan/demo/components/ComponentContainer.scala index 073f7d94..6860d4c1 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/ComponentContainer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/ComponentContainer.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components -import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} -import io.kinoplan.scalajs.react.material.ui.core.MuiTypography -import japgolly.scalajs.react.vdom.all.{VdomElement, div, _} import japgolly.scalajs.react.{BackendScope, PropsChildren, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, div, _} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} +import io.kinoplan.scalajs.react.material.ui.core.MuiTypography + object ComponentContainer extends ScalaCssReactImplicits { case class Props(title: String, style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/Layout.scala b/demo/src/main/scala/io/kinoplan/demo/components/Layout.scala index b7889893..f3b430a8 100755 --- a/demo/src/main/scala/io/kinoplan/demo/components/Layout.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/Layout.scala @@ -1,5 +1,11 @@ package io.kinoplan.demo.components +import japgolly.scalajs.react._ +import japgolly.scalajs.react.extra.router.{Resolution, RouterCtl} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.modules.MainMenu import io.kinoplan.demo.router.AppRouter.Page import io.kinoplan.demo.styles.{DefaultLayoutStyle, LayoutStyle} @@ -7,12 +13,7 @@ import io.kinoplan.demo.utils.Helpers._ import io.kinoplan.demo.utils.icons.{MuiLightBulbFullIcon, MuiLightBulbOutlineIcon} import io.kinoplan.scalajs.react.material.ui.core._ import io.kinoplan.scalajs.react.material.ui.core.styles._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiChevronLeftIcon, MuiMenuIcon, MuiNotificationsIcon} -import japgolly.scalajs.react._ -import japgolly.scalajs.react.extra.router.{Resolution, RouterCtl} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object Layout extends ScalaCssReactImplicits { var paletteValue: PaletteType.Value = PaletteType.light @@ -86,7 +87,7 @@ object Layout extends ScalaCssReactImplicits { MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, menuButtonHidden, aria.label := "Open drawer", onClick --> handleDrawerOpen, - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography( component = "h1", @@ -107,7 +108,7 @@ object Layout extends ScalaCssReactImplicits { ), MuiIconButton(color = MuiIconButton.Color.inherit)( MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.secondary)( - MuiNotificationsIcon() + MuiIcons(MuiIconsModule.Notifications)() ) ) ) @@ -117,7 +118,7 @@ object Layout extends ScalaCssReactImplicits { if (!state.open) css.drawerPaperClose else css.common.emptyStyle, div(css.toolbar, MuiIconButton()(onClick --> handleDrawerClose, - MuiChevronLeftIcon() + MuiIcons(MuiIconsModule.ChevronLeft)() ) ), MainMenu(props.router, props.r) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/TabContainer.scala b/demo/src/main/scala/io/kinoplan/demo/components/TabContainer.scala index 600d650b..f9ba0566 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/TabContainer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/TabContainer.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components -import io.kinoplan.demo.styles.{DefaultTabContainerStyle, TabContainerStyle} -import io.kinoplan.scalajs.react.material.ui.core.MuiTypography -import japgolly.scalajs.react.vdom.all._ import japgolly.scalajs.react.{BackendScope, PropsChildren, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.styles.{DefaultTabContainerStyle, TabContainerStyle} +import io.kinoplan.scalajs.react.material.ui.core.MuiTypography + object TabContainer extends ScalaCssReactImplicits { case class Props(style: TabContainerStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/BottomAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/BottomAppBar.scala index a1a5c456..20a30770 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/BottomAppBar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/BottomAppBar.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.AppBar +import japgolly.scalajs.react.{BackendScope, React, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.models.Message import io.kinoplan.demo.styles.demos.AppBar.{BottomAppBarStyle, DefaultBottomAppBarStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiMenuIcon, MuiMoreVertIcon, MuiSearchIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, React, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object BottomAppBar extends ScalaCssReactImplicits { case class Props(style: BottomAppBarStyle) @@ -42,14 +43,14 @@ object BottomAppBar extends ScalaCssReactImplicits { MuiToolbar()(css.toolbar, MuiIconButton(color = MuiIconButton.Color.inherit)( aria.label := "Open drawer", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), div( MuiIconButton(color = MuiIconButton.Color.inherit)( - MuiSearchIcon() + MuiIcons(MuiIconsModule.Search)() ), MuiIconButton(color = MuiIconButton.Color.inherit)( - MuiMoreVertIcon() + MuiIcons(MuiIconsModule.MoreVert)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/ButtonAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/ButtonAppBar.scala index 2029b2a0..408bce27 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/ButtonAppBar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/ButtonAppBar.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.AppBar +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiMenuIcon -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ButtonAppBar extends ScalaCssReactImplicits { case class Props(style: CommonStyle) @@ -21,7 +22,7 @@ object ButtonAppBar extends ScalaCssReactImplicits { MuiAppBar(position = MuiAppBar.Position.static)( MuiToolbar()( MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, aria.label := "Menu", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)(css.title, "News" diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/DenseAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/DenseAppBar.scala index 8d225d9f..1ff7d9b0 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/DenseAppBar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/DenseAppBar.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.AppBar +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiIconButton, MuiToolbar, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.MuiMenuIcon -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object DenseAppBar extends ScalaCssReactImplicits { case class Props(style: CommonStyle) @@ -22,7 +23,7 @@ object DenseAppBar extends ScalaCssReactImplicits { MuiToolbar(variant = MuiToolbar.Variant.dense)( MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButtonDesktop, aria.label := "Menu", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)( "Photos" diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/MenuAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/MenuAppBar.scala index 697132cd..179f6c78 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/MenuAppBar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/MenuAppBar.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.demos.AppBar -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin -import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAccountCircleIcon, MuiMenuIcon} +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ReactEventFromInput, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ReactEventFromInput, ScalaComponent} import org.scalajs.dom.raw.HTMLElement import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} +import io.kinoplan.scalajs.react.material.ui.core._ +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object MenuAppBar extends ScalaCssReactImplicits { case class Props(style: CommonStyle) @@ -87,7 +88,7 @@ object MenuAppBar extends ScalaCssReactImplicits { MuiToolbar()( MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, aria.label := "Menu", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)(css.flexGrowOne, "Photos" @@ -98,7 +99,7 @@ object MenuAppBar extends ScalaCssReactImplicits { aria.haspopup.`true`, Attr("edge") := "end", onClick ==> handleProfileMenuOpen, - MuiAccountCircleIcon() + MuiIcons(MuiIconsModule.AccountCircle)() ), renderMenu().when(open) ).when(state.auth) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/PrimarySearchAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/PrimarySearchAppBar.scala index a37673c8..78033da6 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/PrimarySearchAppBar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/PrimarySearchAppBar.scala @@ -1,18 +1,20 @@ package io.kinoplan.demo.components.demos.AppBar -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.AppBar.{DefaultPrimarySearchAppBarStyle, PrimarySearchAppBarStyle} -import io.kinoplan.demo.utils.Helpers._ -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin -import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons._ +import scala.scalajs.js.JSConverters._ + +import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} import org.scalajs.dom.raw.HTMLElement import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.AppBar.{DefaultPrimarySearchAppBarStyle, PrimarySearchAppBarStyle} +import io.kinoplan.demo.utils.Helpers._ +import io.kinoplan.scalajs.react.material.ui.core._ +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object PrimarySearchAppBar extends ScalaCssReactImplicits { case class Props(style: PrimarySearchAppBarStyle) @@ -60,7 +62,7 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits { val inputBaseClasses = Map( MuiInputBase.ClassKey.input -> styleAToClassName(css.inputInput), MuiInputBase.ClassKey.root -> styleAToClassName(css.inputRoot) - ) + ).some.orUndefined val ariaOwns = if (isMenuOpen) "material-appbar" else "" @@ -92,7 +94,7 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits { MuiMenuItem()( MuiIconButton(color = MuiIconButton.Color.inherit)( MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.secondary)( - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ), p("Messages") @@ -100,14 +102,14 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits { MuiMenuItem()( MuiIconButton(color = MuiIconButton.Color.inherit)( MuiBadge(badgeContent = VdomNode(11), color = MuiBadge.Color.secondary)( - MuiNotificationsIcon() + MuiIcons(MuiIconsModule.Notifications)() ) ), p("Notifications") ), MuiMenuItem()(onClick ==> handleProfileMenuOpen, MuiIconButton(color = MuiIconButton.Color.inherit)( - MuiAccountCircleIcon() + MuiIcons(MuiIconsModule.AccountCircle)() ), p("Profile") ) @@ -122,25 +124,25 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits { MuiIconButton(color = MuiIconButton.Color.inherit)(css.common.menuButton, aria.label := "Open drawer", Attr("edge") := "start", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit, noWrap = true)(css.title, "Material-UI" ), div(css.search, - div(css.searchIcon, MuiSearchIcon()), + div(css.searchIcon, MuiIcons(MuiIconsModule.Search)()), MuiInputBase(classes = inputBaseClasses)(placeholder := "Search…") ), div(css.common.flexGrowOne), div(css.sectionDesktop, MuiIconButton(color = MuiIconButton.Color.inherit)( MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.secondary)( - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ), MuiIconButton(color = MuiIconButton.Color.inherit)( MuiBadge(badgeContent = VdomNode(17), color = MuiBadge.Color.secondary)( - MuiNotificationsIcon() + MuiIcons(MuiIconsModule.Notifications)() ) ), MuiIconButton(color = MuiIconButton.Color.inherit)( @@ -148,14 +150,14 @@ object PrimarySearchAppBar extends ScalaCssReactImplicits { aria.haspopup.`true`, Attr("edge") := "end", onClick ==> handleProfileMenuOpen, - MuiAccountCircleIcon() + MuiIcons(MuiIconsModule.AccountCircle)() ) ), div(css.sectionMobile, MuiIconButton(color = MuiIconButton.Color.inherit)( aria.haspopup.`true`, onClick ==> handleMobileMenuOpen, - MuiMoreVertIcon() + MuiIcons(MuiIconsModule.MoreVert)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SearchAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SearchAppBar.scala index 192a55cd..a288a2c2 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SearchAppBar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SearchAppBar.scala @@ -1,13 +1,17 @@ package io.kinoplan.demo.components.demos.AppBar +import scala.scalajs.js.JSConverters._ + +import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.AppBar.{DefaultSearchAppBarStyle, SearchAppBarStyle} import io.kinoplan.demo.utils.Helpers._ import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiMenuIcon, MuiSearchIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SearchAppBar extends ScalaCssReactImplicits { case class Props(style: SearchAppBarStyle) @@ -19,7 +23,7 @@ object SearchAppBar extends ScalaCssReactImplicits { val inputBaseClasses = Map( MuiInputBase.ClassKey.input -> styleAToClassName(css.inputInput), MuiInputBase.ClassKey.root -> styleAToClassName(css.inputRoot) - ) + ).some.orUndefined div( ComponentContainer("App Bar with search field")( @@ -28,14 +32,14 @@ object SearchAppBar extends ScalaCssReactImplicits { MuiToolbar()( MuiIconButton(color = MuiIconButton.Color.inherit)(css.common.menuButton, aria.label := "Open drawer", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit, noWrap = true)(css.title, "Material-UI" ), div(css.common.flexGrowOne), div(css.search, - div(css.searchIcon, MuiSearchIcon()), + div(css.searchIcon, MuiIcons(MuiIconsModule.Search)()), MuiInputBase(classes = inputBaseClasses)(placeholder := "Search…") ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SimpleAppBar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SimpleAppBar.scala index f63b2ab4..31731249 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SimpleAppBar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/AppBar/SimpleAppBar.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.AppBar +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiToolbar, MuiTypography} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object SimpleAppBar extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/IconAvatars.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/IconAvatars.scala index b95d8d30..3f24f520 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/IconAvatars.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/IconAvatars.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Avatar +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Avatars.{AvatarsStyle, DefaultAvatarsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiGrid} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAssignmentIcon, MuiFolderIcon, MuiPageviewIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object IconAvatars extends ScalaCssReactImplicits { case class Props(style: AvatarsStyle) @@ -19,13 +20,13 @@ object IconAvatars extends ScalaCssReactImplicits { ComponentContainer("Icon avatars")( MuiGrid(justify = MuiGrid.Justify.center, alignItems = MuiGrid.AlignItems.center, container = true)( MuiAvatar()(css.avatar, - MuiFolderIcon() + MuiIcons(MuiIconsModule.Folder)() ), MuiAvatar()(css.pinkAvatar, - MuiPageviewIcon() + MuiIcons(MuiIconsModule.Pageview)() ), MuiAvatar()(css.greenAvatar, - MuiAssignmentIcon() + MuiIcons(MuiIconsModule.Assignment)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/ImageAvatars.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/ImageAvatars.scala index 7c2dd34b..91c4fd67 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/ImageAvatars.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/ImageAvatars.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Avatar +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Avatars.{AvatarsStyle, DefaultAvatarsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiGrid} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object ImageAvatars extends ScalaCssReactImplicits { case class Props(style: AvatarsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/LetterAvatars.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/LetterAvatars.scala index caa3861f..9043b72c 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/LetterAvatars.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Avatar/LetterAvatars.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Avatar +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Avatars.{AvatarsStyle, DefaultAvatarsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiGrid} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object LetterAvatars extends ScalaCssReactImplicits { case class Props(style: AvatarsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeMax.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeMax.scala index d8aeb469..396ad4f3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeMax.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeMax.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Badges +import japgolly.scalajs.react.{BackendScope, React, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Badges.{BadgeMaxStyle, DefaultBadgeMaxStyle} import io.kinoplan.scalajs.react.material.ui.core.MuiBadge -import io.kinoplan.scalajs.react.material.ui.icons.MuiMailIcon -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, React, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object BadgeMax extends ScalaCssReactImplicits { case class Props(style: BadgeMaxStyle) @@ -19,13 +20,13 @@ object BadgeMax extends ScalaCssReactImplicits { ComponentContainer("Maximum Value")( React.Fragment( MuiBadge(badgeContent = VdomNode(99), color = MuiBadge.Color.primary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ), MuiBadge(badgeContent = VdomNode(100), color = MuiBadge.Color.primary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ), MuiBadge(badgeContent = VdomNode(1000), max = 999, color = MuiBadge.Color.primary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeVisibility.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeVisibility.scala index aacdc1d1..ba8981a9 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeVisibility.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/BadgeVisibility.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Badges +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Badges.{BadgeVisibilityStyle, DefaultBadgeVisibilityStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiMailIcon -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object BadgeVisibility extends ScalaCssReactImplicits { case class Props(style: BadgeVisibilityStyle) @@ -30,14 +31,14 @@ object BadgeVisibility extends ScalaCssReactImplicits { invisible = state.invisible, color = MuiBadge.Color.secondary )(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ), MuiBadge( variant = MuiBadge.Variant.dot, invisible = state.invisible, color = MuiBadge.Color.secondary )(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ), MuiFormGroup(row = true)( @@ -51,10 +52,10 @@ object BadgeVisibility extends ScalaCssReactImplicits { MuiDivider()(css.divider), div(css.row, MuiBadge(badgeContent = VdomNode(0), color = MuiBadge.Color.secondary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ), MuiBadge(badgeContent = VdomNode(0), showZero = true, color = MuiBadge.Color.secondary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/CustomizedBadge.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/CustomizedBadge.scala index 09b4afb8..b7b8607c 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/CustomizedBadge.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/CustomizedBadge.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Badges +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Badges.{CustomizedBadgeStyle, DefaultCustomizedBadgeStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiBadge, MuiIconButton} -import io.kinoplan.scalajs.react.material.ui.icons.MuiMailIcon -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object CustomizedBadge extends ScalaCssReactImplicits { case class Props(style: CustomizedBadgeStyle) @@ -26,7 +27,7 @@ object CustomizedBadge extends ScalaCssReactImplicits { MuiIconButton()( aria.label := "Cart", MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.primary, classes = badgeClasses)( - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/DotBadge.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/DotBadge.scala index 81988524..03dee458 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/DotBadge.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/DotBadge.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Badges +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Badges.{DefaultDotBadgeStyle, DotBadgeStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiBadge, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.MuiMailIcon -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object DotBadge extends ScalaCssReactImplicits { case class Props(style: DotBadgeStyle) @@ -20,10 +21,10 @@ object DotBadge extends ScalaCssReactImplicits { div( div( MuiBadge(variant = MuiBadge.Variant.dot, color = MuiBadge.Color.primary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ), MuiBadge(variant = MuiBadge.Variant.dot, color = MuiBadge.Color.secondary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ), MuiBadge(variant = MuiBadge.Variant.dot, color = MuiBadge.Color.primary)(css.badgeMargin, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/SimpleBadge.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/SimpleBadge.scala index f4838b2d..c56f911a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/SimpleBadge.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Badges/SimpleBadge.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Badges +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Badges.{DefaultSimpleBadgeStyle, SimpleBadgeStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiBadge, MuiButton, MuiIconButton, MuiTab, MuiTabs, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.MuiMailIcon -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SimpleBadge extends ScalaCssReactImplicits { case class Props(style: SimpleBadgeStyle) @@ -27,15 +28,15 @@ object SimpleBadge extends ScalaCssReactImplicits { div( div( MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.primary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ), MuiBadge(badgeContent = VdomNode(10), color = MuiBadge.Color.secondary)(css.badgeMargin, - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ), MuiIconButton()(css.badgeMargin, aria.label := "4 pending messages", MuiBadge(badgeContent = VdomNode(4), color = MuiBadge.Color.primary)( - MuiMailIcon() + MuiIcons(MuiIconsModule.Mail)() ) ) ), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/LabelBottomNavigation.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/LabelBottomNavigation.scala index d7dacf64..798942a2 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/LabelBottomNavigation.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/LabelBottomNavigation.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.BottomNavigation -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.BottomNavigation.{BottomNavigationStyle, DefaultBottomNavigationStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiBottomNavigation, MuiBottomNavigationAction, MuiIcon} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiFavoriteIcon, MuiLocationOnIcon, MuiRestoreIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.BottomNavigation.{BottomNavigationStyle, DefaultBottomNavigationStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiBottomNavigation, MuiBottomNavigationAction, MuiIcon} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object LabelBottomNavigation extends ScalaCssReactImplicits { case class Props(style: BottomNavigationStyle) @@ -30,13 +31,13 @@ object LabelBottomNavigation extends ScalaCssReactImplicits { div( MuiBottomNavigation(onChange = handleChange)(css.root, value := state.value, - MuiBottomNavigationAction(label = VdomNode("Recents"), icon = MuiRestoreIcon()())( + MuiBottomNavigationAction(label = VdomNode("Recents"), icon = MuiIcons(MuiIconsModule.Restore)()())( value := "recents" ), - MuiBottomNavigationAction(label = VdomNode("Favorites"), icon = MuiFavoriteIcon()())( + MuiBottomNavigationAction(label = VdomNode("Favorites"), icon = MuiIcons(MuiIconsModule.Favorite)()())( value := "favorites" ), - MuiBottomNavigationAction(label = VdomNode("Nearby"), icon = MuiLocationOnIcon()())( + MuiBottomNavigationAction(label = VdomNode("Nearby"), icon = MuiIcons(MuiIconsModule.LocationOn)()())( value := "nearby" ), MuiBottomNavigationAction(label = VdomNode("Folder"), icon = MuiIcon()("folder"))( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/SimpleBottomNavigation.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/SimpleBottomNavigation.scala index b43441ab..b4214631 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/SimpleBottomNavigation.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/BottomNavigation/SimpleBottomNavigation.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.BottomNavigation -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.BottomNavigation.{BottomNavigationStyle, DefaultBottomNavigationStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiBottomNavigation, MuiBottomNavigationAction} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiFavoriteIcon, MuiLocationOnIcon, MuiRestoreIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.BottomNavigation.{BottomNavigationStyle, DefaultBottomNavigationStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiBottomNavigation, MuiBottomNavigationAction} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SimpleBottomNavigation extends ScalaCssReactImplicits { case class Props(style: BottomNavigationStyle) @@ -33,9 +34,9 @@ object SimpleBottomNavigation extends ScalaCssReactImplicits { onChange = handleChange )(css.root, value := state.value, - MuiBottomNavigationAction(label = VdomNode("Recents"), icon = MuiRestoreIcon()()), - MuiBottomNavigationAction(label = VdomNode("Favorites"), icon = MuiFavoriteIcon()()), - MuiBottomNavigationAction(label = VdomNode("Nearby"), icon = MuiLocationOnIcon()()) + MuiBottomNavigationAction(label = VdomNode("Recents"), icon = MuiIcons(MuiIconsModule.Restore)()()), + MuiBottomNavigationAction(label = VdomNode("Favorites"), icon = MuiIcons(MuiIconsModule.Favorite)()()), + MuiBottomNavigationAction(label = VdomNode("Nearby"), icon = MuiIcons(MuiIconsModule.LocationOn)()()) ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonBases.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonBases.scala index 4491038b..57afe878 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonBases.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonBases.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Buttons -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.models.Buttons.Image -import io.kinoplan.demo.styles.demos.Buttons.{ButtonBasesStyle, DefaultButtonBasesStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButtonBase, MuiTypography} +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.models.Buttons.Image +import io.kinoplan.demo.styles.demos.Buttons.{ButtonBasesStyle, DefaultButtonBasesStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButtonBase, MuiTypography} object ButtonBases extends ScalaCssReactImplicits { case class Props(style: ButtonBasesStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonSizes.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonSizes.scala index 950dbdd3..00b490b0 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonSizes.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ButtonSizes.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{CommonButtonStyle, DefaultCommonButtonStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiFab, MuiIconButton} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAddIcon, MuiDeleteIcon, MuiNavigationIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ButtonSizes extends ScalaCssReactImplicits { case class Props(style: CommonButtonStyle) @@ -78,15 +79,15 @@ object ButtonSizes extends ScalaCssReactImplicits { div( MuiFab(size = MuiFab.Size.small, color = MuiFab.Color.secondary)(css.marginButton, aria.label := "Add", - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ), MuiFab(size = MuiFab.Size.medium, color = MuiFab.Color.secondary)(css.marginButton, aria.label := "Add", - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ), MuiFab(color = MuiFab.Color.secondary)(css.marginButton, aria.label := "Add", - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ) ), div( @@ -96,7 +97,7 @@ object ButtonSizes extends ScalaCssReactImplicits { color = MuiFab.Color.primary )(css.marginButton, aria.label := "Add", - MuiNavigationIcon()(css.extendedIcon), + MuiIcons(MuiIconsModule.Navigation)()(css.extendedIcon), "Extended" ), MuiFab( @@ -105,27 +106,27 @@ object ButtonSizes extends ScalaCssReactImplicits { color = MuiFab.Color.primary )(css.marginButton, aria.label := "Add", - MuiNavigationIcon()(css.extendedIcon), + MuiIcons(MuiIconsModule.Navigation)()(css.extendedIcon), "Extended" ), MuiFab(variant = MuiFab.Variant.extended, color = MuiFab.Color.primary)(css.marginButton, aria.label := "Add", - MuiNavigationIcon()(css.extendedIcon), + MuiIcons(MuiIconsModule.Navigation)()(css.extendedIcon), "Extended" ) ), div( MuiIconButton()(css.marginButton, aria.label := "Delete", - MuiDeleteIcon(fontSize = MuiDeleteIcon.FontSize.small) + MuiIcons(MuiIconsModule.Delete)(fontSize = MuiIcons.FontSize.small) ), MuiIconButton()(css.marginButton, aria.label := "Delete", - MuiDeleteIcon() + MuiIcons(MuiIconsModule.Delete)() ), MuiIconButton()(css.marginButton, aria.label := "Delete", - MuiDeleteIcon(fontSize = MuiDeleteIcon.FontSize.large) + MuiIcons(MuiIconsModule.Delete)(fontSize = MuiIcons.FontSize.large) ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ContainedButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ContainedButtons.scala index 730caa57..1da807c0 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ContainedButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/ContainedButtons.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{CommonButtonStyle, DefaultCommonButtonStyle} import io.kinoplan.scalajs.react.material.ui.core.MuiButton -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object ContainedButtons extends ScalaCssReactImplicits { case class Props(style: CommonButtonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/CustomizedButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/CustomizedButtons.scala index 5bdd88fd..54db7541 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/CustomizedButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/CustomizedButtons.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{CustomizedButtonsStyle, DefaultCustomizedButtonsStyle} -import io.kinoplan.scalajs.react.material.ui.core.styles._ import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, colors} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles._ object CustomizedButtons extends ScalaCssReactImplicits { case class Props(style: CustomizedButtonsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtonZoom.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtonZoom.scala index b7b1e429..401414fa 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtonZoom.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtonZoom.scala @@ -2,6 +2,11 @@ package io.kinoplan.demo.components.demos.Buttons import scala.scalajs.js +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} import io.kinoplan.demo.models.Buttons.Fab import io.kinoplan.demo.styles.demos.Buttons.{DefaultFloatingActionButtonsZoomStyle, FloatingActionButtonsZoomStyle} @@ -10,11 +15,7 @@ import io.kinoplan.scalajs.react.libs.external.reactSwipeableViews.components.Re import io.kinoplan.scalajs.react.libs.external.reactSwipeableViews.mod.{AxisType, SwipeableViewsProps} import io.kinoplan.scalajs.react.material.ui.core._ import io.kinoplan.scalajs.react.material.ui.core.styles.Direction -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAddIcon, MuiEditIcon, MuiKeyboardArrowUpIcon} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object FloatingActionButtonZoom extends ScalaCssReactImplicits { case class Props(style: FloatingActionButtonsZoomStyle) @@ -36,9 +37,9 @@ object FloatingActionButtonZoom extends ScalaCssReactImplicits { val css = props.style val fabs = List( - Fab(MuiFab.Color.inherit, css.fab, MuiAddIcon()), - Fab(MuiFab.Color.secondary, css.fab, MuiEditIcon()), - Fab(MuiFab.Color.inherit, css.fabAndFabGreen, MuiKeyboardArrowUpIcon()) + Fab(MuiFab.Color.inherit, css.fab, MuiIcons(MuiIconsModule.Add)()), + Fab(MuiFab.Color.secondary, css.fab, MuiIcons(MuiIconsModule.Edit)()), + Fab(MuiFab.Color.inherit, css.fabAndFabGreen, MuiIcons(MuiIconsModule.KeyboardArrowUp)()) ) val enter = css.theme.transitions.duration.enteringScreen diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtons.scala index 221a9957..55a092ad 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/FloatingActionButtons.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{CommonButtonStyle, DefaultCommonButtonStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiFab, MuiIcon} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAddIcon, MuiDeleteIcon, MuiNavigationIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object FloatingActionButtons extends ScalaCssReactImplicits { case class Props(style: CommonButtonStyle) @@ -20,7 +21,7 @@ object FloatingActionButtons extends ScalaCssReactImplicits { div( MuiFab(color = MuiFab.Color.primary)(css.marginButton, aria.label := "Add", - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ), MuiFab(color = MuiFab.Color.secondary)(css.marginButton, aria.label := "Edit", @@ -28,13 +29,13 @@ object FloatingActionButtons extends ScalaCssReactImplicits { ), MuiFab(variant = MuiFab.Variant.extended)(css.marginButton, aria.label := "Delete", - MuiNavigationIcon()(css.extendedIcon), + MuiIcons(MuiIconsModule.Navigation)()(css.extendedIcon), "Extended" ), MuiFab()(css.marginButton, disabled := true, aria.label := "Delete", - MuiDeleteIcon() + MuiIcons(MuiIconsModule.Delete)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconButtons.scala index 408e8728..fc065359 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconButtons.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{CommonButtonStyle, DefaultCommonButtonStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiIcon, MuiIconButton} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAddShoppingCartIcon, MuiDeleteIcon, MuiPhotoCameraIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object IconButtons extends ScalaCssReactImplicits { case class Props(style: CommonButtonStyle) @@ -20,12 +21,12 @@ object IconButtons extends ScalaCssReactImplicits { div( MuiIconButton()(css.marginButton, aria.label := "Delete", - MuiDeleteIcon() + MuiIcons(MuiIconsModule.Delete)() ), MuiIconButton(color = MuiIconButton.Color.primary)(css.marginButton, disabled := true, aria.label := "Delete", - MuiDeleteIcon() + MuiIcons(MuiIconsModule.Delete)() ), MuiIconButton(color = MuiIconButton.Color.secondary)(css.marginButton, aria.label := "Add an alarm", @@ -33,12 +34,12 @@ object IconButtons extends ScalaCssReactImplicits { ), MuiIconButton(color = MuiIconButton.Color.primary)(css.marginButton, aria.label := "Add to shopping cart", - MuiAddShoppingCartIcon() + MuiIcons(MuiIconsModule.AddShoppingCart)() ), input.file(css.inputButton, accept := "image/*", id := "icon-button-file"), label(htmlFor := "icon-button-file")( MuiIconButton(color = MuiIconButton.Color.primary, component = "span")(css.marginButton, - MuiPhotoCameraIcon() + MuiIcons(MuiIconsModule.PhotoCamera)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconLabelButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconLabelButtons.scala index 076edee1..d78c72c2 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconLabelButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/IconLabelButtons.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{DefaultIconLabelButtonsStyle, IconLabelButtonsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiIcon} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiCloudUploadIcon, MuiDeleteIcon, MuiKeyboardVoiceIcon, MuiSaveIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object IconLabelButtons extends ScalaCssReactImplicits { case class Props(style: IconLabelButtonsStyle) @@ -20,7 +21,7 @@ object IconLabelButtons extends ScalaCssReactImplicits { div( MuiButton(variant = MuiButton.Variant.contained, color = MuiButton.Color.secondary)(css.common.marginButton, "Delete", - MuiDeleteIcon()(css.rightIcon) + MuiIcons(MuiIconsModule.Delete)()(css.rightIcon) ), MuiButton(variant = MuiButton.Variant.contained, color = MuiButton.Color.primary)(css.common.marginButton, "Send", @@ -28,15 +29,15 @@ object IconLabelButtons extends ScalaCssReactImplicits { ), MuiButton(variant = MuiButton.Variant.contained, color = MuiButton.Color.default)(css.common.marginButton, "Upload", - MuiCloudUploadIcon()(css.rightIcon) + MuiIcons(MuiIconsModule.CloudUpload)()(css.rightIcon) ), MuiButton(variant = MuiButton.Variant.contained, color = MuiButton.Color.secondary)(css.common.marginButton, disabled := true, - MuiKeyboardVoiceIcon()(css.leftIcon), + MuiIcons(MuiIconsModule.KeyboardVoice)()(css.leftIcon), "Talk" ), MuiButton(variant = MuiButton.Variant.contained, size = MuiButton.Size.small)(css.common.marginButton, - MuiSaveIcon()(css.leftIcon, css.iconSmall), + MuiIcons(MuiIconsModule.Save)()(css.leftIcon, css.iconSmall), "Save" ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/OutlinedButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/OutlinedButtons.scala index d67c3e1d..943cff02 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/OutlinedButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/OutlinedButtons.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{CommonButtonStyle, DefaultCommonButtonStyle} import io.kinoplan.scalajs.react.material.ui.core.MuiButton -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object OutlinedButtons extends ScalaCssReactImplicits { case class Props(style: CommonButtonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/TextButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/TextButtons.scala index 42239344..01185435 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/TextButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Buttons/TextButtons.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Buttons +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Buttons.{CommonButtonStyle, DefaultCommonButtonStyle} import io.kinoplan.scalajs.react.material.ui.core.MuiButton -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object TextButtons extends ScalaCssReactImplicits { case class Props(style: CommonButtonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCard.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCard.scala index ef5cad50..92531cbf 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCard.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCard.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Cards +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Cards.{DefaultMediaCardStyle, MediaCardStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object MediaCard extends ScalaCssReactImplicits { case class Props(style: MediaCardStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCardFit.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCardFit.scala index 537b8874..2ce51921 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCardFit.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaCardFit.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Cards +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Cards.{DefaultMediaCardStyle, MediaCardStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object MediaCardFit extends ScalaCssReactImplicits { case class Props(style: MediaCardStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaControlCard.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaControlCard.scala index e1e39456..b548cfe0 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaControlCard.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/MediaControlCard.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Cards +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Cards.{DefaultMediaControlCardStyle, MediaControlCardStyle} -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiPlayArrowIcon, MuiSkipNextIcon, MuiSkipPreviousIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object MediaControlCard extends ScalaCssReactImplicits { case class Props(style: MediaControlCardStyle) @@ -31,15 +32,23 @@ object MediaControlCard extends ScalaCssReactImplicits { div(css.controls, MuiIconButton()( aria.label := "Previous", - if (css.theme.direction == Direction.rtl.toString) MuiSkipNextIcon() else MuiSkipPreviousIcon() + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.SkipNext)() + } else { + MuiIcons(MuiIconsModule.SkipPrevious)() + } ), MuiIconButton()( aria.label := "Play/pause", - MuiPlayArrowIcon()(css.playIcon) + MuiIcons(MuiIconsModule.PlayArrow)()(css.playIcon) ), MuiIconButton()( aria.label := "Next", - if (css.theme.direction == Direction.rtl.toString) MuiSkipPreviousIcon() else MuiSkipNextIcon() + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.SkipPrevious)() + } else { + MuiIcons(MuiIconsModule.SkipNext)() + } ) ) ), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/RecipeReviewCard.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/RecipeReviewCard.scala index e6048d9d..fbb69011 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/RecipeReviewCard.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/RecipeReviewCard.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Cards +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Cards.{DefaultRecipeReviewCardStyle, RecipeReviewCardStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiExpandMoreIcon, MuiFavoriteIcon, MuiMoreVertIcon, MuiShareIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object RecipeReviewCard extends ScalaCssReactImplicits { case class Props(style: RecipeReviewCardStyle) @@ -32,7 +33,7 @@ object RecipeReviewCard extends ScalaCssReactImplicits { "R" ).rawNode), action = MuiIconButton()( - MuiMoreVertIcon() + MuiIcons(MuiIconsModule.MoreVert)() ), title = VdomNode("Shrimp and Chorizo Paella"), subheader = VdomNode("September 14, 2016") @@ -49,17 +50,17 @@ object RecipeReviewCard extends ScalaCssReactImplicits { MuiCardActions(disableActionSpacing = true)(css.actions, MuiIconButton()( aria.label := "Add to favorites", - MuiFavoriteIcon() + MuiIcons(MuiIconsModule.Favorite)() ), MuiIconButton()( aria.label := "Share", - MuiShareIcon() + MuiIcons(MuiIconsModule.Share)() ), MuiIconButton()(css.expand, expandOpen, aria.label := "Show more", aria.expanded := state.expanded, onClick --> handleExpandClick, - MuiExpandMoreIcon() + MuiIcons(MuiIconsModule.ExpandMore)() ) ), MuiCollapse(in = state.expanded, timeout = MuiCollapse.Timeout.auto, unmountOnExit = true)( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/SimpleCard.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/SimpleCard.scala index 01101f5a..6cbb3e63 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/SimpleCard.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Cards/SimpleCard.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Cards +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Cards.{DefaultSimpleCardStyle, SimpleCardStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object SimpleCard extends ScalaCssReactImplicits { case class Props(style: SimpleCardStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/Chips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/Chips.scala index f8a18f5f..8881455e 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/Chips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/Chips.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Chips +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Chips.{ChipsStyle, DefaultChipsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiChip} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDoneIcon, MuiFaceIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object Chips extends ScalaCssReactImplicits { case class Props(style: ChipsStyle) @@ -41,21 +42,21 @@ object Chips extends ScalaCssReactImplicits { )(css.chip), MuiChip( label = "Clickable Deletable Chip".toVdom, - avatar = MuiAvatar()(MuiFaceIcon()).rawElement, + avatar = MuiAvatar()(MuiIcons(MuiIconsModule.Face)()).rawElement, onDelete = handleDelete )(css.chip, onClick ==> handleClick ), MuiChip( label = "Clickable Deletable Chip".toVdom, - icon = MuiFaceIcon()().rawElement, + icon = MuiIcons(MuiIconsModule.Face)()().rawElement, onDelete = handleDelete )(css.chip, onClick ==> handleClick ), MuiChip( label = "Custom delete icon Chip".toVdom, - deleteIcon = MuiDoneIcon()().rawElement, + deleteIcon = MuiIcons(MuiIconsModule.Done)()().rawElement, onDelete = handleDelete )(css.chip, onClick ==> handleClick @@ -70,15 +71,15 @@ object Chips extends ScalaCssReactImplicits { MuiChip( label = "Primary Clickable Chip".toVdom, avatar = MuiAvatar()("MB").rawElement, - deleteIcon = MuiDoneIcon()().rawElement, + deleteIcon = MuiIcons(MuiIconsModule.Done)()().rawElement, onDelete = handleDelete, color = MuiChip.Color.primary, clickable = true )(css.chip), MuiChip( label = "Primary Clickable Chip".toVdom, - icon = MuiFaceIcon()().rawElement, - deleteIcon = MuiDoneIcon()().rawElement, + icon = MuiIcons(MuiIconsModule.Face)()().rawElement, + deleteIcon = MuiIcons(MuiIconsModule.Done)()().rawElement, onDelete = handleDelete, color = MuiChip.Color.primary, clickable = true @@ -90,13 +91,13 @@ object Chips extends ScalaCssReactImplicits { )(css.chip), MuiChip( label = "Deletable Secondary Chip".toVdom, - avatar = MuiAvatar()(MuiFaceIcon()).rawElement, + avatar = MuiAvatar()(MuiIcons(MuiIconsModule.Face)()).rawElement, onDelete = handleDelete, color = MuiChip.Color.secondary )(css.chip), MuiChip( label = "Deletable Secondary Chip".toVdom, - icon = MuiFaceIcon()().rawElement, + icon = MuiIcons(MuiIconsModule.Face)()().rawElement, onDelete = handleDelete, color = MuiChip.Color.secondary )(css.chip) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsArray.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsArray.scala index 00c46de6..ac395ce8 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsArray.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsArray.scala @@ -1,16 +1,17 @@ package io.kinoplan.demo.components.demos.Chips -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.models.Chips.Chip -import io.kinoplan.demo.styles.demos.Chips.{ChipsArrayStyle, DefaultChipsArrayStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiChip, MuiPaper} -import io.kinoplan.scalajs.react.material.ui.icons.MuiTagFacesIcon +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.models.Chips.Chip +import io.kinoplan.demo.styles.demos.Chips.{ChipsArrayStyle, DefaultChipsArrayStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiChip, MuiPaper} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ChipsArray extends ScalaCssReactImplicits { case class Props(style: ChipsArrayStyle) @@ -31,7 +32,7 @@ object ChipsArray extends ScalaCssReactImplicits { ComponentContainer("Chip array")( MuiPaper()(css.root, state.chips.toVdomArray { chip => - val iconO = if (chip.isReact) Some(MuiTagFacesIcon()().rawElement) else None + val iconO = if (chip.isReact) Some(MuiIcons(MuiIconsModule.TagFaces)()().rawElement) else None MuiChip( label = VdomNode(chip.label), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsPlayground.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsPlayground.scala index 6572c522..425cc183 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsPlayground.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/ChipsPlayground.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Chips +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Chips.{ChipsPlaygroundStyle, DefaultChipsPlaygroundStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDoneIcon, MuiFaceIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js.JSConverters._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ChipsPlayground extends ScalaCssReactImplicits { case class Props(style: ChipsPlaygroundStyle) @@ -81,7 +82,7 @@ object ChipsPlayground extends ScalaCssReactImplicits { } else { state.icon match { case "none" => None - case _ => Some(MuiFaceIcon()().rawElement) + case _ => Some(MuiIcons(MuiIconsModule.Face)()().rawElement) } } @@ -89,7 +90,7 @@ object ChipsPlayground extends ScalaCssReactImplicits { case "none" => None case "img" => Some(MuiAvatar()(src := "/static/images/avatar/1.jpg")().rawElement) case "letter" => Some(MuiAvatar()("FH").rawElement) - case _ => Some(MuiAvatar()(MuiFaceIcon()).rawElement) + case _ => Some(MuiAvatar()(MuiIcons(MuiIconsModule.Face)()).rawElement) } div( @@ -106,7 +107,11 @@ object ChipsPlayground extends ScalaCssReactImplicits { MuiChip( label = "Awesome Chip Component".toVdom, color = state.color, - deleteIcon = (if (state.isOnDeleteCustom) Some(MuiDoneIcon()().rawElement) else None).orUndefined, + deleteIcon = (if (state.isOnDeleteCustom) { + Some(MuiIcons(MuiIconsModule.Done)()().rawElement) + } else { + None + }).orUndefined, onDelete = handleDeleteExample(state), avatar = avatarToPlayground.orUndefined, icon = iconToPlayground.orUndefined, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/OutlinedChips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/OutlinedChips.scala index b70d42cd..84e058f4 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/OutlinedChips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Chips/OutlinedChips.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Chips +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Chips.{ChipsStyle, DefaultChipsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiChip} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDoneIcon, MuiFaceIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object OutlinedChips extends ScalaCssReactImplicits { case class Props(style: ChipsStyle) @@ -46,7 +47,7 @@ object OutlinedChips extends ScalaCssReactImplicits { )(css.chip), MuiChip( label = "Clickable Deletable Chip".toVdom, - avatar = MuiAvatar()(MuiFaceIcon()).rawElement, + avatar = MuiAvatar()(MuiIcons(MuiIconsModule.Face)()).rawElement, onDelete = handleDelete, variant = MuiChip.Variant.outlined )(css.chip, @@ -54,7 +55,7 @@ object OutlinedChips extends ScalaCssReactImplicits { ), MuiChip( label = "Clickable Deletable Chip".toVdom, - icon = MuiFaceIcon()().rawElement, + icon = MuiIcons(MuiIconsModule.Face)()().rawElement, onDelete = handleDelete, variant = MuiChip.Variant.outlined )(css.chip, @@ -62,7 +63,7 @@ object OutlinedChips extends ScalaCssReactImplicits { ), MuiChip( label = "Custom delete icon Chip".toVdom, - deleteIcon = MuiDoneIcon()().rawElement, + deleteIcon = MuiIcons(MuiIconsModule.Done)()().rawElement, onDelete = handleDelete, variant = MuiChip.Variant.outlined )(css.chip, @@ -79,7 +80,7 @@ object OutlinedChips extends ScalaCssReactImplicits { MuiChip( label = "Primary Clickable Chip".toVdom, avatar = MuiAvatar()("MB").rawElement, - deleteIcon = MuiDoneIcon()().rawElement, + deleteIcon = MuiIcons(MuiIconsModule.Done)()().rawElement, onDelete = handleDelete, color = MuiChip.Color.primary, clickable = true, @@ -87,8 +88,8 @@ object OutlinedChips extends ScalaCssReactImplicits { )(css.chip), MuiChip( label = "Primary Clickable Chip".toVdom, - icon = MuiFaceIcon()().rawElement, - deleteIcon = MuiDoneIcon()().rawElement, + icon = MuiIcons(MuiIconsModule.Face)()().rawElement, + deleteIcon = MuiIcons(MuiIconsModule.Done)()().rawElement, onDelete = handleDelete, color = MuiChip.Color.primary, clickable = true, @@ -102,14 +103,14 @@ object OutlinedChips extends ScalaCssReactImplicits { )(css.chip), MuiChip( label = "Deletable Secondary Chip".toVdom, - avatar = MuiAvatar()(MuiFaceIcon()).rawElement, + avatar = MuiAvatar()(MuiIcons(MuiIconsModule.Face)()).rawElement, onDelete = handleDelete, color = MuiChip.Color.secondary, variant = MuiChip.Variant.outlined )(css.chip), MuiChip( label = "Deletable Secondary Chip".toVdom, - icon = MuiFaceIcon()().rawElement, + icon = MuiIcons(MuiIconsModule.Face)()().rawElement, onDelete = handleDelete, color = MuiChip.Color.secondary, variant = MuiChip.Variant.outlined diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/AlertDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/AlertDialog.scala index 7cb3c49f..d3532a27 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/AlertDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/AlertDialog.scala @@ -1,9 +1,10 @@ package io.kinoplan.demo.components.demos.Dialogs +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiDialog, MuiDialogActions, MuiDialogContent, MuiDialogContentText, MuiDialogTitle} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} object AlertDialog { case class State(open: Boolean = false) { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialog.scala index 86a1a9ae..79ba7459 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialog.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Dialogs +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Dialogs.{ConfirmationDialogStyle, DefaultConfirmationDialogStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiDialog, MuiList, MuiListItem, MuiListItemText} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits object ConfirmationDialog extends ScalaCssReactImplicits { case class Props(style: ConfirmationDialogStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialogRaw.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialogRaw.scala index 6e03a325..f3485b15 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialogRaw.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ConfirmationDialogRaw.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Dialogs -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiDialog, MuiDialogActions, MuiDialogContent, MuiDialogTitle, MuiFormControlLabel, MuiRadio, MuiRadioGroup} +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromInput, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromInput, ScalaComponent} -import scala.scalajs.js +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiDialog, MuiDialogActions, MuiDialogContent, MuiDialogTitle, MuiFormControlLabel, MuiRadio, MuiRadioGroup} object ConfirmationDialogRaw { case class Props(open: Boolean, onClose: js.Function1[String, Callback], value: String, dialogClassess: Map[String, String]) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialog.scala index aebbedcf..96e2a0c2 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialog.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Dialogs +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomizedDialog extends ScalaCssReactImplicits { case class Props(style: DialogsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialogTitleWrapped.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialogTitleWrapped.scala index 4884a7d6..2bca0fed 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialogTitleWrapped.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/CustomizedDialogTitleWrapped.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Dialogs -import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiDialogTitle, MuiIconButton, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.MuiCloseIcon -import japgolly.scalajs.react.vdom.all._ import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiDialogTitle, MuiIconButton, MuiTypography} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} + object CustomizedDialogTitleWrapped extends ScalaCssReactImplicits { case class Props(onClose: Callback, style: DialogsStyle) @@ -21,7 +22,7 @@ object CustomizedDialogTitleWrapped extends ScalaCssReactImplicits { MuiIconButton()(css.closeButton, aria.label := "Close", onClick --> props.onClose, - MuiCloseIcon() + MuiIcons(MuiIconsModule.Close)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FormDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FormDialog.scala index 514f4677..942a377b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FormDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FormDialog.scala @@ -1,10 +1,11 @@ package io.kinoplan.demo.components.demos.Dialogs +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiDialog, MuiDialogActions, MuiDialogContent, MuiDialogContentText, MuiDialogTitle, MuiTextField} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} object FormDialog { case class State(open: Boolean = false) { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FullScreenDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FullScreenDialog.scala index 4dd571f1..79b6e305 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FullScreenDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/FullScreenDialog.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Dialogs +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiCloseIcon -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object FullScreenDialog extends ScalaCssReactImplicits { case class Props(style: DialogsStyle) @@ -42,7 +43,7 @@ object FullScreenDialog extends ScalaCssReactImplicits { MuiIconButton(color = MuiIconButton.Color.inherit)( aria.label := "Close", onClick --> handleClickClose, - MuiCloseIcon() + MuiIcons(MuiIconsModule.Close)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)(css.flexStyle, "Sound" diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/MaxWidthDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/MaxWidthDialog.scala index ff00b679..893a1e10 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/MaxWidthDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/MaxWidthDialog.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Dialogs -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} -import io.kinoplan.scalajs.react.material.ui.core._ -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, React, ReactEvent, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} +import io.kinoplan.scalajs.react.material.ui.core._ object MaxWidthDialog extends ScalaCssReactImplicits { case class Props(style: DialogsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ScrollDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ScrollDialog.scala index b8818783..0c70e6db 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ScrollDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/ScrollDialog.scala @@ -1,9 +1,10 @@ package io.kinoplan.demo.components.demos.Dialogs +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiDialog, MuiDialogActions, MuiDialogContent, MuiDialogContentText, MuiDialogTitle} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} object ScrollDialog { case class State(open: Boolean = false, scroll: String = "paper") { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialog.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialog.scala index e2c0cdf4..82b1d43c 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialog.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialog.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Dialogs +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.Dialogs.Emails import io.kinoplan.demo.styles.demos.Chips.{ChipsArrayStyle, DefaultChipsArrayStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTypography} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} object SimpleDialog { case class State(open: Boolean = false, selectedValue: String = Emails.default(1)) { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialogWrapped.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialogWrapped.scala index d7cc4b2e..c61af157 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialogWrapped.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dialogs/SimpleDialogWrapped.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Dialogs -import io.kinoplan.demo.models.Dialogs.Emails -import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} -import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAddIcon, MuiPersonIcon} +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.models.Dialogs.Emails +import io.kinoplan.demo.styles.demos.Dialogs.{DefaultDialogsStyle, DialogsStyle} +import io.kinoplan.scalajs.react.material.ui.core._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SimpleDialogWrapped extends ScalaCssReactImplicits { case class Props(open: Boolean, onClose: js.Function1[String, Callback], selectedValue: String, style: DialogsStyle) @@ -38,7 +39,7 @@ object SimpleDialogWrapped extends ScalaCssReactImplicits { Attr("key") := email, MuiListItemAvatar()( MuiAvatar()(css.avatar, - MuiPersonIcon() + MuiIcons(MuiIconsModule.Person)() ) ), MuiListItemText(primary = VdomNode(email)) @@ -48,7 +49,7 @@ object SimpleDialogWrapped extends ScalaCssReactImplicits { onClick --> handleListItemClick(props, "addAccount"), MuiListItemAvatar()( MuiAvatar()( - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ) ), MuiListItemText(primary = VdomNode("add account")) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/InsetDividers.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/InsetDividers.scala index e120a375..b97017ee 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/InsetDividers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/InsetDividers.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Dividers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Dividers.{DefaultDividersStyle, DividersStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiBeachAccessIcon, MuiImageIcon, MuiWorkIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object InsetDividers extends ScalaCssReactImplicits { case class Props(style: DividersStyle) @@ -19,19 +20,19 @@ object InsetDividers extends ScalaCssReactImplicits { ComponentContainer("Inset Dividers")( MuiList()(css.root, css.rootPaper(Layout.isPaletteLight), MuiListItem()( - MuiAvatar()(MuiImageIcon()), + MuiAvatar()(MuiIcons(MuiIconsModule.Image)()), MuiListItemText(primary = VdomNode("Photos"), secondary = VdomNode("Jan 9, 2014")) ), li( MuiDivider(variant = MuiDivider.Variant.inset) ), MuiListItem()( - MuiAvatar()(MuiWorkIcon()), + MuiAvatar()(MuiIcons(MuiIconsModule.Work)()), MuiListItemText(primary = VdomNode("Work"), secondary = VdomNode("Jan 7, 2014")) ), MuiDivider(variant = MuiDivider.Variant.inset, component = "li"), MuiListItem()( - MuiAvatar()(MuiBeachAccessIcon()), + MuiAvatar()(MuiIcons(MuiIconsModule.BeachAccess)()), MuiListItemText(primary = VdomNode("Vacation"), secondary = VdomNode("July 20, 2014")) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/ListDividers.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/ListDividers.scala index ff1f70f5..d772864f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/ListDividers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/ListDividers.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Dividers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Dividers.{DefaultDividersStyle, DividersStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiDivider, MuiList, MuiListItem, MuiListItemText} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object ListDividers extends ScalaCssReactImplicits { case class Props(style: DividersStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/MiddleDividers.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/MiddleDividers.scala index 22d97880..fc9347e3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/MiddleDividers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/MiddleDividers.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Dividers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Dividers.{DefaultDividersStyle, DividersStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object MiddleDividers extends ScalaCssReactImplicits { case class Props(style: DividersStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/SubheaderDividers.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/SubheaderDividers.scala index 1ceeb1b7..ba02ee08 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/SubheaderDividers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Dividers/SubheaderDividers.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Dividers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Dividers.{DefaultDividersStyle, DividersStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiBeachAccessIcon, MuiImageIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SubheaderDividers extends ScalaCssReactImplicits { case class Props(style: DividersStyle) @@ -19,7 +20,7 @@ object SubheaderDividers extends ScalaCssReactImplicits { ComponentContainer("Subheader Dividers")( MuiList()(css.root, css.rootPaper(Layout.isPaletteLight), MuiListItem()( - MuiAvatar()(MuiImageIcon()), + MuiAvatar()(MuiIcons(MuiIconsModule.Image)()), MuiListItemText(primary = VdomNode("Photos"), secondary = VdomNode("Jan 9, 2014")) ), MuiDivider(component = "li"), @@ -44,7 +45,7 @@ object SubheaderDividers extends ScalaCssReactImplicits { ) ), MuiListItem()( - MuiAvatar()(MuiBeachAccessIcon()), + MuiAvatar()(MuiIcons(MuiIconsModule.BeachAccess)()), MuiListItemText(primary = VdomNode("Vacation"), secondary = VdomNode("July 20, 2014")) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/MiniDrawer.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/MiniDrawer.scala index c6b48502..950fdb04 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/MiniDrawer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/MiniDrawer.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Drawers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Drawers.{DefaultMiniDrawerStyle, MiniDrawerStyle} import io.kinoplan.demo.utils.Helpers.stylesToClassName -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons._ -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object MiniDrawer extends ScalaCssReactImplicits { case class Props(style: MiniDrawerStyle) @@ -40,14 +41,18 @@ object MiniDrawer extends ScalaCssReactImplicits { div(css.toolbar, MuiIconButton()( onClick --> handleDrawerClose, - if (css.theme.direction == Direction.ltr) MuiChevronLeftIcon() else MuiChevronRightIcon() + if (css.theme.direction == Direction.ltr) { + MuiIcons(MuiIconsModule.ChevronLeft)() + } else { + MuiIcons(MuiIconsModule.ChevronRight)() + } ) ), MuiDivider(), MuiList()( List("Inbox", "Starred", "Send email", "Drafts").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -56,7 +61,7 @@ object MiniDrawer extends ScalaCssReactImplicits { MuiList()( List("All mail", "Trash", "Spam").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -73,7 +78,7 @@ object MiniDrawer extends ScalaCssReactImplicits { MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, if (state.open) css.hide else css.common.emptyStyle, aria.label := "Open drawer", onClick --> handleDrawerOpen, - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit, noWrap = true)( "Mini variant drawer" diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/PersistentDrawer.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/PersistentDrawer.scala index ef2f75a5..9e7ada44 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/PersistentDrawer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/PersistentDrawer.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Drawers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Drawers.{DefaultPersistentDrawerStyle, PersistentDrawerStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons._ -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object PersistentDrawer extends ScalaCssReactImplicits { case class Props(style: PersistentDrawerStyle) @@ -37,14 +38,18 @@ object PersistentDrawer extends ScalaCssReactImplicits { div(css.drawerHeader, MuiIconButton()( onClick --> handleDrawerClose, - if (css.theme.direction == Direction.ltr) MuiChevronLeftIcon() else MuiChevronRightIcon() + if (css.theme.direction == Direction.ltr) { + MuiIcons(MuiIconsModule.ChevronLeft)() + } else { + MuiIcons(MuiIconsModule.ChevronRight)() + } ) ), MuiDivider(), MuiList()( List("Inbox", "Starred", "Send email", "Drafts").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -53,7 +58,7 @@ object PersistentDrawer extends ScalaCssReactImplicits { MuiList()( List("All mail", "Trash", "Spam").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -72,7 +77,7 @@ object PersistentDrawer extends ScalaCssReactImplicits { MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, if (state.open) css.hide else css.common.emptyStyle, aria.label := "Open drawer", onClick --> handleDrawerOpen, - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit, noWrap = true)( "Persistent drawer" diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/ResponsiveDrawer.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/ResponsiveDrawer.scala index 97e7fb49..096e30f1 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/ResponsiveDrawer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/ResponsiveDrawer.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Drawers +import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Drawers.{DefaultResponsiveDrawerStyle, ResponsiveDrawerStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiInboxIcon, MuiMailIcon, MuiMenuIcon} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ResponsiveDrawer extends ScalaCssReactImplicits { case class Props(style: ResponsiveDrawerStyle) @@ -37,7 +38,7 @@ object ResponsiveDrawer extends ScalaCssReactImplicits { MuiList()( List("Inbox", "Starred", "Send email", "Drafts").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -46,7 +47,7 @@ object ResponsiveDrawer extends ScalaCssReactImplicits { MuiList()( List("All mail", "Trash", "Spam").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -63,7 +64,7 @@ object ResponsiveDrawer extends ScalaCssReactImplicits { MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, aria.label := "Open drawer", onClick ==> handleDrawerToggle, - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit, noWrap = true)( "Responsive drawer" diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/SwipeableTemporaryDrawer.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/SwipeableTemporaryDrawer.scala index a3244ada..fc7bdb67 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/SwipeableTemporaryDrawer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/SwipeableTemporaryDrawer.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Drawers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Drawers.{DefaultDrawersStyle, DrawersStyle} -import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiInboxIcon, MuiMailIcon} +import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Drawers.{DefaultDrawersStyle, DrawersStyle} +import io.kinoplan.scalajs.react.material.ui.core._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} + object SwipeableTemporaryDrawer extends ScalaCssReactImplicits { case class Props(style: DrawersStyle) @@ -52,7 +53,7 @@ object SwipeableTemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("Inbox", "Starred", "Send email", "Drafts").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -61,7 +62,7 @@ object SwipeableTemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("All mail", "Trash", "Spam").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -74,7 +75,7 @@ object SwipeableTemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("Inbox", "Starred", "Send email", "Drafts").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -83,7 +84,7 @@ object SwipeableTemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("All mail", "Trash", "Spam").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/TemporaryDrawer.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/TemporaryDrawer.scala index 98cac469..d8c401cb 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/TemporaryDrawer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Drawers/TemporaryDrawer.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Drawers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Drawers.{DefaultDrawersStyle, DrawersStyle} -import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiInboxIcon, MuiMailIcon} +import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Drawers.{DefaultDrawersStyle, DrawersStyle} +import io.kinoplan.scalajs.react.material.ui.core._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} + object TemporaryDrawer extends ScalaCssReactImplicits { case class Props(style: DrawersStyle) @@ -52,7 +53,7 @@ object TemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("Inbox", "Starred", "Send email", "Drafts").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -61,7 +62,7 @@ object TemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("All mail", "Trash", "Spam").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -74,7 +75,7 @@ object TemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("Inbox", "Starred", "Send email", "Drafts").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } @@ -83,7 +84,7 @@ object TemporaryDrawer extends ScalaCssReactImplicits { MuiList()( List("All mail", "Trash", "Spam").zipWithIndex.toVdomArray { case (text, index) => MuiListItem(button = true)(Attr("key") := text, - MuiListItemIcon()(if (index % 2 == 0) MuiInboxIcon() else MuiMailIcon()), + MuiListItemIcon()(if (index % 2 == 0) MuiIcons(MuiIconsModule.Inbox)() else MuiIcons(MuiIconsModule.Mail)()), MuiListItemText(primary = VdomNode(text)) ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/ControlledExpansionPanels.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/ControlledExpansionPanels.scala index 9f546505..ce2922c1 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/ControlledExpansionPanels.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/ControlledExpansionPanels.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.ExpansionPanels +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.ExpansionPanels.{ControlledExpansionPanelsStyle, DefaultControlledExpansionPanelsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiExpansionPanel, MuiExpansionPanelDetails, MuiExpansionPanelSummary, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.MuiExpandMoreIcon -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ControlledExpansionPanels extends ScalaCssReactImplicits { case class Props(style: ControlledExpansionPanelsStyle) @@ -33,7 +34,7 @@ object ControlledExpansionPanels extends ScalaCssReactImplicits { ComponentContainer("Controlled Accordion")( div(css.root, MuiExpansionPanel(expanded = state.isPanel1)(onChange --> handleChange("panel1"), - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( MuiTypography()(css.heading, "General settings"), MuiTypography()(css.secondaryHeading, "I am an expansion panel") ), @@ -45,7 +46,7 @@ object ControlledExpansionPanels extends ScalaCssReactImplicits { ) ), MuiExpansionPanel(expanded = state.isPanel2)(onChange --> handleChange("panel2"), - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( MuiTypography()(css.heading, "Users"), MuiTypography()(css.secondaryHeading, "You are currently not an owner") ), @@ -57,7 +58,7 @@ object ControlledExpansionPanels extends ScalaCssReactImplicits { ) ), MuiExpansionPanel(expanded = state.isPanel3)(onChange --> handleChange("panel3"), - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( MuiTypography()(css.heading, "Advanced settings"), MuiTypography()(css.secondaryHeading, "Filtering has been entirely disabled for whole web server") ), @@ -69,7 +70,7 @@ object ControlledExpansionPanels extends ScalaCssReactImplicits { ) ), MuiExpansionPanel(expanded = state.isPanel4)(onChange --> handleChange("panel4"), - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( MuiTypography()(css.heading, "Personal data") ), MuiExpansionPanelDetails()( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/CustomizedExpansionPanel.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/CustomizedExpansionPanel.scala index 4ee79674..0c0a4b9e 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/CustomizedExpansionPanel.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/CustomizedExpansionPanel.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.ExpansionPanels +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.ExpansionPanels.{CustomizedExpansionPanelStyle, DefaultCustomizedExpansionPanelStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiExpansionPanel, MuiExpansionPanelDetails, MuiExpansionPanelSummary, MuiTypography} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomizedExpansionPanel extends ScalaCssReactImplicits { case class Props(style: CustomizedExpansionPanelStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/DetailedExpansionPanel.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/DetailedExpansionPanel.scala index ef8d0287..5c5bedc4 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/DetailedExpansionPanel.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/DetailedExpansionPanel.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.ExpansionPanels +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.ExpansionPanels.{DefaultDetailedExpansionPanelStyle, DetailedExpansionPanelStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiExpandMoreIcon -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object DetailedExpansionPanel extends ScalaCssReactImplicits { case class Props(style: DetailedExpansionPanelStyle) @@ -23,7 +24,7 @@ object DetailedExpansionPanel extends ScalaCssReactImplicits { ComponentContainer("Secondary heading and Columns")( div(css.root, MuiExpansionPanel(defaultExpanded = true)( - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( div(css.column, MuiTypography()(css.heading, "Location") ), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/SimpleExpansionPanel.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/SimpleExpansionPanel.scala index 4d678fc9..79bdd983 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/SimpleExpansionPanel.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/ExpansionPanels/SimpleExpansionPanel.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.ExpansionPanels +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.ExpansionPanels.{DefaultSimpleExpansionPanelStyle, SimpleExpansionPanelStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiExpansionPanel, MuiExpansionPanelDetails, MuiExpansionPanelSummary, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.MuiExpandMoreIcon -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SimpleExpansionPanel extends ScalaCssReactImplicits { case class Props(style: SimpleExpansionPanelStyle) @@ -19,7 +20,7 @@ object SimpleExpansionPanel extends ScalaCssReactImplicits { ComponentContainer("Simple Expansion Panel")( div(css.root, MuiExpansionPanel()( - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( MuiTypography()(css.heading, "Expansion Panel 1" ) @@ -32,7 +33,7 @@ object SimpleExpansionPanel extends ScalaCssReactImplicits { ) ), MuiExpansionPanel()( - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( MuiTypography()(css.heading, "Expansion Panel 2" ) @@ -46,7 +47,7 @@ object SimpleExpansionPanel extends ScalaCssReactImplicits { ), MuiExpansionPanel()( disabled := true, - MuiExpansionPanelSummary(expandIcon = MuiExpandMoreIcon()())( + MuiExpansionPanelSummary(expandIcon = MuiIcons(MuiIconsModule.ExpandMore)()())( MuiTypography()(css.heading, "Disabled Expansion Panel" ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/AdvancedGridList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/AdvancedGridList.scala index 964eb68e..d26a5849 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/AdvancedGridList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/AdvancedGridList.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.GridList +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.models.GridList.TileData import io.kinoplan.demo.styles.demos.GridList.{AdvancedGridListStyle, DefaultAdvancedGridListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiGridList, MuiGridListTile, MuiGridListTileBar, MuiIconButton} -import io.kinoplan.scalajs.react.material.ui.icons.MuiStarBorderIcon -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object AdvancedGridList extends ScalaCssReactImplicits { case class Props(style: AdvancedGridListStyle) @@ -29,7 +30,7 @@ object AdvancedGridList extends ScalaCssReactImplicits { MuiGridListTileBar( title = VdomNode(tile.title), titlePosition = MuiGridListTileBar.TitlePosition.top, - actionIcon = VdomNode(MuiIconButton()(css.iconStyle, MuiStarBorderIcon()).rawNode), + actionIcon = VdomNode(MuiIconButton()(css.iconStyle, MuiIcons(MuiIconsModule.StarBorder)()).rawNode), actionPosition = MuiGridListTileBar.ActionPosition.left )(css.titleBar) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/ImageGridList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/ImageGridList.scala index cdd729e9..ac34597b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/ImageGridList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/ImageGridList.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.GridList +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.models.GridList.TileData import io.kinoplan.demo.styles.demos.GridList.{DefaultImageGridListStyle, ImageGridListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiGridList, MuiGridListTile} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object ImageGridList extends ScalaCssReactImplicits { case class Props(style: ImageGridListStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/SingleLineGridList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/SingleLineGridList.scala index e793a71d..1b80449f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/SingleLineGridList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/SingleLineGridList.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.GridList +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.models.GridList.TileData import io.kinoplan.demo.styles.demos.GridList.{DefaultSingleLineGridListStyle, SingleLineGridListStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiGridList, MuiGridListTile, MuiGridListTileBar, MuiIconButton} -import io.kinoplan.scalajs.react.material.ui.icons.MuiStarBorderIcon -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SingleLineGridList extends ScalaCssReactImplicits { case class Props(style: SingleLineGridListStyle) @@ -34,7 +35,7 @@ object SingleLineGridList extends ScalaCssReactImplicits { MuiGridListTileBar( title = VdomNode(tile.title), classes = barClasses, - actionIcon = VdomNode(MuiIconButton()(MuiStarBorderIcon()(css.title)).rawNode) + actionIcon = VdomNode(MuiIconButton()(MuiIcons(MuiIconsModule.StarBorder)()(css.title)).rawNode) ) ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/TitlebarGridList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/TitlebarGridList.scala index f155e00a..b482d75f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/TitlebarGridList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/GridList/TitlebarGridList.scala @@ -1,16 +1,17 @@ package io.kinoplan.demo.components.demos.GridList -import io.kinoplan.demo.components.{ComponentContainer, Layout} -import io.kinoplan.demo.models.GridList.TileData -import io.kinoplan.demo.styles.demos.GridList.{DefaultTitlebarGridListStyle, TitlebarGridListStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiGridList, MuiGridListTile, MuiGridListTileBar, MuiIconButton, MuiListSubheader} -import io.kinoplan.scalajs.react.material.ui.icons.MuiInfoIcon +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.{ComponentContainer, Layout} +import io.kinoplan.demo.models.GridList.TileData +import io.kinoplan.demo.styles.demos.GridList.{DefaultTitlebarGridListStyle, TitlebarGridListStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiGridList, MuiGridListTile, MuiGridListTileBar, MuiIconButton, MuiListSubheader} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object TitlebarGridList extends ScalaCssReactImplicits { case class Props(style: TitlebarGridListStyle) @@ -33,7 +34,7 @@ object TitlebarGridList extends ScalaCssReactImplicits { MuiGridListTileBar( title = VdomNode(tile.title), subtitle = VdomNode(span(s"by: ${tile.author}").rawNode), - actionIcon = VdomNode(MuiIconButton()(css.iconStyle, MuiInfoIcon()).rawNode) + actionIcon = VdomNode(MuiIconButton()(css.iconStyle, MuiIcons(MuiIconsModule.Info)()).rawNode) ) ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/AlignItemsList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/AlignItemsList.scala index 00f8dc4c..abc4f321 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/AlignItemsList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/AlignItemsList.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Lists +import japgolly.scalajs.react.{BackendScope, React, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiList, MuiListItem, MuiListItemAvatar, MuiListItemText, MuiTypography} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, React, ScalaComponent} -import scalacss.ScalaCssReactImplicits object AlignItemsList extends ScalaCssReactImplicits { case class Props(style: ListStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxList.scala index d251a2f4..d34caa68 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxList.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Lists -import io.kinoplan.demo.components.{ComponentContainer, Layout} -import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiCheckbox, MuiIconButton, MuiList, MuiListItem, MuiListItemSecondaryAction, MuiListItemText} -import io.kinoplan.scalajs.react.material.ui.icons._ +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.{ComponentContainer, Layout} +import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiCheckbox, MuiIconButton, MuiList, MuiListItem, MuiListItemSecondaryAction, MuiListItemText} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} + object CheckboxList extends ScalaCssReactImplicits { case class Props(style: ListStyle) @@ -45,7 +46,7 @@ object CheckboxList extends ScalaCssReactImplicits { MuiListItemSecondaryAction()( MuiIconButton()( aria.label := "Comments", - MuiCommentIcon() + MuiIcons(MuiIconsModule.Comment)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxListSecondary.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxListSecondary.scala index 71a2fbe2..621eba8d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxListSecondary.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/CheckboxListSecondary.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Lists -import io.kinoplan.demo.components.{ComponentContainer, Layout} -import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiCheckbox, MuiList, MuiListItem, MuiListItemAvatar, MuiListItemSecondaryAction, MuiListItemText} +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.{ComponentContainer, Layout} +import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiCheckbox, MuiList, MuiListItem, MuiListItemAvatar, MuiListItemSecondaryAction, MuiListItemText} + object CheckboxListSecondary extends ScalaCssReactImplicits { case class Props(style: ListStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/FolderList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/FolderList.scala index 274e8038..fecf5f60 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/FolderList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/FolderList.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Lists +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiList, MuiListItem, MuiListItemText} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiBeachAccessIcon, MuiImageIcon, MuiWorkIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object FolderList extends ScalaCssReactImplicits { case class Props(style: ListStyle) @@ -21,19 +22,19 @@ object FolderList extends ScalaCssReactImplicits { MuiList()( MuiListItem()( MuiAvatar()( - MuiImageIcon() + MuiIcons(MuiIconsModule.Image)() ), MuiListItemText(primary = VdomNode("Photos"), secondary = VdomNode("Jan 9, 2014")) ), MuiListItem()( MuiAvatar()( - MuiWorkIcon() + MuiIcons(MuiIconsModule.Work)() ), MuiListItemText(primary = VdomNode("Work"), secondary = VdomNode("Jan 7, 2014")) ), MuiListItem()( MuiAvatar()( - MuiBeachAccessIcon() + MuiIcons(MuiIconsModule.BeachAccess)() ), MuiListItemText(primary = VdomNode("Vacation"), secondary = VdomNode("July 20, 2014")) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InsetList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InsetList.scala index 8f7128cb..ca6cefb9 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InsetList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InsetList.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Lists +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemIcon, MuiListItemText} -import io.kinoplan.scalajs.react.material.ui.icons.MuiStarIcon -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object InsetList extends ScalaCssReactImplicits { case class Props(style: ListStyle) @@ -21,7 +22,7 @@ object InsetList extends ScalaCssReactImplicits { MuiList(component = "nav")( MuiListItem(button = true)( MuiListItemIcon()( - MuiStarIcon() + MuiIcons(MuiIconsModule.Star)() ), MuiListItemText(inset = true, primary = VdomNode("Chelsea Otakan")) ), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InteractiveList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InteractiveList.scala index 298082d8..97ca5769 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InteractiveList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/InteractiveList.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Lists -import io.kinoplan.demo.components.{ComponentContainer, Layout} -import io.kinoplan.demo.styles.demos.Lists.{DefaultInteractiveListStyle, InteractiveListStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiCheckbox, MuiFormControlLabel, MuiFormGroup, MuiGrid, MuiIconButton, MuiList, MuiListItem, MuiListItemAvatar, MuiListItemIcon, MuiListItemSecondaryAction, MuiListItemText, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDeleteIcon, MuiFolderIcon} +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.{ComponentContainer, Layout} +import io.kinoplan.demo.styles.demos.Lists.{DefaultInteractiveListStyle, InteractiveListStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiAvatar, MuiCheckbox, MuiFormControlLabel, MuiFormGroup, MuiGrid, MuiIconButton, MuiList, MuiListItem, MuiListItemAvatar, MuiListItemIcon, MuiListItemSecondaryAction, MuiListItemText, MuiTypography} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} + object InteractiveList extends ScalaCssReactImplicits { case class Props(style: InteractiveListStyle) @@ -80,7 +81,7 @@ object InteractiveList extends ScalaCssReactImplicits { List(1, 2, 3).toVdomArray { generateKey => MuiListItem()(Attr("key") := generateKey, MuiListItemIcon()( - MuiFolderIcon() + MuiIcons(MuiIconsModule.Folder)() ), MuiListItemText( primary = VdomNode("Single-line item"), @@ -101,7 +102,7 @@ object InteractiveList extends ScalaCssReactImplicits { MuiListItem()(Attr("key") := generateKey, MuiListItemAvatar()( MuiAvatar()( - MuiFolderIcon() + MuiIcons(MuiIconsModule.Folder)() ) ), MuiListItemText( @@ -121,7 +122,7 @@ object InteractiveList extends ScalaCssReactImplicits { MuiListItem()(Attr("key") := generateKey, MuiListItemAvatar()( MuiAvatar()( - MuiFolderIcon() + MuiIcons(MuiIconsModule.Folder)() ) ), MuiListItemText( @@ -131,7 +132,7 @@ object InteractiveList extends ScalaCssReactImplicits { MuiListItemSecondaryAction()( MuiIconButton()( aria.label := "Delete", - MuiDeleteIcon() + MuiIcons(MuiIconsModule.Delete)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/NestedList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/NestedList.scala index 58a73352..de80b809 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/NestedList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/NestedList.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Lists +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiCollapse, MuiList, MuiListItem, MuiListItemIcon, MuiListItemText, MuiListSubheader} -import io.kinoplan.scalajs.react.material.ui.icons._ -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object NestedList extends ScalaCssReactImplicits { case class Props(style: ListStyle) @@ -30,28 +31,28 @@ object NestedList extends ScalaCssReactImplicits { )( MuiListItem(button = true)( MuiListItemIcon()( - MuiSendIcon() + MuiIcons(MuiIconsModule.Send)() ), MuiListItemText(inset = true, primary = VdomNode("Sent mail")) ), MuiListItem(button = true)( MuiListItemIcon()( - MuiDraftsIcon() + MuiIcons(MuiIconsModule.Drafts)() ), MuiListItemText(inset = true, primary = VdomNode("Drafts")) ), MuiListItem(button = true)(onClick --> handleClick, MuiListItemIcon()( - MuiInboxIcon() + MuiIcons(MuiIconsModule.Inbox)() ), MuiListItemText(inset = true, primary = VdomNode("Inbox")), - if (state.open) MuiExpandLessIcon() else MuiExpandMoreIcon() + if (state.open) MuiIcons(MuiIconsModule.ExpandLess)() else MuiIcons(MuiIconsModule.ExpandMore)() ), MuiCollapse(in = state.open, timeout = MuiCollapse.Timeout.auto, unmountOnExit = true)( MuiList(component = "div", disablePadding = true)(onClick --> handleClick, MuiListItem(button = true)(css.nested, MuiListItemIcon()( - MuiStarBorderIcon() + MuiIcons(MuiIconsModule.StarBorder)() ), MuiListItemText(inset = true, primary = VdomNode("Starred")) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/PinnedSubheaderList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/PinnedSubheaderList.scala index 4ff6f2af..c351f43a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/PinnedSubheaderList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/PinnedSubheaderList.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Lists -import io.kinoplan.demo.components.{ComponentContainer, Layout} -import io.kinoplan.demo.styles.demos.Lists.{DefaultPinnedSubheaderListStyle, PinnedSubheaderListStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemText, MuiListSubheader} +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.{ComponentContainer, Layout} +import io.kinoplan.demo.styles.demos.Lists.{DefaultPinnedSubheaderListStyle, PinnedSubheaderListStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemText, MuiListSubheader} + object PinnedSubheaderList extends ScalaCssReactImplicits { case class Props(style: PinnedSubheaderListStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SelectedListItem.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SelectedListItem.scala index 006d4b70..cdc4ff4b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SelectedListItem.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SelectedListItem.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Lists +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiDivider, MuiList, MuiListItem, MuiListItemIcon, MuiListItemText} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDraftsIcon, MuiInboxIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SelectedListItem extends ScalaCssReactImplicits { case class Props(style: ListStyle) @@ -31,7 +32,7 @@ object SelectedListItem extends ScalaCssReactImplicits { selected := state.isSelectedIndex(0), onClick --> handleListItemClick(0), MuiListItemIcon()( - MuiInboxIcon() + MuiIcons(MuiIconsModule.Inbox)() ), MuiListItemText(primary = VdomNode("Inbox")) ), @@ -39,7 +40,7 @@ object SelectedListItem extends ScalaCssReactImplicits { selected := state.isSelectedIndex(1), onClick --> handleListItemClick(1), MuiListItemIcon()( - MuiDraftsIcon() + MuiIcons(MuiIconsModule.Drafts)() ), MuiListItemText(primary = VdomNode("Drafts")) ), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SimpleList.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SimpleList.scala index ad1dfa56..20a7bf5c 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SimpleList.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SimpleList.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Lists +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiDivider, MuiList, MuiListItem, MuiListItemIcon, MuiListItemText} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDraftsIcon, MuiInboxIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SimpleList extends ScalaCssReactImplicits { case class Props(style: ListStyle) @@ -21,13 +22,13 @@ object SimpleList extends ScalaCssReactImplicits { MuiList(component = "nav")( MuiListItem(button = true)( MuiListItemIcon()( - MuiInboxIcon() + MuiIcons(MuiIconsModule.Inbox)() ), MuiListItemText(primary = VdomNode("Inbox")) ), MuiListItem(button = true)( MuiListItemIcon()( - MuiDraftsIcon() + MuiIcons(MuiIconsModule.Drafts)() ), MuiListItemText(primary = VdomNode("Drafts")) ), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SwitchListSecondary.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SwitchListSecondary.scala index 9a2a472c..f9f95506 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SwitchListSecondary.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Lists/SwitchListSecondary.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Lists +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Lists.{DefaultListStyle, ListStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemIcon, MuiListItemSecondaryAction, MuiListItemText, MuiListSubheader, MuiSwitch} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiBluetoothIcon, MuiWifiIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SwitchListSecondary extends ScalaCssReactImplicits { case class Props(style: ListStyle) @@ -35,7 +36,7 @@ object SwitchListSecondary extends ScalaCssReactImplicits { MuiList(subheader = MuiListSubheader()("Settings"))( MuiListItem()( MuiListItemIcon()( - MuiWifiIcon() + MuiIcons(MuiIconsModule.Wifi)() ), MuiListItemText(primary = VdomNode("Wi-Fi")), MuiListItemSecondaryAction()( @@ -47,7 +48,7 @@ object SwitchListSecondary extends ScalaCssReactImplicits { ), MuiListItem()( MuiListItemIcon()( - MuiBluetoothIcon() + MuiIcons(MuiIconsModule.Bluetooth)() ), MuiListItemText(primary = VdomNode("Bluetooth")), MuiListItemSecondaryAction()( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/FadeMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/FadeMenu.scala index 344fb107..b8549792 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/FadeMenu.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/FadeMenu.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Menus -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiFade, MuiMenu, MuiMenuItem} -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js +import scala.scalajs.js.JSConverters._ + import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import org.scalajs.dom.raw.HTMLElement import scalacss.ScalaCssReactImplicits -import scala.scalajs.js -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiFade, MuiMenu, MuiMenuItem} object FadeMenu extends ScalaCssReactImplicits { @js.native diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/ListItemComposition.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/ListItemComposition.scala index 395a893a..6b127005 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/ListItemComposition.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/ListItemComposition.scala @@ -1,13 +1,17 @@ package io.kinoplan.demo.components.demos.Menus +import scala.scalajs.js.JSConverters._ + +import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Menus.{DefaultListItemCompositionStyle, ListItemCompositionStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiListItemIcon, MuiListItemText, MuiMenuItem, MuiMenuList, MuiPaper} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDraftsIcon, MuiInboxIcon, MuiSendIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ListItemComposition extends ScalaCssReactImplicits { case class Props(style: ListItemCompositionStyle) @@ -18,7 +22,7 @@ object ListItemComposition extends ScalaCssReactImplicits { val textClasses = Map( MuiListItemText.ClassKey.primary -> styleAToClassName(css.primary) - ) + ).some.orUndefined div( ComponentContainer("Customized MenuItem")( @@ -27,19 +31,19 @@ object ListItemComposition extends ScalaCssReactImplicits { MuiMenuList()( MuiMenuItem()(css.menuItem, MuiListItemIcon()(css.icon, - MuiSendIcon() + MuiIcons(MuiIconsModule.Send)() ), MuiListItemText(classes = textClasses, inset = true, primary = VdomNode("Sent mail")) ), MuiMenuItem()(css.menuItem, MuiListItemIcon()(css.icon, - MuiDraftsIcon() + MuiIcons(MuiIconsModule.Drafts)() ), MuiListItemText(classes = textClasses, inset = true, primary = VdomNode("Drafts")) ), MuiMenuItem()(css.menuItem, MuiListItemIcon()(css.icon, - MuiInboxIcon() + MuiIcons(MuiIconsModule.Inbox)() ), MuiListItemText(classes = textClasses, inset = true, primary = VdomNode("Inbox")) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/LongMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/LongMenu.scala index 21ff454a..3fe339ea 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/LongMenu.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/LongMenu.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.demos.Menus -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.utils.props.MuiPaperProps -import io.kinoplan.scalajs.react.material.ui.core.{MuiIconButton, MuiMenu, MuiMenuItem} -import io.kinoplan.scalajs.react.material.ui.icons.MuiMoreVertIcon +import scala.scalajs.js +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} import org.scalajs.dom.raw.HTMLElement import scalacss.ScalaCssReactImplicits -import scala.scalajs.js -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.utils.props.MuiPaperProps +import io.kinoplan.scalajs.react.material.ui.core.{MuiIconButton, MuiMenu, MuiMenuItem} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object LongMenu extends ScalaCssReactImplicits { case class State(anchorEl: Option[HTMLElement] = None) { @@ -66,7 +67,7 @@ object LongMenu extends ScalaCssReactImplicits { aria.owns := ariaOwns, aria.haspopup.`true`, onClick ==> handleClick, - MuiMoreVertIcon() + MuiIcons(MuiIconsModule.MoreVert)() ), MuiMenu( anchorEl = state.anchorEl.orUndefined, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleListMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleListMenu.scala index 4aad992c..06d7b1e4 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleListMenu.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleListMenu.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Menus -import io.kinoplan.demo.components.{ComponentContainer, Layout} -import io.kinoplan.demo.styles.demos.Menus.{DefaultMenuStyle, MenuStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemText, MuiMenu, MuiMenuItem} +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} import org.scalajs.dom.raw.HTMLElement import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.{ComponentContainer, Layout} +import io.kinoplan.demo.styles.demos.Menus.{DefaultMenuStyle, MenuStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemText, MuiMenu, MuiMenuItem} object SimpleListMenu extends ScalaCssReactImplicits { case class Props(style: MenuStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleMenu.scala index a8a3cdac..13f3d39f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleMenu.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/SimpleMenu.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Menus -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiMenu, MuiMenuItem} -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js.JSConverters._ + import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromHtml, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import org.scalajs.dom.raw.HTMLElement import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiMenu, MuiMenuItem} object SimpleMenu extends ScalaCssReactImplicits { case class State(anchorEl: Option[HTMLElement] = None) { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/TypographyMenu.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/TypographyMenu.scala index ee0da14a..b9224264 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/TypographyMenu.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Menus/TypographyMenu.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Menus +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Menus.{DefaultTypographyMenuStyle, TypographyMenuStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiListItemIcon, MuiMenuItem, MuiMenuList, MuiPaper, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDraftsIcon, MuiPriorityHighIcon, MuiSendIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object TypographyMenu extends ScalaCssReactImplicits { case class Props(style: TypographyMenuStyle) @@ -22,19 +23,19 @@ object TypographyMenu extends ScalaCssReactImplicits { MuiMenuList()( MuiMenuItem()( MuiListItemIcon()( - MuiSendIcon() + MuiIcons(MuiIconsModule.Send)() ), MuiTypography(variant = MuiTypography.Variant.inherit)("A short message") ), MuiMenuItem()( MuiListItemIcon()( - MuiPriorityHighIcon() + MuiIcons(MuiIconsModule.PriorityHigh)() ), MuiTypography(variant = MuiTypography.Variant.inherit)("A very long text that overflows") ), MuiMenuItem()( MuiListItemIcon()( - MuiDraftsIcon() + MuiIcons(MuiIconsModule.Drafts)() ), MuiTypography(variant = MuiTypography.Variant.inherit, noWrap = true)( "A very long text that overflows" diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Paper/PaperSheet.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Paper/PaperSheet.scala index 4aeb3526..51da836d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Paper/PaperSheet.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Paper/PaperSheet.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Paper +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Paper.{DefaultPaperStyle, PaperStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiPaper, MuiTypography} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object PaperSheet extends ScalaCssReactImplicits { case class Props(style: PaperStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DateAndTimePickers.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DateAndTimePickers.scala index c38db473..9defb7a5 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DateAndTimePickers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DateAndTimePickers.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Pickers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Pickers.{DefaultPickersStyle, PickersStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.MuiInputLabelProps import io.kinoplan.scalajs.react.material.ui.core.MuiTextField -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object DateAndTimePickers extends ScalaCssReactImplicits { case class Props(style: PickersStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DatePickers.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DatePickers.scala index fa55bc63..5f39ddc4 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DatePickers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/DatePickers.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Pickers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Pickers.{DefaultPickersStyle, PickersStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.MuiInputLabelProps import io.kinoplan.scalajs.react.material.ui.core.MuiTextField -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object DatePickers extends ScalaCssReactImplicits { case class Props(style: PickersStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/TimePickers.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/TimePickers.scala index ca80c658..937fea91 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/TimePickers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Pickers/TimePickers.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Pickers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Pickers.{DefaultPickersStyle, PickersStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.{MuiInputLabelProps, MuiNativeInputProps} import io.kinoplan.scalajs.react.material.ui.core.MuiTextField -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object TimePickers extends ScalaCssReactImplicits { case class Props(style: PickersStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularDeterminate.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularDeterminate.scala index 17a79afc..02c269bc 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularDeterminate.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularDeterminate.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Progress -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Progress.{CircularProgressStyle, DefaultCircularProgressStyle} -import io.kinoplan.scalajs.react.material.ui.core.MuiCircularProgress -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Progress.{CircularProgressStyle, DefaultCircularProgressStyle} +import io.kinoplan.scalajs.react.material.ui.core.MuiCircularProgress object CircularDeterminate extends ScalaCssReactImplicits { case class Props(style: CircularProgressStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIndeterminate.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIndeterminate.scala index 6db17144..7a59fb86 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIndeterminate.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIndeterminate.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Progress +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Progress.{CircularProgressStyle, DefaultCircularProgressStyle} import io.kinoplan.scalajs.react.material.ui.core.MuiCircularProgress -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CircularIndeterminate extends ScalaCssReactImplicits { case class Props(style: CircularProgressStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIntegration.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIntegration.scala index a746f856..e6faefa0 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIntegration.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularIntegration.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Progress -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Progress.{CircularIntegrationStyle, DefaultCircularIntegrationStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiCircularProgress, MuiFab} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiCheckIcon, MuiSaveIcon} -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Progress.{CircularIntegrationStyle, DefaultCircularIntegrationStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiCircularProgress, MuiFab} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object CircularIntegration extends ScalaCssReactImplicits { case class Props(style: CircularIntegrationStyle) @@ -46,7 +47,7 @@ object CircularIntegration extends ScalaCssReactImplicits { div(css.wrapper, MuiFab(color = MuiFab.Color.primary)(buttonCss, onClick --> handleButtonClick(state.loading), - if (state.success) MuiCheckIcon() else MuiSaveIcon() + if (state.success) MuiIcons(MuiIconsModule.Check)() else MuiIcons(MuiIconsModule.Save)() ), MuiCircularProgress(size = 68)(css.fabProgress).when(state.loading) ), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularStatic.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularStatic.scala index a80a6fa4..6d191cec 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularStatic.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularStatic.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Progress -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Progress.{CircularProgressStyle, DefaultCircularProgressStyle} -import io.kinoplan.scalajs.react.material.ui.core.MuiCircularProgress -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Progress.{CircularProgressStyle, DefaultCircularProgressStyle} +import io.kinoplan.scalajs.react.material.ui.core.MuiCircularProgress object CircularStatic extends ScalaCssReactImplicits { case class Props(style: CircularProgressStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularUnderLoad.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularUnderLoad.scala index e7ac30d6..bacf0eb8 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularUnderLoad.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CircularUnderLoad.scala @@ -1,10 +1,11 @@ package io.kinoplan.demo.components.demos.Progress -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.MuiCircularProgress import japgolly.scalajs.react.ScalaComponent import japgolly.scalajs.react.vdom.all.div +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.MuiCircularProgress + object CircularUnderLoad { private val component = ScalaComponent.builder[Unit]("CircularUnderLoad") .renderStatic( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CustomizedProgress.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CustomizedProgress.scala index 79e6de50..4fd47a61 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CustomizedProgress.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/CustomizedProgress.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Progress +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Progress.{CustomizedProgressStyle, DefaultCustomizedProgressStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiCircularProgress, MuiLinearProgress, MuiPaper} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomizedProgress extends ScalaCssReactImplicits { case class Props(style: CustomizedProgressStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/DelayingAppearance.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/DelayingAppearance.scala index 9b6bc307..bf7380ac 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/DelayingAppearance.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/DelayingAppearance.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Progress -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Progress.{DefaultDelayingAppearanceStyle, DelayingAppearanceStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiCircularProgress, MuiFade, MuiTypography} -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Progress.{DefaultDelayingAppearanceStyle, DelayingAppearanceStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiCircularProgress, MuiFade, MuiTypography} object DelayingAppearance extends ScalaCssReactImplicits { case class Props(style: DelayingAppearanceStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearBuffer.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearBuffer.scala index 339e660c..c2399141 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearBuffer.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearBuffer.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Progress -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} -import io.kinoplan.scalajs.react.material.ui.core.MuiLinearProgress -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js +import scala.scalajs.js.Math + import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js -import scala.scalajs.js.Math +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} +import io.kinoplan.scalajs.react.material.ui.core.MuiLinearProgress object LinearBuffer extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearDeterminate.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearDeterminate.scala index dd8c5949..fedbe40c 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearDeterminate.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearDeterminate.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Progress -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} -import io.kinoplan.scalajs.react.material.ui.core.MuiLinearProgress -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js +import scala.scalajs.js.Math + import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js -import scala.scalajs.js.Math +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} +import io.kinoplan.scalajs.react.material.ui.core.MuiLinearProgress object LinearDeterminate extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearIndeterminate.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearIndeterminate.scala index e8f3ece7..f68d1691 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearIndeterminate.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearIndeterminate.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Progress +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.MuiLinearProgress -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object LinearIndeterminate extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearQuery.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearQuery.scala index 94ccf9e0..232e666a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearQuery.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Progress/LinearQuery.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Progress +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.MuiLinearProgress -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object LinearQuery extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxLabels.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxLabels.scala index c1c14362..a2c6bc9d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxLabels.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxLabels.scala @@ -1,13 +1,17 @@ package io.kinoplan.demo.components.demos.SelectionControls +import scala.scalajs.js.JSConverters._ + +import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.SelectionControls.{CustomControlStyle, DefaultCustomControlStyle} import io.kinoplan.demo.utils.Helpers.{StringExtended, styleAToClassName} import io.kinoplan.scalajs.react.material.ui.core.{MuiCheckbox, MuiFormControlLabel, MuiFormGroup} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiCheckBoxOutlineBlankIcon, MuiFavoriteBorderIcon, MuiFavoriteIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object CheckboxLabels extends ScalaCssReactImplicits { case class Props(style: CustomControlStyle) @@ -58,7 +62,7 @@ object CheckboxLabels extends ScalaCssReactImplicits { val controlClasses = Map( MuiCheckbox.ClassKey.root -> styleAToClassName(css.root), MuiCheckbox.ClassKey.checked -> styleAToClassName(css.checked) - ) + ).some.orUndefined div( ComponentContainer("Checkbox Labels")( @@ -109,15 +113,15 @@ object CheckboxLabels extends ScalaCssReactImplicits { ), MuiFormControlLabel( control = MuiCheckbox( - icon = MuiFavoriteBorderIcon()(), - checkedIcon = MuiFavoriteIcon()() + icon = MuiIcons(MuiIconsModule.FavoriteBorder)()(), + checkedIcon = MuiIcons(MuiIconsModule.Favorite)()() )(value := "checkedH").rawElement, label = "Custom icon".toVdom ), MuiFormControlLabel( control = MuiCheckbox( - icon = MuiCheckBoxOutlineBlankIcon(fontSize = MuiCheckBoxOutlineBlankIcon.FontSize.small)(), - checkedIcon = MuiFavoriteIcon(fontSize = MuiFavoriteIcon.FontSize.small)() + icon = MuiIcons(MuiIconsModule.CheckBoxOutlineBlank)(fontSize = MuiIcons.FontSize.small)(), + checkedIcon = MuiIcons(MuiIconsModule.Favorite)(fontSize = MuiIcons.FontSize.small)() )(value := "checkedI").rawElement, label = "Custom size".toVdom ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Checkboxes.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Checkboxes.scala index 58dcfd6f..cb373128 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Checkboxes.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Checkboxes.scala @@ -1,9 +1,10 @@ package io.kinoplan.demo.components.demos.SelectionControls +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.scalajs.react.material.ui.core.MuiCheckbox -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} object Checkboxes { case class State( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxesGroup.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxesGroup.scala index b6d7acdf..bd05ba59 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxesGroup.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CheckboxesGroup.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.SelectionControls +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.SelectionControls.{ControlButtonsGroupStyle, DefaultControlButtonsGroupStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiCheckbox, MuiFormControl, MuiFormControlLabel, MuiFormGroup, MuiFormHelperText, MuiFormLabel} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CheckboxesGroup extends ScalaCssReactImplicits { case class Props(style: ControlButtonsGroupStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CustomizedSwitches.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CustomizedSwitches.scala index 543ab26c..698c468f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CustomizedSwitches.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/CustomizedSwitches.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.SelectionControls +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.SelectionControls.{CustomizedSwitchesStyle, DefaultCustomizedSwitchesStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControlLabel, MuiFormGroup, MuiSwitch} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomizedSwitches extends ScalaCssReactImplicits { case class Props(style: CustomizedSwitchesStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/FormControlLabelPosition.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/FormControlLabelPosition.scala index d9e23615..6a886a51 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/FormControlLabelPosition.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/FormControlLabelPosition.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.SelectionControls -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiFormControlLabel, MuiFormLabel, MuiRadio, MuiRadioGroup} -import japgolly.scalajs.react.vdom.all._ import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiFormControlLabel, MuiFormLabel, MuiRadio, MuiRadioGroup} + object FormControlLabelPosition extends ScalaCssReactImplicits { case class State(value: String = "female") { def handleChange(value: String) = copy(value = value) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtons.scala index 90f9dd11..740bb1c8 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtons.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.SelectionControls +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.SelectionControls.{CustomControlStyle, DefaultCustomControlStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.MuiRadio -import io.kinoplan.scalajs.react.material.ui.icons.{MuiRadioButtonCheckedIcon, MuiRadioButtonUncheckedIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object RadioButtons extends ScalaCssReactImplicits { case class Props(style: CustomControlStyle) @@ -67,8 +68,8 @@ object RadioButtons extends ScalaCssReactImplicits { MuiRadio( checked = state.isE, color = MuiRadio.Color.default, - icon = MuiRadioButtonUncheckedIcon(fontSize = MuiRadioButtonUncheckedIcon.FontSize.small)(), - checkedIcon = MuiRadioButtonCheckedIcon(fontSize = MuiRadioButtonCheckedIcon.FontSize.small)() + icon = MuiIcons(MuiIconsModule.RadioButtonUnchecked)(fontSize = MuiIcons.FontSize.small)(), + checkedIcon = MuiIcons(MuiIconsModule.RadioButtonChecked)(fontSize = MuiIcons.FontSize.small)() )( onChange ==> handleChange, value := "e", diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtonsGroup.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtonsGroup.scala index a3a2b671..c07c3789 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtonsGroup.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/RadioButtonsGroup.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.SelectionControls +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.SelectionControls.{ControlButtonsGroupStyle, DefaultControlButtonsGroupStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiFormControlLabel, MuiFormHelperText, MuiFormLabel, MuiRadio, MuiRadioGroup} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object RadioButtonsGroup extends ScalaCssReactImplicits { case class Props(style: ControlButtonsGroupStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchLabels.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchLabels.scala index bef02e42..37594414 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchLabels.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchLabels.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.SelectionControls +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControlLabel, MuiFormGroup, MuiSwitch} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object SwitchLabels extends ScalaCssReactImplicits { case class State( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Switches.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Switches.scala index 4ae0cd85..c20c1237 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Switches.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/Switches.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.SelectionControls -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.MuiSwitch -import japgolly.scalajs.react.vdom.all._ import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.MuiSwitch + object Switches extends ScalaCssReactImplicits { case class State( checkedA: Boolean = true, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchesGroup.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchesGroup.scala index abb88a76..64f054ba 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchesGroup.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/SelectionControls/SwitchesGroup.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.SelectionControls +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiFormControlLabel, MuiFormGroup, MuiFormHelperText, MuiFormLabel, MuiSwitch} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object SwitchesGroup extends ScalaCssReactImplicits { case class State( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/ControlledOpenSelect.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/ControlledOpenSelect.scala index def04cc7..f6dfa7b0 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/ControlledOpenSelect.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/ControlledOpenSelect.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Selects +import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Selects.{ControlledOpenSelectStyle, DefaultControlledOpenSelectStyle} import io.kinoplan.demo.utils.props.MuiNativeInputProps import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiFormControl, MuiInputLabel, MuiMenuItem, MuiSelect} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object ControlledOpenSelect extends ScalaCssReactImplicits { case class Props(style: ControlledOpenSelectStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/CustomizedSelects.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/CustomizedSelects.scala index 776a1e87..41380cba 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/CustomizedSelects.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/CustomizedSelects.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Selects +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Selects.{CustomizedSelectsStyle, DefaultCustomizedSelectsStyle} import io.kinoplan.demo.utils.Helpers._ import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiInputBase, MuiInputLabel, MuiMenuItem, MuiNativeSelect, MuiSelect} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomizedSelects extends ScalaCssReactImplicits { case class Props(style: CustomizedSelectsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/DialogSelect.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/DialogSelect.scala index 6621c0f2..5ef03730 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/DialogSelect.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/DialogSelect.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Selects +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Selects.{DefaultSelectStyle, SelectStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiDialog, MuiDialogActions, MuiDialogContent, MuiDialogTitle, MuiFormControl, MuiInput, MuiInputLabel, MuiMenuItem, MuiSelect} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ReactEventFromInput, ScalaComponent} -import scalacss.ScalaCssReactImplicits object DialogSelect extends ScalaCssReactImplicits { case class Props(style: SelectStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/MultipleSelect.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/MultipleSelect.scala index f8e0e8d1..844b7703 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/MultipleSelect.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/MultipleSelect.scala @@ -1,19 +1,20 @@ package io.kinoplan.demo.components.demos.Selects -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Selects.{DefaultMultipleSelectStyle, MultipleSelectStyle} -import io.kinoplan.demo.utils.props.{MuiMenuProps, MuiNativeInputProps, MuiPaperProps} -import io.kinoplan.scalajs.react.material.ui.core.{MuiCheckbox, MuiChip, MuiFormControl, MuiInput, MuiInputLabel, MuiListItemText, MuiMenuItem, MuiSelect} -import io.kinoplan.scalajs.react.material.ui.html.ReactEventFromMultipleSelect +import scala.scalajs.js +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} import japgolly.scalajs.react.raw.React import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromInput, ScalaComponent} import org.scalajs.dom.raw.HTMLSelectElement import scalacss.ScalaCssReactImplicits -import scala.scalajs.js -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Selects.{DefaultMultipleSelectStyle, MultipleSelectStyle} +import io.kinoplan.demo.utils.props.{MuiMenuProps, MuiNativeInputProps, MuiPaperProps} +import io.kinoplan.scalajs.react.material.ui.core.{MuiCheckbox, MuiChip, MuiFormControl, MuiInput, MuiInputLabel, MuiListItemText, MuiMenuItem, MuiSelect} +import io.kinoplan.scalajs.react.material.ui.html.ReactEventFromMultipleSelect object MultipleSelect extends ScalaCssReactImplicits { case class Props(style: MultipleSelectStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/NativeSelects.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/NativeSelects.scala index 78cf6273..9303c4ab 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/NativeSelects.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/NativeSelects.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Selects -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Selects.{DefaultSelectStyle, SelectStyle} -import io.kinoplan.demo.utils.props.MuiNativeInputProps -import io.kinoplan.scalajs.react.material.ui.core.{MuiFilledInput, MuiFormControl, MuiFormHelperText, MuiInput, MuiInputLabel, MuiNativeSelect, MuiOutlinedInput, MuiSelect} +import japgolly.scalajs.react.{BackendScope, ReactDOM, ReactEventFromInput, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactDOM, ReactEventFromInput, ScalaComponent} import org.scalajs.dom.{Element, document} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Selects.{DefaultSelectStyle, SelectStyle} +import io.kinoplan.demo.utils.props.MuiNativeInputProps +import io.kinoplan.scalajs.react.material.ui.core.{MuiFilledInput, MuiFormControl, MuiFormHelperText, MuiInput, MuiInputLabel, MuiNativeSelect, MuiOutlinedInput, MuiSelect} + object NativeSelects extends ScalaCssReactImplicits { case class Props(style: SelectStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/SimpleSelect.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/SimpleSelect.scala index ee9b25c6..d382149f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/SimpleSelect.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Selects/SimpleSelect.scala @@ -1,16 +1,17 @@ package io.kinoplan.demo.components.demos.Selects -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Selects.{DefaultSelectStyle, SelectStyle} -import io.kinoplan.demo.utils.props.MuiNativeInputProps -import io.kinoplan.scalajs.react.material.ui.core.{MuiFilledInput, MuiFormControl, MuiFormHelperText, MuiInput, MuiInputLabel, MuiMenuItem, MuiOutlinedInput, MuiSelect} +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, ReactDOM, ReactEventFromInput, ScalaComponent} import japgolly.scalajs.react.raw.React import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactDOM, ReactEventFromInput, ScalaComponent} import org.scalajs.dom.{Element, document} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Selects.{DefaultSelectStyle, SelectStyle} +import io.kinoplan.demo.utils.props.MuiNativeInputProps +import io.kinoplan.scalajs.react.material.ui.core.{MuiFilledInput, MuiFormControl, MuiFormHelperText, MuiInput, MuiInputLabel, MuiMenuItem, MuiOutlinedInput, MuiSelect} object SimpleSelect extends ScalaCssReactImplicits { case class Props(style: SelectStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/ConsecutiveSnackbars.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/ConsecutiveSnackbars.scala index 02b93c82..a0dfa176 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/ConsecutiveSnackbars.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/ConsecutiveSnackbars.scala @@ -1,20 +1,21 @@ package io.kinoplan.demo.components.demos.Snackbars -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.models.Snackbars.MessageInfo -import io.kinoplan.demo.styles.demos.Snackbars.{DefaultSimpleSnackbarStyle, SimpleSnackbarStyle} -import io.kinoplan.demo.utils.props.MuiContentProps -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiIconButton, MuiSnackbar} -import io.kinoplan.scalajs.react.material.ui.icons.MuiCloseIcon +import scala.collection.mutable +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} import org.scalajs.dom.html import scalacss.ScalaCssReactImplicits -import scala.collection.mutable -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.models.Snackbars.MessageInfo +import io.kinoplan.demo.styles.demos.Snackbars.{DefaultSimpleSnackbarStyle, SimpleSnackbarStyle} +import io.kinoplan.demo.utils.props.MuiContentProps +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiIconButton, MuiSnackbar} +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ConsecutiveSnackbars extends ScalaCssReactImplicits { var queues = mutable.Queue[MessageInfo]() @@ -80,7 +81,7 @@ object ConsecutiveSnackbars extends ScalaCssReactImplicits { Attr("key") := "close", aria.label := "Close", onClick --> handleCloseClick, - MuiCloseIcon() + MuiIcons(MuiIconsModule.Close)() ) ) )(Attr("key") := state.key) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/CustomizedSnackbars.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/CustomizedSnackbars.scala index e4037c57..e3067963 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/CustomizedSnackbars.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/CustomizedSnackbars.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Snackbars +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.components.demos.Snackbars.wrappers.MySnackbarContentWrapper import io.kinoplan.demo.styles.demos.Snackbars.{CustomizedSnackbarsStyle, DefaultCustomizedSnackbarsStyle} -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiSnackbar} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin object CustomizedSnackbars extends ScalaCssReactImplicits { case class Props(style: CustomizedSnackbarsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FabIntegrationSnackbar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FabIntegrationSnackbar.scala index f36f7392..c1750fc6 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FabIntegrationSnackbar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FabIntegrationSnackbar.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Snackbars +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Snackbars.{DefaultFabIntegrationSnackbarStyle, FabIntegrationSnackbarStyle} import io.kinoplan.demo.utils.props.MuiContentProps import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiButton, MuiFab, MuiIconButton, MuiSnackbar, MuiToolbar, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAddIcon, MuiMenuIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object FabIntegrationSnackbar extends ScalaCssReactImplicits { case class Props(style: FabIntegrationSnackbarStyle) @@ -39,7 +40,7 @@ object FabIntegrationSnackbar extends ScalaCssReactImplicits { MuiToolbar()( MuiIconButton(color = MuiIconButton.Color.inherit)(css.menuButton, aria.label := "Menu", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiTypography(variant = MuiTypography.Variant.h6, color = MuiTypography.Color.inherit)( "Out of my way!" @@ -47,7 +48,7 @@ object FabIntegrationSnackbar extends ScalaCssReactImplicits { ) ), MuiFab(color = MuiFab.Color.secondary)(css.fab, if (state.open) css.fabMoveUp else css.fabMoveDown, - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ), MuiSnackbar( open = state.open, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FadeSnackbar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FadeSnackbar.scala index 894c0d80..e73c32da 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FadeSnackbar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/FadeSnackbar.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Snackbars +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.utils.props.MuiContentProps import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiFade, MuiSnackbar} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits object FadeSnackbar extends ScalaCssReactImplicits { case class State(open: Boolean = false) { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/LongTextSnackbar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/LongTextSnackbar.scala index 93e79fb3..97b523ba 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/LongTextSnackbar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/LongTextSnackbar.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Snackbars +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Snackbars.{CustomizedSnackbarsStyle, DefaultCustomizedSnackbarsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiSnackbarContent} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object LongTextSnackbar extends ScalaCssReactImplicits { case class Props(style: CustomizedSnackbarsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/PositionedSnackbar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/PositionedSnackbar.scala index 9b86ba1b..6df2b77b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/PositionedSnackbar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/PositionedSnackbar.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Snackbars +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.utils.props.MuiContentProps -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiSnackbar} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin object PositionedSnackbar { case class State( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/SimpleSnackbar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/SimpleSnackbar.scala index fe3c6215..4c1ce596 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/SimpleSnackbar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/SimpleSnackbar.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Snackbars +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Snackbars.{DefaultSimpleSnackbarStyle, SimpleSnackbarStyle} import io.kinoplan.demo.utils.props.MuiContentProps -import io.kinoplan.scalajs.react.material.ui.core.internal.Origin import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiIconButton, MuiSnackbar} -import io.kinoplan.scalajs.react.material.ui.icons.MuiCloseIcon -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.internal.Origin +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SimpleSnackbar extends ScalaCssReactImplicits { case class Props(style: SimpleSnackbarStyle) @@ -53,7 +54,7 @@ object SimpleSnackbar extends ScalaCssReactImplicits { Attr("key") := "close", aria.label := "Close", onClick --> handleCloseClick, - MuiCloseIcon() + MuiIcons(MuiIconsModule.Close)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/wrappers/MySnackbarContentWrapper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/wrappers/MySnackbarContentWrapper.scala index b8e67f2b..0f816236 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/wrappers/MySnackbarContentWrapper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Snackbars/wrappers/MySnackbarContentWrapper.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Snackbars.wrappers -import io.kinoplan.demo.styles.demos.Snackbars.{DefaultMySnackbarContentWrapperStyle, MySnackbarContentWrapperStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiIconButton, MuiSnackbarContent} -import io.kinoplan.scalajs.react.material.ui.icons._ +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} import scalacss.ScalaCssReactImplicits import scalacss.internal.StyleA -import scala.scalajs.js +import io.kinoplan.demo.styles.demos.Snackbars.{DefaultMySnackbarContentWrapperStyle, MySnackbarContentWrapperStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiIconButton, MuiSnackbarContent} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object MySnackbarContentWrapper extends ScalaCssReactImplicits { case class Props( @@ -23,11 +24,11 @@ object MySnackbarContentWrapper extends ScalaCssReactImplicits { class Backend(t: BackendScope[Props, Unit]) { def variantIcon(variant: String) = { variant match { - case "success" => MuiCheckCircleIcon() - case "warning" => MuiWarningIcon() - case "error" => MuiErrorIcon() - case "info" => MuiInfoIcon() - case _ => MuiInfoIcon() + case "success" => MuiIcons(MuiIconsModule.CheckCircle)() + case "warning" => MuiIcons(MuiIconsModule.Warning)() + case "error" => MuiIcons(MuiIconsModule.Error)() + case "info" => MuiIcons(MuiIconsModule.Info)() + case _ => MuiIcons(MuiIconsModule.Info)() } } @@ -46,7 +47,7 @@ object MySnackbarContentWrapper extends ScalaCssReactImplicits { Attr("key") := "close", aria.label := "Close", onClick -->? props.onCloseClick, - MuiCloseIcon()(css.icon) + MuiIcons(MuiIconsModule.Close)()(css.icon) ).rawNode ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/CustomizedStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/CustomizedStepper.scala index 8c722a4c..d0455229 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/CustomizedStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/CustomizedStepper.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Steppers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Steppers.{CustomizedStepperStyle, DefaultCustomizedStepperStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepConnector, MuiStepLabel, MuiStepper, MuiTypography} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomizedStepper extends ScalaCssReactImplicits { val steps = List("Select campaign settings", "Create an ad group", "Create an ad") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/DotsMobileStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/DotsMobileStepper.scala index 8a491a98..220a3d40 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/DotsMobileStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/DotsMobileStepper.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Steppers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Steppers.{DefaultMobileStepperStyle, MobileStepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiMobileStepper} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiKeyboardArrowLeftIcon, MuiKeyboardArrowRightIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object DotsMobileStepper extends ScalaCssReactImplicits { case class Props(style: MobileStepperStyle) @@ -35,7 +36,11 @@ object DotsMobileStepper extends ScalaCssReactImplicits { onClick --> handleNext, disabled := state.isNextDisabled, "Next", - if (css.theme.direction == Direction.rtl) MuiKeyboardArrowLeftIcon() else MuiKeyboardArrowRightIcon() + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.KeyboardArrowLeft)() + } else { + MuiIcons(MuiIconsModule.KeyboardArrowRight)() + } ).rawNode ) @@ -43,7 +48,11 @@ object DotsMobileStepper extends ScalaCssReactImplicits { MuiButton(size = MuiButton.Size.small)( onClick --> handleBack, disabled := state.isBackDisabled, - if (css.theme.direction == Direction.rtl) MuiKeyboardArrowRightIcon() else MuiKeyboardArrowLeftIcon(), + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.KeyboardArrowRight)() + } else { + MuiIcons(MuiIconsModule.KeyboardArrowLeft)() + }, "Back" ).rawNode ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLabelPositionBelowStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLabelPositionBelowStepper.scala index f0ab1c96..d18f47cd 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLabelPositionBelowStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLabelPositionBelowStepper.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Steppers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepLabel, MuiStepper, MuiTypography} +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepLabel, MuiStepper, MuiTypography} + object HorizontalLabelPositionBelowStepper extends ScalaCssReactImplicits { val steps = List("Select master blaster campaign settings", "Create an ad group", "Create an ad") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLinearStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLinearStepper.scala index 22f06420..c0b571f3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLinearStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalLinearStepper.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Steppers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepLabel, MuiStepper, MuiTypography} +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepLabel, MuiStepper, MuiTypography} object HorizontalLinearStepper extends ScalaCssReactImplicits { val steps = List("Select campaign settings", "Create an ad group", "Create an ad") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearAlternativeLabelStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearAlternativeLabelStepper.scala index b1464c8c..b6b71262 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearAlternativeLabelStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearAlternativeLabelStepper.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Steppers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepButton, MuiStepper, MuiTypography} +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepButton, MuiStepper, MuiTypography} object HorizontalNonLinearAlternativeLabelStepper extends ScalaCssReactImplicits { val steps = List("Select campaign settings", "Create an ad group", "Create an ad") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepper.scala index 6a8b5e0d..fa6f9d38 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepper.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Steppers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepButton, MuiStepper, MuiTypography} +import scala.collection.SortedSet + +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.collection.SortedSet +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepButton, MuiStepper, MuiTypography} object HorizontalNonLinearStepper extends ScalaCssReactImplicits { val steps = List("Select campaign settings", "Create an ad group", "Create an ad") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepperWithError.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepperWithError.scala index a6aab9bc..57a5bd3d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepperWithError.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/HorizontalNonLinearStepperWithError.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Steppers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepLabel, MuiStepper, MuiTypography} +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSConverters._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Steppers.{DefaultStepperStyle, StepperStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiStep, MuiStepLabel, MuiStepper, MuiTypography} object HorizontalNonLinearStepperWithError extends ScalaCssReactImplicits { val steps = List("Select campaign settings", "Create an ad group", "Create an ad") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/ProgressMobileStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/ProgressMobileStepper.scala index ef0d6885..611e5ff0 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/ProgressMobileStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/ProgressMobileStepper.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Steppers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Steppers.{DefaultMobileStepperStyle, MobileStepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiMobileStepper} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiKeyboardArrowLeftIcon, MuiKeyboardArrowRightIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ProgressMobileStepper extends ScalaCssReactImplicits { case class Props(style: MobileStepperStyle) @@ -35,7 +36,11 @@ object ProgressMobileStepper extends ScalaCssReactImplicits { onClick --> handleNext, disabled := state.isNextDisabled, "Next", - if (css.theme.direction == Direction.rtl) MuiKeyboardArrowLeftIcon() else MuiKeyboardArrowRightIcon() + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.KeyboardArrowLeft)() + } else { + MuiIcons(MuiIconsModule.KeyboardArrowRight)() + } ).rawNode ) @@ -43,7 +48,11 @@ object ProgressMobileStepper extends ScalaCssReactImplicits { MuiButton(size = MuiButton.Size.small)( onClick --> handleBack, disabled := state.isBackDisabled, - if (css.theme.direction == Direction.rtl) MuiKeyboardArrowRightIcon() else MuiKeyboardArrowLeftIcon(), + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.KeyboardArrowRight)() + } else { + MuiIcons(MuiIconsModule.KeyboardArrowLeft)() + }, "Back" ).rawNode ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/TextMobileStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/TextMobileStepper.scala index dfd80d16..76e08a27 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/TextMobileStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/TextMobileStepper.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Steppers +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.models.Steppers.TutorialStep import io.kinoplan.demo.styles.demos.Steppers.{DefaultTextMobileStepperStyle, TextMobileStepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiMobileStepper, MuiPaper, MuiTypography} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiKeyboardArrowLeftIcon, MuiKeyboardArrowRightIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object TextMobileStepper extends ScalaCssReactImplicits { val maxSteps = TutorialStep.default.length @@ -40,7 +41,11 @@ object TextMobileStepper extends ScalaCssReactImplicits { onClick --> handleNext, disabled := state.isNextDisabled, "Next", - if (css.theme.direction == Direction.rtl) MuiKeyboardArrowLeftIcon() else MuiKeyboardArrowRightIcon() + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.KeyboardArrowLeft)() + } else { + MuiIcons(MuiIconsModule.KeyboardArrowRight)() + } ).rawNode ) @@ -48,7 +53,11 @@ object TextMobileStepper extends ScalaCssReactImplicits { MuiButton(size = MuiButton.Size.small)( onClick --> handleBack, disabled := state.isBackDisabled, - if (css.theme.direction == Direction.rtl) MuiKeyboardArrowRightIcon() else MuiKeyboardArrowLeftIcon(), + if (css.theme.direction == Direction.rtl) { + MuiIcons(MuiIconsModule.KeyboardArrowRight)() + } else { + MuiIcons(MuiIconsModule.KeyboardArrowLeft)() + }, "Back" ).rawNode ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/VerticalLinearStepper.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/VerticalLinearStepper.scala index 1593e0f3..28d0cc0f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/VerticalLinearStepper.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Steppers/VerticalLinearStepper.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.Steppers -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Steppers.{DefaultVerticalLinearStepperStyle, VerticalLinearStepperStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiPaper, MuiStep, MuiStepContent, MuiStepLabel, MuiStepper, MuiTypography} +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Steppers.{DefaultVerticalLinearStepperStyle, VerticalLinearStepperStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiPaper, MuiStep, MuiStepContent, MuiStepLabel, MuiStepper, MuiTypography} + object VerticalLinearStepper extends ScalaCssReactImplicits { val steps = List("Select campaign settings", "Create an ad group", "Create an ad") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/CustomizedTable.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/CustomizedTable.scala index d6400fc3..f4fec93a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/CustomizedTable.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/CustomizedTable.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tables +import japgolly.scalajs.react._ +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.Tables.TableItem import io.kinoplan.demo.styles.demos.Tables.{CustomizedTableStyle, DefaultCustomizedTableStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core._ -import japgolly.scalajs.react._ -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import scalacss.ScalaCssReactImplicits object CustomizedTable extends ScalaCssReactImplicits { case class Props(style: CustomizedTableStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/EnhancedTable.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/EnhancedTable.scala index 2e77fd15..cf1100c2 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/EnhancedTable.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/EnhancedTable.scala @@ -1,5 +1,13 @@ package io.kinoplan.demo.components.demos.Tables +import scala.scalajs.js +import scala.scalajs.js.Math + +import japgolly.scalajs.react._ +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.components.demos.Tables.wrappers.{EnhancedTableHead, EnhancedTableToolbar} import io.kinoplan.demo.models.Tables.TableItem @@ -7,13 +15,6 @@ import io.kinoplan.demo.styles.demos.Tables.{DefaultEnhancedTableStyle, Enhanced import io.kinoplan.demo.utils.props.{MuiBackIconButtonProps, MuiNextIconButtonProps} import io.kinoplan.scalajs.react.material.ui.core._ import io.kinoplan.scalajs.react.material.ui.html.ReactEventFromNumberInput -import japgolly.scalajs.react._ -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js -import scala.scalajs.js.Math object EnhancedTable extends ScalaCssReactImplicits { case class Props(style: EnhancedTableStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SimpleTable.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SimpleTable.scala index fdd99668..7757535e 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SimpleTable.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SimpleTable.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tables -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.models.Tables.TableItem -import io.kinoplan.demo.styles.demos.Tables.{DefaultSimpleTableStyle, SimpleTableStyle} -import io.kinoplan.scalajs.react.material.ui.core._ import japgolly.scalajs.react._ import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.models.Tables.TableItem +import io.kinoplan.demo.styles.demos.Tables.{DefaultSimpleTableStyle, SimpleTableStyle} +import io.kinoplan.scalajs.react.material.ui.core._ + object SimpleTable extends ScalaCssReactImplicits { case class Props(style: SimpleTableStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SpanningTable.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SpanningTable.scala index 92452877..d9f69061 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SpanningTable.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/SpanningTable.scala @@ -1,16 +1,17 @@ package io.kinoplan.demo.components.demos.Tables -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.models.Tables.SpanningItem -import io.kinoplan.demo.styles.demos.Tables.{DefaultSimpleTableStyle, SimpleTableStyle} -import io.kinoplan.demo.utils.Helpers.DoubleExtended -import io.kinoplan.scalajs.react.material.ui.core._ +import scala.scalajs.js.JSNumberOps._ + import japgolly.scalajs.react._ import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js.JSNumberOps._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.models.Tables.SpanningItem +import io.kinoplan.demo.styles.demos.Tables.{DefaultSimpleTableStyle, SimpleTableStyle} +import io.kinoplan.demo.utils.Helpers.DoubleExtended +import io.kinoplan.scalajs.react.material.ui.core._ object SpanningTable extends ScalaCssReactImplicits { val TAX_RATE = 0.07 diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableHead.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableHead.scala index c3d1b4e1..5fe464b3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableHead.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableHead.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Tables.wrappers -import io.kinoplan.demo.models.Tables.Row -import io.kinoplan.scalajs.react.material.ui.core._ import japgolly.scalajs.react._ import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.models.Tables.Row +import io.kinoplan.scalajs.react.material.ui.core._ + object EnhancedTableHead extends ScalaCssReactImplicits { case class Props( selectedCount: Int, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableToolbar.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableToolbar.scala index 36cdff5b..50167589 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableToolbar.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tables/wrappers/EnhancedTableToolbar.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tables.wrappers -import io.kinoplan.demo.components.Layout -import io.kinoplan.demo.styles.demos.Tables.{DefaultEnhancedTableToolbarStyle, EnhancedTableToolbarStyle} -import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDeleteIcon, MuiFilterListIcon} import japgolly.scalajs.react._ import japgolly.scalajs.react.raw.React import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.Layout +import io.kinoplan.demo.styles.demos.Tables.{DefaultEnhancedTableToolbarStyle, EnhancedTableToolbarStyle} +import io.kinoplan.scalajs.react.material.ui.core._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} + object EnhancedTableToolbar extends ScalaCssReactImplicits { case class Props(selectedCount: Int, style: EnhancedTableToolbarStyle) { val selectedNonEmpty = selectedCount > 0 @@ -38,10 +39,10 @@ object EnhancedTableToolbar extends ScalaCssReactImplicits { div(css.spacer), div(css.actions, MuiTooltip(title = "Delete")( - MuiIconButton()(aria.label := "Delete", MuiDeleteIcon()) + MuiIconButton()(aria.label := "Delete", MuiIcons(MuiIconsModule.Delete)()) ).when(props.selectedNonEmpty), MuiTooltip(title = "Filter list")( - MuiIconButton()(aria.label := "Filter list", MuiFilterListIcon()) + MuiIconButton()(aria.label := "Filter list", MuiIcons(MuiIconsModule.FilterList)()) ).when(props.selectedIsEmpty) ) ).rawNode diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CenteredTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CenteredTabs.scala index 844d6dd4..07958d9c 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CenteredTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CenteredTabs.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiPaper, MuiTab, MuiTabs} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object CenteredTabs extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CustomizedTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CustomizedTabs.scala index 2a5c7c1c..64c136e3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CustomizedTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/CustomizedTabs.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.Tabs.{CustomizedTabsStyle, DefaultCustomizedTabsStyle} import io.kinoplan.demo.utils.Helpers.{StringExtended, _} import io.kinoplan.scalajs.react.material.ui.core.{MuiTab, MuiTabs, MuiTypography} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object CustomizedTabs extends ScalaCssReactImplicits { case class Props(style: CustomizedTabsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/DisabledTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/DisabledTabs.scala index 7c17468d..7bd7054d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/DisabledTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/DisabledTabs.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiPaper, MuiTab, MuiTabs} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} - -import scala.scalajs.js object DisabledTabs { case class State(value: js.Any = 2) { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/FullWidthTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/FullWidthTabs.scala index 3506ee1d..f6930d88 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/FullWidthTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/FullWidthTabs.scala @@ -2,16 +2,17 @@ package io.kinoplan.demo.components.demos.Tabs import scala.scalajs.js +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} import io.kinoplan.demo.styles.demos.Tabs.{DefaultFullWidthTabsStyle, FullWidthTabsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.libs.external.reactSwipeableViews.components.ReactSwipeableViews import io.kinoplan.scalajs.react.libs.external.reactSwipeableViews.mod.{AxisType, SwipeableViewsProps} -import io.kinoplan.scalajs.react.material.ui.core.styles.Direction import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiTab, MuiTabs} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.core.styles.Direction object FullWidthTabs extends ScalaCssReactImplicits { case class Props(style: FullWidthTabsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconLabelTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconLabelTabs.scala index 898742f5..e5045b9a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconLabelTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconLabelTabs.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Tabs.{DefaultIconTabsStyle, IconTabsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiPaper, MuiTab, MuiTabs} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiFavoriteIcon, MuiPersonPinIcon, MuiPhoneIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object IconLabelTabs extends ScalaCssReactImplicits { case class Props(style: IconTabsStyle) @@ -36,9 +37,9 @@ object IconLabelTabs extends ScalaCssReactImplicits { textColor = MuiTabs.TextColor.secondary, )( value := state.value, - MuiTab(icon = MuiPhoneIcon()(), label = "RECENTS".toVdom), - MuiTab(icon = MuiFavoriteIcon()(), label = "FAVORITES".toVdom), - MuiTab(icon = MuiPersonPinIcon()(), label = "NEARBY".toVdom) + MuiTab(icon = MuiIcons(MuiIconsModule.Phone)()(), label = "RECENTS".toVdom), + MuiTab(icon = MuiIcons(MuiIconsModule.Favorite)()(), label = "FAVORITES".toVdom), + MuiTab(icon = MuiIcons(MuiIconsModule.PersonPin)()(), label = "NEARBY".toVdom) ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconTabs.scala index 9af63735..2c14f40a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/IconTabs.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.Tabs.{DefaultIconTabsStyle, IconTabsStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiPaper, MuiTab, MuiTabs} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiFavoriteIcon, MuiPersonPinIcon, MuiPhoneIcon} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.Tabs.{DefaultIconTabsStyle, IconTabsStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiPaper, MuiTab, MuiTabs} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object IconTabs extends ScalaCssReactImplicits { case class Props(style: IconTabsStyle) @@ -35,9 +36,9 @@ object IconTabs extends ScalaCssReactImplicits { textColor = MuiTabs.TextColor.primary, )( value := state.value, - MuiTab(icon = MuiPhoneIcon()()), - MuiTab(icon = MuiFavoriteIcon()()), - MuiTab(icon = MuiPersonPinIcon()()) + MuiTab(icon = MuiIcons(MuiIconsModule.Phone)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.Favorite)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.PersonPin)()()) ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/NavTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/NavTabs.scala index a5208ad3..f04aab44 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/NavTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/NavTabs.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiNoSsr, MuiTab, MuiTabs} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object NavTabs extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonAuto.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonAuto.scala index d9d070d9..d24eda73 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonAuto.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonAuto.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} import io.kinoplan.demo.styles.demos.Tabs.{DefaultScrollableTabsStyle, ScrollableTabsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiTab, MuiTabs} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object ScrollableTabsButtonAuto extends ScalaCssReactImplicits { case class Props(style: ScrollableTabsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonForce.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonForce.scala index d5f94446..052722b8 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonForce.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonForce.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} import io.kinoplan.demo.styles.demos.Tabs.{DefaultScrollableTabsStyle, ScrollableTabsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiTab, MuiTabs} -import io.kinoplan.scalajs.react.material.ui.icons._ -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ScrollableTabsButtonForce extends ScalaCssReactImplicits { case class Props(style: ScrollableTabsStyle) @@ -47,13 +48,13 @@ object ScrollableTabsButtonForce extends ScalaCssReactImplicits { scrollButtons = MuiTabs.ScrollButtons.on )( value := state.value, - MuiTab(label = "Item One".toVdom, icon = MuiPhoneIcon()()), - MuiTab(label = "Item Two".toVdom, icon = MuiFavoriteIcon()()), - MuiTab(label = "Item Three".toVdom, icon = MuiPersonPinIcon()()), - MuiTab(label = "Item Four".toVdom, icon = MuiHelpIcon()()), - MuiTab(label = "Item Five".toVdom, icon = MuiShoppingBasketIcon()()), - MuiTab(label = "Item Six".toVdom, icon = MuiThumbDownIcon()()), - MuiTab(label = "Item Seven".toVdom, icon = MuiThumbUpIcon()()) + MuiTab(label = "Item One".toVdom, icon = MuiIcons(MuiIconsModule.Phone)()()), + MuiTab(label = "Item Two".toVdom, icon = MuiIcons(MuiIconsModule.Favorite)()()), + MuiTab(label = "Item Three".toVdom, icon = MuiIcons(MuiIconsModule.PersonPin)()()), + MuiTab(label = "Item Four".toVdom, icon = MuiIcons(MuiIconsModule.Help)()()), + MuiTab(label = "Item Five".toVdom, icon = MuiIcons(MuiIconsModule.ShoppingBasket)()()), + MuiTab(label = "Item Six".toVdom, icon = MuiIcons(MuiIconsModule.ThumbDown)()()), + MuiTab(label = "Item Seven".toVdom, icon = MuiIcons(MuiIconsModule.ThumbUp)()()) ) ), TabContainer()("Item One").when(state.isOne), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonPrevent.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonPrevent.scala index d634c241..03395781 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonPrevent.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/ScrollableTabsButtonPrevent.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs -import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} -import io.kinoplan.demo.styles.demos.Tabs.{DefaultScrollableTabsStyle, ScrollableTabsStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiTab, MuiTabs} -import io.kinoplan.scalajs.react.material.ui.icons._ -import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} +import io.kinoplan.demo.styles.demos.Tabs.{DefaultScrollableTabsStyle, ScrollableTabsStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiTab, MuiTabs} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object ScrollableTabsButtonPrevent extends ScalaCssReactImplicits { case class Props(style: ScrollableTabsStyle) @@ -44,13 +45,13 @@ object ScrollableTabsButtonPrevent extends ScalaCssReactImplicits { scrollButtons = MuiTabs.ScrollButtons.off )( value := state.value, - MuiTab(icon = MuiPhoneIcon()()), - MuiTab(icon = MuiFavoriteIcon()()), - MuiTab(icon = MuiPersonPinIcon()()), - MuiTab(icon = MuiHelpIcon()()), - MuiTab(icon = MuiShoppingBasketIcon()()), - MuiTab(icon = MuiThumbDownIcon()()), - MuiTab(icon = MuiThumbUpIcon()()) + MuiTab(icon = MuiIcons(MuiIconsModule.Phone)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.Favorite)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.PersonPin)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.Help)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.ShoppingBasket)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.ThumbDown)()()), + MuiTab(icon = MuiIcons(MuiIconsModule.ThumbUp)()()) ) ), TabContainer()("Item One").when(state.isOne), diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/SimpleTabs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/SimpleTabs.scala index b6984a61..40e52e02 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/SimpleTabs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/SimpleTabs.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiTab, MuiTabs} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object SimpleTabs extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/TabsWrappedLabel.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/TabsWrappedLabel.scala index be53fb38..87ea2084 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/TabsWrappedLabel.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tabs/TabsWrappedLabel.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.components.demos.Tabs +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout, TabContainer} import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.{MuiAppBar, MuiTab, MuiTabs} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object TabsWrappedLabel extends ScalaCssReactImplicits { case class Props(style: CommonStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/ComposedTextField.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/ComposedTextField.scala index 179f43a1..3c152060 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/ComposedTextField.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/ComposedTextField.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.demos.TextFields -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.demos.TextFields.{ComponentTextFieldStyle, DefaultComponentTextFieldStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiFilledInput, MuiFormControl, MuiFormHelperText, MuiInput, MuiInputLabel, MuiOutlinedInput} -import japgolly.scalajs.react.vdom.all._ import japgolly.scalajs.react.{BackendScope, ReactDOM, ReactEventFromInput, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import org.scalajs.dom.{Element, document} import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.demo.styles.demos.TextFields.{ComponentTextFieldStyle, DefaultComponentTextFieldStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiFilledInput, MuiFormControl, MuiFormHelperText, MuiInput, MuiInputLabel, MuiOutlinedInput} + object ComposedTextField extends ScalaCssReactImplicits { case class Props(style: ComponentTextFieldStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputBase.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputBase.scala index 3b1ad259..f4c24883 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputBase.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputBase.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.TextFields +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.TextFields.{CustomizedInputBaseStyle, DefaultCustomizedInputBaseStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiDivider, MuiIconButton, MuiInputBase, MuiPaper} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiDirectionsIcon, MuiMenuIcon, MuiSearchIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object CustomizedInputBase extends ScalaCssReactImplicits { case class Props(style: CustomizedInputBaseStyle) @@ -20,17 +21,17 @@ object CustomizedInputBase extends ScalaCssReactImplicits { MuiPaper(elevation = 1)(css.root, MuiIconButton()(css.iconButton, aria.label := "Menu", - MuiMenuIcon() + MuiIcons(MuiIconsModule.Menu)() ), MuiInputBase()(css.input, placeholder := "Search Google Maps"), MuiIconButton()(css.iconButton, aria.label := "Search", - MuiSearchIcon() + MuiIcons(MuiIconsModule.Search)() ), MuiDivider()(css.divider), MuiIconButton(color = MuiIconButton.Color.primary)(css.iconButton, aria.label := "Directions", - MuiDirectionsIcon() + MuiIcons(MuiIconsModule.Directions)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputs.scala index e47b716e..ee9701a7 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/CustomizedInputs.scala @@ -1,16 +1,17 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.{ComponentContainer, Layout} import io.kinoplan.demo.styles.demos.TextFields.{CustomizedInputsStyle, DefaultCustomizedInputsStyle} import io.kinoplan.demo.utils.Helpers._ import io.kinoplan.demo.utils.props.{MuiInputLabelProps, MuiInputProps} -import io.kinoplan.scalajs.react.material.ui.core.styles._ import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiInput, MuiInputBase, MuiInputLabel, MuiTextField, colors} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js +import io.kinoplan.scalajs.react.material.ui.core.styles._ object CustomizedInputs extends ScalaCssReactImplicits { case class Props(style: CustomizedInputsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledInputAdornments.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledInputAdornments.scala index fae2d12a..ac832789 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledInputAdornments.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledInputAdornments.scala @@ -1,19 +1,20 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js.JSConverters._ + import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.TextFields.FieldRange import io.kinoplan.demo.styles.demos.TextFields.{DefaultInputAdornmentsStyle, InputAdornmentsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.MuiInputProps import io.kinoplan.scalajs.react.material.ui.core.{MuiIconButton, MuiInputAdornment, MuiMenuItem, MuiTextField} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiVisibilityIcon, MuiVisibilityOffIcon} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js.JSConverters._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object FilledInputAdornments extends ScalaCssReactImplicits { case class Props(style: InputAdornmentsStyle) @@ -73,7 +74,11 @@ object FilledInputAdornments extends ScalaCssReactImplicits { MuiIconButton()( aria.label := "Toggle password visibility", onClick --> handleClickShowPassword, - if (state.showPassword) MuiVisibilityIcon() else MuiVisibilityOffIcon() + if (state.showPassword) { + MuiIcons(MuiIconsModule.Visibility)() + } else { + MuiIcons(MuiIconsModule.VisibilityOff)() + } ) ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledTextFields.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledTextFields.scala index d4ba75ae..33b5da5f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledTextFields.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/FilledTextFields.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.TextFields.Currency import io.kinoplan.demo.styles.demos.TextFields.{DefaultVariantTextFieldsStyle, VariantTextFieldsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.{MuiInputLabelProps, MuiInputProps, MuiMenuProps, MuiSelectProps} import io.kinoplan.scalajs.react.material.ui.core.{MuiMenuItem, MuiTextField} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object FilledTextFields extends ScalaCssReactImplicits { case class Props(style: VariantTextFieldsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputAdornments.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputAdornments.scala index d29300da..5a494621 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputAdornments.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputAdornments.scala @@ -1,19 +1,20 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js.JSConverters._ + import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.TextFields.FieldRange import io.kinoplan.demo.styles.demos.TextFields.{DefaultInputAdornmentsStyle, InputAdornmentsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.MuiInputProps import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiFormHelperText, MuiIconButton, MuiInput, MuiInputAdornment, MuiInputLabel, MuiMenuItem, MuiTextField} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiVisibilityIcon, MuiVisibilityOffIcon} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js.JSConverters._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object InputAdornments extends ScalaCssReactImplicits { case class Props(style: InputAdornmentsStyle) @@ -73,7 +74,7 @@ object InputAdornments extends ScalaCssReactImplicits { MuiIconButton()( aria.label := "Toggle password visibility", onClick --> handleClickShowPassword, - if (state.showPassword) MuiVisibilityIcon() else MuiVisibilityOffIcon() + if (state.showPassword) MuiIcons(MuiIconsModule.Visibility)() else MuiIcons(MuiIconsModule.VisibilityOff)() ) ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputWithIcon.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputWithIcon.scala index 8fd28a12..e079fec1 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputWithIcon.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/InputWithIcon.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js.JSConverters._ + import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.TextFields.{DefaultInputAdornmentsStyle, InputAdornmentsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.MuiInputProps import io.kinoplan.scalajs.react.material.ui.core.{MuiFormControl, MuiGrid, MuiInput, MuiInputAdornment, MuiInputLabel, MuiTextField} -import io.kinoplan.scalajs.react.material.ui.icons.MuiAccountCircleIcon -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js.JSConverters._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object InputWithIcon extends ScalaCssReactImplicits { case class Props(style: InputAdornmentsStyle) @@ -26,7 +27,7 @@ object InputWithIcon extends ScalaCssReactImplicits { MuiFormControl()(css.cssMargin, MuiInputLabel()(htmlFor := "input-with-icon-adornment", "With a start adornment"), MuiInput(startAdornment = MuiInputAdornment(position = MuiInputAdornment.Position.start)( - MuiAccountCircleIcon() + MuiIcons(MuiIconsModule.AccountCircle)() ))( id := "adornment-amount" ) @@ -35,7 +36,7 @@ object InputWithIcon extends ScalaCssReactImplicits { label = "TextField".toVdom, InputProps = MuiInputProps( startAdornment = MuiInputAdornment(position = MuiInputAdornment.Position.start)( - MuiAccountCircleIcon() + MuiIcons(MuiIconsModule.AccountCircle)() ).rawNode.some.orUndefined ) )(css.cssMargin, @@ -44,7 +45,7 @@ object InputWithIcon extends ScalaCssReactImplicits { div(css.cssMargin, MuiGrid(container = true, spacing = 8, alignItems = MuiGrid.AlignItems.flexEnd)( MuiGrid(item = true)( - MuiAccountCircleIcon() + MuiIcons(MuiIconsModule.AccountCircle)() ), MuiGrid(item = true)( MuiTextField(label = "With a grid".toVdom)(id := "input-with-icon-grid") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/Inputs.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/Inputs.scala index 6a8be969..ee12e313 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/Inputs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/Inputs.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.TextFields +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.TextFields.{ComponentTextFieldStyle, DefaultComponentTextFieldStyle} import io.kinoplan.demo.utils.props.MuiInputProps import io.kinoplan.scalajs.react.material.ui.core.MuiInput -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object Inputs extends ScalaCssReactImplicits { case class Props(style: ComponentTextFieldStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedInputAdornments.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedInputAdornments.scala index da435a12..330db5bb 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedInputAdornments.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedInputAdornments.scala @@ -1,19 +1,20 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js.JSConverters._ + import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.TextFields.FieldRange import io.kinoplan.demo.styles.demos.TextFields.{DefaultInputAdornmentsStyle, InputAdornmentsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.MuiInputProps import io.kinoplan.scalajs.react.material.ui.core.{MuiIconButton, MuiInputAdornment, MuiMenuItem, MuiTextField} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiVisibilityIcon, MuiVisibilityOffIcon} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js.JSConverters._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object OutlinedInputAdornments extends ScalaCssReactImplicits { case class Props(style: InputAdornmentsStyle) @@ -73,7 +74,7 @@ object OutlinedInputAdornments extends ScalaCssReactImplicits { MuiIconButton()( aria.label := "Toggle password visibility", onClick --> handleClickShowPassword, - if (state.showPassword) MuiVisibilityIcon() else MuiVisibilityOffIcon() + if (state.showPassword) MuiIcons(MuiIconsModule.Visibility)() else MuiIcons(MuiIconsModule.VisibilityOff)() ) ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedTextFields.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedTextFields.scala index cb21763b..fecc1898 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedTextFields.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/OutlinedTextFields.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.TextFields.Currency import io.kinoplan.demo.styles.demos.TextFields.{DefaultVariantTextFieldsStyle, VariantTextFieldsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.{MuiInputLabelProps, MuiInputProps, MuiMenuProps, MuiSelectProps} import io.kinoplan.scalajs.react.material.ui.core.{MuiMenuItem, MuiTextField} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object OutlinedTextFields extends ScalaCssReactImplicits { case class Props(style: VariantTextFieldsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFieldMargins.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFieldMargins.scala index 77e7d70f..f3087200 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFieldMargins.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFieldMargins.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.TextFields +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.TextFields.{DefaultTextFieldsStyle, TextFieldsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.scalajs.react.material.ui.core.MuiTextField -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object TextFieldMargins extends ScalaCssReactImplicits { case class Props(style: TextFieldsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFields.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFields.scala index 8164ea8b..54cc5345 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFields.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/TextFields/TextFields.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.demos.TextFields +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.TextFields.Currency import io.kinoplan.demo.styles.demos.TextFields.{DefaultTextFieldsStyle, TextFieldsStyle} import io.kinoplan.demo.utils.Helpers.StringExtended import io.kinoplan.demo.utils.props.{MuiInputLabelProps, MuiInputProps, MuiMenuProps, MuiSelectProps} import io.kinoplan.scalajs.react.material.ui.core.{MuiMenuItem, MuiTextField} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ReactEventFromTextArea, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object TextFields extends ScalaCssReactImplicits { case class Props(style: TextFieldsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/ControlledTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/ControlledTooltips.scala index 0692a52e..802b57d3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/ControlledTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/ControlledTooltips.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Tooltips -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} -import japgolly.scalajs.react.vdom.all._ import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} + object ControlledTooltips extends ScalaCssReactImplicits { case class State(open: Boolean = false) { def handleTooltipClose = copy(open = false) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DelayTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DelayTooltips.scala index 4798b057..38db848a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DelayTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DelayTooltips.scala @@ -1,10 +1,11 @@ package io.kinoplan.demo.components.demos.Tooltips -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} import japgolly.scalajs.react.ScalaComponent import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} + object DelayTooltips { private val component = ScalaComponent.builder[Unit]("DelayTooltips") .renderStatic( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DisabledTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DisabledTooltips.scala index e59a385d..225c2478 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DisabledTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/DisabledTooltips.scala @@ -1,10 +1,11 @@ package io.kinoplan.demo.components.demos.Tooltips -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} import japgolly.scalajs.react.ScalaComponent import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} + object DisabledTooltips { private val component = ScalaComponent.builder[Unit]("DisabledTooltips") .renderStatic( diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/InteractiveTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/InteractiveTooltips.scala index 12a9022c..0d6ab532 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/InteractiveTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/InteractiveTooltips.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Tooltips +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Tooltips.{DefaultInteractiveTooltipsStyle, InteractiveTooltipsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object InteractiveTooltips extends ScalaCssReactImplicits { case class Props(style: InteractiveTooltipsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/PositionedTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/PositionedTooltips.scala index 9fdedfaf..b637f8f7 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/PositionedTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/PositionedTooltips.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Tooltips +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Tooltips.{DefaultPositionedTooltipsStyle, PositionedTooltipsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiGrid, MuiTooltip} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object PositionedTooltips extends ScalaCssReactImplicits { case class Props(style: PositionedTooltipsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/SimpleTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/SimpleTooltips.scala index 138e4f12..2bb7661d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/SimpleTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/SimpleTooltips.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Tooltips +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Tooltips.{DefaultSimpleTooltipsStyle, SimpleTooltipsStyle} import io.kinoplan.scalajs.react.material.ui.core.{MuiFab, MuiIconButton, MuiTooltip} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAddIcon, MuiDeleteIcon} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object SimpleTooltips extends ScalaCssReactImplicits { case class Props(style: SimpleTooltipsStyle) @@ -21,19 +22,19 @@ object SimpleTooltips extends ScalaCssReactImplicits { MuiTooltip(title = "Delete")( MuiIconButton()( aria.label := "Delete", - MuiDeleteIcon() + MuiIcons(MuiIconsModule.Delete)() ) ), MuiTooltip(title = "Add")( aria.label := "Add", MuiFab(color = MuiFab.Color.primary)(css.fab, - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ) ), MuiTooltip(title = "Add")( aria.label := "Add", MuiFab(color = MuiFab.Color.secondary)(css.fab, - MuiAddIcon() + MuiIcons(MuiIconsModule.Add)() ) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TransitionsTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TransitionsTooltips.scala index 9f7a5f49..8d00d8bb 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TransitionsTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TransitionsTooltips.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.components.demos.Tooltips -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiFade, MuiTooltip, MuiZoom} +import scala.scalajs.js + import japgolly.scalajs.react.ScalaComponent import japgolly.scalajs.react.vdom.all._ -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiFade, MuiTooltip, MuiZoom} object TransitionsTooltips { private val component = ScalaComponent.builder[Unit]("TransitionsTooltips") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TriggersTooltips.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TriggersTooltips.scala index fd7a4510..19cceb58 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TriggersTooltips.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/TriggersTooltips.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Tooltips -import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiClickAwayListener, MuiGrid, MuiTooltip} -import japgolly.scalajs.react.vdom.all._ +import scala.scalajs.js + import japgolly.scalajs.react.{BackendScope, Callback, ReactEventFromHtml, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits -import scala.scalajs.js +import io.kinoplan.demo.components.ComponentContainer +import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiClickAwayListener, MuiGrid, MuiTooltip} object TriggersTooltips extends ScalaCssReactImplicits { case class State(open: Boolean = false) { diff --git a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/VariableWidth.scala b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/VariableWidth.scala index 434c10e3..2e8c1df3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/VariableWidth.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/demos/Tooltips/VariableWidth.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.demos.Tooltips +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.demos.Tooltips.{DefaultVariableWidthStyle, VariableWidthStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core.{MuiButton, MuiTooltip} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object VariableWidth extends ScalaCssReactImplicits { case class Props(style: VariableWidthStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CollapsedBreadcrumbs.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CollapsedBreadcrumbs.scala index ee30fa95..fb5ff757 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CollapsedBreadcrumbs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CollapsedBreadcrumbs.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.labs.Breadcrumbs +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Breadcrumbs.{BreadcrumbsStyle, DefaultBreadcrumbsStyle} import io.kinoplan.scalajs.react.material.ui.core._ import io.kinoplan.scalajs.react.material.ui.lab.MuiBreadcrumbs -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CollapsedBreadcrumbs extends ScalaCssReactImplicits { case class Props(style: BreadcrumbsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomSeparator.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomSeparator.scala index 180e0469..ec5d4222 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomSeparator.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomSeparator.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.labs.Breadcrumbs +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Breadcrumbs.{BreadcrumbsStyle, DefaultBreadcrumbsStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiNavigateNextIcon +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} import io.kinoplan.scalajs.react.material.ui.lab.MuiBreadcrumbs -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomSeparator extends ScalaCssReactImplicits { case class Props(style: BreadcrumbsStyle) @@ -38,7 +39,9 @@ object CustomSeparator extends ScalaCssReactImplicits { ), br(), MuiPaper()(css.paper, - MuiBreadcrumbs(separator = MuiNavigateNextIcon(fontSize = MuiSvgIcon.FontSize.small)())(aria.label := "Breadcrumb", + MuiBreadcrumbs( + separator = MuiIcons(MuiIconsModule.Navigation)(fontSize = MuiIcons.FontSize.small)() + )(aria.label := "Breadcrumb", MuiLink(color = MuiLink.Color.inherit)(href := "/", onClick --> handleClick, "Material-UI"), MuiLink(color = MuiLink.Color.inherit)(href := "/#demos/app-bar/", onClick --> handleClick, "Lab"), MuiTypography(color = MuiTypography.Color.textPrimary)("Breadcrumb") diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomizedBreadcrumbs.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomizedBreadcrumbs.scala index fa10e75f..5fb6c586 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomizedBreadcrumbs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/CustomizedBreadcrumbs.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.labs.Breadcrumbs +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Breadcrumbs.{CustomizedBreadcrumbsStyle, DefaultCustomizedBreadcrumbsStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiExpandMoreIcon, MuiHomeIcon} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} import io.kinoplan.scalajs.react.material.ui.lab.MuiBreadcrumbs -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits object CustomizedBreadcrumbs extends ScalaCssReactImplicits { case class Props(style: CustomizedBreadcrumbsStyle) @@ -28,14 +29,14 @@ object CustomizedBreadcrumbs extends ScalaCssReactImplicits { component = "a", label = VdomNode("Home"), avatar = MuiAvatar()(css.avatar, - MuiHomeIcon() + MuiIcons(MuiIconsModule.Home)() )().rawElement )(css.chip, href := "#", onClick --> handleClick), MuiChip(component = "a", label = VdomNode("Catalog"))(css.chip, href := "#", onClick --> handleClick), MuiChip( label = VdomNode("Accessories"), onDelete = handleChangeOnDelete, - deleteIcon = MuiExpandMoreIcon()().rawElement + deleteIcon = MuiIcons(MuiIconsModule.ExpandMore)()().rawElement )(css.chip, onClick --> handleClick) ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/IconBreadcrumbs.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/IconBreadcrumbs.scala index 8781a64a..9210588a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/IconBreadcrumbs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/IconBreadcrumbs.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.labs.Breadcrumbs +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Breadcrumbs.{BreadcrumbsStyle, DefaultBreadcrumbsStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.{MuiGrainIcon, MuiHomeIcon, MuiWhatshotIcon} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} import io.kinoplan.scalajs.react.material.ui.lab.MuiBreadcrumbs -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits object IconBreadcrumbs extends ScalaCssReactImplicits { case class Props(style: BreadcrumbsStyle) @@ -26,17 +27,17 @@ object IconBreadcrumbs extends ScalaCssReactImplicits { MuiLink(color = MuiLink.Color.inherit)(css.link, href := "/", onClick --> handleClick, - MuiHomeIcon()(css.icon), + MuiIcons(MuiIconsModule.Home)()(css.icon), "Material-UI" ), MuiLink(color = MuiLink.Color.inherit)(css.link, href := "/#demos/app-bar/", onClick --> handleClick, - MuiWhatshotIcon()(css.icon), + MuiIcons(MuiIconsModule.Whatshot)()(css.icon), "Lab" ), MuiTypography(color = MuiTypography.Color.textPrimary)(css.link, - MuiGrainIcon()(css.icon), + MuiIcons(MuiIconsModule.Grain)()(css.icon), "Breadcrumb" ) ) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/SimpleBreadcrumbs.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/SimpleBreadcrumbs.scala index b116d85d..3ba881fe 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/SimpleBreadcrumbs.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Breadcrumbs/SimpleBreadcrumbs.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.labs.Breadcrumbs +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer -import io.kinoplan.demo.styles.labs.Breadcrumbs.{DefaultBreadcrumbsStyle, BreadcrumbsStyle} +import io.kinoplan.demo.styles.labs.Breadcrumbs.{BreadcrumbsStyle, DefaultBreadcrumbsStyle} import io.kinoplan.scalajs.react.material.ui.core._ import io.kinoplan.scalajs.react.material.ui.lab.MuiBreadcrumbs -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits object SimpleBreadcrumbs extends ScalaCssReactImplicits { case class Props(style: BreadcrumbsStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/CustomIconSlider.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/CustomIconSlider.scala index 5129c029..1fcefb7d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/CustomIconSlider.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/CustomIconSlider.scala @@ -1,16 +1,19 @@ package io.kinoplan.demo.components.labs.Slider +import scala.scalajs.js +import scala.scalajs.js.JSConverters._ + +import cats.syntax.option._ +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Slider.{DefaultSliderStyle, SliderStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiLensIcon +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} import io.kinoplan.scalajs.react.material.ui.lab.MuiSlider -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object CustomIconSlider extends ScalaCssReactImplicits { case class Props(style: SliderStyle) @@ -29,12 +32,12 @@ object CustomIconSlider extends ScalaCssReactImplicits { val imageSliderClasses = Map( MuiSlider.ClassKey.container -> styleAToClassName(css.slider) - ) + ).some.orUndefined val iconSliderClasses = Map( MuiSlider.ClassKey.container -> styleAToClassName(css.slider), MuiSlider.ClassKey.thumbIconWrapper -> styleAToClassName(css.thumbIconWrapper) - ) + ).some.orUndefined div( ComponentContainer("Custom thumb")( @@ -55,7 +58,7 @@ object CustomIconSlider extends ScalaCssReactImplicits { MuiSlider( classes = iconSliderClasses, onChange = handleChange, - thumb = MuiLensIcon()(style := js.Dictionary("color" -> "#fff"))().rawElement + thumb = MuiIcons(MuiIconsModule.Lens)()(style := js.Dictionary("color" -> "#fff"))().rawElement )( aria.labelledBy := "slider-icon", value := state.value diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/DisabledSlider.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/DisabledSlider.scala index d75bc259..7a54379b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/DisabledSlider.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/DisabledSlider.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.labs.Slider +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Slider.{DefaultDisabledSliderStyle, DisabledSliderStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.lab.MuiSlider -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} -import scalacss.ScalaCssReactImplicits object DisabledSlider extends ScalaCssReactImplicits { case class Props(style: DisabledSliderStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/SimpleSlider.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/SimpleSlider.scala index b0d81100..44a6af04 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/SimpleSlider.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/SimpleSlider.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.labs.Slider +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Slider.{DefaultSliderStyle, SliderStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core._ import io.kinoplan.scalajs.react.material.ui.lab.MuiSlider -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits object SimpleSlider extends ScalaCssReactImplicits { case class Props(style: SliderStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/StepSlider.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/StepSlider.scala index 43104ec5..41702f6d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/StepSlider.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/StepSlider.scala @@ -1,13 +1,14 @@ package io.kinoplan.demo.components.labs.Slider +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Slider.{DefaultSliderStyle, SliderStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.core._ import io.kinoplan.scalajs.react.material.ui.lab.MuiSlider -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits object StepSlider extends ScalaCssReactImplicits { case class Props(style: SliderStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/VerticalSlider.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/VerticalSlider.scala index 34313e80..81379ca2 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/VerticalSlider.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/Slider/VerticalSlider.scala @@ -1,12 +1,13 @@ package io.kinoplan.demo.components.labs.Slider +import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.Slider.{DefaultVerticalSliderStyle, VerticalSliderStyle} import io.kinoplan.demo.utils.Helpers.styleAToClassName import io.kinoplan.scalajs.react.material.ui.lab.MuiSlider -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ReactEvent, ScalaComponent} -import scalacss.ScalaCssReactImplicits object VerticalSlider extends ScalaCssReactImplicits { case class Props(style: VerticalSliderStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/OpenIconSpeedDial.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/OpenIconSpeedDial.scala index c8667dae..8cfb1f1b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/OpenIconSpeedDial.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/OpenIconSpeedDial.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.labs.SpeedDial +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.SpeedDial.Action import io.kinoplan.demo.styles.labs.SpeedDial.{DefaultSpeedDialStyle, SpeedDialStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiEditIcon +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} import io.kinoplan.scalajs.react.material.ui.lab.{MuiSpeedDial, MuiSpeedDialAction, MuiSpeedDialIcon} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object OpenIconSpeedDial extends ScalaCssReactImplicits { case class Props(style: SpeedDialStyle) @@ -46,7 +47,7 @@ object OpenIconSpeedDial extends ScalaCssReactImplicits { MuiButton()(onClick --> handleVisibility, "Toggle Speed Dial"), MuiSpeedDial( ariaLabel = "SpeedDial openIcon example", - icon = MuiSpeedDialIcon(openIcon = MuiEditIcon()())().rawElement, + icon = MuiSpeedDialIcon(openIcon = MuiIcons(MuiIconsModule.Edit)()())().rawElement, open = state.open, onClose = onClose )(css.speedDial, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/SpeedDialTooltipOpen.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/SpeedDialTooltipOpen.scala index 9e232920..59b5d0df 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/SpeedDialTooltipOpen.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/SpeedDial/SpeedDialTooltipOpen.scala @@ -1,17 +1,18 @@ package io.kinoplan.demo.components.labs.SpeedDial +import scala.scalajs.js + +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.Attr +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.models.SpeedDial.Action import io.kinoplan.demo.styles.labs.SpeedDial.{DefaultSpeedDialStyle, SpeedDialStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons.MuiEditIcon +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} import io.kinoplan.scalajs.react.material.ui.lab.{MuiSpeedDial, MuiSpeedDialAction, MuiSpeedDialIcon} -import japgolly.scalajs.react.vdom.Attr -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js object SpeedDialTooltipOpen extends ScalaCssReactImplicits { case class Props(style: SpeedDialStyle) @@ -46,7 +47,7 @@ object SpeedDialTooltipOpen extends ScalaCssReactImplicits { MuiButton()(onClick --> handleVisibility, "Persistent action tooltips"), MuiSpeedDial( ariaLabel = "SpeedDial tooltip example", - icon = MuiSpeedDialIcon(openIcon = MuiEditIcon()())().rawElement, + icon = MuiSpeedDialIcon(openIcon = MuiIcons(MuiIconsModule.Edit)()())().rawElement, open = state.open, onClose = onClose )(css.speedDial, diff --git a/demo/src/main/scala/io/kinoplan/demo/components/labs/ToggleButton/ToggleButtons.scala b/demo/src/main/scala/io/kinoplan/demo/components/labs/ToggleButton/ToggleButtons.scala index 0035bfd0..cc2b00fc 100644 --- a/demo/src/main/scala/io/kinoplan/demo/components/labs/ToggleButton/ToggleButtons.scala +++ b/demo/src/main/scala/io/kinoplan/demo/components/labs/ToggleButton/ToggleButtons.scala @@ -1,16 +1,17 @@ package io.kinoplan.demo.components.labs.ToggleButton +import scala.scalajs.js +import scala.scalajs.js.JSConverters._ + +import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} +import japgolly.scalajs.react.vdom.all.{VdomElement, _} +import scalacss.ScalaCssReactImplicits + import io.kinoplan.demo.components.ComponentContainer import io.kinoplan.demo.styles.labs.ToggleButton.{DefaultToggleButtonStyle, ToggleButtonStyle} import io.kinoplan.scalajs.react.material.ui.core._ -import io.kinoplan.scalajs.react.material.ui.icons._ +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} import io.kinoplan.scalajs.react.material.ui.lab.{MuiToggleButton, MuiToggleButtonGroup} -import japgolly.scalajs.react.vdom.all.{VdomElement, _} -import japgolly.scalajs.react.{BackendScope, Callback, ScalaComponent} -import scalacss.ScalaCssReactImplicits - -import scala.scalajs.js -import scala.scalajs.js.JSConverters._ object ToggleButtons extends ScalaCssReactImplicits { case class Props(style: ToggleButtonStyle) @@ -42,10 +43,10 @@ object ToggleButtons extends ScalaCssReactImplicits { div(css.toggleContainer, MuiToggleButtonGroup(exclusive = true, onChange = handleAlignment)( value := state.alignment, - MuiToggleButton()(value := "left", MuiFormatAlignLeftIcon()), - MuiToggleButton()(value := "center", MuiFormatAlignCenterIcon()), - MuiToggleButton()(value := "right", MuiFormatAlignRightIcon()), - MuiToggleButton()(value := "justify", disabled := true, MuiFormatAlignJustifyIcon()) + MuiToggleButton()(value := "left", MuiIcons(MuiIconsModule.FormatAlignLeft)()), + MuiToggleButton()(value := "center", MuiIcons(MuiIconsModule.FormatAlignCenter)()), + MuiToggleButton()(value := "right", MuiIcons(MuiIconsModule.FormatAlignRight)()), + MuiToggleButton()(value := "justify", disabled := true, MuiIcons(MuiIconsModule.FormatAlignJustify)()) ) ), MuiTypography(variant = MuiTypography.Variant.caption, gutterBottom = true)("Exclusive Selection"), @@ -59,12 +60,12 @@ object ToggleButtons extends ScalaCssReactImplicits { div(css.toggleContainer, MuiToggleButtonGroup(exclusive = true, onChange = handleFormat)( value := state.formats.toJSArray, - MuiToggleButton()(value := "bold", MuiFormatBoldIcon()), - MuiToggleButton()(value := "italic", MuiFormatItalicIcon()), - MuiToggleButton()(value := "underlined", MuiFormatUnderlinedIcon()), + MuiToggleButton()(value := "bold", MuiIcons(MuiIconsModule.FormatBold)()), + MuiToggleButton()(value := "italic", MuiIcons(MuiIconsModule.FormatItalic)()), + MuiToggleButton()(value := "underlined", MuiIcons(MuiIconsModule.FormatUnderlined)()), MuiToggleButton()(value := "color", disabled := true, - MuiFormatColorFillIcon(), - MuiArrowDropDownIcon() + MuiIcons(MuiIconsModule.FormatColorFill)(), + MuiIcons(MuiIconsModule.ArrowDropDown)() ) ) ), diff --git a/demo/src/main/scala/io/kinoplan/demo/models/Buttons/Fab.scala b/demo/src/main/scala/io/kinoplan/demo/models/Buttons/Fab.scala index 407ce565..bc452b8e 100644 --- a/demo/src/main/scala/io/kinoplan/demo/models/Buttons/Fab.scala +++ b/demo/src/main/scala/io/kinoplan/demo/models/Buttons/Fab.scala @@ -1,8 +1,9 @@ package io.kinoplan.demo.models.Buttons +import scalacss.internal.StyleA + import io.kinoplan.scalajs.react.bridge.WithProps import io.kinoplan.scalajs.react.material.ui.core.MuiFab -import scalacss.internal.StyleA case class Fab( color: MuiFab.Color.Value, diff --git a/demo/src/main/scala/io/kinoplan/demo/models/MenuItem.scala b/demo/src/main/scala/io/kinoplan/demo/models/MenuItem.scala index 45d10689..2994cdd8 100644 --- a/demo/src/main/scala/io/kinoplan/demo/models/MenuItem.scala +++ b/demo/src/main/scala/io/kinoplan/demo/models/MenuItem.scala @@ -1,8 +1,8 @@ package io.kinoplan.demo.models -import io.kinoplan.scalajs.react.bridge.WithProps import io.kinoplan.demo.router.AppRouter.{DashboardRoute, Page} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiAssignmentIcon, MuiBarChartIcon, MuiDashboardIcon, MuiLayersIcon, MuiPeopleIcon, MuiShoppingCartIcon} +import io.kinoplan.scalajs.react.bridge.WithProps +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} case class MenuItem( label: String, @@ -12,16 +12,16 @@ case class MenuItem( object MenuItem { val menuItemsFirst = List( - MenuItem("Dashboard", MuiDashboardIcon(), DashboardRoute), - MenuItem("Orders", MuiShoppingCartIcon(), DashboardRoute), - MenuItem("Customers", MuiPeopleIcon(), DashboardRoute), - MenuItem("Reports", MuiBarChartIcon(), DashboardRoute), - MenuItem("Integrations", MuiLayersIcon(), DashboardRoute) + MenuItem("Dashboard", MuiIcons(MuiIconsModule.Dashboard)(), DashboardRoute), + MenuItem("Orders", MuiIcons(MuiIconsModule.ShoppingCart)(), DashboardRoute), + MenuItem("Customers", MuiIcons(MuiIconsModule.People)(), DashboardRoute), + MenuItem("Reports", MuiIcons(MuiIconsModule.BarChart)(), DashboardRoute), + MenuItem("Integrations", MuiIcons(MuiIconsModule.Layers)(), DashboardRoute) ) - private val muiAssignment = MuiAssignmentIcon( - color = MuiAssignmentIcon.Color.primary, - fontSize = MuiAssignmentIcon.FontSize.default + private val muiAssignment = MuiIcons(MuiIconsModule.Assignment)( + color = MuiIcons.Color.primary, + fontSize = MuiIcons.FontSize.default ) val menuItemsSecond = List( diff --git a/demo/src/main/scala/io/kinoplan/demo/models/SpeedDial/Action.scala b/demo/src/main/scala/io/kinoplan/demo/models/SpeedDial/Action.scala index a4b8ea77..e85ac220 100644 --- a/demo/src/main/scala/io/kinoplan/demo/models/SpeedDial/Action.scala +++ b/demo/src/main/scala/io/kinoplan/demo/models/SpeedDial/Action.scala @@ -1,8 +1,9 @@ package io.kinoplan.demo.models.SpeedDial -import io.kinoplan.scalajs.react.material.ui.icons._ import japgolly.scalajs.react.vdom.VdomNode +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} + case class Action( icon: VdomNode, name: String @@ -10,10 +11,10 @@ case class Action( object Action { val commons = List( - Action(MuiFileCopyIcon(), "Copy"), - Action(MuiSaveIcon(), "Save"), - Action(MuiPrintIcon(), "Print"), - Action(MuiShareIcon(), "Share"), - Action(MuiDeleteIcon(), "Delete") + Action(MuiIcons(MuiIconsModule.FileCopy)(), "Copy"), + Action(MuiIcons(MuiIconsModule.Save)(), "Save"), + Action(MuiIcons(MuiIconsModule.Print)(), "Print"), + Action(MuiIcons(MuiIconsModule.Share)(), "Share"), + Action(MuiIcons(MuiIconsModule.Delete)(), "Delete") ) } diff --git a/demo/src/main/scala/io/kinoplan/demo/models/Tables/Row.scala b/demo/src/main/scala/io/kinoplan/demo/models/Tables/Row.scala index 32f2afe8..cb5921f6 100644 --- a/demo/src/main/scala/io/kinoplan/demo/models/Tables/Row.scala +++ b/demo/src/main/scala/io/kinoplan/demo/models/Tables/Row.scala @@ -1,10 +1,10 @@ package io.kinoplan.demo.models.Tables +import scala.scalajs.js.| + import japgolly.scalajs.react.raw._ import org.scalajs.dom.html -import scala.scalajs.js.| - case class Row( id: String, numeric: Boolean, diff --git a/demo/src/main/scala/io/kinoplan/demo/modules/ChildMenu.scala b/demo/src/main/scala/io/kinoplan/demo/modules/ChildMenu.scala index d7e5c515..7dad97f9 100644 --- a/demo/src/main/scala/io/kinoplan/demo/modules/ChildMenu.scala +++ b/demo/src/main/scala/io/kinoplan/demo/modules/ChildMenu.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.modules -import io.kinoplan.demo.models.ChildMenuItem -import io.kinoplan.demo.router.AppRouter.Page -import io.kinoplan.demo.styles.{DefaultChildMenuStyle, ChildMenuStyle} -import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemText} +import japgolly.scalajs.react.{BackendScope, ScalaComponent} import japgolly.scalajs.react.extra.router.{Resolution, RouterCtl} -import japgolly.scalajs.react.vdom.all._ import japgolly.scalajs.react.vdom.{Attr, VdomArray, VdomNode} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.models.ChildMenuItem +import io.kinoplan.demo.router.AppRouter.Page +import io.kinoplan.demo.styles.{ChildMenuStyle, DefaultChildMenuStyle} +import io.kinoplan.scalajs.react.material.ui.core.{MuiList, MuiListItem, MuiListItemText} + object ChildMenu extends ScalaCssReactImplicits { case class Props( router: RouterCtl[Page], diff --git a/demo/src/main/scala/io/kinoplan/demo/modules/MainMenu.scala b/demo/src/main/scala/io/kinoplan/demo/modules/MainMenu.scala index 92e13cca..c6b44937 100644 --- a/demo/src/main/scala/io/kinoplan/demo/modules/MainMenu.scala +++ b/demo/src/main/scala/io/kinoplan/demo/modules/MainMenu.scala @@ -1,14 +1,15 @@ package io.kinoplan.demo.modules +import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import japgolly.scalajs.react.extra.router.{Resolution, RouterCtl} +import japgolly.scalajs.react.vdom.{Attr, VdomArray, VdomNode} +import japgolly.scalajs.react.vdom.all._ + import io.kinoplan.demo.components.Layout import io.kinoplan.demo.models.{ChildMenuItem, MenuItem} import io.kinoplan.demo.router.AppRouter.Page import io.kinoplan.scalajs.react.material.ui.core.{MuiCollapse, MuiDivider, MuiList, MuiListItem, MuiListItemIcon, MuiListItemText, MuiListSubheader, colors} -import io.kinoplan.scalajs.react.material.ui.icons.{MuiExpandLessIcon, MuiExpandMoreIcon, MuiInboxIcon, MuiLocalBarIcon} -import japgolly.scalajs.react.extra.router.{Resolution, RouterCtl} -import japgolly.scalajs.react.vdom.all._ -import japgolly.scalajs.react.vdom.{Attr, VdomArray, VdomNode} -import japgolly.scalajs.react.{BackendScope, ScalaComponent} +import io.kinoplan.scalajs.react.material.ui.icons.{MuiIcons, MuiIconsModule} object MainMenu { case class Props(router: RouterCtl[Page], r: Resolution[Page]) @@ -27,9 +28,17 @@ object MainMenu { def render(props: Props, state: State): VdomArray = { val iconColor = if (Layout.isPaletteLight) "rgba(0, 0, 0, 0.54)" else colors.common.white - val demoExpandIcon = if (state.demoOpen) MuiExpandLessIcon()(color := iconColor) else MuiExpandMoreIcon()(color := iconColor) + val demoExpandIcon = if (state.demoOpen) { + MuiIcons(MuiIconsModule.ExpandLess)()(color := iconColor) + } else { + MuiIcons(MuiIconsModule.ExpandMore)()(color := iconColor) + } - val labExpandIcon = if (state.labOpen) MuiExpandLessIcon()(color := iconColor) else MuiExpandMoreIcon()(color := iconColor) + val labExpandIcon = if (state.labOpen) { + MuiIcons(MuiIconsModule.ExpandLess)()(color := iconColor) + } else { + MuiIcons(MuiIconsModule.ExpandMore)()(color := iconColor) + } VdomArray( MuiDivider()(Attr("key") := 1), @@ -49,7 +58,7 @@ object MainMenu { }, MuiListItem(button = true)(onClick --> handleDemoListClick, Attr("key") := 5, MuiListItemIcon()( - MuiInboxIcon() + MuiIcons(MuiIconsModule.Inbox)() ), MuiListItemText(inset = true, primary = VdomNode("Component Demos"))(), demoExpandIcon @@ -59,7 +68,7 @@ object MainMenu { ), MuiListItem(button = true)(onClick --> handleLabListClick, Attr("key") := 7, MuiListItemIcon()( - MuiLocalBarIcon() + MuiIcons(MuiIconsModule.LocalBar)() ), MuiListItemText(inset = true, primary = VdomNode("Lab"))(), labExpandIcon diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/SimpleTablePage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/SimpleTablePage.scala index c0d1faed..cc37282b 100755 --- a/demo/src/main/scala/io/kinoplan/demo/pages/SimpleTablePage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/SimpleTablePage.scala @@ -1,15 +1,16 @@ package io.kinoplan.demo.pages -import io.kinoplan.demo.models.Tables.TableItem -import io.kinoplan.demo.router.AppRouter.Page -import io.kinoplan.demo.styles.demos.Tables.{DefaultSimpleTableStyle, SimpleTableStyle} -import io.kinoplan.scalajs.react.material.ui.core._ import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.Attr import japgolly.scalajs.react.vdom.all._ import scalacss.ScalaCssReactImplicits +import io.kinoplan.demo.models.Tables.TableItem +import io.kinoplan.demo.router.AppRouter.Page +import io.kinoplan.demo.styles.demos.Tables.{DefaultSimpleTableStyle, SimpleTableStyle} +import io.kinoplan.scalajs.react.material.ui.core._ + object SimpleTablePage extends ScalaCssReactImplicits { case class Props(router: RouterCtl[Page], style: SimpleTableStyle) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/AppBarPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/AppBarPage.scala index ff4b2cfb..f9d71189 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/AppBarPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/AppBarPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.AppBar._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.AppBar._ +import io.kinoplan.demo.router.AppRouter.Page + object AppBarPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/AvatarsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/AvatarsPage.scala index 47b54f0d..64ecd45e 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/AvatarsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/AvatarsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Avatar.{IconAvatars, ImageAvatars, LetterAvatars} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Avatar.{IconAvatars, ImageAvatars, LetterAvatars} +import io.kinoplan.demo.router.AppRouter.Page + object AvatarsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/BadgesPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/BadgesPage.scala index f6440c69..ef233ceb 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/BadgesPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/BadgesPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Badges._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Badges._ +import io.kinoplan.demo.router.AppRouter.Page + object BadgesPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/BottomNavigationPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/BottomNavigationPage.scala index ef3046b9..3de326d6 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/BottomNavigationPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/BottomNavigationPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.BottomNavigation.{LabelBottomNavigation, SimpleBottomNavigation} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.BottomNavigation.{LabelBottomNavigation, SimpleBottomNavigation} +import io.kinoplan.demo.router.AppRouter.Page + object BottomNavigationPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ButtonsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ButtonsPage.scala index 062f7b37..01f925a9 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ButtonsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ButtonsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Buttons._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Buttons._ +import io.kinoplan.demo.router.AppRouter.Page + object ButtonsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/CardsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/CardsPage.scala index aa41b824..d1442740 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/CardsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/CardsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Cards.{MediaCard, MediaCardFit, MediaControlCard, RecipeReviewCard, SimpleCard} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Cards.{MediaCard, MediaCardFit, MediaControlCard, RecipeReviewCard, SimpleCard} +import io.kinoplan.demo.router.AppRouter.Page + object CardsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ChipsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ChipsPage.scala index 2862ee8c..808eff9d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ChipsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ChipsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Chips.{Chips, ChipsArray, ChipsPlayground, OutlinedChips} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Chips.{Chips, ChipsArray, ChipsPlayground, OutlinedChips} +import io.kinoplan.demo.router.AppRouter.Page + object ChipsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/DialogsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/DialogsPage.scala index 565ce6d4..02b16df3 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/DialogsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/DialogsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Dialogs.{AlertDialog, ConfirmationDialog, CustomizedDialog, FormDialog, FullScreenDialog, MaxWidthDialog, ScrollDialog, SimpleDialog} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Dialogs.{AlertDialog, ConfirmationDialog, CustomizedDialog, FormDialog, FullScreenDialog, MaxWidthDialog, ScrollDialog, SimpleDialog} +import io.kinoplan.demo.router.AppRouter.Page + object DialogsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/DividersPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/DividersPage.scala index 96edeab6..adc98b4d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/DividersPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/DividersPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Dividers.{InsetDividers, ListDividers, MiddleDividers, SubheaderDividers} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Dividers.{InsetDividers, ListDividers, MiddleDividers, SubheaderDividers} +import io.kinoplan.demo.router.AppRouter.Page + object DividersPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/DrawersPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/DrawersPage.scala index 11354b70..519be8a5 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/DrawersPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/DrawersPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Drawers._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Drawers._ +import io.kinoplan.demo.router.AppRouter.Page + object DrawersPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ExpansionPanelsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ExpansionPanelsPage.scala index 60634f34..fa1e0c66 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ExpansionPanelsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ExpansionPanelsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.ExpansionPanels._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.ExpansionPanels._ +import io.kinoplan.demo.router.AppRouter.Page + object ExpansionPanelsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/GridListPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/GridListPage.scala index c806f78e..6846b3e7 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/GridListPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/GridListPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.GridList.{AdvancedGridList, ImageGridList, SingleLineGridList, TitlebarGridList} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.GridList.{AdvancedGridList, ImageGridList, SingleLineGridList, TitlebarGridList} +import io.kinoplan.demo.router.AppRouter.Page + object GridListPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ListsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ListsPage.scala index 9d17d49a..08b80768 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ListsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ListsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Lists._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Lists._ +import io.kinoplan.demo.router.AppRouter.Page + object ListsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/MenusPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/MenusPage.scala index 3b305f5e..980f8d75 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/MenusPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/MenusPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Menus._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Menus._ +import io.kinoplan.demo.router.AppRouter.Page + object MenusPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/PaperPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/PaperPage.scala index c67e97fb..132c3640 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/PaperPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/PaperPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Paper.PaperSheet -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Paper.PaperSheet +import io.kinoplan.demo.router.AppRouter.Page + object PaperPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/PickersPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/PickersPage.scala index 15e9bdb8..d2ab04ff 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/PickersPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/PickersPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Pickers.{DateAndTimePickers, DatePickers, TimePickers} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Pickers.{DateAndTimePickers, DatePickers, TimePickers} +import io.kinoplan.demo.router.AppRouter.Page + object PickersPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ProgressPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ProgressPage.scala index efc1c905..21045ac7 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/ProgressPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/ProgressPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Progress._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Progress._ +import io.kinoplan.demo.router.AppRouter.Page + object ProgressPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectionControlsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectionControlsPage.scala index 5f932eab..fa15917a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectionControlsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectionControlsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.SelectionControls._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.SelectionControls._ +import io.kinoplan.demo.router.AppRouter.Page + object SelectionControlsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectsPage.scala index 74d052f0..bb2f2ecd 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SelectsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Selects._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Selects._ +import io.kinoplan.demo.router.AppRouter.Page + object SelectsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SnackbarsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SnackbarsPage.scala index d9bd8f4d..9bffbce7 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SnackbarsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SnackbarsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Snackbars._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Snackbars._ +import io.kinoplan.demo.router.AppRouter.Page + object SnackbarsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SteppersPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SteppersPage.scala index be3062ce..b8b3522b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/SteppersPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/SteppersPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Steppers._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Steppers._ +import io.kinoplan.demo.router.AppRouter.Page + object SteppersPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TablesPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TablesPage.scala index 06758137..426e3b9f 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TablesPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TablesPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Tables._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Tables._ +import io.kinoplan.demo.router.AppRouter.Page + object TablesPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TabsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TabsPage.scala index f29fd9c4..fa71bd00 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TabsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TabsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Tabs._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Tabs._ +import io.kinoplan.demo.router.AppRouter.Page + object TabsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TextFieldsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TextFieldsPage.scala index 915978bb..f35a13cf 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TextFieldsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TextFieldsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.TextFields._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.TextFields._ +import io.kinoplan.demo.router.AppRouter.Page + object TextFieldsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TooltipsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TooltipsPage.scala index 4c93caa0..aea2a641 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/demos/TooltipsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/demos/TooltipsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.demos -import io.kinoplan.demo.components.demos.Tooltips._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.demos.Tooltips._ +import io.kinoplan.demo.router.AppRouter.Page + object TooltipsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/labs/BreadcrumbsPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/labs/BreadcrumbsPage.scala index 056410cb..bdc44c59 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/labs/BreadcrumbsPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/labs/BreadcrumbsPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.labs -import io.kinoplan.demo.components.labs.Breadcrumbs._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.labs.Breadcrumbs._ +import io.kinoplan.demo.router.AppRouter.Page + object BreadcrumbsPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/labs/SliderPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/labs/SliderPage.scala index e578238f..f2e33a93 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/labs/SliderPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/labs/SliderPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.labs -import io.kinoplan.demo.components.labs.Slider._ -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.labs.Slider._ +import io.kinoplan.demo.router.AppRouter.Page + object SliderPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/labs/SpeedDialPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/labs/SpeedDialPage.scala index e2b72f1c..f87c7f56 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/labs/SpeedDialPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/labs/SpeedDialPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.labs -import io.kinoplan.demo.components.labs.SpeedDial.{OpenIconSpeedDial, SpeedDialTooltipOpen} -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.labs.SpeedDial.{OpenIconSpeedDial, SpeedDialTooltipOpen} +import io.kinoplan.demo.router.AppRouter.Page + object SpeedDialPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/pages/labs/ToggleButtonPage.scala b/demo/src/main/scala/io/kinoplan/demo/pages/labs/ToggleButtonPage.scala index 75ffe68d..f16f0d2c 100644 --- a/demo/src/main/scala/io/kinoplan/demo/pages/labs/ToggleButtonPage.scala +++ b/demo/src/main/scala/io/kinoplan/demo/pages/labs/ToggleButtonPage.scala @@ -1,11 +1,12 @@ package io.kinoplan.demo.pages.labs -import io.kinoplan.demo.components.labs.ToggleButton.ToggleButtons -import io.kinoplan.demo.router.AppRouter.Page import japgolly.scalajs.react._ import japgolly.scalajs.react.extra.router.RouterCtl import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.demo.components.labs.ToggleButton.ToggleButtons +import io.kinoplan.demo.router.AppRouter.Page + object ToggleButtonPage { case class Props(router: RouterCtl[Page]) diff --git a/demo/src/main/scala/io/kinoplan/demo/router/AppRouter.scala b/demo/src/main/scala/io/kinoplan/demo/router/AppRouter.scala index 25674b45..f1d1b527 100755 --- a/demo/src/main/scala/io/kinoplan/demo/router/AppRouter.scala +++ b/demo/src/main/scala/io/kinoplan/demo/router/AppRouter.scala @@ -1,10 +1,11 @@ package io.kinoplan.demo.router +import japgolly.scalajs.react.extra.router._ + import io.kinoplan.demo.components.Layout import io.kinoplan.demo.pages.SimpleTablePage import io.kinoplan.demo.pages.demos._ import io.kinoplan.demo.pages.labs.{BreadcrumbsPage, SliderPage, SpeedDialPage, ToggleButtonPage} -import japgolly.scalajs.react.extra.router._ object AppRouter { sealed trait Page diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/LayoutStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/LayoutStyle.scala index b6de710c..fba69b3b 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/LayoutStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/LayoutStyle.scala @@ -1,10 +1,10 @@ package io.kinoplan.demo.styles +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.scalajs.react.material.ui.core.styles.CreateTransitionsOptions -import scala.scalajs.js - case class LayoutStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/PrimarySearchAppBarStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/PrimarySearchAppBarStyle.scala index 1af858f4..2768fd92 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/PrimarySearchAppBarStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/PrimarySearchAppBarStyle.scala @@ -1,11 +1,11 @@ package io.kinoplan.demo.styles.demos.AppBar +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.styles.colorManipulator.fade -import scala.scalajs.js - case class PrimarySearchAppBarStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/SearchAppBarStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/SearchAppBarStyle.scala index 04104f40..8acecca4 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/SearchAppBarStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/AppBar/SearchAppBarStyle.scala @@ -1,11 +1,11 @@ package io.kinoplan.demo.styles.demos.AppBar +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.styles.colorManipulator.fade -import scala.scalajs.js - case class SearchAppBarStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Buttons/ButtonBasesStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Buttons/ButtonBasesStyle.scala index 84677e72..2d02a262 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Buttons/ButtonBasesStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Buttons/ButtonBasesStyle.scala @@ -1,9 +1,9 @@ package io.kinoplan.demo.styles.demos.Buttons -import io.kinoplan.demo.CssSettings._ - import scala.scalajs.js +import io.kinoplan.demo.CssSettings._ + case class ButtonBasesStyle(common: CommonButtonStyle = DefaultCommonButtonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Cards/RecipeReviewCardStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Cards/RecipeReviewCardStyle.scala index 3ae424ac..a868affe 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Cards/RecipeReviewCardStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Cards/RecipeReviewCardStyle.scala @@ -1,12 +1,12 @@ package io.kinoplan.demo.styles.demos.Cards +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.colors import io.kinoplan.scalajs.react.material.ui.core.styles.CreateTransitionsOptions -import scala.scalajs.js - case class RecipeReviewCardStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import dsl._ import common.theme diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/MiniDrawerStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/MiniDrawerStyle.scala index 7ea0d5eb..742f040d 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/MiniDrawerStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/MiniDrawerStyle.scala @@ -1,11 +1,11 @@ package io.kinoplan.demo.styles.demos.Drawers +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.styles.CreateTransitionsOptions -import scala.scalajs.js - case class MiniDrawerStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/PersistentDrawerStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/PersistentDrawerStyle.scala index c731c1d2..718e0a97 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/PersistentDrawerStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Drawers/PersistentDrawerStyle.scala @@ -1,11 +1,11 @@ package io.kinoplan.demo.styles.demos.Drawers +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.styles.CreateTransitionsOptions -import scala.scalajs.js - case class PersistentDrawerStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/SelectionControls/CustomizedSwitchesStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/SelectionControls/CustomizedSwitchesStyle.scala index 8c18e1a3..051d9232 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/SelectionControls/CustomizedSwitchesStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/SelectionControls/CustomizedSwitchesStyle.scala @@ -1,12 +1,12 @@ package io.kinoplan.demo.styles.demos.SelectionControls +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.colors import io.kinoplan.scalajs.react.material.ui.core.styles.CreateTransitionsOptions -import scala.scalajs.js - case class CustomizedSwitchesStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Selects/CustomizedSelectsStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Selects/CustomizedSelectsStyle.scala index 511450a4..42f0dc38 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Selects/CustomizedSelectsStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Selects/CustomizedSelectsStyle.scala @@ -1,10 +1,10 @@ package io.kinoplan.demo.styles.demos.Selects +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} -import scala.scalajs.js - case class CustomizedSelectsStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Snackbars/FabIntegrationSnackbarStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Snackbars/FabIntegrationSnackbarStyle.scala index e1dd8515..30a060cd 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Snackbars/FabIntegrationSnackbarStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Snackbars/FabIntegrationSnackbarStyle.scala @@ -1,11 +1,11 @@ package io.kinoplan.demo.styles.demos.Snackbars +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.styles.CreateTransitionsOptions -import scala.scalajs.js - case class FabIntegrationSnackbarStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Steppers/CustomizedStepperStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Steppers/CustomizedStepperStyle.scala index eb7b2058..1ba514f7 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/Steppers/CustomizedStepperStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/Steppers/CustomizedStepperStyle.scala @@ -1,10 +1,10 @@ package io.kinoplan.demo.styles.demos.Steppers +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} -import scala.scalajs.js - case class CustomizedStepperStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/styles/demos/TextFields/CustomizedInputsStyle.scala b/demo/src/main/scala/io/kinoplan/demo/styles/demos/TextFields/CustomizedInputsStyle.scala index a75903d0..d4e25ba2 100644 --- a/demo/src/main/scala/io/kinoplan/demo/styles/demos/TextFields/CustomizedInputsStyle.scala +++ b/demo/src/main/scala/io/kinoplan/demo/styles/demos/TextFields/CustomizedInputsStyle.scala @@ -1,11 +1,11 @@ package io.kinoplan.demo.styles.demos.TextFields +import scala.scalajs.js + import io.kinoplan.demo.CssSettings._ import io.kinoplan.demo.styles.{CommonStyle, DefaultCommonStyle} import io.kinoplan.scalajs.react.material.ui.core.colors -import scala.scalajs.js - case class CustomizedInputsStyle(common: CommonStyle = DefaultCommonStyle) extends StyleSheet.Inline { import common.theme import dsl._ diff --git a/demo/src/main/scala/io/kinoplan/demo/utils/Helpers.scala b/demo/src/main/scala/io/kinoplan/demo/utils/Helpers.scala index 95b8b5a5..c39fc291 100755 --- a/demo/src/main/scala/io/kinoplan/demo/utils/Helpers.scala +++ b/demo/src/main/scala/io/kinoplan/demo/utils/Helpers.scala @@ -1,13 +1,12 @@ package io.kinoplan.demo.utils -import cats.syntax.option._ -import japgolly.scalajs.react.vdom.VdomNode -import scalacss.internal.StyleA - import scala.scalajs.js +import scala.scalajs.js.JSConverters._ import scala.scalajs.js.JSNumberOps._ -import scala.scalajs.js.JSConverters._ +import cats.syntax.option._ +import japgolly.scalajs.react.vdom.VdomNode +import scalacss.internal.StyleA object Helpers { implicit class StringExtended(value: String) { diff --git a/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbFullIcon.scala b/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbFullIcon.scala index cd5d8f62..746f01c4 100644 --- a/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbFullIcon.scala +++ b/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbFullIcon.scala @@ -1,8 +1,9 @@ package io.kinoplan.demo.utils.icons -import io.kinoplan.scalajs.react.material.ui.utils.MuiSvgIconCustom import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.scalajs.react.material.ui.utils.MuiSvgIconCustom + object MuiLightBulbFullIcon extends MuiSvgIconCustom( svg.path(svg.d := "m9,21c0,0.55 0.45,1 1,1l4,0c0.55,0 1,-0.45 1,-1l0,-1l-6,0l0,1zm3,-19c-3.86,0 -7,3.14 -7,7c0,2.38 1.19,4.47 3,5.74l0,2.26c0,0.55 0.45,1 1,1l6,0c0.55,0 1,-0.45 1,-1l0,-2.26c1.81,-1.27 3,-3.36 3,-5.74c0,-3.86 -3.14,-7 -7,-7z") ) diff --git a/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbOutlineIcon.scala b/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbOutlineIcon.scala index fad12be3..0c843600 100644 --- a/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbOutlineIcon.scala +++ b/demo/src/main/scala/io/kinoplan/demo/utils/icons/MuiLightBulbOutlineIcon.scala @@ -1,8 +1,9 @@ package io.kinoplan.demo.utils.icons -import io.kinoplan.scalajs.react.material.ui.utils.MuiSvgIconCustom import japgolly.scalajs.react.vdom.all._ +import io.kinoplan.scalajs.react.material.ui.utils.MuiSvgIconCustom + object MuiLightBulbOutlineIcon extends MuiSvgIconCustom( svg.path(svg.d := "M9 21c0 .55.45 1 1 1h4c.55 0 1-.45 1-1v-1H9v1zm3-19C8.14 2 5 5.14 5 9c0 2.38 1.19 4.47 3 5.74V17c0 .55.45 1 1 1h6c.55 0 1-.45 1-1v-2.26c1.81-1.27 3-3.36 3-5.74 0-3.86-3.14-7-7-7zm2.85 11.1l-.85.6V16h-4v-2.3l-.85-.6C7.8 12.16 7 10.63 7 9c0-2.76 2.24-5 5-5s5 2.24 5 5c0 1.63-.8 3.16-2.15 4.1z") ) diff --git a/demo/src/main/scala/io/kinoplan/demo/utils/props/MuiInputProps.scala b/demo/src/main/scala/io/kinoplan/demo/utils/props/MuiInputProps.scala index 6aa1b75a..115ee79a 100644 --- a/demo/src/main/scala/io/kinoplan/demo/utils/props/MuiInputProps.scala +++ b/demo/src/main/scala/io/kinoplan/demo/utils/props/MuiInputProps.scala @@ -1,10 +1,10 @@ package io.kinoplan.demo.utils.props -import japgolly.scalajs.react.raw.React - import scala.scalajs.js import scala.scalajs.js.JSConverters._ +import japgolly.scalajs.react.raw.React + @js.native trait MuiInputProps extends js.Object { def readOnly: js.UndefOr[Boolean] = js.native diff --git a/icons/src/main/scala/io/kinoplan/scalajs/react/material/ui/icons/MuiIcons.scala b/icons/src/main/scala/io/kinoplan/scalajs/react/material/ui/icons/MuiIcons.scala new file mode 100644 index 00000000..46228e40 --- /dev/null +++ b/icons/src/main/scala/io/kinoplan/scalajs/react/material/ui/icons/MuiIcons.scala @@ -0,0 +1,43 @@ +package io.kinoplan.scalajs.react.material.ui.icons + +import scala.scalajs.js +import scala.scalajs.js.| + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + +class MuiIcons(value: js.Any) extends ReactBridgeComponent with SvgIconExtensions { + override lazy val componentValue = value + + def apply( + classes: js.UndefOr[Map[ClassKey.Value, String]] = js.undefined, + color: js.UndefOr[Color.Value] = js.undefined, + component: js.UndefOr[String | js.Function] = js.undefined, + fontSize: js.UndefOr[FontSize.Value] = js.undefined, + nativeColor: js.UndefOr[String] = js.undefined, + shapeRendering: js.UndefOr[String] = js.undefined, + titleAccess: js.UndefOr[String] = js.undefined, + viewBox: js.UndefOr[String] = js.undefined + ): WithProps = auto +} + +object MuiIcons extends SvgIconExtensions { + def apply(value: MuiIconsModule.Value)( + classes: js.UndefOr[Map[ClassKey.Value, String]] = js.undefined, + color: js.UndefOr[Color.Value] = js.undefined, + component: js.UndefOr[String | js.Function] = js.undefined, + fontSize: js.UndefOr[FontSize.Value] = js.undefined, + nativeColor: js.UndefOr[String] = js.undefined, + shapeRendering: js.UndefOr[String] = js.undefined, + titleAccess: js.UndefOr[String] = js.undefined, + viewBox: js.UndefOr[String] = js.undefined + ): WithProps = new MuiIcons(value).apply( + classes = classes, + color = color, + component = component, + fontSize = fontSize, + nativeColor = nativeColor, + shapeRendering = shapeRendering, + titleAccess = titleAccess, + viewBox = viewBox + ) +} diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiBreadcrumbs.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiBreadcrumbs.scala index 1f47e978..5d60553c 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiBreadcrumbs.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiBreadcrumbs.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.lab -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.vdom.html_<^.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.html_<^.VdomNode + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiBreadcrumbs extends ReactBridgeComponent { override protected lazy val componentValue: js.Function = RawComponent diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSlider.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSlider.scala index a355db43..3745996b 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSlider.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSlider.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.lab -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import scala.scalajs.js +import scala.scalajs.js.annotation.JSImport + import japgolly.scalajs.react.ReactEvent import japgolly.scalajs.react.raw.React -import scala.scalajs.js -import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} object MuiSlider extends ReactBridgeComponent with MuiSliderExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDial.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDial.scala index 6adc8b8f..fd386d70 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDial.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDial.scala @@ -1,13 +1,14 @@ package io.kinoplan.scalajs.react.material.ui.lab -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} -import japgolly.scalajs.react.raw.React -import japgolly.scalajs.react.vdom.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import japgolly.scalajs.react.raw.React +import japgolly.scalajs.react.vdom.VdomNode + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiSpeedDial extends ReactBridgeComponent with MuiSpeedDialExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialAction.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialAction.scala index be5d8789..82fd5607 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialAction.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialAction.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.lab -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} +import scala.scalajs.js +import scala.scalajs.js.annotation.JSImport + import japgolly.scalajs.react.ReactEventFromHtml import japgolly.scalajs.react.vdom.html_<^.VdomNode -import scala.scalajs.js -import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} object MuiSpeedDialAction extends ReactBridgeComponent with MuiSpeedDialActionExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialIcon.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialIcon.scala index 570b21ce..90883b6f 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialIcon.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiSpeedDialIcon.scala @@ -1,11 +1,12 @@ package io.kinoplan.scalajs.react.material.ui.lab -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} -import japgolly.scalajs.react.vdom.VdomNode - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import japgolly.scalajs.react.vdom.VdomNode + +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithPropsNoChildren} + object MuiSpeedDialIcon extends ReactBridgeComponent with MuiSpeedDialIconExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButton.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButton.scala index f795c446..3f480cc6 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButton.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButton.scala @@ -1,10 +1,10 @@ package io.kinoplan.scalajs.react.material.ui.lab -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiToggleButton extends ReactBridgeComponent with MuiToggleButtonExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButtonGroup.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButtonGroup.scala index b3e7d7cb..cc81dff9 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButtonGroup.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/MuiToggleButtonGroup.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui.lab -import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - import scala.scalajs.js import scala.scalajs.js.annotation.JSImport import scala.scalajs.js.| +import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} + object MuiToggleButtonGroup extends ReactBridgeComponent with MuiToggleButtonGroupExtensions { override protected lazy val componentValue: js.Function = RawComponent diff --git a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/package.scala b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/package.scala index 80e15ef5..6dbb9c31 100644 --- a/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/package.scala +++ b/lab/src/main/scala/io/kinoplan/scalajs/react/material/ui/lab/package.scala @@ -1,11 +1,11 @@ package io.kinoplan.scalajs.react.material.ui -import japgolly.scalajs.react.Callback -import japgolly.scalajs.react.raw.SyntheticEvent - import scala.scalajs.js import scala.scalajs.js.| +import japgolly.scalajs.react.Callback +import japgolly.scalajs.react.raw.SyntheticEvent + package object lab { type Handler1[A] = A => Callback type Handler2[A, B] = (A, B) => Callback diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c100200d..57fa1add 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,6 +1,5 @@ import sbt._ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ -import sbt.Keys.scalaVersion object Dependencies { @@ -19,6 +18,5 @@ object Dependencies { val scalaJsDom = Def.setting("org.scala-js" %%% "scalajs-dom" % "0.9.8") val scalaJsReactCore = Def.setting("com.github.japgolly.scalajs-react" %%% "core" % scalaJsReactV) val scalaJsReactExtra = Def.setting("com.github.japgolly.scalajs-react" %%% "extra" % scalaJsReactV) - val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value) val scalablyTypedRuntime = Def.setting("com.olvind" %%% "scalablytyped-runtime" % "2.1.0") } diff --git a/project/Generator.scala b/project/Generator.scala index b5133ec0..ea9173f1 100644 --- a/project/Generator.scala +++ b/project/Generator.scala @@ -82,60 +82,24 @@ object Generator { val iconNames = iconSources.get.map(_.getName.stripSuffix(".js")).sorted - val moduleFile: File = src / "MuiIconModule.scala" + val moduleFile: File = src / "MuiIconsModule.scala" - val moduleIcons = iconNames.map(name => s"""| def $name: js.Any = js.native""".stripMargin).mkString("\n") + val moduleIcons = iconNames.map(name => s"""| def $name: js.Any = js.native""".stripMargin).mkString("\n") IO.write( moduleFile, s"""package io.kinoplan.scalajs.react.material.ui.icons - | - |import scala.scalajs.js - |import scala.scalajs.js.annotation.JSImport - | - |@js.native - |@JSImport("@material-ui/icons", JSImport.Namespace) - |object MuiIconModule extends js.Object { - """.stripMargin.trim + "\n" + moduleIcons + "\n" + "}" + | + |import scala.scalajs.js + |import scala.scalajs.js.annotation.JSImport + | + |@js.native + |@JSImport("@material-ui/icons", JSImport.Namespace) + |object MuiIconsModule extends js.Object { + | type Value = js.Any + """.stripMargin.trim + "\n\n" + moduleIcons + "\n" + "}\n" ) - val packageFile: File = src / "package.scala" - - val packageIcons = iconNames.map(name => - s"""| object Mui${name}Icon extends Bridge { override lazy val componentValue = $name }""".stripMargin - ).mkString("\n") - - IO.write( - packageFile, - s"""package io.kinoplan.scalajs.react.material.ui - | - |import io.kinoplan.scalajs.react.bridge.{ReactBridgeComponent, WithProps} - |import io.kinoplan.scalajs.react.material.ui.icons.MuiIconModule._ - |import io.kinoplan.scalajs.react.material.ui.icons.SvgIconExtensions - | - |import scala.scalajs.js - |import scala.scalajs.js.| - | - |trait Bridge extends ReactBridgeComponent with MuiIcons - | - |trait MuiIcons extends ReactBridgeComponent with SvgIconExtensions { - | def apply( - | classes: js.UndefOr[Map[ClassKey.Value, String]] = js.undefined, - | color: js.UndefOr[Color.Value] = js.undefined, - | component: js.UndefOr[String | js.Function] = js.undefined, - | fontSize: js.UndefOr[FontSize.Value] = js.undefined, - | nativeColor: js.UndefOr[String] = js.undefined, - | shapeRendering: js.UndefOr[String] = js.undefined, - | titleAccess: js.UndefOr[String] = js.undefined, - | viewBox: js.UndefOr[String] = js.undefined - | ): WithProps = auto - |} - | - |package object icons { - | - """.stripMargin.trim + "\n" + packageIcons + "\n" + "}" - ) - - Seq(moduleFile, packageFile) + Seq(moduleFile) } } diff --git a/project/Settings.scala b/project/Settings.scala index f4830ca4..962d1146 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -34,15 +34,6 @@ object Settings { Dependencies.scalaJsReactExtra.value )) - val scalajsDependenciesBridge = Def.setting(Seq( - Dependencies.scalaJsReactCore.value, - Dependencies.scalaReflect.value - )) - - val scalajsDependenciesExternalLibs = Def.setting(Seq( - Dependencies.scalaJsReactCore.value - )) - val reactDependencies = Seq( DependenciesNPM.react, DependenciesNPM.reactDom diff --git a/project/plugins.sbt b/project/plugins.sbt index 7db30d6e..de6fbd3e 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,5 @@ val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.1.1") -resolvers += Resolver.sonatypeRepo("snapshots") resolvers += Resolver.bintrayRepo("oyvindberg", "converter") addSbtPlugin("org.scalablytyped.converter" % s"sbt-converter${if (scalaJSVersion.startsWith("0.6")) "06" else ""}" % "1.0.0-beta28") @@ -11,4 +10,6 @@ addSbtPlugin("ch.epfl.scala" % s"sbt-scalajs-bundler${if (scalaJSVersion.startsW addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.14") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.23") + addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.4") diff --git a/scalafix.sbt b/scalafix.sbt new file mode 100644 index 00000000..eb14b630 --- /dev/null +++ b/scalafix.sbt @@ -0,0 +1,9 @@ +semanticdbEnabled in ThisBuild := true + +semanticdbVersion in ThisBuild := scalafixSemanticdb.revision + +scalafixScalaBinaryVersion in ThisBuild := "2.13" + +scalafixDependencies in ThisBuild ++= Seq( + "com.github.liancheng" %% "organize-imports" % "0.4.3" +) diff --git a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithProps.scala b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithProps.scala index b875f865..d0fddde0 100644 --- a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithProps.scala +++ b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithProps.scala @@ -1,9 +1,9 @@ package io.kinoplan.scalajs.react.bridge -import japgolly.scalajs.react.vdom.{TagMod, VdomElement, VdomNode} - import scala.scalajs.js +import japgolly.scalajs.react.vdom.{TagMod, VdomElement, VdomNode} + class WithProps(jsComponent: JsComponentType, jsProps: js.Object) { def apply(attrAndChildren: TagMod*): WithPropsAndTagsMods = { val (props, children) = extractPropsAndChildren(attrAndChildren) diff --git a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagModsAndChildren.scala b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagModsAndChildren.scala index 5d72cc8b..6266e38b 100644 --- a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagModsAndChildren.scala +++ b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagModsAndChildren.scala @@ -1,9 +1,9 @@ package io.kinoplan.scalajs.react.bridge -import japgolly.scalajs.react.vdom.{VdomElement, VdomNode} - import scala.scalajs.js +import japgolly.scalajs.react.vdom.{VdomElement, VdomNode} + class WithPropsAndTagModsAndChildren(jsComponent: JsComponentType, jsProps: js.Object, children: List[VdomNode]) { def apply: VdomElement = jsComponent(jsProps)(children: _*) } diff --git a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagsMods.scala b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagsMods.scala index a7bdd9e7..2dea3795 100644 --- a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagsMods.scala +++ b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsAndTagsMods.scala @@ -1,9 +1,9 @@ package io.kinoplan.scalajs.react.bridge -import japgolly.scalajs.react.vdom.{VdomElement, VdomNode} - import scala.scalajs.js +import japgolly.scalajs.react.vdom.{VdomElement, VdomNode} + class WithPropsAndTagsMods(jsComponent: JsComponentType, jsProps: js.Object, tagModChildren: List[VdomNode]) { def apply(children: VdomNode*): VdomElement = { new WithPropsAndTagModsAndChildren(jsComponent, jsProps, tagModChildren ++ children).apply diff --git a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsNoChildren.scala b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsNoChildren.scala index 897ada0a..aa351083 100644 --- a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsNoChildren.scala +++ b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/WithPropsNoChildren.scala @@ -1,9 +1,9 @@ package io.kinoplan.scalajs.react.bridge -import japgolly.scalajs.react.vdom.{TagMod, VdomElement} - import scala.scalajs.js +import japgolly.scalajs.react.vdom.{TagMod, VdomElement} + class WithPropsNoChildren(jsComponent: JsComponentType, jsProps: js.Object) { def apply(attrAndChildren: TagMod*): VdomElement = { new WithProps(jsComponent, jsProps).apply(attrAndChildren: _*).apply() diff --git a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/package.scala b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/package.scala index 2fe717f6..24aed4e5 100644 --- a/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/package.scala +++ b/utils/bridge/src/main/scala/io/kinoplan/scalajs/react/bridge/package.scala @@ -3,14 +3,14 @@ package io.kinoplan.scalajs.react import scala.concurrent.{ExecutionContext, Future} import scala.reflect.ClassTag import scala.scalajs.js -import scala.scalajs.js.JSConverters._ import scala.scalajs.js.{Object, |} +import scala.scalajs.js.JSConverters._ +import japgolly.scalajs.react.{CallbackTo, Children, CtorType} import japgolly.scalajs.react.component.Js import japgolly.scalajs.react.raw.React -import japgolly.scalajs.react.vdom.Implicits._ import japgolly.scalajs.react.vdom.{TagMod, VdomElement, VdomNode} -import japgolly.scalajs.react.{CallbackTo, Children, CtorType} +import japgolly.scalajs.react.vdom.Implicits._ package object bridge extends GeneratedImplicits { def writerFromConversion[A](implicit conv: A => js.Any): JsWriter[A] = JsWriter(x => x)