Merge pull request #211 from citizennet/API-1813/multi-select-toolbar…

…-search-dropdown API-1813 Allow Selecting Multiple in renderToolbarSearchDropdown
citizennet · Oct 12, 2021 · 9d668ce · 9d668ce
2 parents 1b24b28 + a2b9a47
commit 9d668ce
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purescript-ocelot",
-  "version": "0.32.1",
+  "version": "0.33.0",
   "private": true,
   "scripts": {
     "build-all": "make build",

diff --git a/src/Interfaces/Typeahead/Interface.purs b/src/Interfaces/Typeahead/Interface.purs
@@ -300,8 +300,10 @@ searchDropdownInputToToolbarSingleInput r =
   , disabled: false
   , render: renderToolbarSearchDropdown
       r.placeholder
-      r.resetLabel
-      renderLabel
+      ( case _ of
+          Nothing -> HH.text r.resetLabel
+          Just x -> renderLabel x
+      )
       renderFuzzy
   }
   where

diff --git a/src/Typeahead.purs b/src/Typeahead.purs
@@ -68,7 +68,6 @@ import Data.Foldable as Data.Foldable
 import Data.Fuzzy as Data.Fuzzy
 import Data.Maybe (Maybe(..))
 import Data.Maybe as Data.Maybe
-import Data.Newtype as Data.Newtype
 import Data.Rational ((%))
 import Data.String as Data.String
 import Data.Time.Duration as Data.Time.Duration
@@ -914,12 +913,13 @@ renderMultiInput input renderContainer st =
     ]
 
 renderSearchDropdown
-  :: ∀ action item m
+  :: ∀ action f item m
    . Eq item
+  => Data.Foldable.Foldable f
   => String
   -> Halogen.HTML.PlainHTML
   -> (Data.Fuzzy.Fuzzy item -> Halogen.HTML.PlainHTML)
-  -> CompositeComponentRender action Maybe item m
+  -> CompositeComponentRender action f item m
 renderSearchDropdown resetLabel label renderFuzzy st =
   Halogen.HTML.label
     [ Ocelot.HTML.Properties.css "relative" ]
@@ -934,12 +934,14 @@ renderSearchDropdown resetLabel label renderFuzzy st =
       [ Ocelot.Block.ItemContainer.dropdownContainer
         [ renderInput, renderReset ]
         renderFuzzy
-        ((==) st.selected <<< Just <<< _.original <<< Data.Newtype.unwrap)
+        isSelected
         st.fuzzyItems
         st.highlightedIndex
       ]
     ]
   where
+  isSelected :: Data.Fuzzy.Fuzzy item -> Boolean
+  isSelected (Data.Fuzzy.Fuzzy { original }) = Data.Foldable.elem original st.selected
   renderInput =
     Halogen.HTML.div
       [ Ocelot.HTML.Properties.css "m-4 border-b-2 border-blue-88 pb-2 flex" ]
@@ -954,7 +956,7 @@ renderSearchDropdown resetLabel label renderFuzzy st =
       [ Halogen.HTML.Events.onClick \_ -> Select.Action $ RemoveAll
       ]
       [ Halogen.HTML.text resetLabel ]
-      ( Data.Maybe.isNothing st.selected )
+      ( Data.Foldable.null st.selected )
       false
 
 renderSingle
@@ -1013,14 +1015,14 @@ renderSingle iprops renderItem renderContainer st =
   showSelected = Data.Maybe.isJust st.selected && st.visibility == Select.Off
 
 renderToolbarSearchDropdown
-  :: ∀ action item m
+  :: ∀ action f item m
    . Eq item
+  => Data.Foldable.Foldable f
   => String
-  -> String
-  -> (item -> Halogen.HTML.PlainHTML)
+  -> (f item -> Halogen.HTML.PlainHTML)
   -> (Data.Fuzzy.Fuzzy item -> Halogen.HTML.PlainHTML)
-  -> CompositeComponentRender action Maybe item m
-renderToolbarSearchDropdown defaultLabel resetLabel renderItem renderFuzzy st =
+  -> CompositeComponentRender action f item m
+renderToolbarSearchDropdown resetLabel renderText renderFuzzy st =
   renderSearchDropdown resetLabel label renderFuzzy st
   where
     label = Ocelot.Block.ItemContainer.dropdownButton
@@ -1030,7 +1032,7 @@ renderToolbarSearchDropdown defaultLabel resetLabel renderItem renderFuzzy st =
         : Ocelot.Block.Button.buttonMainClasses
         <> Ocelot.Block.Button.buttonClearClasses
       ]
-      [ Data.Maybe.maybe (Halogen.HTML.text defaultLabel) (Halogen.HTML.fromPlainHTML <<< renderItem) st.selected ]
+      [ (Halogen.HTML.fromPlainHTML <<< renderText) st.selected ]
 
 replaceSelected
   :: forall action f item m

diff --git a/ui-guide/Components/Typeaheads.purs b/ui-guide/Components/Typeaheads.purs
@@ -4,6 +4,7 @@ import Prelude
 
 import Control.Parallel as Control.Parallel
 import Data.Array (head, take)
+import Data.Array as Data.Array
 import Data.Maybe (Maybe(..))
 import Data.Newtype (unwrap)
 import Effect.Aff.Class (class MonadAff)
@@ -647,8 +648,42 @@ cnDocumentationBlocks =
               , disabled: false
               , render: TA.renderToolbarSearchDropdown
                 "All Locations"
+                ( case _ of
+                    Nothing -> HH.text "All Locations"
+                    Just (Async.Location x) -> HH.text x.name
+                )
+                (HH.span_ <<< IC.boldMatches "name")
+              }
+            ]
+          ]
+        , content
+          [ Card.card
+            [ HP.class_ $ HH.ClassName "flex-1" ]
+            [ HH.h3
+              [ HP.classes Format.captionClasses ]
+              [ HH.text "Multi - Searchable Dropdown in a Toolbar (e.g. for filtering)" ]
+            , HH.slot_ _multiLocation 11
+              ( TA.component
+                { runSelect: Data.Array.cons
+                , runRemove: Data.Array.filter <<< (/=)
+                , runFilterFuzzy: identity
+                , runFilterItems: const
+                }
+              )
+              { items: NotAsked
+              , insertable: TA.NotInsertable
+              , keepOpen: true
+              , debounceTime: Nothing
+              , async: Nothing
+              , itemToObject: Async.locationToObject
+              , disabled: false
+              , render: TA.renderToolbarSearchDropdown
                 "All Locations"
-                (HH.text <<< _.name <<< unwrap)
+                ( case _ of
+                    [] -> HH.text "All Locations"
+                    [ Async.Location x ] -> HH.text x.name
+                    xs -> HH.text (show (Data.Array.length xs) <> " Locations Selected")
+                )
                 (HH.span_ <<< IC.boldMatches "name")
               }
             ]