diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 91f1fd23..9ac78866 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.5.9 e1d1b1e181abf55ca0d846d122ad757c17f1036c + +# Scala Steward: Reformat with scalafmt 3.8.2 +d5013353825651b12e1a62694ef36d307c81ca5b diff --git a/.scalafmt.conf b/.scalafmt.conf index 25a792c2..e45df2ff 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.9 +version = 3.8.2 maxColumn = 120 diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala index 4cd4d1a4..8373ef4a 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala @@ -7,7 +7,13 @@ import scala.scalajs.js.JSConverters._ trait Transitions extends js.Object { def easing: Easing = js.native def duration: Duration = js.native - def create: js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String] = js.native + + def create: js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ] = js.native + def getAutoHeightDuration: js.Function1[Double, Double] = js.native } @@ -16,7 +22,11 @@ object Transitions { def apply( easing: Easing, duration: Duration, - create: js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String], + create: js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ], getAutoHeightDuration: Double => Double ) = { val o: Map[String, Any] = Map( diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala index 8505e80d..c4cb4fe9 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala @@ -7,7 +7,15 @@ import scala.scalajs.js.JSConverters._ trait TransitionsOptions extends js.Object { def easing: js.UndefOr[EasingPartial] = js.native def duration: js.UndefOr[DurationPartial] = js.native - def create: js.UndefOr[js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String]] = js.native + + def create: js.UndefOr[ + js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ] + ] = js.native + def getAutoHeightDuration: js.UndefOr[js.Function1[Double, Double]] = js.native } @@ -16,7 +24,13 @@ object TransitionsOptions { def apply( easing: js.UndefOr[EasingPartial] = js.undefined, duration: js.UndefOr[DurationPartial] = js.undefined, - create: js.UndefOr[js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String]] = js.undefined, + create: js.UndefOr[ + js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ] + ] = js.undefined, getAutoHeightDuration: js.UndefOr[Double => Double] = js.undefined ) = { val o: Map[String, Any] = Seq( 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 a6020733..d550741c 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 @@ -76,7 +76,11 @@ package object styles { ) @js.native object createTypography - extends js.Function2[Palette, TypographyOptions | js.Function1[Palette, TypographyOptions], Typography] { + extends js.Function2[ + Palette, + TypographyOptions | js.Function1[Palette, TypographyOptions], + Typography + ] { override def apply( palette: Palette, 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 ad36e753..cc77e664 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 @@ -91,7 +91,8 @@ case class ButtonBasesStyle(common: CommonButtonStyle = DefaultCommonButtonStyle private val backdropImagePreliminary = style( unsafeRoot( - s".${imagePreliminary.htmlClass}:hover .${imageBackdrop.htmlClass}, .${imagePreliminary.htmlClass}.${focusVisible.htmlClass} .${imageBackdrop.htmlClass}" + s".${imagePreliminary.htmlClass}:hover .${imageBackdrop.htmlClass}, .${imagePreliminary.htmlClass}.${focusVisible + .htmlClass} .${imageBackdrop.htmlClass}" )( opacity(0.15) ) @@ -99,7 +100,8 @@ case class ButtonBasesStyle(common: CommonButtonStyle = DefaultCommonButtonStyle private val markedImagePreliminary = style( unsafeRoot( - s".${imagePreliminary.htmlClass}:hover .${imageMarked.htmlClass}, .${imagePreliminary.htmlClass}.${focusVisible.htmlClass} .${imageMarked.htmlClass}" + s".${imagePreliminary.htmlClass}:hover .${imageMarked.htmlClass}, .${imagePreliminary.htmlClass}.${focusVisible + .htmlClass} .${imageMarked.htmlClass}" )( opacity(0) ) @@ -107,7 +109,8 @@ case class ButtonBasesStyle(common: CommonButtonStyle = DefaultCommonButtonStyle private val titleImagePreliminary = style( unsafeRoot( - s".${imagePreliminary.htmlClass}:hover .${imageTitle.htmlClass}, .${imagePreliminary.htmlClass}.${focusVisible.htmlClass} .${imageTitle.htmlClass}" + s".${imagePreliminary.htmlClass}:hover .${imageTitle.htmlClass}, .${imagePreliminary.htmlClass}.${focusVisible + .htmlClass} .${imageTitle.htmlClass}" )( border :=! "4px solid currentColor" )