buttonState :: ButtonState

kimispencer · kimispencer · commit 873b8cf45079 · 2019-06-21T18:38:46.000+02:00
diff --git a/docs/Examples/Button.example.purs b/docs/Examples/Button.example.purs
@@ -27,7 +27,7 @@ docs =
 
       , [ h2_ "Disabled"
         , example
-            $ button defaults { title = "Button", buttonState = Just $ Disabled }
+            $ button defaults { title = "Button", buttonState = Disabled }
         ]
 
       , [ h2_ "Size"
@@ -56,7 +56,7 @@ docs =
         ]
       , [ h4_ "Primary + Disabled"
         , example
-            $ button primary { title = "Button", buttonState = Just $ Disabled }
+            $ button primary { title = "Button", buttonState = Disabled }
         ]
       , [ h4_ "Secondary Medium (default)"
         , example
@@ -76,7 +76,7 @@ docs =
         ]
       , [ h4_ "Secondary + Disabled"
         , example
-            $ button secondary { title = "Button", buttonState = Just $ Disabled }
+            $ button secondary { title = "Button", buttonState = Disabled }
         ]
       , [ h4_ "Icon button"
         , example
@@ -100,19 +100,19 @@ docs =
         ]
       , [ h4_ "Loading (Medium/default)"
         , example
-            $ button primary { buttonState = Just $ Loading }
+            $ button primary { buttonState = Loading }
         ]
       , [ h4_ "Loading (Small) "
         , example
-            $ button primary { buttonState = Just $ Loading, size = Small }
+            $ button primary { buttonState = Loading, size = Small }
         ]
       , [ h4_ "Loading (Large) "
         , example
-            $ button primary { buttonState = Just $ Loading, size = Large }
+            $ button primary { buttonState = Loading, size = Large }
         ]
       , [ h4_ "Loading (ExtraLarge) "
         , example
-            $ button primary { buttonState = Just $ Loading, size = ExtraLarge }
+            $ button primary { buttonState = Loading, size = ExtraLarge }
         ]
       ]
 
diff --git a/docs/Examples/InputGroup.example.purs b/docs/Examples/InputGroup.example.purs
@@ -23,13 +23,13 @@ docs =
             , addOnLeft:
                 toNullable $ Just $ R.div
                   { children:
-                    [ button defaults { title = "Button", buttonState = Just $ Enabled }
+                    [ button defaults { title = "Button", buttonState = Enabled }
                     ]
                   }
             , addOnRight:
                 toNullable $ Just $ R.div
                   { children:
-                    [ button defaults { title = "Button", buttonState = Just $ Enabled }
+                    [ button defaults { title = "Button", buttonState = Enabled }
                     ]
                   }
             , inputContent: toNullable $ Just $ input text_ { placeholder = "Placeholder..." }
diff --git a/docs/Examples/Wizard.example.purs b/docs/Examples/Wizard.example.purs
@@ -87,7 +87,7 @@ docs = unit # make (createComponent "WizardExample") { initialState, render }
                             in
                               [ Button.button Button.secondary
                                   { title = "Back"
-                                  , buttonState = Just $ if isNothing previousStepM then Button.Disabled else Button.Enabled
+                                  , buttonState = if isNothing previousStepM then Button.Disabled else Button.Enabled
                                   , onPress = maybe (mkEffectFn1 mempty) (capture identity <<< const <<< send self <<< SetWizardStep) previousStepM
                                   }
                               , Button.button Button.primary
diff --git a/src/Lumi/Components/Button.purs b/src/Lumi/Components/Button.purs
@@ -33,7 +33,7 @@ type CommonButtonProps rest =
   , testId :: Nullable String
   , title :: String
   , type :: String
-  , buttonState :: Maybe ButtonState
+  , buttonState :: ButtonState
   | rest
   }
 
@@ -69,16 +69,14 @@ button = makeStateless component render
             , "data-testid": props.testId
             , disabled:
                 case props.buttonState of
-                  Just Enabled -> false
-                  Just Disabled -> true
-                  Just Loading -> false
-                  Nothing -> false
+                  Enabled -> false
+                  Disabled -> true
+                  Loading -> false
             , "data-loading":
                 case props.buttonState of
-                  Just Enabled -> false
-                  Just Disabled -> false
-                  Just Loading -> true
-                  Nothing -> false
+                  Enabled -> false
+                  Disabled -> false
+                  Loading -> true
             , onClick: props.onPress
             , style: props.style
             , type: props.type
@@ -99,7 +97,7 @@ defaults =
   , testId: toNullable Nothing
   , title: invisibleSpace
   , type: ""
-  , buttonState: Nothing
+  , buttonState: Enabled
   }
 
 primary :: ButtonProps
@@ -145,16 +143,14 @@ iconButton = makeStateless iconComponent render
         , type: props.type
         , disabled:
             case props.buttonState of
-              Just Enabled -> false
-              Just Disabled -> true
-              Just Loading -> true
-              Nothing -> false
+              Enabled -> false
+              Disabled -> true
+              Loading -> true
         , "data-loading":
             case props.buttonState of
-              Just Enabled -> false
-              Just Disabled -> true
-              Just Loading -> true
-              Nothing -> false
+              Enabled -> false
+              Disabled -> true
+              Loading -> true
         }
       where
         children =
