Merge pull request #213 from xsistens/master

Scala.js version update to 0.6.5

Author: japgolly

core/src/main/scala/japgolly/scalajs/react/Addons.scala

@@ -66,14 +66,17 @@ object Addons {
    *
    * https://facebook.github.io/react/docs/perf.html
    */
+  @js.native
   @JSName("React.addons.Perf")
   object Perf extends js.Object {
     type Measurements = js.Array[Measurement]
 
+    @js.native
     sealed trait Measurement extends js.Object {
       val totalTime: Double = js.native
     }
 
+    @js.native
     sealed trait Report extends js.Object
 
     def start(): Unit = js.native

core/src/main/scala/japgolly/scalajs/react/Events.scala

@@ -68,6 +68,7 @@ object ReactKeyboardEvent {
 }
 
 /** https://facebook.github.io/react/docs/events.html */
+@js.native
 trait SyntheticEvent[+DOMEventTarget <: dom.Node] extends js.Object {
   val bubbles         : Boolean        = js.native
   val cancelable      : Boolean        = js.native
@@ -91,6 +92,7 @@ trait SyntheticEvent[+DOMEventTarget <: dom.Node] extends js.Object {
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticUIEvent.js */
+@js.native
 trait SyntheticUIEvent[+DOMEventTarget <: dom.Node] extends SyntheticEvent[DOMEventTarget] {
   override val nativeEvent: dom.UIEvent = js.native
   /**
@@ -106,6 +108,7 @@ trait SyntheticUIEvent[+DOMEventTarget <: dom.Node] extends SyntheticEvent[DOMEv
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticClipboardEvent.js */
+@js.native
 trait SyntheticClipboardEvent[+DOMEventTarget <: dom.Node] extends SyntheticEvent[DOMEventTarget] {
   /**
    * The clipboardData attribute is an instance of the DataTransfer interface which lets a script read and manipulate
@@ -122,6 +125,7 @@ trait SyntheticClipboardEvent[+DOMEventTarget <: dom.Node] extends SyntheticEven
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticCompositionEvent.js */
+@js.native
 trait SyntheticCompositionEvent[+DOMEventTarget <: dom.Node] extends SyntheticEvent[DOMEventTarget] {
   override val nativeEvent: dom.CompositionEvent = js.native
   /**
@@ -136,12 +140,14 @@ trait SyntheticCompositionEvent[+DOMEventTarget <: dom.Node] extends SyntheticEv
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticDragEvent.js */
+@js.native
 trait SyntheticDragEvent[+DOMEventTarget <: dom.Node] extends SyntheticMouseEvent[DOMEventTarget] {
   override val nativeEvent: dom.DragEvent = js.native
   val dataTransfer: dom.DataTransfer = js.native
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticFocusEvent.js */
+@js.native
 trait SyntheticFocusEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEvent[DOMEventTarget] {
   override val nativeEvent: dom.FocusEvent = js.native
   val relatedTarget: dom.EventTarget = js.native
@@ -162,6 +168,7 @@ trait SyntheticFocusEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEvent[
 //}
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticKeyboardEvent.js */
+@js.native
 trait SyntheticKeyboardEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEvent[DOMEventTarget] {
   override val nativeEvent: dom.KeyboardEvent = js.native
   /** See org.scalajs.dom.extensions.KeyValue */
@@ -180,6 +187,7 @@ trait SyntheticKeyboardEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEve
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticMouseEvent.js */
+@js.native
 trait SyntheticMouseEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEvent[DOMEventTarget] {
   override val nativeEvent: dom.MouseEvent = js.native
   val screenX  : Double  = js.native
@@ -199,6 +207,7 @@ trait SyntheticMouseEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEvent[
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticTouchEvent.js */
+@js.native
 trait SyntheticTouchEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEvent[DOMEventTarget] {
   override val nativeEvent: dom.TouchEvent = js.native
   val altKey        : Boolean       = js.native
@@ -212,6 +221,7 @@ trait SyntheticTouchEvent[+DOMEventTarget <: dom.Node] extends SyntheticUIEvent[
 }
 
 /** https://github.com/facebook/react/blob/master/src/browser/syntheticEvents/SyntheticWheelEvent.js */
+@js.native
 trait SyntheticWheelEvent[+DOMEventTarget <: dom.Node] extends SyntheticMouseEvent[DOMEventTarget] {
   override val nativeEvent: dom.WheelEvent = js.native
   def deltaX(event: dom.Event): Double = js.native

core/src/main/scala/japgolly/scalajs/react/FunctionalComponent.scala

@@ -15,6 +15,7 @@ import scala.scalajs.js
  *
  * @since React 0.14
  */
+@js.native
 sealed trait FunctionalComponent[-P] extends js.Any
 // type FunctionalComponent[-P] = js.Function1[P, ReactElement]
 // ↑ Doesn't work for Scala for two reasons:
@@ -46,6 +47,7 @@ object FunctionalComponent {
   /**
    * A [[FunctionalComponent]] that accepts [[PropsChildren]] in addition to `props`.
    */
+  @js.native
   sealed trait WithChildren[-P] extends js.Any
 
   def withChildren[P](render: (P, PropsChildren) => ReactElement): WithChildren[P] = {

core/src/main/scala/japgolly/scalajs/react/React.scala

@@ -4,7 +4,10 @@ import org.scalajs.dom
 import scala.scalajs.js
 import js.{Dynamic, UndefOr, ThisFunction, ThisFunction0, Object, Any => JAny}
 
+@js.native
 object React extends React
+
+@js.native
 trait React extends Object {
 
   /**
@@ -113,6 +116,7 @@ trait React extends Object {
 }
 
 /** `React.Children` */
+@js.native
 trait ReactChildren extends Object {
 
   /** Invoke fn on every immediate child contained within children with this set to context. If children is a nested object or array it will be traversed: fn will never be passed the container objects. If children is null or undefined returns null or undefined rather than an empty object. */

core/src/main/scala/japgolly/scalajs/react/ReactDOM.scala

@@ -4,7 +4,10 @@ import org.scalajs.dom
 import scala.scalajs.js
 import js.{ThisFunction, ThisFunction0, Object}
 
+@js.native
 object ReactDOM extends ReactDOM
+
+@js.native
 trait ReactDOM extends Object {
 
   /**

core/src/main/scala/japgolly/scalajs/react/package.scala

@@ -19,6 +19,7 @@ package object react extends ReactEventAliases {
    * If P,S,B,N types are needed and there's another object that has them, this is used to bridge for type inference.
    */
   trait ReactComponentTypeAux[P, S, +B, +N <: TopNode]
+  @js.native
   trait ReactComponentTypeAuxJ[P, S, +B, +N <: TopNode] extends js.Object
   implicit def reactComponentTypeAuxJ[P, S, B, N <: TopNode](a: ReactComponentTypeAuxJ[P,S,B,N]): ReactComponentTypeAux[P,S,B,N] =
     a.asInstanceOf[ReactComponentTypeAux[P,S,B,N]]
@@ -30,6 +31,7 @@ package object react extends ReactEventAliases {
 
   // TODO WrapObj was one of the first things I did when starting with ScalaJS. Reconsider.
   /** Allows Scala classes to be used in place of `Object`. */
+  @js.native
   trait WrapObj[+A] extends Object { val v: A = js.native }
   def WrapObj[A](v: A) =
     Dynamic.literal("v" -> v.asInstanceOf[JAny]).asInstanceOf[WrapObj[A]]

core/src/main/scala/japgolly/scalajs/react/types.scala

@@ -11,33 +11,40 @@ import js.annotation.{JSBracketAccess, JSName}
 object CompScope {
 
   /** Methods always available. */
+  @js.native
   trait AlwaysAvailable extends Object {
     def isMounted(): Boolean = js.native
   }
 
+  @js.native
   trait HasProps[+Props] extends Object {
     @JSName("props") private[react] def _props: WrapObj[Props] with PropsMixedIn = js.native
   }
 
+  @js.native
   trait HasState[+State] extends Object {
     @JSName("state") private[react] def _state: WrapObj[State] = js.native
   }
 
+  @js.native
   trait CanSetState[State] extends HasState[State] {
     @JSName("setState") private[react] def _setState(s: WrapObj[State]): Unit = js.native
     @JSName("setState") private[react] def _setState(s: WrapObj[State], callback: UndefOr[JFn]): Unit = js.native
     @JSName("setState") private[react] def _modState(s: js.Function1[WrapObj[State], WrapObj[State]], callback: UndefOr[JFn]): Unit = js.native
   }
 
+  @js.native
   trait HasBackend[+Backend] extends Object {
     def backend: Backend = js.native
   }
 
+  @js.native
   trait CanGetInitialState[-Props, +State] extends Object {
     @JSName("getInitialState") private[react] def _getInitialState(s: WrapObj[Props]): WrapObj[State] = js.native
   }
 
   /** Functions available to components when they're mounted. */
+  @js.native
   trait Mounted[+Node <: TopNode] extends Object {
     def refs: RefsObject = js.native
 
@@ -57,11 +64,16 @@ object CompScope {
     @JSName("forceUpdate") private[react] def _forceUpdate(): Unit = js.native
   }
 
+  @js.native
   trait ReadDirect    extends Object
+  @js.native
   trait ReadCallback  extends Object
+  @js.native
   trait WriteDirect   extends Object
+  @js.native
   trait WriteCallback extends Object
 
+  @js.native
   trait AnyUnmounted[Props, State, +Backend]
     extends AlwaysAvailable
        with HasProps[Props]
@@ -70,26 +82,31 @@ object CompScope {
        with HasBackend[Backend]
        // prohibits: IsMounted
 
+  @js.native
   trait AnyMounted[Props, State, +Backend, +Node <: TopNode]
     extends AnyUnmounted[Props, State, Backend]
        with Mounted[Node]
        with ReactComponentTypeAuxJ[Props, State, Backend, Node]
 
+  @js.native
   trait AnyDuringCallback
     extends ReadDirect
        with WriteCallback
 
   /** Type of an unmounted component's `this` scope, as available within lifecycle methods. */
+  @js.native
   trait DuringCallbackU[Props, State, +Backend]
     extends AnyUnmounted[Props, State, Backend]
        with AnyDuringCallback
 
   /** Type of a mounted component's `this` scope, as available within lifecycle methods. */
+  @js.native
   trait DuringCallbackM[Props, State, +Backend, +Node <: TopNode]
     extends AnyMounted[Props, State, Backend, Node]
        with AnyDuringCallback
 
   /** Type of a component's `this` scope during componentWillUpdate. */
+  @js.native
   trait WillUpdate[Props, +State, +Backend, +Node <: TopNode]
     extends AlwaysAvailable
        with HasProps[Props]
@@ -104,6 +121,7 @@ object CompScope {
 import CompScope._
 
 /** Type of a component's `this` scope as is available to backends. */
+@js.native
 trait BackendScope[Props, State]
   extends AlwaysAvailable
      with HasProps[Props]
@@ -117,61 +135,73 @@ trait BackendScope[Props, State]
 // =====================================================================================================================
 
 /** Type of `this.refs` */
+@js.native
 trait RefsObject extends Object {
   @JSBracketAccess
   def apply[Node <: TopNode](key: String): UndefOr[ReactComponentM_[Node]] = js.native
 }
 
 /** Additional methods that React mixes into `this.props` */
+@js.native
 trait PropsMixedIn extends Object {
   def children: PropsChildren = js.native
 }
 
 /** Type of `this.props.children` */
+@js.native
 trait PropsChildren extends Object
 
 /**
  * https://facebook.github.io/react/docs/glossary.html indicates children can be a super type of ReactElement.
  * Array and null are acceptable, thus this can be 0-n elements.
  */
+@js.native
 trait ReactNode extends Object
 
 /** ReactElement = ReactComponentElement | ReactDOMElement  */
+@js.native
 trait ReactElement extends Object with ReactNode {
   def key: UndefOr[String] = js.native
   def ref: UndefOr[String] = js.native
 }
 
 /** A React virtual DOM element, such as 'div', 'table', etc. */
+@js.native
 trait ReactDOMElement extends ReactElement {
   def `type`: String = js.native
   def props : Object = js.native
 }
 
 /** An instance of a React component. Prefer using the subtype ReactComponentU instead. */
+@js.native
 trait ReactComponentElement[Props]
   extends ReactElement
      with HasProps[Props]
 
 /** A JS function that creates a React component instance. */
+@js.native
 trait ReactComponentC_ extends JFn
 
 /** An unmounted component. Not guaranteed to have been created by Scala, could be a React addon. */
+@js.native
 trait ReactComponentU_ extends ReactElement
 
 /** A mounted component. Not guaranteed to have been created by Scala, could be a React addon. */
+@js.native
 trait ReactComponentM_[+Node <: TopNode]
   extends ReactComponentU_
      with Mounted[Node]
 
 /** The underlying function that creates a Scala-based React component instance. */
+@js.native
 trait ReactComponentCU[Props, State, +Backend, +Node <: TopNode]
   extends ReactComponentC_
      with ReactComponentTypeAuxJ[Props, State, Backend, Node] {
   def apply(props: WrapObj[Props], children: ReactNode*): ReactComponentU[Props, State, Backend, Node] = js.native
 }
 
 /** An unmounted Scala component. */
+@js.native
 trait ReactComponentU[Props, State, +Backend, +Node <: TopNode]
   extends ReactComponentU_
      with AnyUnmounted[Props, State, Backend]
@@ -180,30 +210,37 @@ trait ReactComponentU[Props, State, +Backend, +Node <: TopNode]
      with WriteDirect
 
 /** A mounted Scala component. */
+@js.native
 trait ReactComponentM[Props, State, +Backend, +Node <: TopNode]
   extends ReactComponentU[Props, State, Backend, Node]
      with ReactComponentM_[Node]
      with AnyMounted[Props, State, Backend, Node]
 
+@js.native
 trait ReactComponentSpec[Props, State, +Backend, +Node <: TopNode] extends Object with ReactComponentTypeAuxJ[Props, State, Backend, Node]
 
 /**
  * A component created via [[React.createClass]].
  */
+@js.native
 trait ReactClass[Props, State, +Backend, +Node <: TopNode] extends Object with ReactComponentTypeAuxJ[Props, State, Backend, Node]
 
 // =====================================================================================================================
 
+@js.native
 trait JsComponentType[Props <: js.Any, State <: js.Any, +Node <: TopNode] extends Object
 
+@js.native
 trait JsComponentC[Props <: js.Any, State <: js.Any, +Node <: TopNode] extends ReactComponentC_ with JsComponentType[Props, State, Node] {
   def apply(props: Props, children: ReactNode*): JsComponentU[Props, State, Node] = js.native
 }
 
+@js.native
 trait JsComponentU[Props <: js.Any, State <: js.Any, +Node <: TopNode]
   extends ReactComponentU_
   with JsComponentType[Props, State, Node]
 
+@js.native
 trait JsComponentM[Props <: js.Any, State <: js.Any, +Node <: TopNode]
   extends JsComponentU[Props, State, Node]
   with Mounted[Node] with ReactComponentM_[Node] {

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.4")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.5")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 

test/src/main/scala/japgolly/scalajs/react/test/ReactTestUtils.scala

@@ -1,12 +1,16 @@
 package japgolly.scalajs.react.test
 
+import scala.scalajs.js
 import scala.scalajs.js.{Function1 => JFn1, Object, Array, UndefOr, undefined, Dynamic, native}
 import scala.scalajs.js.annotation.JSName
 import japgolly.scalajs.react._
 
 /** https://facebook.github.io/react/docs/test-utils.html */
+@js.native
 @JSName("React.addons.TestUtils")
 object ReactTestUtils extends ReactTestUtils
+
+@js.native
 trait ReactTestUtils extends Object {
 
   def Simulate: Simulate = native
@@ -74,6 +78,7 @@ trait ReactTestUtils extends Object {
   def findRenderedComponentWithType(tree: ComponentM, c: ComponentClass): ComponentM = native
 }
 
+@js.native
 trait Simulate extends Object {
   def beforeInput      (t: ReactOrDomNode, eventData: Object = native): Unit = native
   def blur             (t: ReactOrDomNode, eventData: Object = native): Unit = native