Skip to content

Update scalafmt-core to 3.7.14 #201

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Update scalafmt-core to 3.7.14 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b87d84a
Update scalafmt-core to 3.7.14
scala-steward Sep 6, 2023
fd5c72a
Reformat with scalafmt 3.7.14
scala-steward Sep 6, 2023
24ddb03
Add 'Reformat with scalafmt 3.7.14' to .git-blame-ignore-revs
scala-steward Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.5.9
e1d1b1e181abf55ca0d846d122ad757c17f1036c

# Scala Steward: Reformat with scalafmt 3.7.14
fd5c72a3f14b845c266010db0fd982e9257e1b69
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.5.9
version = 3.7.14

maxColumn = 120

Expand Down
14 changes: 12 additions & 2 deletions core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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(
Expand Down
18 changes: 16 additions & 2 deletions ...src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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(
Expand Down
6 changes: 5 additions & 1 deletion core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down