Skip to content
This repository was archived by the owner on Feb 10, 2023. It is now read-only.

Commit adfe2fe

Browse files
cquirozcquiroz
committed
Update react common an mark childess componunts as such
Signed-off-by: Carlos Quiroz <[email protected]>
1 parent a5ae010 commit adfe2fe

File tree

18 files changed

+165
-221
lines changed

18 files changed

+165
-221
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ lazy val facade =
134134
libraryDependencies ++= Seq(
135135
"com.github.japgolly.scalajs-react" %%% "core" % scalaJsReact,
136136
"com.github.japgolly.scalajs-react" %%% "extra" % scalaJsReact,
137-
"io.github.cquiroz.react" %%% "common" % "0.4.0",
137+
"io.github.cquiroz.react" %%% "common" % "0.4.2",
138138
"com.github.japgolly.scalajs-react" %%% "test" % scalaJsReact % Test,
139139
"com.lihaoyi" %%% "utest" % "0.7.2" % Test,
140140
"org.typelevel" %%% "cats-core" % "2.1.0" % Test

‎facade/src/main/scala/react/semanticui/addons/confirm/Confirm.scala

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,20 @@ import react.semanticui.modules.modal._
1212
import react.semanticui.{ raw => suiraw }
1313

1414
final case class Confirm(
15-
cancelButton: js.UndefOr[VdomNode | Button.ButtonProps] = js.undefined,
16-
confirmButton: js.UndefOr[VdomNode | Button.ButtonProps] = js.undefined,
17-
content: js.UndefOr[VdomNode | ModalContent.ModalContentProps] = js.undefined,
18-
header: js.UndefOr[VdomNode | ModalHeader.ModalHeaderProps] = js.undefined,
19-
onCancelE: js.UndefOr[Confirm.OnCancel] = js.undefined,
20-
onCancel: js.UndefOr[Callback] = js.undefined,
21-
onConfirmE: js.UndefOr[Confirm.OnConfirm] = js.undefined,
22-
onConfirm: js.UndefOr[Callback] = js.undefined,
23-
open: js.UndefOr[Boolean] = js.undefined,
24-
size: js.UndefOr[ModalSize] = js.undefined,
25-
override val children: CtorType.ChildrenArgs = Seq.empty
26-
) extends GenericComponentPC[Confirm.ConfirmProps] {
15+
cancelButton: js.UndefOr[VdomNode | Button.ButtonProps] = js.undefined,
16+
confirmButton: js.UndefOr[VdomNode | Button.ButtonProps] = js.undefined,
17+
content: js.UndefOr[VdomNode | ModalContent.ModalContentProps] = js.undefined,
18+
header: js.UndefOr[VdomNode | ModalHeader.ModalHeaderProps] = js.undefined,
19+
onCancelE: js.UndefOr[Confirm.OnCancel] = js.undefined,
20+
onCancel: js.UndefOr[Callback] = js.undefined,
21+
onConfirmE: js.UndefOr[Confirm.OnConfirm] = js.undefined,
22+
onConfirm: js.UndefOr[Callback] = js.undefined,
23+
open: js.UndefOr[Boolean] = js.undefined,
24+
size: js.UndefOr[ModalSize] = js.undefined
25+
) extends GenericComponentP[Confirm.ConfirmProps] {
2726
override def cprops = Confirm.props(this)
28-
@inline def renderWith =
27+
@inline def render =
2928
Confirm.component(Confirm.props(this))
30-
override def withChildren(children: CtorType.ChildrenArgs) =
31-
copy(children = children)
3229
}
3330

3431
object Confirm {
@@ -123,10 +120,6 @@ object Confirm {
123120
}
124121

125122
private val component =
126-
JsComponent[ConfirmProps, Children.Varargs, Null](RawComponent)
123+
JsComponent[ConfirmProps, Children.None, Null](RawComponent)
127124

128-
def apply(
129-
content: VdomNode*
130-
): Confirm =
131-
new Confirm(children = content)
132125
}

‎facade/src/main/scala/react/semanticui/elements/button/ButtonOr.scala

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,19 @@ import js.annotation._
55
import js.|
66
import japgolly.scalajs.react._
77
import japgolly.scalajs.react.raw.JsNumber
8-
import japgolly.scalajs.react.vdom.VdomNode
98
import react.semanticui._
109
import react.common._
1110
import react.common.style._
1211

1312
final case class ButtonOr(
14-
as: js.UndefOr[AsC] = js.undefined,
15-
className: js.UndefOr[String] = js.undefined,
16-
clazz: js.UndefOr[Css] = js.undefined,
17-
text: js.UndefOr[JsNumber | String] = js.undefined,
18-
override val children: CtorType.ChildrenArgs = Seq.empty
19-
) extends GenericComponentPC[ButtonOr.ButtonOrProps] {
13+
as: js.UndefOr[AsC] = js.undefined,
14+
className: js.UndefOr[String] = js.undefined,
15+
clazz: js.UndefOr[Css] = js.undefined,
16+
text: js.UndefOr[JsNumber | String] = js.undefined
17+
) extends GenericComponentP[ButtonOr.ButtonOrProps] {
2018
override def cprops = ButtonOr.props(this)
21-
@inline def renderWith =
19+
@inline def render =
2220
ButtonOr.component(ButtonOr.props(this))
23-
override def withChildren(children: CtorType.ChildrenArgs) =
24-
copy(children = children)
2521
}
2622

2723
object ButtonOr {
@@ -67,10 +63,6 @@ object ButtonOr {
6763
}
6864

6965
private val component =
70-
JsComponent[ButtonOrProps, Children.Varargs, Null](RawComponent)
66+
JsComponent[ButtonOrProps, Children.None, Null](RawComponent)
7167

72-
def apply(
73-
content: VdomNode*
74-
): ButtonOr =
75-
new ButtonOr(children = content)
7668
}

‎facade/src/main/scala/react/semanticui/elements/flag/Flag.scala

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ import react.semanticui._
88
import react.common.style._
99

1010
final case class Flag(
11-
as: js.UndefOr[AsC] = js.undefined,
12-
className: js.UndefOr[String] = js.undefined,
13-
clazz: js.UndefOr[Css] = js.undefined,
14-
name: js.UndefOr[String] = js.undefined,
15-
override val children: CtorType.ChildrenArgs = Seq.empty
16-
) extends GenericComponentPC[Flag.FlagProps] {
17-
override def cprops = Flag.props(this)
18-
@inline def renderWith = Flag.component(Flag.props(this))
19-
override def withChildren(children: CtorType.ChildrenArgs) =
20-
copy(children = children)
11+
as: js.UndefOr[AsC] = js.undefined,
12+
className: js.UndefOr[String] = js.undefined,
13+
clazz: js.UndefOr[Css] = js.undefined,
14+
name: js.UndefOr[String] = js.undefined
15+
) extends GenericComponentP[Flag.FlagProps] {
16+
override def cprops = Flag.props(this)
17+
@inline def render = Flag.component(Flag.props(this))
2118
}
2219

2320
object Flag {
@@ -56,10 +53,7 @@ object Flag {
5653
}
5754

5855
private val component =
59-
JsComponent[FlagProps, Children.Varargs, Null](RawComponent)
56+
JsComponent[FlagProps, Children.None, Null](RawComponent)
6057

61-
def apply(
62-
name: String
63-
): Flag =
64-
new Flag(name = name)
58+
def apply(name: String): Flag = new Flag(name = name)
6559
}

‎facade/src/main/scala/react/semanticui/elements/icon/Icon.scala

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,26 @@ import scala.scalajs.js.|
1212
import js.annotation._
1313

1414
final case class Icon(
15-
as: js.UndefOr[AsC] = js.undefined,
16-
bordered: js.UndefOr[Boolean] = js.undefined,
17-
circular: js.UndefOr[Boolean] = js.undefined,
18-
className: js.UndefOr[String] = js.undefined,
19-
clazz: js.UndefOr[Css] = js.undefined,
20-
color: js.UndefOr[SemanticColor] = js.undefined,
21-
corner: js.UndefOr[IconCorner] = js.undefined,
22-
disabled: js.UndefOr[Boolean] = js.undefined,
23-
fitted: js.UndefOr[Boolean] = js.undefined,
24-
flipped: js.UndefOr[IconFlip] = js.undefined,
25-
inverted: js.UndefOr[Boolean] = js.undefined,
26-
link: js.UndefOr[Boolean] = js.undefined,
27-
loading: js.UndefOr[Boolean] = js.undefined,
28-
name: js.UndefOr[suiraw.SemanticICONS] = js.undefined,
29-
rotated: js.UndefOr[IconRotated] = js.undefined,
30-
size: js.UndefOr[SemanticSize] = js.undefined,
31-
ariaLabel: js.UndefOr[String] = js.undefined,
32-
override val children: CtorType.ChildrenArgs = Seq.empty
33-
) extends GenericComponentPC[Icon.IconProps] {
34-
override def cprops = Icon.props(this)
35-
@inline def renderWith = Icon.component(Icon.props(this))
36-
override def withChildren(children: CtorType.ChildrenArgs) =
37-
copy(children = children)
15+
as: js.UndefOr[AsC] = js.undefined,
16+
bordered: js.UndefOr[Boolean] = js.undefined,
17+
circular: js.UndefOr[Boolean] = js.undefined,
18+
className: js.UndefOr[String] = js.undefined,
19+
clazz: js.UndefOr[Css] = js.undefined,
20+
color: js.UndefOr[SemanticColor] = js.undefined,
21+
corner: js.UndefOr[IconCorner] = js.undefined,
22+
disabled: js.UndefOr[Boolean] = js.undefined,
23+
fitted: js.UndefOr[Boolean] = js.undefined,
24+
flipped: js.UndefOr[IconFlip] = js.undefined,
25+
inverted: js.UndefOr[Boolean] = js.undefined,
26+
link: js.UndefOr[Boolean] = js.undefined,
27+
loading: js.UndefOr[Boolean] = js.undefined,
28+
name: js.UndefOr[suiraw.SemanticICONS] = js.undefined,
29+
rotated: js.UndefOr[IconRotated] = js.undefined,
30+
size: js.UndefOr[SemanticSize] = js.undefined,
31+
ariaLabel: js.UndefOr[String] = js.undefined
32+
) extends GenericComponentP[Icon.IconProps] {
33+
override def cprops = Icon.props(this)
34+
@inline def render = Icon.component(Icon.props(this))
3835
}
3936

4037
object Icon {
@@ -91,7 +88,7 @@ object Icon {
9188
}
9289

9390
private val component =
94-
JsComponent[IconProps, Children.Varargs, Null](RawComponent)
91+
JsComponent[IconProps, Children.None, Null](RawComponent)
9592

9693
def apply(name: String): Icon =
9794
new Icon(as = js.undefined,
@@ -110,6 +107,5 @@ object Icon {
110107
name = name,
111108
rotated = js.undefined,
112109
size = js.undefined,
113-
ariaLabel = js.undefined,
114-
children = Seq.empty)
110+
ariaLabel = js.undefined)
115111
}

‎facade/src/main/scala/react/semanticui/elements/icon/package.scala

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ package object icon {
5656
name = i.name,
5757
rotated = i.rotated,
5858
size = s,
59-
ariaLabel = i.ariaLabel,
60-
children = i.children)
59+
ariaLabel = i.ariaLabel)
6160

