Remove old Form.build functions (#30)

Replace Form.build with Form.buildConcurrently
Remove Form.buildWithDefaults

Author: arthurxavierx

docs/Examples/Form.example.purs

@@ -47,7 +47,7 @@ data Action formData formResult
   | SetForceTopLabels Boolean
   | SetReadonly Boolean
   | SetSimulatePauses Boolean
-  | SetUser (Maybe formResult) formData
+  | SetUser (formData -> formData)
   | Submit
   | Reset
 
@@ -79,11 +79,18 @@ docs = unit # make component { initialState, render }
       SetSimulatePauses simulatePauses ->
         self.setState _ { simulatePauses = simulatePauses }
 
-      SetUser result user ->
-        self.setState _
-          { result = result
-          , user = user
-          }
+      SetUser update ->
+        let
+          formProps =
+            { loadColor: loadColor self.state.simulatePauses
+            , loadColors: loadColors self.state.simulatePauses
+            , readonly: self.state.readonly
+            }
+        in
+          self.setState \s -> s
+            { result = F.revalidate userForm formProps (update s.user)
+            , user = update s.user
+            }
 
       Submit ->
         self.setState \state -> state { user = F.setModified state.user, modalOpen = isJust state.result }
@@ -155,7 +162,7 @@ docs = unit # make component { initialState, render }
                   , children:
                       [ userComponent
                           { value: user
-                          , onChange: \r -> send self <<< SetUser r
+                          , onChange: send self <<< SetUser
                           , loadColor: loadColor simulatePauses
                           , loadColors: loadColors simulatePauses
                           , inlineTable
@@ -264,15 +271,27 @@ type ValidatedUser =
 -- | remounting this component on each render.
 userComponent
   :: { value :: User
-     , onChange :: Maybe ValidatedUser -> User -> Effect Unit
+     , onChange :: (User -> User) -> Effect Unit
      , loadColor :: String -> Aff { label :: String, value :: String }
      , loadColors :: String -> Aff (Array { label :: String, value :: String })
      , inlineTable :: Boolean
      , forceTopLabels :: Boolean
      , readonly :: Boolean
      }
   -> JSX
-userComponent = F.build ado
+userComponent = F.build userForm
+
+userForm
+  :: forall props
+   . FormBuilder
+      { loadColor :: String -> Aff { label :: String, value :: String }
+      , loadColors :: String -> Aff (Array { label :: String, value :: String })
+      , readonly :: Boolean
+      | props
+      }
+      User
+      ValidatedUser
+userForm = ado
   firstName <-
     F.indent "First Name" Required
     $ F.focus (prop (SProxy :: SProxy "firstName"))

src/Lumi/Components/Form.purs

@@ -1,9 +1,8 @@
 module Lumi.Components.Form
-  ( module Internal
+  ( module Defaults
+  , module Internal
   , module Validation
   , build
-  , buildConcurrently
-  , buildWithDefaults
   , static
   , section
   , inputBox
@@ -66,7 +65,8 @@ import JSS (JSS, jss)
 import Lumi.Components.Color (colors)
 import Lumi.Components.Column (column)
 import Lumi.Components.FetchCache as FetchCache
-import Lumi.Components.Form.Internal (FormBuilder(..), SeqFormBuilder, Tree(..), formBuilder, formBuilder_, invalidate, revalidate, sequential, pruneTree)
+import Lumi.Components.Form.Defaults (formDefaults) as Defaults
+import Lumi.Components.Form.Internal (FormBuilder(..), SeqFormBuilder, Tree(..), formBuilder, formBuilder_, invalidate, pruneTree, sequential)
 import Lumi.Components.Form.Internal (FormBuilder, SeqFormBuilder, formBuilder, formBuilder_, invalidate, listen, parallel, revalidate, sequential) as Internal
 import Lumi.Components.Form.Validation (Validated(..), Validator, _Validated, fromValidated, mustBe, mustEqual, nonEmpty, nonEmptyArray, nonNull, validNumber, validInt, optional, setFresh, setModified, validated, warn) as Validation
 import Lumi.Components.Input (alignToInput)
@@ -98,30 +98,6 @@ import Unsafe.Coerce (unsafeCoerce)
 -- | _Note_: this function should be fully applied, to avoid remounting
 -- | the component on each render.
 build
-  :: forall props unvalidated result
-   . FormBuilder { readonly :: Boolean | props } unvalidated result
-  -> { value :: unvalidated
-     , onChange :: Maybe result -> unvalidated -> Effect Unit
-     , inlineTable :: Boolean
-     , forceTopLabels :: Boolean
-     , readonly :: Boolean
-     | props
-     }
-  -> JSX
-build editor = \props ->
-  form props
-    { onChange = \f ->
-        let v = f props.value
-         in props.onChange (revalidate editor (unsafeCoerce props) v) v
-    }
-  where
-     form = buildConcurrently editor
-
--- | Create a React component for a form from a `FormBuilder`.
--- |
--- | _Note_: this function should be fully applied, to avoid remounting
--- | the component on each render.
-buildConcurrently
   :: forall props unvalidated result
    . FormBuilder { readonly :: Boolean | props } unvalidated result
   -> { value :: unvalidated
@@ -132,7 +108,7 @@ buildConcurrently
      | props
      }
   -> JSX
-buildConcurrently editor = makeStateless (createComponent "Form") render where
+build editor = makeStateless (createComponent "Form") render where
   render props@{ value, onChange, inlineTable, forceTopLabels, readonly } =
 
     let forest = Array.mapMaybe pruneTree $ edit onChange
@@ -182,29 +158,6 @@ buildConcurrently editor = makeStateless (createComponent "Form") render where
           , children: surround fieldDivider (map toRow forest)
           }
 
--- | Utility function.
--- | Create a React component for a form from a `FormBuilder` and a default
--- | form state. This default value is used in the form whenever the `value`
--- | prop is `Nothing`.
--- |
--- | _Note_: this function should be fully applied, to avoid remounting
--- | the component on each render.
-buildWithDefaults
-  :: forall props unvalidated result
-   . unvalidated
-  -> FormBuilder { readonly :: Boolean | props } unvalidated result
-  -> { value :: Maybe unvalidated
-     , onChange :: Maybe result -> unvalidated -> Effect Unit
-     , inlineTable :: Boolean
-     , forceTopLabels :: Boolean
-     , readonly :: Boolean
-     | props
-     }
-  -> JSX
-buildWithDefaults defaults editor = \props -> form props { value = fromMaybe defaults props.value }
-  where
-     form = build editor
-
 -- | Create an always-valid `FormBuilder` that renders the supplied `JSX`.
 static :: forall props value. JSX -> FormBuilder props value Unit
 static edit = formBuilder \_ _ -> { edit: const edit, validate: pure unit }

src/Lumi/Components/Form/Defaults.purs

@@ -10,7 +10,7 @@ import Prelude
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..))
 import Data.Symbol (class IsSymbol, SProxy(..))
-import Lumi.Components.Form (Validated(..))
+import Lumi.Components.Form.Validation (Validated(..))
 import Prim.Row (class Cons, class Lacks)
 import Prim.RowList (class RowToList, Cons, Nil)
 import Record.Builder (Builder)

src/Lumi/Components/Wizard.purs

@@ -63,7 +63,7 @@ step
   ~> Wizard step { readonly :: Boolean | props } value
 step s f =
   let
-    form = F.buildConcurrently f
+    form = F.build f
   in
     Wizard $ liftF $ Form
       { step: s