Skip to content

Commit 3df9147

Browse files
committed
Merge remote-tracking branch 'origin/master' into michael/event-utilities
2 parents 39b1119 + 5ed9e3e commit 3df9147

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

Diff for: examples/component/src/Container.purs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
module Container where
22

3-
import Prelude
4-
53
import React.Basic (ReactComponent, createElement, stateless)
64
import React.Basic.DOM as R
75
import ToggleButton as ToggleButton
86

9-
component :: ReactComponent Unit
7+
component :: ReactComponent {}
108
component = stateless
119
{ displayName: "Container"
1210
, render: \_ ->

Diff for: generated-docs/React/Basic.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#### `react`
44

55
``` purescript
6-
react :: forall props state fx. { displayName :: String, initialState :: { | state }, receiveProps :: props -> { | state } -> (SetState state fx) -> Eff (react :: ReactFX | fx) Unit, render :: props -> { | state } -> (SetState state fx) -> JSX } -> ReactComponent props
6+
react :: forall props state fx. { displayName :: String, initialState :: { | state }, receiveProps :: { | props } -> { | state } -> (SetState state fx) -> Eff (react :: ReactFX | fx) Unit, render :: { | props } -> { | state } -> (SetState state fx) -> JSX } -> ReactComponent { | props }
77
```
88

99
Create a React component from a _specification_ of that component.
@@ -19,7 +19,7 @@ module (and re-exported here).
1919
#### `stateless`
2020

2121
``` purescript
22-
stateless :: forall props. { displayName :: String, render :: props -> JSX } -> ReactComponent props
22+
stateless :: forall props. { displayName :: String, render :: { | props } -> JSX } -> ReactComponent { | props }
2323
```
2424

2525
Create a stateless React component.
@@ -30,7 +30,7 @@ components which don't use state.
3030
#### `createElement`
3131

3232
``` purescript
33-
createElement :: forall props. ReactComponent props -> props -> JSX
33+
createElement :: forall props. ReactComponent { | props } -> { | props } -> JSX
3434
```
3535

3636
Create a `JSX` node from a React component, by providing the props.

Diff for: src/React/Basic.purs

+11-11
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ react
3838
:: forall props state fx
3939
. { displayName :: String
4040
, initialState :: { | state }
41-
, receiveProps :: props -> { | state } -> (SetState state fx) -> Eff (react :: ReactFX | fx) Unit
42-
, render :: props -> { | state } -> (SetState state fx) -> JSX
41+
, receiveProps :: { | props } -> { | state } -> (SetState state fx) -> Eff (react :: ReactFX | fx) Unit
42+
, render :: { | props } -> { | state } -> (SetState state fx) -> JSX
4343
}
44-
-> ReactComponent props
44+
-> ReactComponent { | props }
4545
react { displayName, initialState, receiveProps, render } =
4646
component_
4747
{ displayName
@@ -57,9 +57,9 @@ react { displayName, initialState, receiveProps, render } =
5757
stateless
5858
:: forall props
5959
. { displayName :: String
60-
, render :: props -> JSX
60+
, render :: { | props } -> JSX
6161
}
62-
-> ReactComponent props
62+
-> ReactComponent { | props }
6363
stateless { displayName, render } =
6464
react
6565
{ displayName
@@ -74,8 +74,8 @@ type SetState state fx = ({ | state } -> { | state }) -> Eff (react :: ReactFX |
7474
-- | Create a `JSX` node from a React component, by providing the props.
7575
createElement
7676
:: forall props
77-
. ReactComponent props
78-
-> props
77+
. ReactComponent { | props }
78+
-> { | props }
7979
-> JSX
8080
createElement = runFn2 createElement_
8181

@@ -104,12 +104,12 @@ foreign import component_
104104
:: forall props state fx
105105
. { displayName :: String
106106
, initialState :: { | state }
107-
, receiveProps :: EffFn3 (react :: ReactFX | fx) props { | state } (SetState state fx) Unit
108-
, render :: Fn3 props { | state } (SetState state fx) JSX
107+
, receiveProps :: EffFn3 (react :: ReactFX | fx) { | props } { | state } (SetState state fx) Unit
108+
, render :: Fn3 { | props } { | state } (SetState state fx) JSX
109109
}
110-
-> ReactComponent props
110+
-> ReactComponent { | props }
111111

112-
foreign import createElement_ :: forall props. Fn2 (ReactComponent props) props JSX
112+
foreign import createElement_ :: forall props. Fn2 (ReactComponent { | props }) { | props } JSX
113113

114114
foreign import createElementKeyed_ :: forall props. Fn2 (ReactComponent { | props }) { key :: String | props } JSX
115115

0 commit comments

Comments
 (0)