@@ -184,7 +180,7 @@ iconButtonDefaults =
   , type: ""
   , iconLeft: Nothing
   , iconRight: Nothing
-  , buttonState: Nothing
+  , buttonState: Enabled
   }
 
 styles :: JSS
diff --git a/src/Lumi/Components/Modal.purs b/src/Lumi/Components/Modal.purs
@@ -279,7 +279,7 @@ modalPortal = toReactComponent identity modalPortalComponent
                                     , toMaybe props.onActionButtonClick # foldMap \actionFn ->
                                         Button.button Button.primary
                                           { title = props.actionButtonTitle
-                                          , buttonState = Just $ props.actionButtonDisabled
+                                          , buttonState = props.actionButtonDisabled
                                           , onPress = mkEffectFn1 \_ -> actionFn
                                           , style = R.css { marginLeft: "1.2rem" }
                                           }
diff --git a/src/Lumi/Components/Pagination.purs b/src/Lumi/Components/Pagination.purs
@@ -61,7 +61,7 @@ pagination = makeStateless (createComponent "Pagination") render
                 [ Button.button Button.secondary
                     { title = show (i + 1)
                     , onPress = handler_ $ props.onChange i
-                    , buttonState = Just $ if i == props.currentPage then Button.Disabled else Button.Enabled
+                    , buttonState = if i == props.currentPage then Button.Disabled else Button.Enabled
                     }
                 ]
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ docs =`
`27`	`27`
`28`	`28`	`, [ h2_ "Disabled"`
`29`	`29`	`, example`
`30`		`- $ button defaults { title = "Button", buttonState = Just $ Disabled }`
	`30`	`+ $ button defaults { title = "Button", buttonState = Disabled }`
`31`	`31`	`]`
`32`	`32`
`33`	`33`	`, [ h2_ "Size"`
`@@ -56,7 +56,7 @@ docs =`
`56`	`56`	`]`
`57`	`57`	`, [ h4_ "Primary + Disabled"`
`58`	`58`	`, example`
`59`		`- $ button primary { title = "Button", buttonState = Just $ Disabled }`
	`59`	`+ $ button primary { title = "Button", buttonState = Disabled }`
`60`	`60`	`]`
`61`	`61`	`, [ h4_ "Secondary Medium (default)"`
`62`	`62`	`, example`
`@@ -76,7 +76,7 @@ docs =`
`76`	`76`	`]`
`77`	`77`	`, [ h4_ "Secondary + Disabled"`
`78`	`78`	`, example`
`79`		`- $ button secondary { title = "Button", buttonState = Just $ Disabled }`
	`79`	`+ $ button secondary { title = "Button", buttonState = Disabled }`
`80`	`80`	`]`
`81`	`81`	`, [ h4_ "Icon button"`
`82`	`82`	`, example`
`@@ -100,19 +100,19 @@ docs =`
`100`	`100`	`]`
`101`	`101`	`, [ h4_ "Loading (Medium/default)"`
`102`	`102`	`, example`
`103`		`- $ button primary { buttonState = Just $ Loading }`
	`103`	`+ $ button primary { buttonState = Loading }`
`104`	`104`	`]`
`105`	`105`	`, [ h4_ "Loading (Small) "`
`106`	`106`	`, example`
`107`		`- $ button primary { buttonState = Just $ Loading, size = Small }`
	`107`	`+ $ button primary { buttonState = Loading, size = Small }`
`108`	`108`	`]`
`109`	`109`	`, [ h4_ "Loading (Large) "`
`110`	`110`	`, example`
`111`		`- $ button primary { buttonState = Just $ Loading, size = Large }`
	`111`	`+ $ button primary { buttonState = Loading, size = Large }`
`112`	`112`	`]`
`113`	`113`	`, [ h4_ "Loading (ExtraLarge) "`
`114`	`114`	`, example`
`115`		`- $ button primary { buttonState = Just $ Loading, size = ExtraLarge }`
	`115`	`+ $ button primary { buttonState = Loading, size = ExtraLarge }`
`116`	`116`	`]`
`117`	`117`	`]`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ docs =`
`23`	`23`	`, addOnLeft:`
`24`	`24`	`toNullable $ Just $ R.div`
`25`	`25`	`{ children:`
`26`		`- [ button defaults { title = "Button", buttonState = Just $ Enabled }`
	`26`	`+ [ button defaults { title = "Button", buttonState = Enabled }`