6261
def color(s: SemanticColor): Icon =
6362
new Icon(as = i.as,
@@ -76,8 +75,7 @@ package object icon {
7675
name = i.name,
7776
rotated = i.rotated,
7877
size = i.size,
79-
ariaLabel = i.ariaLabel,
80-
children = i.children)
78+
ariaLabel = i.ariaLabel)
8179

8280
def flipped(s: IconFlip): Icon =
8381
new Icon(as = i.as,
@@ -96,8 +94,7 @@ package object icon {
9694
name = i.name,
9795
rotated = i.rotated,
9896
size = i.size,
99-
ariaLabel = i.ariaLabel,
100-
children = i.children)
97+
ariaLabel = i.ariaLabel)
10198

10299
def rotated(s: IconRotated): Icon =
103100
new Icon(as = i.as,
@@ -116,8 +113,7 @@ package object icon {
116113
name = i.name,
117114
rotated = s,
118115
size = i.size,
119-
ariaLabel = i.ariaLabel,
120-
children = i.children)
116+
ariaLabel = i.ariaLabel)
121117

122118
def bordered(): Icon =
123119
new Icon(as = i.as,
@@ -136,8 +132,7 @@ package object icon {
136132
name = i.name,
137133
rotated = i.rotated,
138134
size = i.size,
139-
ariaLabel = i.ariaLabel,
140-
children = i.children)
135+
ariaLabel = i.ariaLabel)
141136

