Merge pull request #171 from citizennet/FBCM-4154/citizengabe/Fix-meridiem-change

FBCM-4154 Fix meridiem change

Author: citizengabe

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purescript-ocelot",
-  "version": "0.27.0",
+  "version": "0.27.1",
   "private": true,
   "scripts": {
     "build-all": "make build",
@@ -21,4 +21,4 @@
     "request": "^2.88.0",
     "yarn": "^1.16.0"
   }
-}
+}

spago.dhall

@@ -9,6 +9,7 @@ Authors:
   "Forest Toney <https://github.com/foresttoney>",
   "Hardy Jones <https://github.com/joneshf-cn>",
   "Vance Palacio <https://github.com/vanceism7>"
+  "Gabe Johnson <https://github.com/citizengabe>"
 -}
 
 { name = "ocelot"

src/Components/TimePicker/Component.purs

@@ -5,7 +5,7 @@ import Prelude
 import Data.Array ((!!))
 import Data.Array as Array
 import Data.FunctorWithIndex (mapWithIndex)
-import Data.Maybe (Maybe(..))
+import Data.Maybe (Maybe(..), isNothing)
 import Data.String (trim)
 import Data.Symbol (SProxy(..))
 import Data.Time (Time)
@@ -184,7 +184,9 @@ embeddedHandleAction = case _ of
       otherwise -> pure unit
 
   OnBlur -> do
-    handleSearch
+    { selection } <- H.get
+    when (isNothing selection) handleSearch
+
 
 handleSearch :: forall m. MonadAff m => CompositeComponentM m Unit
 handleSearch = do
@@ -215,7 +217,7 @@ embeddedHandleMessage = case _ of
         synchronize
 
   S.Searched text -> do
-    H.modify_ _ { search = text }
+    H.modify_ _ { search = text, selection = Nothing }
     -- we don't actually want to match on search, we want to wait
     -- until they hit ENTER and then we'll try to match their search
 

src/Components/TimePicker/Utils.purs

@@ -2,27 +2,43 @@ module Ocelot.Components.TimePicker.Utils where
 
 import Prelude
 
+import Control.Alt ((<|>))
 import Data.Array (length)
 import Data.Array.NonEmpty (catMaybes, head)
 import Data.DateTime (time)
 import Data.Either (either, hush)
 import Data.Formatter.DateTime (unformatDateTime)
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
-import Data.String (joinWith)
+import Data.String (joinWith, toLower)
 import Data.String.Regex (match, parseFlags, regex)
 import Data.Time (Time)
 
+data Meridiem
+  = AM
+  | PM
+
+meridiemToString :: Meridiem -> String
+meridiemToString = case _ of
+  AM -> "AM"
+  PM -> "PM"
 
 ----------
 -- Search
 guessTime :: String -> Maybe Time
 guessTime ""   = Nothing
 guessTime text =
-  let meridian :: Maybe String
-      meridian = either
-        (const Nothing)
-        (\r -> join $ head <$> match r text)
-        (regex "p" $ parseFlags "i")
+  let meridiem :: Maybe Meridiem
+      meridiem = do
+        let
+          regexFlags = parseFlags "i"
+        regexA <- hush (regex "a" $ regexFlags)
+        regexP <- hush (regex "p" $ regexFlags)
+        matched <- match regexA text <|> match regexP text
+        meridiemString <- head matched
+        case toLower meridiemString of
+          "a" -> Just AM
+          "p" -> Just PM
+          _ -> Nothing
 
       digits :: Array String
       digits = either
@@ -42,9 +58,13 @@ guessTime text =
         _ -> Nothing
 
       format :: String
-      format = (maybe "HHmm" (const "hhmm a") meridian)
+      format = (maybe "HHmm" (const "hhmm a") meridiem)
+
+      suffix :: String
+      suffix = maybe "" (\m -> " " <> meridiemToString m) meridiem
+
 
       guess :: Maybe String
-      guess = (_ <> maybe "" (const " PM") meridian) <$> hourMin
+      guess = (_ <> suffix) <$> hourMin
 
    in time <$> (join $ hush <<< unformatDateTime format <$> guess)