`27`	`27`	`]`
`28`	`28`	`}`
`29`	`29`	`, addOnRight:`
`30`	`30`	`toNullable $ Just $ R.div`
`31`	`31`	`{ children:`
`32`		`- [ button defaults { title = "Button", buttonState = Just $ Enabled }`
	`32`	`+ [ button defaults { title = "Button", buttonState = Enabled }`
`33`	`33`	`]`
`34`	`34`	`}`
`35`	`35`	`, inputContent: toNullable $ Just $ input text_ { placeholder = "Placeholder..." }`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ docs = unit # make (createComponent "WizardExample") { initialState, render }`
`87`	`87`	`in`
`88`	`88`	`[ Button.button Button.secondary`
`89`	`89`	`{ title = "Back"`
`90`		`- , buttonState = Just $ if isNothing previousStepM then Button.Disabled else Button.Enabled`
	`90`	`+ , buttonState = if isNothing previousStepM then Button.Disabled else Button.Enabled`
`91`	`91`	`, onPress = maybe (mkEffectFn1 mempty) (capture identity <<< const <<< send self <<< SetWizardStep) previousStepM`
`92`	`92`	`}`
`93`	`93`	`, Button.button Button.primary`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ modalPortal = toReactComponent identity modalPortalComponent`
`279`	`279`	`, toMaybe props.onActionButtonClick # foldMap \actionFn ->`
`280`	`280`	`Button.button Button.primary`
`281`	`281`	`{ title = props.actionButtonTitle`
`282`		`- , buttonState = Just $ props.actionButtonDisabled`
	`282`	`+ , buttonState = props.actionButtonDisabled`
`283`	`283`	`, onPress = mkEffectFn1 \_ -> actionFn`
`284`	`284`	`, style = R.css { marginLeft: "1.2rem" }`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ pagination = makeStateless (createComponent "Pagination") render`
`61`	`61`	`[ Button.button Button.secondary`
`62`	`62`	`{ title = show (i + 1)`
`63`	`63`	`, onPress = handler_ $ props.onChange i`
`64`		`- , buttonState = Just $ if i == props.currentPage then Button.Disabled else Button.Enabled`
	`64`	`+ , buttonState = if i == props.currentPage then Button.Disabled else Button.Enabled`
`65`	`65`	`}`
`66`	`66`	`]`
`67`	`67`