Upgrade to purescript 0.12, purescript-react 6.0.0

* Have to use createElementUnsafe, createLeafElementUnsafe due to
  purescript-contrib/purescript-react#151
* Change createNoChild to use createLeafElementUnsafe
* Change from Eff eff to Effect
* Fix imports
* Change unsafe components to require record props

Author: jvliwanag

README.md

@@ -27,7 +27,7 @@ place to go for help. This will be acheived by:
 lagging behind or the component does not yet have a safe version, it's still possible to use
 the library without too much hassle.
 
-- Stay event framework agnostic. This is acheived by using `EffFnX` to model the event callbacks.
+- Stay event framework agnostic. This is acheived by using `EffectFnX` to model the event callbacks.
 There will be additional libraries for your favourite action library - e.g. `purescript-reactnative-thermite`
 I have also made a very small and simple library for dispatching react actions [purescript-dispatcher-react](http://github.com/doolse/purescript-dispatcher-react).
 
@@ -168,7 +168,7 @@ Replace the contents of `src/Main.purs` with
 module Main where
 
 import Prelude
-import Control.Monad.Eff (Eff)
+import Effect (Eff)
 import React (ReactClass, ReactElement, Render, createClass, getProps, spec)
 import ReactNative.API (REGISTER, registerComponent)
 import ReactNative.Components.Text (text_)

src/ReactNative/API/API.purs

@@ -1,25 +1,21 @@
 module ReactNative.API (
-  alert, ALERT
+  alert
 , keyboardDismiss
-, registerComponent, REGISTER
+, registerComponent
 ) where
 
-import Control.Monad.Eff (kind Effect, Eff)
+import Effect (Effect)
 import Data.Function.Uncurried (Fn4, runFn4)
 import Data.Maybe (Maybe)
 import Data.Nullable (Nullable, toNullable)
 import Data.Unit (Unit)
 import React (ReactClass)
 
-foreign import data ALERT :: Effect
+foreign import alertImpl :: forall b o. Fn4 String (Nullable String) b o (Effect Unit)
 
-foreign import alertImpl :: forall e b o. Fn4 String (Nullable String) b o (Eff (alert::ALERT|e) Unit)
-
-
-alert :: forall e. String -> Maybe String -> Eff (alert::ALERT|e) Unit
+alert :: String -> Maybe String -> Effect Unit
 alert s ms = runFn4 alertImpl s (toNullable ms) [] {}
 
-foreign import keyboardDismiss :: forall eff. Eff eff Unit
+foreign import keyboardDismiss :: Effect Unit
 
-foreign import data REGISTER :: Effect
-foreign import registerComponent :: forall e props. String -> ReactClass props -> Eff (register::REGISTER|e) Unit
+foreign import registerComponent :: forall props. String -> ReactClass props -> Effect Unit

src/ReactNative/Android/API.purs

@@ -1,11 +1,11 @@
 module ReactNative.Android.API where
 
 import Prelude
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Uncurried (EffFn1, EffFn2, runEffFn2)
+import Effect (Effect)
+import Effect.Uncurried (EffectFn1, EffectFn2, runEffectFn2)
 
-foreign import backAndroidAddListener :: forall eff. EffFn2 eff String (EffFn1 eff Unit Boolean) Unit
-foreign import exitApp :: forall eff. Int -> Eff eff Unit
+foreign import backAndroidAddListener :: EffectFn2 String (EffectFn1 Unit Boolean) Unit
+foreign import exitApp :: Int -> Effect Unit
 
-addBackEventCallback :: forall eff. EffFn1 eff Unit Boolean -> Eff eff Unit
-addBackEventCallback = runEffFn2 backAndroidAddListener "hardwareBackPress"
+addBackEventCallback :: EffectFn1 Unit Boolean -> Effect Unit
+addBackEventCallback = runEffectFn2 backAndroidAddListener "hardwareBackPress"

src/ReactNative/Android/Components.purs

@@ -13,7 +13,7 @@ module ReactNative.Android.Components (
 ) where
 
 import Prelude
-import Control.Monad.Eff (Eff)
+import Effect (Effect)
 import Data.Maybe (Maybe(..))
 import ReactNative.Optional (class Optional)
 import React (ReactElement, ReactThis)
@@ -25,11 +25,11 @@ import ReactNative.PropTypes.Color (Color)
 import ReactNative.Unsafe.ApplyProps (unsafeApplyProps)
 import ReactNative.Unsafe.Components (drawerLayoutAndroidU, toolbarAndroidU)
 
-type ToolbarAndroidPropO eff = ViewPropsEx eff (
+type ToolbarAndroidPropO = ViewPropsEx (
     actions :: Array ToolbarAction
   , navIcon :: ImageSource
-  , onIconClicked :: UnitEventHandler eff
-  , onActionSelected :: EventHandler eff Int
+  , onIconClicked :: UnitEventHandler
+  , onActionSelected :: EventHandler Int
   , title :: String
   , titleColor :: Color
   , contentInsetEnd :: Int
@@ -42,8 +42,8 @@ type ToolbarAndroidPropO eff = ViewPropsEx eff (
 ) () ()
 
 -- | Create a [ToolbarAndroid](https://facebook.github.io/react-native/docs/toolbarandroid.html) component
-toolbarAndroid' :: forall eff o
-  .  Optional o (ToolbarAndroidPropO eff)
+toolbarAndroid' :: forall o
+  .  Optional o ToolbarAndroidPropO
   => {|o} -> Array ReactElement -> ReactElement
 toolbarAndroid' = toolbarAndroidU <<< unsafeApplyProps
 
@@ -108,27 +108,27 @@ type DrawerLayoutProps o = {
   | o
 }
 
-type DrawerLayoutPropsO eff = (
+type DrawerLayoutPropsO = (
     ref :: RefType DrawerLayoutRef
   , drawerBackgroundColor :: Color
   , drawerLockMode :: DrawerLockMode
   , keyboardDismissMode :: DrawerKeyboardDismissMode
-  , onDrawerClose :: EventHandler eff Unit
-  , onDrawerOpen :: EventHandler eff Unit
-  , onDrawerSlide :: EventHandler eff Unit
-  , onDrawerStateChanged :: EventHandler eff Unit
+  , onDrawerClose :: EventHandler Unit
+  , onDrawerOpen :: EventHandler Unit
+  , onDrawerSlide :: EventHandler Unit
+  , onDrawerStateChanged :: EventHandler Unit
   , statusBarBackgroundColor :: Color
 )
 
 newtype DrawerLayoutRef = DrawerLayoutRef (forall p s. ReactThis p s)
 
 -- | Create a [DrawerLayoutAndroid](https://facebook.github.io/react-native/docs/drawerlayoutandroid.html) component
-drawerLayoutAndroid' :: forall eff o
-  .  Optional o (DrawerLayoutPropsO eff)
+drawerLayoutAndroid' :: forall o
+  .  Optional o DrawerLayoutPropsO
   => DrawerLayoutProps o
   -> Array ReactElement
   -> ReactElement
 drawerLayoutAndroid' = drawerLayoutAndroidU <<< unsafeApplyProps
 
-foreign import openDrawer :: forall eff. DrawerLayoutRef -> Eff eff Unit
-foreign import closeDrawer :: forall eff. DrawerLayoutRef -> Eff eff Unit
+foreign import openDrawer :: DrawerLayoutRef -> Effect Unit
+foreign import closeDrawer :: DrawerLayoutRef -> Effect Unit

src/ReactNative/Components/ActivityIndicator.purs

@@ -20,7 +20,7 @@ type ActivityIndicatorProps r = {
   | r
 }
 
-type ActivityIndicatorPropsO eff = ViewPropsEx eff (
+type ActivityIndicatorPropsO = ViewPropsEx (
     color :: Color
   , size :: ActivityIndicatorSize
 ) () (
@@ -32,8 +32,8 @@ activityIndicator :: Boolean -> ReactElement
 activityIndicator animating = activityIndicatorU {animating}
 
 -- | Create an ActivityIndicator with props and the `animating` flag
-activityIndicator' :: forall eff o
-  .  Optional o (ActivityIndicatorPropsO eff)
+activityIndicator' :: forall o
+  .  Optional o ActivityIndicatorPropsO
   => ActivityIndicatorProps o -> ReactElement
 activityIndicator' = activityIndicatorU <<< unsafeApplyProps
 

src/ReactNative/Components/Button.purs

@@ -11,22 +11,22 @@ import ReactNative.Unsafe.ApplyProps (unsafeApplyProps)
 import ReactNative.Unsafe.Components (buttonU)
 import Prelude
 
-type ButtonPropsO eff = (
+type ButtonPropsO = (
     accessibilityLabel :: String
   , color :: Color
   , disabled :: Boolean
-  , onPress :: EventHandler eff TouchEvent
+  , onPress :: EventHandler TouchEvent
   , title :: String
 )
 
 -- | Create a button with the given `title` and `onPress` handler
-button :: forall eff. String -> EventHandler eff TouchEvent -> ReactElement
+button :: String -> EventHandler TouchEvent -> ReactElement
 button title onPress = buttonU {title, onPress}
 
 -- | Create a button with the given `title`
 button_ :: String -> ReactElement
 button_ title = buttonU {title}
 
 -- | Create a button with the given props and `title`
-button' :: forall o eff. Optional o (ButtonPropsO eff) => {|o} -> ReactElement
+button' :: forall o. Optional o ButtonPropsO => {|o} -> ReactElement
 button' = buttonU <<< unsafeApplyProps

src/ReactNative/Components/Image.purs

@@ -19,13 +19,13 @@ type ImageProps r = {
   | r
 }
 
-type ImagePropsO eff = BaseProps (
+type ImagePropsO = BaseProps (
     style :: Styles
-  , onError :: UnitEventHandler eff
-  , onLayout :: EventHandler eff LayoutEvent
-  , onLoad :: UnitEventHandler eff
-  , onLoadEnd :: UnitEventHandler eff
-  , onLoadStart :: UnitEventHandler eff
+  , onError :: UnitEventHandler
+  , onLayout :: EventHandler LayoutEvent
+  , onLoad :: UnitEventHandler
+  , onLoadEnd :: UnitEventHandler
+  , onLoadStart :: UnitEventHandler
   , resizeMode :: ResizeMode
   , android :: {
       resizeMethod :: ResizeMethod
@@ -36,8 +36,8 @@ type ImagePropsO eff = BaseProps (
     , blurRadius :: Number
     , capInsets :: {top::Number, left::Number, bottom::Number, right::Number}
     , defaultSource :: ImageSource
-    , onPartialLoad :: UnitEventHandler eff
-    , onProgress :: EventHandler eff ImageProgressEvent
+    , onPartialLoad :: UnitEventHandler
+    , onProgress :: EventHandler ImageProgressEvent
     }
 )
 
@@ -50,8 +50,8 @@ backgroundImage style source = imageU {style, source}
 -- | Create a background image with props and source
 -- |
 -- | Background images are simply normal images with children overalayed ontop
-backgroundImage' :: forall eff o
-  .  Optional o (ImagePropsO eff)
+backgroundImage' :: forall o
+  .  Optional o ImagePropsO
   => ImageProps o -> Array ReactElement -> ReactElement
 backgroundImage' = imageU <<< unsafeApplyProps
 
@@ -64,8 +64,8 @@ image :: Styles -> ImageSource -> ReactElement
 image style source = imageU {style, source} []
 
 -- | Create an Image with props and source
-image' :: forall eff o
-  .  Optional o (ImagePropsO eff)
+image' :: forall o
+  .  Optional o ImagePropsO
   => ImageProps o -> ReactElement
 image' p = imageU (unsafeApplyProps p) []
 

src/ReactNative/Components/ListView.purs

@@ -13,12 +13,12 @@ module ReactNative.Components.ListView (
 ) where
 
 import Prelude
-import Control.Monad.Eff.Uncurried (EffFn2)
+import Effect.Uncurried (EffectFn2)
 import Data.Function.Uncurried (Fn2, Fn3, Fn4, mkFn2, mkFn4, runFn3, runFn4)
 import Data.Maybe (Maybe(..))
 import Data.Nullable (Nullable, toNullable)
+import Foreign.Object (Object)
 import ReactNative.Optional (class Optional)
-import Data.StrMap (StrMap)
 import React (ReactElement)
 import ReactNative.Components.ScrollView (ScrollViewPropsEx)
 import ReactNative.Events (EventHandler, EventHandler2, ScrollEvent)
@@ -37,11 +37,11 @@ type ListViewProps a section blob r = {
   | r
 }
 
-type ListViewPropsO section eff = ScrollViewPropsEx eff (
+type ListViewPropsO section = ScrollViewPropsEx (
     enableEmptySections :: Boolean
   , initialListSize :: Int
-  , onChangeVisibleRows :: EventHandler2 eff RowMap RowMap
-  , onEndReached :: EventHandler eff (Nullable ScrollEvent)
+  , onChangeVisibleRows :: EventHandler2 RowMap RowMap
+  , onEndReached :: EventHandler (Nullable ScrollEvent)
   , onEndReachedThreshold :: Int
   , pageSize :: Int
   , renderFooter :: Unit -> ReactElement
@@ -57,8 +57,8 @@ listView :: forall blob a section. ListViewDataSource' blob a section -> (a -> R
 listView dataSource rf = listViewU {dataSource,renderRow:rowRenderer rf,enableEmptySections:true}
 
 -- | Create a list view with props, a data source and a row renderer
-listView' :: forall o blob a section eff
-  .  Optional o (ListViewPropsO section eff)
+listView' :: forall o blob a section
+  .  Optional o (ListViewPropsO section)
   => ListViewProps a section blob o
   -> ReactElement
 listView' = listViewU <<< unsafeApplyProps
@@ -97,8 +97,8 @@ class DataSourceRowCloneable blob a | blob -> a
 class DataSourceSectionCloneable blob a section | blob -> a, blob -> section
 
 instance arrayRowCloneable :: DataSourceRowCloneable (Array a) a
-instance strMapMapCloneable :: DataSourceSectionCloneable (StrMap (StrMap a)) a (StrMap a)
-instance strMapArrayCloneable :: DataSourceSectionCloneable (StrMap (Array a)) a (Array a)
+instance strMapMapCloneable :: DataSourceSectionCloneable (Object (Object a)) a (Object a)
+instance strMapArrayCloneable :: DataSourceSectionCloneable (Object (Array a)) a (Array a)
 instance arrayArrayCloneable :: DataSourceSectionCloneable (Array (Array a)) a (Array a)
 
 cloneWithRowsAndSections :: forall blob a section. DataSourceSectionCloneable blob a section => ListViewDataSource' blob a section -> blob -> ListViewDataSource' blob a section
@@ -135,7 +135,7 @@ foreign import data SectionRenderer :: Type -> Type
 rowRenderer :: forall a. (a -> ReactElement) -> RowRenderer a
 rowRenderer = unsafeCoerce
 
-rowRenderer' :: forall a eff. (a -> SectionId -> RowId -> EffFn2 eff SectionId RowId Unit -> ReactElement) -> RowRenderer a
+rowRenderer' :: forall a. (a -> SectionId -> RowId -> EffectFn2 SectionId RowId Unit -> ReactElement) -> RowRenderer a
 rowRenderer' = unsafeCoerce <<< mkFn4
 
 sectionRenderer :: forall section. (section -> ReactElement) -> SectionRenderer section
@@ -144,4 +144,4 @@ sectionRenderer = unsafeCoerce
 sectionRenderer' :: forall section. (section -> SectionId -> ReactElement) -> SectionRenderer section
 sectionRenderer' = unsafeCoerce <<< mkFn2
 
-type RowMap = StrMap (StrMap Boolean)
+type RowMap = Object (Object Boolean)

src/ReactNative/Components/Modal.purs

@@ -37,37 +37,37 @@ orientationType = {
   , landscape: Orientation "landscape"
 }
 
-type OnRequestClose eff =  UnitEventHandler eff
+type OnRequestClose = UnitEventHandler
 
-type ModalPropsO a eff = (
+type ModalPropsO a = (
     animationType :: AnimationType
-  , onShow :: UnitEventHandler eff
+  , onShow :: UnitEventHandler
   , transparent :: Boolean
   , visible :: Boolean
   , android :: {
       hardwareAccelerated :: Boolean
-    , onRequestClose :: OnRequestClose eff
+    , onRequestClose :: OnRequestClose
   }
   , ios :: {
-      onOrientationChange :: EventHandler eff Orientation
+      onOrientationChange :: EventHandler Orientation
     , supportedOrientations :: Array Orientation
   }
 )
 
-modal' :: forall a eff o
-  .  Optional o (ModalPropsO a eff)
+modal' :: forall a o
+  .  Optional o (ModalPropsO a)
   => {|o} -> Array ReactElement -> ReactElement
 modal' = modalU <<< unsafeApplyProps
 
 -- On request is required *for android*. Least nasty solution is to require it, and provide a default for iOS
 -- https://github.com/facebook/react-native/commit/ce81f8b35af8d273072583d369594d4f5fd6d696
-modal_ :: forall eff. OnRequestClose eff -> Array ReactElement -> ReactElement
+modal_ :: OnRequestClose -> Array ReactElement -> ReactElement
 modal_ orc = modalU {onRequestClose: orc}
 
 modalIOS_ :: Array ReactElement -> ReactElement
 modalIOS_ = modalU {}
 
-modal :: forall eff. Boolean -> AnimationType -> OnRequestClose eff -> Array ReactElement -> ReactElement
+modal :: Boolean -> AnimationType -> OnRequestClose -> Array ReactElement -> ReactElement
 modal v at orc = modalU {visible: v, animationType: at, onRequestClose: orc}
 
 modalIOS :: Boolean -> AnimationType -> Array ReactElement -> ReactElement