142137
def circular(): Icon =
143138
new Icon(as = i.as,
@@ -156,8 +151,7 @@ package object icon {
156151
name = i.name,
157152
rotated = i.rotated,
158153
size = i.size,
159-
ariaLabel = i.ariaLabel,
160-
children = i.children)
154+
ariaLabel = i.ariaLabel)
161155

162156
def className(c: String): Icon =
163157
new Icon(as = i.as,
@@ -176,8 +170,7 @@ package object icon {
176170
name = i.name,
177171
rotated = i.rotated,
178172
size = i.size,
179-
ariaLabel = i.ariaLabel,
180-
children = i.children)
173+
ariaLabel = i.ariaLabel)
181174

182175
def corner(c: IconCorner): Icon =
183176
new Icon(as = i.as,
@@ -196,8 +189,7 @@ package object icon {
196189
name = i.name,
197190
rotated = i.rotated,
198191
size = i.size,
199-
ariaLabel = i.ariaLabel,
200-
children = i.children)
192+
ariaLabel = i.ariaLabel)
201193

202194
def disabled: Icon =
203195
new Icon(as = i.as,
@@ -216,8 +208,7 @@ package object icon {
216208
name = i.name,
217209
rotated = i.rotated,
218210
size = i.size,
219-
ariaLabel = i.ariaLabel,
220-
children = i.children)
211+
ariaLabel = i.ariaLabel)
221212

