diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyTypeConversions.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyTypeConversions.scala index fc0cb243c7..df8d238a19 100644 --- a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyTypeConversions.scala +++ b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/flavours/SlinkyTypeConversions.scala @@ -12,7 +12,7 @@ object SlinkyTypeConversions { // CastConversion(reactNames.ReactType, ReactComponentClass, _1), CastConversion(reactNames.ComponentState, QualifiedName.Object), CastConversion(reactNames.ReactDOM, QualifiedName.Any), - CastConversion(reactNames.ReactNode, TagMod, Ref(TypeRef.ScalaAny)), + CastConversion(reactNames.ReactNode, ReactElement), CastConversion(reactNames.RefObject, ReactRef, _1), // CastConversion(reactNames.Component, rawReactComponent, _1, TypeRef.Object), // CastConversion(reactNames.ComponentClass, rawReactComponentClassP, _1Object), diff --git a/tests/material-ui/check-slinky/m/material-ui/build.sbt b/tests/material-ui/check-slinky/m/material-ui/build.sbt index a5591f52ae..815c7c69b5 100644 --- a/tests/material-ui/check-slinky/m/material-ui/build.sbt +++ b/tests/material-ui/check-slinky/m/material-ui/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "material-ui" -version := "0.0-unknown-3ac7af" +version := "0.0-unknown-614c02" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "0.0-unknown-c6c500", + "org.scalablytyped" %%% "react" % "0.0-unknown-e3bc89", "org.scalablytyped" %%% "std" % "0.0-unknown-e37381") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/material-ui/check-slinky/r/react/build.sbt b/tests/material-ui/check-slinky/r/react/build.sbt index 6071893df4..478bf7031a 100644 --- a/tests/material-ui/check-slinky/r/react/build.sbt +++ b/tests/material-ui/check-slinky/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-c6c500" +version := "0.0-unknown-e3bc89" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala b/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala index 18dc721406..3672eb1530 100644 --- a/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala +++ b/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala @@ -1,13 +1,13 @@ package typingsSlinky.react.anon -import slinky.core.TagMod +import slinky.core.facade.ReactElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native trait Children extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native } object Children { @@ -28,7 +28,7 @@ object Children { x } @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala b/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala index d454614c9d..bbd4c6381c 100644 --- a/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala +++ b/tests/material-ui/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala @@ -1,6 +1,5 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import typingsSlinky.react.anon.Html import scala.scalajs.js import scala.scalajs.js.`|` @@ -8,7 +7,7 @@ import scala.scalajs.js.annotation._ @js.native trait DOMAttributes[T] extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[slinky.core.facade.ReactElement] = js.native var dangerouslySetInnerHTML: js.UndefOr[Html] = js.native var onClick: js.UndefOr[Double | (js.Function1[/* x */ String, Unit])] = js.native } @@ -31,7 +30,7 @@ object DOMAttributes { x } @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/c/componentstest/build.sbt b/tests/react-integration-test/check-slinky/c/componentstest/build.sbt index b62c330db9..4667f0e792 100644 --- a/tests/react-integration-test/check-slinky/c/componentstest/build.sbt +++ b/tests/react-integration-test/check-slinky/c/componentstest/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "componentstest" -version := "0.0-unknown-9cbc83" +version := "0.0-unknown-8c14dd" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt b/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt index 2501313066..be8c651d49 100644 --- a/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-bootstrap/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-bootstrap" -version := "0.32-21afab" +version := "0.32-2c56d3" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt b/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt index f0002860f6..5560129baa 100644 --- a/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-contextmenu/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-contextmenu" -version := "2.13.0-133270" +version := "2.13.0-15dbfd" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt b/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt index 7551f8a8c8..d3171f399a 100644 --- a/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-dropzone/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-dropzone" -version := "10.1.10-fa69dc" +version := "10.1.10-61bc0b" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react-select/build.sbt b/tests/react-integration-test/check-slinky/r/react-select/build.sbt index 423246e2d9..d3c5af8b2f 100644 --- a/tests/react-integration-test/check-slinky/r/react-select/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react-select/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-select" -version := "0.0-unknown-55a081" +version := "0.0-unknown-50a4f9" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/r/react/build.sbt b/tests/react-integration-test/check-slinky/r/react/build.sbt index dcd9bb8930..9d310f7e81 100644 --- a/tests/react-integration-test/check-slinky/r/react/build.sbt +++ b/tests/react-integration-test/check-slinky/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "16.9.2-46bbda" +version := "16.9.2-7f52cd" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala index db342812b3..d055d6e39d 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala @@ -1,6 +1,5 @@ package typingsSlinky.react.anon -import slinky.core.TagMod import slinky.core.facade.ReactElement import scala.scalajs.js import scala.scalajs.js.`|` @@ -8,7 +7,7 @@ import scala.scalajs.js.annotation._ @js.native trait Children extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native } object Children { @@ -31,7 +30,7 @@ object Children { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Component.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Component.scala index 2686a692e3..855bf692a3 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Component.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Component.scala @@ -1,7 +1,6 @@ package typingsSlinky.react.mod import org.scalablytyped.runtime.StringDictionary -import slinky.core.TagMod import typingsSlinky.std.Pick import scala.scalajs.js import scala.scalajs.js.`|` @@ -42,7 +41,7 @@ class Component[P, S, SS] protected () extends ComponentLifecycle[P, S, SS] { var state: S = js.native def forceUpdate(): Unit = js.native def forceUpdate(callback: js.Function0[Unit]): Unit = js.native - def render(): TagMod[Any] = js.native + def render(): slinky.core.facade.ReactElement = js.native def setState[K /* <: /* keyof S */ String */](): Unit = js.native def setState[K /* <: /* keyof S */ String */](state: S): Unit = js.native def setState[K /* <: /* keyof S */ String */](state: S, callback: js.Function0[Unit]): Unit = js.native diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentSpec.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentSpec.scala index 66728a12bc..6840b50293 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentSpec.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ComponentSpec.scala @@ -1,7 +1,6 @@ package typingsSlinky.react.mod import org.scalablytyped.runtime.StringDictionary -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -10,12 +9,12 @@ import scala.scalajs.js.annotation._ trait ComponentSpec[P, S] extends Mixin[P, S] with /* propertyName */ StringDictionary[js.Any] { - def render(): TagMod[Any] = js.native + def render(): slinky.core.facade.ReactElement = js.native } object ComponentSpec { @scala.inline - def apply[P, S](render: () => TagMod[Any]): ComponentSpec[P, S] = { + def apply[P, S](render: () => slinky.core.facade.ReactElement): ComponentSpec[P, S] = { val __obj = js.Dynamic.literal(render = js.Any.fromFunction0(render)) __obj.asInstanceOf[ComponentSpec[P, S]] } @@ -31,7 +30,7 @@ object ComponentSpec { x } @scala.inline - def setRender(value: () => TagMod[Any]): Self = this.set("render", js.Any.fromFunction0(value)) + def setRender(value: () => slinky.core.facade.ReactElement): Self = this.set("render", js.Any.fromFunction0(value)) } } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ConsumerProps.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ConsumerProps.scala index 94d3841833..a3b7afd738 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ConsumerProps.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ConsumerProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -8,12 +7,12 @@ import scala.scalajs.js.annotation._ @js.native trait ConsumerProps[T] extends js.Object { var unstable_observedBits: js.UndefOr[Double] = js.native - def children(value: T): TagMod[Any] = js.native + def children(value: T): slinky.core.facade.ReactElement = js.native } object ConsumerProps { @scala.inline - def apply[T](children: T => TagMod[Any]): ConsumerProps[T] = { + def apply[T](children: T => slinky.core.facade.ReactElement): ConsumerProps[T] = { val __obj = js.Dynamic.literal(children = js.Any.fromFunction1(children)) __obj.asInstanceOf[ConsumerProps[T]] } @@ -29,7 +28,7 @@ object ConsumerProps { x } @scala.inline - def setChildren(value: T => TagMod[Any]): Self = this.set("children", js.Any.fromFunction1(value)) + def setChildren(value: T => slinky.core.facade.ReactElement): Self = this.set("children", js.Any.fromFunction1(value)) @scala.inline def setUnstable_observedBits(value: Double): Self = this.set("unstable_observedBits", value.asInstanceOf[js.Any]) @scala.inline diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala index 5f0b7bb0f2..45ea8e55e6 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala @@ -2,7 +2,6 @@ package typingsSlinky.react.mod import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget -import slinky.core.TagMod import slinky.web.SyntheticAnimationEvent import slinky.web.SyntheticClipboardEvent import slinky.web.SyntheticCompositionEvent @@ -21,7 +20,7 @@ import scala.scalajs.js.annotation._ @js.native trait DOMAttributes[T] extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[slinky.core.facade.ReactElement] = js.native var dangerouslySetInnerHTML: js.UndefOr[Html] = js.native // Media Events var onAbort: js.UndefOr[ReactEventHandler[T]] = js.native @@ -140,7 +139,7 @@ object DOMAttributes { @scala.inline def setChildrenReactElement(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedHTMLFactory.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedHTMLFactory.scala index 6fc2fe9c6f..54a1369e57 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedHTMLFactory.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DetailedHTMLFactory.scala @@ -1,7 +1,6 @@ package typingsSlinky.react.mod import org.scalajs.dom.raw.HTMLElement -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -9,7 +8,7 @@ import scala.scalajs.js.annotation._ @js.native trait DetailedHTMLFactory[P /* <: HTMLAttributes[T] */, T /* <: HTMLElement */] extends DOMFactory[P, T] { def apply(): DetailedReactHTMLElement[P, T] = js.native - def apply(children: TagMod[Any]*): DetailedReactHTMLElement[P, T] = js.native - def apply(props: ClassAttributes[T] with P, children: TagMod[Any]*): DetailedReactHTMLElement[P, T] = js.native + def apply(children: slinky.core.facade.ReactElement*): DetailedReactHTMLElement[P, T] = js.native + def apply(props: ClassAttributes[T] with P, children: slinky.core.facade.ReactElement*): DetailedReactHTMLElement[P, T] = js.native } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProfilerProps.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProfilerProps.scala index 987d58aa69..a0db543bf5 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProfilerProps.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProfilerProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import typingsSlinky.react.reactStrings.mount import typingsSlinky.react.reactStrings.update import scala.scalajs.js @@ -9,7 +8,7 @@ import scala.scalajs.js.annotation._ @js.native trait ProfilerProps extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[slinky.core.facade.ReactElement] = js.native var id: String = js.native var onRender: ProfilerOnRenderCallback = js.native } @@ -43,7 +42,7 @@ object ProfilerProps { @scala.inline def setChildrenReactElement(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Props.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Props.scala index c8e86011cb..0a8105abda 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Props.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/Props.scala @@ -1,6 +1,5 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import slinky.core.facade.ReactRef import scala.scalajs.js import scala.scalajs.js.`|` @@ -25,7 +24,7 @@ import scala.scalajs.js.annotation._ */ @js.native trait Props[T] extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[slinky.core.facade.ReactElement] = js.native var key: js.UndefOr[Key] = js.native var ref: js.UndefOr[LegacyRef[T]] = js.native } @@ -50,7 +49,7 @@ object Props { @scala.inline def setChildrenReactElement(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProviderProps.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProviderProps.scala index acb445e6a1..6d5b109436 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProviderProps.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ProviderProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -8,7 +7,7 @@ import scala.scalajs.js.annotation._ // Context via RenderProps @js.native trait ProviderProps[T] extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[slinky.core.facade.ReactElement] = js.native var value: T = js.native } @@ -34,7 +33,7 @@ object ProviderProps { @scala.inline def setChildrenReactElement(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactNodeArray.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactNodeArray.scala index 0c9c4e1de8..fa05bd95a0 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactNodeArray.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactNodeArray.scala @@ -1,11 +1,11 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import typingsSlinky.std.Array import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native -trait ReactNodeArray extends Array[TagMod[Any]] +trait ReactNodeArray + extends Array[slinky.core.facade.ReactElement] diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala index d474d1c428..11985c82aa 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/ReactPortal.scala @@ -1,13 +1,12 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native trait ReactPortal extends ReactElement { - var children: TagMod[Any] = js.native + var children: slinky.core.facade.ReactElement = js.native } object ReactPortal { @@ -29,7 +28,7 @@ object ReactPortal { x } @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SVGFactory.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SVGFactory.scala index 914437f4bd..85f8b95146 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SVGFactory.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SVGFactory.scala @@ -1,7 +1,6 @@ package typingsSlinky.react.mod import org.scalajs.dom.raw.SVGElement -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -9,7 +8,10 @@ import scala.scalajs.js.annotation._ @js.native trait SVGFactory extends DOMFactory[SVGAttributes[SVGElement], SVGElement] { def apply(): ReactSVGElement = js.native - def apply(children: TagMod[Any]*): ReactSVGElement = js.native - def apply(props: ClassAttributes[SVGElement] with SVGAttributes[SVGElement], children: TagMod[Any]*): ReactSVGElement = js.native + def apply(children: slinky.core.facade.ReactElement*): ReactSVGElement = js.native + def apply( + props: ClassAttributes[SVGElement] with SVGAttributes[SVGElement], + children: slinky.core.facade.ReactElement* + ): ReactSVGElement = js.native } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala index c7a6a57465..9341d5d432 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/SuspenseProps.scala @@ -1,13 +1,12 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native trait SuspenseProps extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[slinky.core.facade.ReactElement] = js.native /** A fallback react tree to show when a Suspense child (like React.lazy) suspends */ var fallback: (/* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify NonNullable */ js.Any) | Null = js.native } @@ -32,7 +31,7 @@ object SuspenseProps { @scala.inline def setChildrenReactElement(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/cloneElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/cloneElement.scala index e35d10a50f..2bd77da102 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/cloneElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/cloneElement.scala @@ -4,7 +4,6 @@ import org.scalajs.dom.raw.Element import org.scalajs.dom.raw.HTMLElement import org.scalajs.dom.raw.SVGElement import slinky.core.ReactComponentClass -import slinky.core.TagMod import typingsSlinky.std.Partial import scala.scalajs.js import scala.scalajs.js.`|` @@ -15,20 +14,36 @@ import scala.scalajs.js.annotation._ object cloneElement extends js.Object { // Custom components def apply[P](element: FunctionComponentElement[P]): FunctionComponentElement[P] = js.native - def apply[P](element: FunctionComponentElement[P], props: Partial[P] with Attributes, children: TagMod[Any]*): FunctionComponentElement[P] = js.native + def apply[P]( + element: FunctionComponentElement[P], + props: Partial[P] with Attributes, + children: slinky.core.facade.ReactElement* + ): FunctionComponentElement[P] = js.native def apply[P](element: ReactElement): slinky.core.facade.ReactElement = js.native - def apply[P](element: ReactElement, props: Partial[P] with Attributes, children: TagMod[Any]*): slinky.core.facade.ReactElement = js.native + def apply[P]( + element: ReactElement, + props: Partial[P] with Attributes, + children: slinky.core.facade.ReactElement* + ): slinky.core.facade.ReactElement = js.native def apply[P, T /* <: ReactComponentClass[P] */](element: CElement[P, T]): CElement[P, T] = js.native - def apply[P, T /* <: ReactComponentClass[P] */](element: CElement[P, T], props: Partial[P] with ClassAttributes[T], children: TagMod[Any]*): CElement[P, T] = js.native + def apply[P, T /* <: ReactComponentClass[P] */]( + element: CElement[P, T], + props: Partial[P] with ClassAttributes[T], + children: slinky.core.facade.ReactElement* + ): CElement[P, T] = js.native // DOM Element (has to be the last, because type checking stops at first overload that fits) def apply[P /* <: DOMAttributes[T] */, T /* <: Element */](element: DOMElement[P, T]): slinky.core.facade.ReactElement = js.native - def apply[P /* <: DOMAttributes[T] */, T /* <: Element */](element: DOMElement[P, T], props: DOMAttributes[T] with P, children: TagMod[Any]*): slinky.core.facade.ReactElement = js.native + def apply[P /* <: DOMAttributes[T] */, T /* <: Element */]( + element: DOMElement[P, T], + props: DOMAttributes[T] with P, + children: slinky.core.facade.ReactElement* + ): slinky.core.facade.ReactElement = js.native // DOM Elements // ReactHTMLElement def apply[P /* <: HTMLAttributes[T] */, T /* <: HTMLElement */](element: DetailedReactHTMLElement[P, T]): DetailedReactHTMLElement[P, T] = js.native - def apply[P /* <: HTMLAttributes[T] */, T /* <: HTMLElement */](element: DetailedReactHTMLElement[P, T], props: P, children: TagMod[Any]*): DetailedReactHTMLElement[P, T] = js.native + def apply[P /* <: HTMLAttributes[T] */, T /* <: HTMLElement */](element: DetailedReactHTMLElement[P, T], props: P, children: slinky.core.facade.ReactElement*): DetailedReactHTMLElement[P, T] = js.native // SVGElement def apply[P /* <: SVGAttributes[T] */, T /* <: SVGElement */](element: ReactSVGElement): ReactSVGElement = js.native - def apply[P /* <: SVGAttributes[T] */, T /* <: SVGElement */](element: ReactSVGElement, props: P, children: TagMod[Any]*): ReactSVGElement = js.native + def apply[P /* <: SVGAttributes[T] */, T /* <: SVGElement */](element: ReactSVGElement, props: P, children: slinky.core.facade.ReactElement*): ReactSVGElement = js.native } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement.scala index 8a0c6fd71e..5f2fe15ee8 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement.scala @@ -3,7 +3,6 @@ package typingsSlinky.react.mod import org.scalajs.dom.raw.Element import org.scalajs.dom.raw.SVGElement import slinky.core.ReactComponentClass -import slinky.core.TagMod import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @@ -12,35 +11,46 @@ import scala.scalajs.js.annotation._ @js.native object createElement extends js.Object { def apply[P /* <: js.Object */](`type`: String): slinky.core.facade.ReactElement = js.native - def apply[P /* <: js.Object */](`type`: String, children: TagMod[Any]*): slinky.core.facade.ReactElement = js.native - def apply[P /* <: js.Object */](`type`: String, props: Attributes with P, children: TagMod[Any]*): slinky.core.facade.ReactElement = js.native + def apply[P /* <: js.Object */](`type`: String, children: slinky.core.facade.ReactElement*): slinky.core.facade.ReactElement = js.native + def apply[P /* <: js.Object */](`type`: String, props: Attributes with P, children: slinky.core.facade.ReactElement*): slinky.core.facade.ReactElement = js.native def apply[P /* <: js.Object */](`type`: ClassType[P, ReactComponentClass[P], ReactComponentClass[P]]): CElement[P, ReactComponentClass[P]] = js.native - def apply[P /* <: js.Object */](`type`: ClassType[P, ReactComponentClass[P], ReactComponentClass[P]], children: TagMod[Any]*): CElement[P, ReactComponentClass[P]] = js.native + def apply[P /* <: js.Object */]( + `type`: ClassType[P, ReactComponentClass[P], ReactComponentClass[P]], + children: slinky.core.facade.ReactElement* + ): CElement[P, ReactComponentClass[P]] = js.native def apply[P /* <: js.Object */]( `type`: ClassType[P, ReactComponentClass[P], ReactComponentClass[P]], props: ClassAttributes[ReactComponentClass[P]] with P, - children: TagMod[Any]* + children: slinky.core.facade.ReactElement* ): CElement[P, ReactComponentClass[P]] = js.native def apply[P /* <: js.Object */](`type`: ComponentClass[P, js.Object]): slinky.core.facade.ReactElement = js.native - def apply[P /* <: js.Object */](`type`: ComponentClass[P, js.Object], children: TagMod[Any]*): slinky.core.facade.ReactElement = js.native - def apply[P /* <: js.Object */](`type`: ComponentClass[P, js.Object], props: Attributes with P, children: TagMod[Any]*): slinky.core.facade.ReactElement = js.native + def apply[P /* <: js.Object */](`type`: ComponentClass[P, js.Object], children: slinky.core.facade.ReactElement*): slinky.core.facade.ReactElement = js.native + def apply[P /* <: js.Object */]( + `type`: ComponentClass[P, js.Object], + props: Attributes with P, + children: slinky.core.facade.ReactElement* + ): slinky.core.facade.ReactElement = js.native // Custom components def apply[P /* <: js.Object */](`type`: FunctionComponent[P]): FunctionComponentElement[P] = js.native - def apply[P /* <: js.Object */](`type`: FunctionComponent[P], children: TagMod[Any]*): FunctionComponentElement[P] = js.native - def apply[P /* <: js.Object */](`type`: FunctionComponent[P], props: Attributes with P, children: TagMod[Any]*): FunctionComponentElement[P] = js.native - def apply[P /* <: DOMAttributes[T] */, T /* <: Element */](`type`: String, props: ClassAttributes[T] with P, children: TagMod[Any]*): slinky.core.facade.ReactElement = js.native + def apply[P /* <: js.Object */](`type`: FunctionComponent[P], children: slinky.core.facade.ReactElement*): FunctionComponentElement[P] = js.native + def apply[P /* <: js.Object */](`type`: FunctionComponent[P], props: Attributes with P, children: slinky.core.facade.ReactElement*): FunctionComponentElement[P] = js.native + def apply[P /* <: DOMAttributes[T] */, T /* <: Element */](`type`: String, props: ClassAttributes[T] with P, children: slinky.core.facade.ReactElement*): slinky.core.facade.ReactElement = js.native def apply[P /* <: SVGAttributes[T] */, T /* <: SVGElement */](`type`: /* import warning: LimitUnionLength.leaveTypeRef Was union type with length 55 */ js.Any): ReactSVGElement = js.native def apply[P /* <: SVGAttributes[T] */, T /* <: SVGElement */]( `type`: /* import warning: LimitUnionLength.leaveTypeRef Was union type with length 55 */ js.Any, - children: TagMod[Any]* + children: slinky.core.facade.ReactElement* ): ReactSVGElement = js.native def apply[P /* <: SVGAttributes[T] */, T /* <: SVGElement */]( `type`: /* import warning: LimitUnionLength.leaveTypeRef Was union type with length 55 */ js.Any, props: ClassAttributes[T] with P, - children: TagMod[Any]* + children: slinky.core.facade.ReactElement* ): ReactSVGElement = js.native def apply[P /* <: js.Object */, T /* <: ReactComponentClass[P] */, C /* <: ReactComponentClass[P] */](`type`: ClassType[P, T, C]): CElement[P, T] = js.native - def apply[P /* <: js.Object */, T /* <: ReactComponentClass[P] */, C /* <: ReactComponentClass[P] */](`type`: ClassType[P, T, C], children: TagMod[Any]*): CElement[P, T] = js.native - def apply[P /* <: js.Object */, T /* <: ReactComponentClass[P] */, C /* <: ReactComponentClass[P] */](`type`: ClassType[P, T, C], props: ClassAttributes[T] with P, children: TagMod[Any]*): CElement[P, T] = js.native + def apply[P /* <: js.Object */, T /* <: ReactComponentClass[P] */, C /* <: ReactComponentClass[P] */](`type`: ClassType[P, T, C], children: slinky.core.facade.ReactElement*): CElement[P, T] = js.native + def apply[P /* <: js.Object */, T /* <: ReactComponentClass[P] */, C /* <: ReactComponentClass[P] */]( + `type`: ClassType[P, T, C], + props: ClassAttributes[T] with P, + children: slinky.core.facade.ReactElement* + ): CElement[P, T] = js.native } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement_input.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement_input.scala index d6074c8b7f..6f7dee5861 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement_input.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/createElement_input.scala @@ -1,7 +1,6 @@ package typingsSlinky.react.mod import org.scalajs.dom.raw.HTMLInputElement -import slinky.core.TagMod import typingsSlinky.react.reactStrings.input import scala.scalajs.js import scala.scalajs.js.`|` @@ -13,11 +12,11 @@ object createElement_input extends js.Object { // DOM Elements // TODO: generalize this to everything in `keyof ReactHTML`, not just "input" def apply(`type`: input): DetailedReactHTMLElement[InputHTMLAttributes[HTMLInputElement], HTMLInputElement] = js.native - def apply(`type`: input, children: TagMod[Any]*): DetailedReactHTMLElement[InputHTMLAttributes[HTMLInputElement], HTMLInputElement] = js.native + def apply(`type`: input, children: slinky.core.facade.ReactElement*): DetailedReactHTMLElement[InputHTMLAttributes[HTMLInputElement], HTMLInputElement] = js.native def apply( `type`: input, props: InputHTMLAttributes[HTMLInputElement] with ClassAttributes[HTMLInputElement], - children: TagMod[Any]* + children: slinky.core.facade.ReactElement* ): DetailedReactHTMLElement[InputHTMLAttributes[HTMLInputElement], HTMLInputElement] = js.native } diff --git a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/package.scala b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/package.scala index 1820566b0f..b179ed13d1 100644 --- a/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/package.scala +++ b/tests/react-integration-test/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/package.scala @@ -23,7 +23,7 @@ package object mod { type ClipboardEventHandler[T] = typingsSlinky.react.mod.EventHandler[slinky.web.SyntheticClipboardEvent[T]] type ComponentFactory[P, T /* <: slinky.core.ReactComponentClass[P] */] = js.Function2[ /* props */ js.UndefOr[typingsSlinky.react.mod.ClassAttributes[T] with P], - /* repeated */ slinky.core.TagMod[scala.Any], + /* repeated */ slinky.core.facade.ReactElement, typingsSlinky.react.mod.CElement[P, T] ] /** @@ -42,7 +42,7 @@ package object mod { type ContextType[C /* <: typingsSlinky.react.mod.Context[_] */] = js.Any type DOMFactory[P /* <: typingsSlinky.react.mod.DOMAttributes[T] */, T /* <: org.scalajs.dom.raw.Element */] = js.Function2[ /* props */ js.UndefOr[(typingsSlinky.react.mod.ClassAttributes[T] with P) | scala.Null], - /* repeated */ slinky.core.TagMod[scala.Any], + /* repeated */ slinky.core.facade.ReactElement, slinky.core.facade.ReactElement ] // Any prop that has a default prop becomes optional, but its type is unchanged @@ -89,7 +89,7 @@ package object mod { // ---------------------------------------------------------------------- type Factory[P] = js.Function2[ /* props */ js.UndefOr[typingsSlinky.react.mod.Attributes with P], - /* repeated */ slinky.core.TagMod[scala.Any], + /* repeated */ slinky.core.facade.ReactElement, slinky.core.facade.ReactElement ] type FocusEventHandler[T] = typingsSlinky.react.mod.EventHandler[slinky.web.SyntheticFocusEvent[T]] @@ -100,7 +100,7 @@ package object mod { ] type FunctionComponentFactory[P] = js.Function2[ /* props */ js.UndefOr[typingsSlinky.react.mod.Attributes with P], - /* repeated */ slinky.core.TagMod[scala.Any], + /* repeated */ slinky.core.facade.ReactElement, typingsSlinky.react.mod.FunctionComponentElement[P] ] type GetDerivedStateFromError[P, S] = /** diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt b/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt index 3473097a8d..b1b33754be 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "semantic-ui-react" -version := "0.0-unknown-e4c47d" +version := "0.0-unknown-beba91" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionAccordionAccordionMod/StrictAccordionAccordionProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionAccordionAccordionMod/StrictAccordionAccordionProps.scala index 9ebf4f2f0d..a5cb387cf5 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionAccordionAccordionMod/StrictAccordionAccordionProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionAccordionAccordionMod/StrictAccordionAccordionProps.scala @@ -1,7 +1,6 @@ package typingsSlinky.semanticUiReact.accordionAccordionAccordionMod import org.scalajs.dom.raw.HTMLDivElement -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticMouseEvent import typingsSlinky.semanticUiReact.accordionPanelMod.AccordionPanelProps @@ -18,7 +17,7 @@ trait StrictAccordionAccordionProps extends js.Object { /** An element type to render as (string or function). */ var as: js.UndefOr[js.Any] = js.native /** Primary content. */ - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native /** Additional classes. */ var className: js.UndefOr[String] = js.native /** Initial activeIndex value. */ @@ -70,7 +69,7 @@ object StrictAccordionAccordionProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionContentMod/StrictAccordionContentProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionContentMod/StrictAccordionContentProps.scala index 472b61777c..e5e527a78c 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionContentMod/StrictAccordionContentProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionContentMod/StrictAccordionContentProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.semanticUiReact.accordionContentMod -import slinky.core.TagMod import slinky.core.facade.ReactElement import typingsSlinky.semanticUiReact.genericMod.SemanticShorthandContent import scala.scalajs.js @@ -14,7 +13,7 @@ trait StrictAccordionContentProps extends js.Object { /** An element type to render as (string or function). */ var as: js.UndefOr[js.Any] = js.native /** Primary content. */ - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native /** Additional classes. */ var className: js.UndefOr[String] = js.native /** Shorthand for primary content. */ @@ -49,7 +48,7 @@ object StrictAccordionContentProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionPanelMod/StrictAccordionPanelProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionPanelMod/StrictAccordionPanelProps.scala index e1a2865a91..d51d97c8ae 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionPanelMod/StrictAccordionPanelProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionPanelMod/StrictAccordionPanelProps.scala @@ -1,7 +1,6 @@ package typingsSlinky.semanticUiReact.accordionPanelMod import org.scalajs.dom.raw.HTMLDivElement -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticMouseEvent import typingsSlinky.react.mod.ReactNodeArray @@ -63,7 +62,7 @@ object StrictAccordionPanelProps { def setContentReactElement(value: ReactElement): Self = this.set("content", value.asInstanceOf[js.Any]) @scala.inline def setContentFunction3( - value: (/* component */ ReactType[AccordionContentProps], AccordionContentProps, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[AccordionContentProps], AccordionContentProps, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("content", js.Any.fromFunction3(value)) @scala.inline def setContent(value: SemanticShorthandItem[AccordionContentProps]): Self = this.set("content", value.asInstanceOf[js.Any]) @@ -81,7 +80,7 @@ object StrictAccordionPanelProps { def setTitleReactElement(value: ReactElement): Self = this.set("title", value.asInstanceOf[js.Any]) @scala.inline def setTitleFunction3( - value: (/* component */ ReactType[AccordionTitleProps], AccordionTitleProps, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[AccordionTitleProps], AccordionTitleProps, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("title", js.Any.fromFunction3(value)) @scala.inline def setTitle(value: SemanticShorthandItem[AccordionTitleProps]): Self = this.set("title", value.asInstanceOf[js.Any]) diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionTitleMod/StrictAccordionTitleProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionTitleMod/StrictAccordionTitleProps.scala index a2dfdad4ba..e84dbe48d8 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionTitleMod/StrictAccordionTitleProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/accordionTitleMod/StrictAccordionTitleProps.scala @@ -1,7 +1,6 @@ package typingsSlinky.semanticUiReact.accordionTitleMod import org.scalajs.dom.raw.HTMLDivElement -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticMouseEvent import typingsSlinky.react.mod.ReactNodeArray @@ -19,7 +18,7 @@ trait StrictAccordionTitleProps extends js.Object { /** An element type to render as (string or function). */ var as: js.UndefOr[js.Any] = js.native /** Primary content. */ - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native /** Additional classes. */ var className: js.UndefOr[String] = js.native /** Shorthand for primary content. */ @@ -75,7 +74,7 @@ object StrictAccordionTitleProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline @@ -94,7 +93,7 @@ object StrictAccordionTitleProps { def setIconFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("icon", js.Any.fromFunction3(value)) @scala.inline def setIcon( diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonContentMod/StrictButtonContentProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonContentMod/StrictButtonContentProps.scala index 518e9509f3..3fb66ec339 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonContentMod/StrictButtonContentProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonContentMod/StrictButtonContentProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.semanticUiReact.buttonContentMod -import slinky.core.TagMod import slinky.core.facade.ReactElement import typingsSlinky.semanticUiReact.genericMod.SemanticShorthandContent import scala.scalajs.js @@ -12,7 +11,7 @@ trait StrictButtonContentProps extends js.Object { /** An element type to render as (string or function). */ var as: js.UndefOr[js.Any] = js.native /** Primary content. */ - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native /** Additional classes. */ var className: js.UndefOr[String] = js.native /** Shorthand for primary content. */ @@ -47,7 +46,7 @@ object StrictButtonContentProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonGroupMod/StrictButtonGroupProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonGroupMod/StrictButtonGroupProps.scala index 68b86d873b..7826d2c018 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonGroupMod/StrictButtonGroupProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonGroupMod/StrictButtonGroupProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.semanticUiReact.buttonGroupMod -import slinky.core.TagMod import slinky.core.facade.ReactElement import typingsSlinky.semanticUiReact.buttonMod.ButtonProps import typingsSlinky.semanticUiReact.genericMod.SemanticCOLORS @@ -28,7 +27,7 @@ trait StrictButtonGroupProps extends js.Object { /** Array of shorthand Button values. */ var buttons: js.UndefOr[SemanticShorthandCollection[ButtonProps]] = js.native /** Primary content. */ - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native /** Additional classes. */ var className: js.UndefOr[String] = js.native /** Groups can have a shared color. */ @@ -101,7 +100,7 @@ object StrictButtonGroupProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonMod/StrictButtonProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonMod/StrictButtonProps.scala index 839ed30594..c6338b3f57 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonMod/StrictButtonProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/buttonMod/StrictButtonProps.scala @@ -1,7 +1,6 @@ package typingsSlinky.semanticUiReact.buttonMod import org.scalajs.dom.raw.HTMLButtonElement -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticMouseEvent import typingsSlinky.react.mod.ButtonHTMLAttributes @@ -169,7 +168,7 @@ object StrictButtonProps { def setIconFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("icon", js.Any.fromFunction3(value)) @scala.inline def setIcon( @@ -189,7 +188,7 @@ object StrictButtonProps { def setLabelFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("label", js.Any.fromFunction3(value)) @scala.inline def setLabel( diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala index 601999c201..2b53d7cc9a 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionPanel.scala @@ -1,7 +1,6 @@ package typingsSlinky.semanticUiReact.components import org.scalajs.dom.raw.HTMLDivElement -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticMouseEvent import slinky.web.html.div.tag @@ -32,7 +31,7 @@ object AccordionPanel { def contentReactElement(value: ReactElement): this.type = set("content", value.asInstanceOf[js.Any]) @scala.inline def contentFunction3( - value: (/* component */ ReactType[AccordionContentProps], AccordionContentProps, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[AccordionContentProps], AccordionContentProps, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("content", js.Any.fromFunction3(value)) @scala.inline def content(value: SemanticShorthandItem[AccordionContentProps]): this.type = set("content", value.asInstanceOf[js.Any]) @@ -44,7 +43,7 @@ object AccordionPanel { def titleReactElement(value: ReactElement): this.type = set("title", value.asInstanceOf[js.Any]) @scala.inline def titleFunction3( - value: (/* component */ ReactType[AccordionTitleProps], AccordionTitleProps, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[AccordionTitleProps], AccordionTitleProps, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("title", js.Any.fromFunction3(value)) @scala.inline def title(value: SemanticShorthandItem[AccordionTitleProps]): this.type = set("title", value.asInstanceOf[js.Any]) diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala index f529756261..021357b8ab 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/AccordionTitle.scala @@ -1,7 +1,6 @@ package typingsSlinky.semanticUiReact.components import org.scalajs.dom.raw.HTMLDivElement -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticMouseEvent import slinky.web.html.div.tag @@ -41,7 +40,7 @@ object AccordionTitle { def iconFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("icon", js.Any.fromFunction3(value)) @scala.inline def icon( diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala index 07ee0679eb..50a2d4a204 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Button.scala @@ -4,7 +4,6 @@ import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import org.scalajs.dom.raw.HTMLButtonElement import slinky.core.SyntheticEvent -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticAnimationEvent import slinky.web.SyntheticClipboardEvent @@ -268,7 +267,7 @@ object Button { def iconFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify IconProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("icon", js.Any.fromFunction3(value)) @scala.inline def icon( @@ -302,7 +301,7 @@ object Button { def labelFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("label", js.Any.fromFunction3(value)) @scala.inline def label( diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala index 8b19334fe5..887cc65733 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/components/Input.scala @@ -4,7 +4,6 @@ import org.scalajs.dom.raw.Event import org.scalajs.dom.raw.EventTarget import org.scalajs.dom.raw.HTMLInputElement import slinky.core.SyntheticEvent -import slinky.core.TagMod import slinky.core.facade.ReactElement import slinky.web.SyntheticAnimationEvent import slinky.web.SyntheticClipboardEvent @@ -264,7 +263,7 @@ object Input { def iconReactElement(value: ReactElement): this.type = set("icon", value.asInstanceOf[js.Any]) @scala.inline def iconFunction3( - value: (/* component */ ReactType[InputProps], InputProps, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[InputProps], InputProps, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("icon", js.Any.fromFunction3(value)) @scala.inline def icon(value: js.Any | SemanticShorthandItem[InputProps]): this.type = set("icon", value.asInstanceOf[js.Any]) @@ -278,7 +277,7 @@ object Input { def inputReactElement(value: ReactElement): this.type = set("input", value.asInstanceOf[js.Any]) @scala.inline def inputFunction3( - value: (/* component */ ReactType[HtmlInputrops], HtmlInputrops, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[HtmlInputrops], HtmlInputrops, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("input", js.Any.fromFunction3(value)) @scala.inline def input(value: SemanticShorthandItem[HtmlInputrops]): this.type = set("input", value.asInstanceOf[js.Any]) @@ -304,7 +303,7 @@ object Input { def labelFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): this.type = set("label", js.Any.fromFunction3(value)) @scala.inline def label( diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/containerContainerMod/StrictContainerProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/containerContainerMod/StrictContainerProps.scala index 911e9dde13..e810322da0 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/containerContainerMod/StrictContainerProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/containerContainerMod/StrictContainerProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.semanticUiReact.containerContainerMod -import slinky.core.TagMod import slinky.core.facade.ReactElement import typingsSlinky.semanticUiReact.genericMod.SemanticShorthandContent import typingsSlinky.semanticUiReact.genericMod.SemanticTEXTALIGNMENTS @@ -13,7 +12,7 @@ trait StrictContainerProps extends js.Object { /** An element type to render as (string or function). */ var as: js.UndefOr[js.Any] = js.native /** Primary content. */ - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native /** Additional classes. */ var className: js.UndefOr[String] = js.native /** Shorthand for primary content. */ @@ -50,7 +49,7 @@ object StrictContainerProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlLabelProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlLabelProps.scala index 6ac0f269ee..6b47fe30cb 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlLabelProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlLabelProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.semanticUiReact.genericMod -import slinky.core.TagMod import slinky.core.facade.ReactElement import scala.scalajs.js import scala.scalajs.js.`|` @@ -8,7 +7,7 @@ import scala.scalajs.js.annotation._ @js.native trait StrictHtmlLabelProps extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native } object StrictHtmlLabelProps { @@ -31,7 +30,7 @@ object StrictHtmlLabelProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlSpanProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlSpanProps.scala index 99d8863317..e1e7578a32 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlSpanProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/StrictHtmlSpanProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.semanticUiReact.genericMod -import slinky.core.TagMod import slinky.core.facade.ReactElement import scala.scalajs.js import scala.scalajs.js.`|` @@ -8,7 +7,7 @@ import scala.scalajs.js.annotation._ @js.native trait StrictHtmlSpanProps extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native } object StrictHtmlSpanProps { @@ -31,7 +30,7 @@ object StrictHtmlSpanProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/package.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/package.scala index 6df6c60b07..d477ff6797 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/package.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/genericMod/package.scala @@ -6,12 +6,12 @@ import scala.scalajs.js.annotation._ package object genericMod { type SemanticShorthandCollection[TProps] = js.Array[typingsSlinky.semanticUiReact.genericMod.SemanticShorthandItem[TProps]] - type SemanticShorthandContent = slinky.core.TagMod[scala.Any] - type SemanticShorthandItem[TProps] = slinky.core.TagMod[scala.Any] | TProps | typingsSlinky.semanticUiReact.genericMod.SemanticShorthandItemFunc[TProps] + type SemanticShorthandContent = slinky.core.facade.ReactElement + type SemanticShorthandItem[TProps] = slinky.core.facade.ReactElement | TProps | typingsSlinky.semanticUiReact.genericMod.SemanticShorthandItemFunc[TProps] type SemanticShorthandItemFunc[TProps] = js.Function3[ /* component */ typingsSlinky.react.mod.ReactType[TProps], /* props */ TProps, - /* children */ js.UndefOr[slinky.core.TagMod[scala.Any] | typingsSlinky.react.mod.ReactNodeArray], + /* children */ js.UndefOr[slinky.core.facade.ReactElement | typingsSlinky.react.mod.ReactNodeArray], slinky.core.facade.ReactElement | scala.Null ] } diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/inputInputMod/StrictInputProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/inputInputMod/StrictInputProps.scala index 633817f084..5c62973d08 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/inputInputMod/StrictInputProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/inputInputMod/StrictInputProps.scala @@ -1,7 +1,6 @@ package typingsSlinky.semanticUiReact.inputInputMod import org.scalajs.dom.raw.HTMLInputElement -import slinky.core.TagMod import slinky.core.facade.ReactElement import typingsSlinky.react.mod.ChangeEvent import typingsSlinky.react.mod.InputHTMLAttributes @@ -120,7 +119,7 @@ object StrictInputProps { def setIconReactElement(value: ReactElement): Self = this.set("icon", value.asInstanceOf[js.Any]) @scala.inline def setIconFunction3( - value: (/* component */ ReactType[InputProps], InputProps, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[InputProps], InputProps, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("icon", js.Any.fromFunction3(value)) @scala.inline def setIcon(value: js.Any | SemanticShorthandItem[InputProps]): Self = this.set("icon", value.asInstanceOf[js.Any]) @@ -134,7 +133,7 @@ object StrictInputProps { def setInputReactElement(value: ReactElement): Self = this.set("input", value.asInstanceOf[js.Any]) @scala.inline def setInputFunction3( - value: (/* component */ ReactType[HtmlInputrops], HtmlInputrops, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + value: (/* component */ ReactType[HtmlInputrops], HtmlInputrops, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("input", js.Any.fromFunction3(value)) @scala.inline def setInput(value: SemanticShorthandItem[HtmlInputrops]): Self = this.set("input", value.asInstanceOf[js.Any]) @@ -150,7 +149,7 @@ object StrictInputProps { def setLabelFunction3( value: (/* component */ ReactType[ /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _ - ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[TagMod[Any] | ReactNodeArray]) => ReactElement | Null + ], /* import warning: transforms.QualifyReferences#resolveTypeRef many Couldn't qualify LabelProps */ _, /* children */ js.UndefOr[ReactElement | ReactNodeArray]) => ReactElement | Null ): Self = this.set("label", js.Any.fromFunction3(value)) @scala.inline def setLabel( diff --git a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/testContainerTestContainerMod/StrictTestContainerProps.scala b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/testContainerTestContainerMod/StrictTestContainerProps.scala index 20a13e3720..762a4e491c 100644 --- a/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/testContainerTestContainerMod/StrictTestContainerProps.scala +++ b/tests/react-integration-test/check-slinky/s/semantic-ui-react/src/main/scala/typingsSlinky/semanticUiReact/testContainerTestContainerMod/StrictTestContainerProps.scala @@ -1,6 +1,5 @@ package typingsSlinky.semanticUiReact.testContainerTestContainerMod -import slinky.core.TagMod import slinky.core.facade.ReactElement import typingsSlinky.semanticUiReact.genericMod.SemanticShorthandContent import typingsSlinky.semanticUiReact.genericMod.SemanticTEXTALIGNMENTS @@ -13,7 +12,7 @@ trait StrictTestContainerProps extends js.Object { /** An element type to render as (string or function). */ var as: js.UndefOr[js.Any] = js.native /** Primary content. */ - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native /** Additional classes. */ var className: js.UndefOr[String] = js.native /** Shorthand for primary content. */ @@ -79,7 +78,7 @@ object StrictTestContainerProps { @scala.inline def setChildrenReactElement(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt index 6bf2513913..1a2fbff7e8 100644 --- a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt +++ b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-event-listener/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-event-listener" -version := "0.38.0-0286a8" +version := "0.38.0-dc344e" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt index 9490aba2cc..1f641aced1 100644 --- a/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt +++ b/tests/react-integration-test/check-slinky/s/stardust-ui__react-component-ref/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "stardust-ui__react-component-ref" -version := "0.38.0-a8f745" +version := "0.38.0-09f335" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "16.9.2-46bbda", + "org.scalablytyped" %%% "react" % "16.9.2-7f52cd", "org.scalablytyped" %%% "std" % "0.0-unknown-d0ed57") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt b/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt index 46103647e8..efd2022498 100644 --- a/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt +++ b/tests/react-transition-group/check-slinky/r/react-transition-group/build.sbt @@ -1,12 +1,12 @@ organization := "org.scalablytyped" name := "react-transition-group" -version := "2.0-c1ee01" +version := "2.0-574554" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( "com.olvind" %%% "scalablytyped-runtime" % "2.1.0", "me.shadaj" %%% "slinky-web" % "0.6.5", - "org.scalablytyped" %%% "react" % "0.0-unknown-4a6b2b", + "org.scalablytyped" %%% "react" % "0.0-unknown-25bc05", "org.scalablytyped" %%% "std" % "0.0-unknown-a14703") publishArtifact in packageDoc := false scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials") diff --git a/tests/react-transition-group/check-slinky/r/react/build.sbt b/tests/react-transition-group/check-slinky/r/react/build.sbt index 9e5d8cbcf7..56415a9e0f 100644 --- a/tests/react-transition-group/check-slinky/r/react/build.sbt +++ b/tests/react-transition-group/check-slinky/r/react/build.sbt @@ -1,6 +1,6 @@ organization := "org.scalablytyped" name := "react" -version := "0.0-unknown-4a6b2b" +version := "0.0-unknown-25bc05" scalaVersion := "2.13.2" enablePlugins(ScalaJSPlugin) libraryDependencies ++= Seq( diff --git a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala index 18dc721406..3672eb1530 100644 --- a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala +++ b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/anon/Children.scala @@ -1,13 +1,13 @@ package typingsSlinky.react.anon -import slinky.core.TagMod +import slinky.core.facade.ReactElement import scala.scalajs.js import scala.scalajs.js.`|` import scala.scalajs.js.annotation._ @js.native trait Children extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[ReactElement] = js.native } object Children { @@ -28,7 +28,7 @@ object Children { x } @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) } diff --git a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala index 1e6cee585d..da4f22d041 100644 --- a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala +++ b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/DOMAttributes.scala @@ -1,6 +1,5 @@ package typingsSlinky.react.mod -import slinky.core.TagMod import typingsSlinky.react.anon.Html import scala.scalajs.js import scala.scalajs.js.`|` @@ -8,7 +7,7 @@ import scala.scalajs.js.annotation._ @js.native trait DOMAttributes[T] extends js.Object { - var children: js.UndefOr[TagMod[Any]] = js.native + var children: js.UndefOr[slinky.core.facade.ReactElement] = js.native var dangerouslySetInnerHTML: js.UndefOr[Html] = js.native } @@ -30,7 +29,7 @@ object DOMAttributes { x } @scala.inline - def setChildren(value: TagMod[Any]): Self = this.set("children", value.asInstanceOf[js.Any]) + def setChildren(value: slinky.core.facade.ReactElement): Self = this.set("children", value.asInstanceOf[js.Any]) @scala.inline def deleteChildren: Self = this.set("children", js.undefined) @scala.inline diff --git a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/global/JSX/ElementClass.scala b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/global/JSX/ElementClass.scala index eba760446b..9e220d9c3a 100644 --- a/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/global/JSX/ElementClass.scala +++ b/tests/react-transition-group/check-slinky/r/react/src/main/scala/typingsSlinky/react/mod/global/JSX/ElementClass.scala @@ -1,6 +1,6 @@ package typingsSlinky.react.mod.global.JSX -import slinky.core.TagMod +import slinky.core.facade.ReactElement import typingsSlinky.react.mod.Component import scala.scalajs.js import scala.scalajs.js.`|` @@ -9,12 +9,12 @@ import scala.scalajs.js.annotation._ @js.native trait ElementClass extends Component[js.Any, js.Object] { - def render(): TagMod[Any] = js.native + def render(): ReactElement = js.native } object ElementClass { @scala.inline - def apply(render: () => TagMod[Any]): ElementClass = { + def apply(render: () => ReactElement): ElementClass = { val __obj = js.Dynamic.literal(render = js.Any.fromFunction0(render)) __obj.asInstanceOf[ElementClass] } @@ -30,7 +30,7 @@ object ElementClass { x } @scala.inline - def setRender(value: () => TagMod[Any]): Self = this.set("render", js.Any.fromFunction0(value)) + def setRender(value: () => ReactElement): Self = this.set("render", js.Any.fromFunction0(value)) } }