Remove use of __current

Author: paf31

README.md

@@ -31,22 +31,22 @@ import Control.Monad.Eff
 import React
 import React.DOM
 
-hello = mkUI spec do
-  props <- getProps
+hello = mkUI (spec unit) \ctx -> do
+  props <- getProps ctx
   return $ h1 [ className "Hello"
               ] 
               [ text "Hello, "
               , text props.name
               ]
 
-incrementCounter e = do
-  val <- readState
-  writeState (val + 1)
+incrementCounter ctx e = do
+  val <- readState ctx
+  writeState ctx (val + 1)
 
-counter = mkUI (spec { getInitialState = return 0 }) do
-  val <- readState
+counter = mkUI (spec 0) \ctx -> do
+  val <- readState ctx
   return $ p [ className "Counter"
-             , onClick incrementCounter
+             , onClick (incrementCounter ctx)
              ] 
              [ text (show val)
              , text " Click me to increment!"

docs/React.md

@@ -1,201 +1,213 @@
 ## Module React
 
+This module defines foreign types and functions which wrap React's functionality.
+
 #### `UI`
 
 ``` purescript
 data UI :: *
 ```
 
+A virtual DOM node, or component.
+
 #### `UIRef`
 
 ``` purescript
-data UIRef :: # ! -> *
+data UIRef :: *
 ```
 
+A reference to a component, essentially React's `this`.
+
 #### `EventHandler`
 
 ``` purescript
 data EventHandler :: * -> *
 ```
 
+An event handler. The type argument represents the type of the event.
+
 #### `Disallowed`
 
 ``` purescript
 data Disallowed :: !
 ```
 
+This phantom effect indicates that both read and write access to a resource are disallowed.
+
 #### `ReadAllowed`
 
 ``` purescript
 data ReadAllowed :: !
 ```
 
+This phantom effect indicates that only read access to a resource is allowed.
+
 #### `WriteAllowed`
 
 ``` purescript
 data WriteAllowed :: !
 ```
 
+This phantom effect indicates that only write access to a resource is allowed.
+
 #### `ReactState`
 
 ``` purescript
 data ReactState :: # ! -> * -> !
 ```
 
+This effect indicates that a computation may read or write the component state.
+
 #### `ReactProps`
 
 ``` purescript
 data ReactProps :: * -> !
 ```
 
+This effect indicates that a computation may read the component props.
+
 #### `ReactRefs`
 
 ``` purescript
 data ReactRefs :: * -> !
 ```
 
-#### `noop0`
+This effect indicates that a computation may read the component refs.
 
-``` purescript
-noop0 :: forall eff result. Eff eff result
-```
-
-#### `noop1`
+#### `Event`
 
 ``` purescript
-noop1 :: forall a eff result. a -> Eff eff result
+data Event :: *
 ```
 
-#### `noop2`
+The type of DOM events.
 
-``` purescript
-noop2 :: forall a b eff result. a -> b -> Eff eff result
-```
-
-#### `Render`
+#### `MouseEvent`
 
 ``` purescript
-type Render props refs state eff = Eff (props :: ReactProps props, refs :: Disallowed, state :: ReactState (read :: ReadAllowed) state | eff) UI
+type MouseEvent = { pageX :: Number, pageY :: Number }
 ```
 
-#### `UISpec`
+The type of mouse events.
 
-``` purescript
-type UISpec props refs state eff1 eff2 eff3 eff4 eff5 eff6 eff7 eff8 = { getInitialState :: Eff (props :: ReactProps props, state :: Disallowed, refs :: Disallowed | eff1) state, componentWillMount :: Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: Disallowed | eff2) Unit, componentDidMount :: Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff3) Unit, componentWillReceiveProps :: props -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff4) Unit, shouldComponentUpdate :: props -> state -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff5) Boolean, componentWillUpdate :: props -> state -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff6) Unit, componentDidUpdate :: props -> state -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed) state, refs :: ReactRefs refs | eff7) Unit, componentWillUnmount :: Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed) state, refs :: ReactRefs refs | eff8) Unit }
-```
-
-#### `spec`
+#### `KeyboardEvent`
 
 ``` purescript
-spec :: forall props refs state eff1 eff2 eff3 eff4 eff5 eff6 eff7 eff8. UISpec props refs state eff1 eff2 eff3 eff4 eff5 eff6 eff7 eff8
+type KeyboardEvent = { altKey :: Boolean, ctrlKey :: Boolean, charCode :: Int, key :: String, keyCode :: Int, locale :: String, location :: Int, metaKey :: Boolean, repeat :: Boolean, shiftKey :: Boolean, which :: Int }
 ```
 
-#### `getProps`
+The type of keyboard events.
 
-``` purescript
-getProps :: forall props eff. Eff (props :: ReactProps props | eff) props
-```
-
-#### `getRefs`
+#### `EventHandlerContext`
 
 ``` purescript
-getRefs :: forall refs eff. Eff (refs :: ReactRefs refs | eff) refs
+type EventHandlerContext eff props refs state result = Eff (props :: ReactProps props, refs :: ReactRefs refs, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state | eff) result
 ```
 
-#### `writeState`
+A function which handles events.
 
-``` purescript
-writeState :: forall state statePerms eff. state -> Eff (state :: ReactState (read :: ReadAllowed, write :: WriteAllowed | statePerms) state | eff) state
-```
-
-#### `readState`
+#### `Render`
 
 ``` purescript
-readState :: forall state statePerms eff. Eff (state :: ReactState (read :: ReadAllowed | statePerms) state | eff) state
+type Render props refs state eff = UIRef -> Eff (props :: ReactProps props, refs :: Disallowed, state :: ReactState (read :: ReadAllowed) state | eff) UI
 ```
 
-#### `getSelf`
+A rendering function.
 
-``` purescript
-getSelf :: forall eff. Eff eff (UIRef eff)
-```
-
-#### `runUI`
+#### `UISpec`
 
 ``` purescript
-runUI :: forall refEff eff result. UIRef refEff -> Eff refEff result -> Eff eff result
+type UISpec props refs state eff = { getInitialState :: UIRef -> Eff (props :: ReactProps props, state :: Disallowed, refs :: Disallowed | eff) state, componentWillMount :: UIRef -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: Disallowed | eff) Unit, componentDidMount :: UIRef -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff) Unit, componentWillReceiveProps :: UIRef -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff) Unit, shouldComponentUpdate :: UIRef -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff) Boolean, componentWillUpdate :: UIRef -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state, refs :: ReactRefs refs | eff) Unit, componentDidUpdate :: UIRef -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed) state, refs :: ReactRefs refs | eff) Unit, componentWillUnmount :: UIRef -> Eff (props :: ReactProps props, state :: ReactState (read :: ReadAllowed) state, refs :: ReactRefs refs | eff) Unit }
 ```
 
-#### `mkUI`
+A specification of a component.
+
+#### `spec`
 
 ``` purescript
-mkUI :: forall props refs state eff eff1 eff2 eff3 eff4 eff5 eff6 eff7 eff8. UISpec props refs state eff1 eff2 eff3 eff4 eff5 eff6 eff7 eff8 -> Render props refs state eff -> props -> UI
+spec :: forall props refs state eff. state -> UISpec props refs state eff
 ```
 
-#### `DOMEvent`
+Create a component specification.
+
+#### `getProps`
 
 ``` purescript
-type DOMEvent = forall attrs. {  | attrs }
+getProps :: forall props eff. UIRef -> Eff (props :: ReactProps props | eff) props
 ```
 
-#### `DOMEventTarget`
+Read the component props.
+
+#### `getRefs`
 
 ``` purescript
-type DOMEventTarget = forall attrs. {  | attrs }
+getRefs :: forall refs eff. UIRef -> Eff (refs :: ReactRefs refs | eff) refs
 ```
 
-#### `Event`
+Read the component refs.
+
+#### `writeState`
 
 ``` purescript
-type Event = { bubbles :: Boolean, cancelable :: Boolean, currentTarget :: DOMEventTarget, defaultPrevented :: Boolean, eventPhase :: Number, isTrusted :: Boolean, nativeEvent :: DOMEvent, preventDefault :: {  } -> {  }, stopPropagation :: {  } -> {  }, target :: DOMEventTarget, timeStamp :: Number, eventType :: String }
+writeState :: forall state eff. UIRef -> state -> Eff (state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state | eff) state
 ```
 
-#### `MouseEvent`
+Write the component state.
+
+#### `readState`
 
 ``` purescript
-type MouseEvent = { pageX :: Number, pageY :: Number }
+readState :: forall state stateEff eff. UIRef -> Eff (state :: ReactState (read :: ReadAllowed | stateEff) state | eff) state
 ```
 
-#### `KeyboardEvent`
+Read the component state.
+
+#### `transformState`
 
 ``` purescript
-type KeyboardEvent = { altKey :: Boolean, ctrlKey :: Boolean, charCode :: Number, key :: String, keyCode :: Number, locale :: String, location :: Number, metaKey :: Boolean, repeat :: Boolean, shiftKey :: Boolean, which :: Number }
+transformState :: forall state statePerms eff. UIRef -> (state -> state) -> Eff (state :: ReactState (read :: ReadAllowed, write :: WriteAllowed) state | eff) state
 ```
 
-#### `EventHandlerContext`
+Transform the component state by applying a function.
+
+#### `mkUI`
 
 ``` purescript
-type EventHandlerContext eff props refs state result = forall statePerms. Eff (props :: ReactProps props, refs :: ReactRefs refs, state :: ReactState (read :: ReadAllowed, write :: WriteAllowed | statePerms) state | eff) result
+mkUI :: forall props refs state eff. UISpec props refs state eff -> Render props refs state eff -> props -> UI
 ```
 
+Create a component from a component spec.
+
 #### `handle`
 
 ``` purescript
 handle :: forall eff ev props refs state result. (ev -> EventHandlerContext eff props refs state result) -> EventHandler ev
 ```
 
+Create an event handler.
+
 #### `renderToString`
 
 ``` purescript
 renderToString :: UI -> String
 ```
 
+Render a component as a string.
+
 #### `renderToBody`
 
 ``` purescript
 renderToBody :: forall eff. UI -> Eff (dom :: DOM | eff) UI
 ```
 
+Render a component to the document body.
+
 #### `renderToElementById`
 
 ``` purescript
 renderToElementById :: forall eff. String -> UI -> Eff (dom :: DOM | eff) UI
 ```
 
-#### `deferred`
-
-``` purescript
-deferred :: forall a eff. Eff eff a -> Eff eff a
-```
+Render a component to the element with the specified ID.
 
 

example/index.html

@@ -1,17 +1,10 @@
 <!doctype>
 <html>
 <head>
-<style>
-.Counter, .Hello {
-  cursor: pointer;
-  user-select: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-}
-</style>
+  <title>purescript-react example</title>
 </head>
 <body>
-<script src="../bower_components/react/react.js"></script>
-<script src="index.js"></script>
+  <script src="../bower_components/react/react.js"></script>
+  <script src="index.js"></script>
 </body>
 </html>