Skip to content

Some improvements to the Upload component #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 23, 2020
Merged

Some improvements to the Upload component #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8925fb4
Add FormDefaults instance for Set and Map
arthurxavierx Jun 18, 2020
512c9c7
Fix weird border on upload component
arthurxavierx Jun 18, 2020
d679eae
Add onClick prop to Upload and let specific files be non-removable
arthurxavierx Jun 18, 2020
9884760
Code review feedback
arthurxavierx Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion docs/Examples/Form.example.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,13 @@ userForm = ado
{ variant: Upload.Avatar
, backend:
{ fetch: \id ->
pure { id, name: Upload.FileName "avatar", previewUri: Nothing }
pure
{ id
, name: Upload.FileName "avatar"
, previewUri: Nothing
, readonly: false
}
, remove: \_ -> pure true
, upload: \file -> produceAff \emitter -> do
let
totalBytes = Int.round $ File.size file
Expand Down
35 changes: 30 additions & 5 deletions docs/Examples/Upload.example.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import Effect.Random (randomRange)
import Effect.Uncurried (runEffectFn2)
import Lumi.Components.Button (button, primary) as Button
import Lumi.Components.Column (column, column_)
import Lumi.Components.Example (example)
import Lumi.Components.Input as Input
import Lumi.Components.LabeledField (labeledField, RequiredField(..))
import Lumi.Components.Text (h2_)
import Lumi.Components.Upload (FileId(..), FileName(..), UploadVariant(..), defaults, upload)
import Lumi.Components.Example (example)
import React.Basic (Component, JSX, createComponent, make)
import React.Basic.DOM as R
import React.Basic.DOM.Events (targetChecked)
Expand Down Expand Up @@ -117,7 +117,13 @@ docs = unit # make component { initialState, didMount, render }
, readonly = self.state.readonly
, backend =
{ fetch: \id@(FileId name) ->
pure { id, name: FileName name, previewUri: Nothing }
pure
{ id
, name: FileName name
, previewUri: Nothing
, readonly: false
}
, remove: \_ -> pure true
, upload: \file -> produceAff \emitter ->
uploadWithRandomPauses emitter file
}
Expand All @@ -134,10 +140,17 @@ docs = unit # make component { initialState, didMount, render }
{ value = self.state.files
, variant = Files
, onChange = send self <<< FileEx
, onClick = \(FileId id) -> Just $ log id
, readonly = self.state.readonly
, backend =
{ fetch: \id@(FileId name) ->
pure { id, name: FileName name, previewUri: Nothing }
pure
{ id
, name: FileName name
, previewUri: Nothing
, readonly: false
}
, remove: \_ -> pure true
, upload: \file -> produceAff \emitter -> do
foldMap AVar.read self.state.startUpload
void $ foldMap AVar.tryTake self.state.startUpload
Expand All @@ -163,7 +176,13 @@ docs = unit # make component { initialState, didMount, render }
, readonly = self.state.readonly
, backend =
{ fetch: \id@(FileId name) -> do
pure { id, name: FileName name, previewUri: Nothing }
pure
{ id
, name: FileName name
, previewUri: Nothing
, readonly: false
}
, remove: \_ -> pure true
, upload: \file -> produceAff \emitter ->
uploadWithRandomPauses emitter file
}
Expand All @@ -182,7 +201,13 @@ docs = unit # make component { initialState, didMount, render }
, readonly = self.state.readonly
, backend =
{ fetch: \id@(FileId name) -> do
pure { id, name: FileName name, previewUri: Nothing }
pure
{ id
, name: FileName name
, previewUri: Nothing
, readonly: false
}
, remove: \_ -> pure true
, upload: \file -> produceAff \emitter ->
uploadWithRandomPauses emitter file
}
Expand Down
2 changes: 1 addition & 1 deletion src/Lumi/Components/Form.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ import Lumi.Components.Column (column)
import Lumi.Components.FetchCache as FetchCache
import Lumi.Components.Form.Defaults (formDefaults) as Defaults
import Lumi.Components.Form.Internal (Forest, FormBuilder'(..), FormBuilder, SeqFormBuilder, Tree(..), formBuilder, formBuilder_, invalidate, pruneTree, sequential)
import Lumi.Components.Form.Internal (Forest(..), FormBuilder', FormBuilder, SeqFormBuilder', SeqFormBuilder, formBuilder, formBuilder_, invalidate, listen, parallel, revalidate, sequential) as Internal
import Lumi.Components.Form.Internal (Forest, FormBuilder', FormBuilder, SeqFormBuilder', SeqFormBuilder, Tree(..), formBuilder, formBuilder_, invalidate, listen, parallel, revalidate, sequential) as Internal
import Lumi.Components.Form.Validation (setModified)
import Lumi.Components.Form.Validation (Validated(..), Validator, _Validated, fromValidated, mustBe, mustEqual, nonEmpty, nonEmptyArray, nonNull, validNumber, validInt, validDate, optional, setFresh, setModified, validated, warn) as Validation
import Lumi.Components.Input (alignToInput)
Expand Down
6 changes: 6 additions & 0 deletions src/Lumi/Components/Form/Defaults.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ import Prelude

import Data.Array.NonEmpty (NonEmptyArray)
import Data.Either (Either(..))
import Data.Map (Map)
import Data.Map as Map
import Data.Set (Set)
import Data.Set as Set
import Data.Maybe (Maybe(..))
import Data.Symbol (class IsSymbol, SProxy(..))
import Lumi.Components.Form.Validation (Validated(..))
Expand Down Expand Up @@ -38,6 +42,8 @@ instance formDefaultsNumber :: FormDefaults Number where formDefaults = 0.0
instance formDefaultsInt :: FormDefaults Int where formDefaults = 0
instance formDefaultsString :: FormDefaults String where formDefaults = ""
instance formDefaultsArray :: FormDefaults (Array a) where formDefaults = []
instance formDefaultsSet :: FormDefaults (Set a) where formDefaults = Set.empty
instance formDefaultsMap :: FormDefaults (Map k a) where formDefaults = Map.empty

instance formDefaultsNonEmptyArray :: FormDefaults a => FormDefaults (NonEmptyArray a) where
formDefaults = pure formDefaults
Expand Down
Loading