222213
def fitted: Icon =
223214
new Icon(as = i.as,
@@ -236,8 +227,7 @@ package object icon {
236227
name = i.name,
237228
rotated = i.rotated,
238229
size = i.size,
239-
ariaLabel = i.ariaLabel,
240-
children = i.children)
230+
ariaLabel = i.ariaLabel)
241231

242232
def inverted: Icon =
243233
new Icon(as = i.as,
@@ -256,8 +246,7 @@ package object icon {
256246
name = i.name,
257247
rotated = i.rotated,
258248
size = i.size,
259-
ariaLabel = i.ariaLabel,
260-
children = i.children)
249+
ariaLabel = i.ariaLabel)
261250

262251
def link: Icon =
263252
new Icon(as = i.as,
@@ -276,8 +265,7 @@ package object icon {
276265
name = i.name,
277266
rotated = i.rotated,
278267
size = i.size,
279-
ariaLabel = i.ariaLabel,
280-
children = i.children)
268+
ariaLabel = i.ariaLabel)
281269

282270
def loading: Icon =
283271
new Icon(as = i.as,
@@ -296,7 +284,6 @@ package object icon {
296284
name = i.name,
297285
rotated = i.rotated,
298286
size = i.size,
299-
ariaLabel = i.ariaLabel,
300-
children = i.children)
287+
ariaLabel = i.ariaLabel)
301288
}
302289
}

0 commit comments

Comments
 (0)