Merge pull request #179 from citizennet/AS-1317/upgrade-halogen-v6

AS-1317 Upgrade Halogen to v6

Author: boygao1992

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/ocelot
   docker:
-    - image: circleci/node:10.15-browsers
+    - image: circleci/node:10.24-buster-browsers
   environment:
     RTS_ARGS: +RTS -N2 -RTS
 
@@ -13,6 +13,10 @@ jobs:
     steps:
       - checkout
 
+      - run:
+          name: Install libtinfo (required until purescript 0.14.2)
+          command: sudo apt install libtinfo5 libncurses5-dev
+
       - restore_cache:
           keys:
             - v4-yarn-cache-{{ .Branch }}-{{ checksum "package.json" }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purescript-ocelot",
-  "version": "0.28.2",
+  "version": "0.29.0",
   "private": true,
   "scripts": {
     "build-all": "make build",
@@ -13,7 +13,7 @@
     "browserify": "^16.5.1",
     "parcel": "1.12.4",
     "parcel-bundler": "1.12.3",
-    "purescript": "^0.13.8",
+    "purescript": "0.14.1",
     "spago": "^0.15.2"
   },
   "dependencies": {

packages.dhall

@@ -126,11 +126,37 @@ let halogen-renderless =
       , version = "v0.0.4"
       }
 
+let html-parser-halogen =
+      { dependencies = [ "string-parsers", "halogen" ]
+      , repo =
+          "https://github.com/rnons/purescript-html-parser-halogen.git"
+      , version = "v1.0.0-rc.2"
+      }
+
+let svg-parser =
+      { dependencies = [ "prelude", "string-parsers" ]
+      , repo =
+          "https://github.com/citizennet/purescript-svg-parser.git"
+      , version = "v2.0.0"
+      }
+
+let svg-parser-halogen =
+      { dependencies = [ "svg-parser", "halogen" ]
+      , repo =
+          "https://github.com/rnons/purescript-svg-parser-halogen.git"
+      , version = "v2.0.0-rc.1"
+      }
+
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200724/packages.dhall sha256:bb941d30820a49345a0e88937094d2b9983d939c9fd3a46969b85ce44953d7d9
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210506/packages.dhall sha256:d199e142515f9cc15838d8e6d724a98cd0ca776ceb426b7b36e841311643e3ef
 
 let overrides = {=}
 
-let additions = { halogen-renderless }
+let additions =
+      { halogen-renderless
+      , html-parser-halogen
+      , svg-parser
+      , svg-parser-halogen
+      }
 
 in  upstream // overrides // additions

spago.dhall

@@ -31,6 +31,7 @@ Authors:
   , "halogen-svg-elems"
   , "html-parser-halogen"
   , "js-timers"
+  , "js-uri"
   , "numbers"
   , "psci-support"
   , "read"

src/Blocks/Pager.purs

@@ -18,7 +18,7 @@ import Web.UIEvent.MouseEvent (MouseEvent)
 -----
 -- old CN pager (require citizennet.css)
 
-pager :: ∀ p i. Int -> Int -> (Int -> MouseEvent -> Maybe i) -> HH.HTML p i
+pager :: ∀ p i. Int -> Int -> (Int -> MouseEvent -> i) -> HH.HTML p i
 pager skip last query =
   HH.div
     [ HP.classes
@@ -102,15 +102,15 @@ pagerNew ::
   Int ->
   Int ->
   Array (HP.IProp HTMLdiv i) ->
-  (Int -> MouseEvent -> Maybe i) ->
+  (Int -> MouseEvent -> i) ->
   HH.HTML p i
 pagerNew skip last iprops query = HH.div iprops (makePagingButtonsNew skip last query)
 
 makePagingButtonsNew ::
   forall p i.
   Int ->
   Int ->
-  (Int -> MouseEvent -> Maybe i) ->
+  (Int -> MouseEvent -> i) ->
   Array (HH.HTML p i)
 makePagingButtonsNew skip last query = foldlWithIndex makePagingButtons' [] makeList
   where

src/Components/MultiInput/Component.purs

@@ -13,7 +13,6 @@ import Data.FunctorWithIndex as Data.FunctorWithIndex
 import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Maybe as Data.Maybe
 import Data.String as Data.String
-import Data.Symbol (SProxy(..))
 import Effect.Aff.Class (class MonadAff)
 import Halogen as Halogen
 import Halogen.HTML as Halogen.HTML
@@ -22,13 +21,14 @@ import Halogen.HTML.Properties as Halogen.HTML.Properties
 import Ocelot.Block.Icon as Ocelot.Block.Icon
 import Ocelot.Components.MultiInput.TextWidth as Ocelot.Components.MultiInput.TextWidth
 import Ocelot.HTML.Properties as Ocelot.HTML.Properties
+import Type.Proxy (Proxy(..))
 import Web.Event.Event as Web.Event.Event
 import Web.HTML.HTMLElement as Web.HTML.HTMLElement
 import Web.UIEvent.KeyboardEvent as Web.UIEvent.KeyboardEvent
 
 type Slot = Halogen.Slot Query Output
 
-type Component m = Halogen.Component Halogen.HTML.HTML Query Input Output m
+type Component m = Halogen.Component Query Input Output m
 type ComponentHTML m = Halogen.ComponentHTML Action ChildSlots m
 type ComponentM m a = Halogen.HalogenM State Action ChildSlots Output m a
 
@@ -86,7 +86,7 @@ type ChildSlots =
   ( textWidth :: Ocelot.Components.MultiInput.TextWidth.Slot Unit
   )
 
-_textWidth = SProxy :: SProxy "textWidth"
+_textWidth = Proxy :: Proxy "textWidth"
 
 component ::
   forall m.
@@ -420,7 +420,7 @@ measureTextWidth ::
   String ->
   ComponentM m (Maybe Number)
 measureTextWidth text = do
-  Halogen.query _textWidth unit <<< Halogen.request
+  Halogen.request _textWidth unit
     $ Ocelot.Components.MultiInput.TextWidth.GetWidth text
 
 preventDefault ::
@@ -514,11 +514,11 @@ renderItemDisplay index text =
   Halogen.HTML.div
     [ Halogen.HTML.Properties.classes itemDisplayClasses ]
     [ Halogen.HTML.span
-        [ Halogen.HTML.Events.onClick \_ -> Just (EditItem index) ]
+        [ Halogen.HTML.Events.onClick \_ -> EditItem index ]
         [ Halogen.HTML.text text ]
     , Halogen.HTML.button
         [ Halogen.HTML.Properties.classes closeButtonClasses
-        , Halogen.HTML.Events.onClick \_ -> Just (RemoveOne index)
+        , Halogen.HTML.Events.onClick \_ -> RemoveOne index
         ]
         [ Ocelot.Block.Icon.delete_ ]
     ]
@@ -535,7 +535,7 @@ renderItemEdit placeholder index inputBox =
     [ renderAutoSizeInput placeholder index false inputBox
     , Halogen.HTML.button
         [ Halogen.HTML.Properties.classes closeButtonClasses
-        , Halogen.HTML.Events.onClick \_ -> Just (RemoveOne index)
+        , Halogen.HTML.Events.onClick \_ -> RemoveOne index
         ]
         [ Ocelot.Block.Icon.delete_ ]
     ]
@@ -553,9 +553,9 @@ renderAutoSizeInput placeholder index new inputBox =
     [ Halogen.HTML.input
         [ Halogen.HTML.Properties.attr (Halogen.HTML.AttrName "style") css
         , Halogen.HTML.Properties.classes inputClasses
-        , Halogen.HTML.Events.onBlur \_ -> Just (OnBlur index)
-        , Halogen.HTML.Events.onKeyDown (Just <<< OnKeyDown index)
-        , Halogen.HTML.Events.onValueInput (Just <<< OnInput index)
+        , Halogen.HTML.Events.onBlur \_ -> OnBlur index
+        , Halogen.HTML.Events.onKeyDown (OnKeyDown index)
+        , Halogen.HTML.Events.onValueInput (OnInput index)
         , Halogen.HTML.Properties.placeholder case new of
             false -> ""
             true

src/Components/MultiInput/TextWidth.purs

@@ -25,7 +25,7 @@ import Web.HTML.HTMLElement as Web.HTML.HTMLElement
 
 type Slot = Halogen.Slot Query Output
 
-type Component m = Halogen.Component Halogen.HTML.HTML Query Input Output m
+type Component m = Halogen.Component Query Input Output m
 type ComponentHTML m = Halogen.ComponentHTML Action ChildSlots m
 type ComponentM m a = Halogen.HalogenM State Action ChildSlots Output m a
 

src/Components/SearchBar.purs

@@ -56,7 +56,7 @@ data Message
  = Searched String
 
 -- | The standard search bar
-component :: ∀ m. MonadAff m => H.Component HH.HTML Query Input Message m
+component :: ∀ m. MonadAff m => H.Component Query Input Message m
 component =
   H.mkComponent
     { initialState
@@ -76,7 +76,7 @@ component =
 
 -- | A search bar which allows the user to specify if it should
 -- | stay open when unfocused
-component' :: ∀ m. MonadAff m => H.Component HH.HTML Query Input' Message m
+component' :: ∀ m. MonadAff m => H.Component Query Input' Message m
 component' =
   H.mkComponent
     { initialState
@@ -171,24 +171,24 @@ render :: forall m.
 render st@{ query, open } =
   HH.label
     [ HP.classes $ containerClasses <> containerCondClasses
-    , HE.onClick (Just <<< const Open)
+    , HE.onClick \_ -> Open
     ]
     [ HH.div
       [ HP.classes $ iconClasses <> iconCondClasses ]
       [ Icon.search_ ]
     , HH.div
       [ css "flex-grow" ]
       [ HH.input
-        [ HE.onValueInput (Just <<< Search)
+        [ HE.onValueInput Search
         , HP.placeholder "Search"
         , HP.value query
         , HP.classes $ inputClasses <> inputCondClasses
-        , HE.onBlur (Just <<< const Blur)
+        , HE.onBlur \_ -> Blur
         , HP.tabIndex 0
         ]
       ]
     , HH.button
-      [ HE.onClick $ Just <<< Clear
+      [ HE.onClick Clear
       , HP.type_ HP.ButtonButton
       , HP.classes $ buttonClasses <> buttonCondClasses <> hideClearClasses
       ]

src/Components/Tree/Component.purs

@@ -49,7 +49,7 @@ data Message item
 component :: ∀ m item.
   MonadAff m =>
   Eq item =>
-  H.Component HH.HTML (Query item) (Input item) (Message item) m
+  H.Component (Query item) (Input item) (Message item) m
 component =
   H.mkComponent
     { initialState
@@ -80,14 +80,14 @@ render { items, renderItem, checkable } =
           [ css "inline-flex" ]
           [ Conditional.alt_ (checkable value)
             [ Checkbox.checkbox_
-              [ HE.onChecked $ Just <<< ToggleItem value itemPath (A.cons ix indexPath)
+              [ HE.onChecked $ ToggleItem value itemPath (A.cons ix indexPath)
               , HP.checked selected
               ]
               [ HH.fromPlainHTML $ renderItem value ]
             ]
             [ HH.span
               [ css "cursor-pointer"
-              , HE.onClick $ Just <<< const (ToggleChildren path)
+              , HE.onClick \_ -> ToggleChildren path
               ]
               [ HH.fromPlainHTML $ renderItem value ]
             ]
@@ -108,7 +108,7 @@ render { items, renderItem, checkable } =
 
     renderCarat children expanded path =
       carat
-        [ HE.onClick $ Just <<< const (ToggleChildren path)
+        [ HE.onClick \_ -> ToggleChildren path
         , css $ "mr-3 text-xl align-text-bottom cursor-pointer " <> visible
         ]
       where

src/Data/IntervalTree.purs

@@ -17,7 +17,7 @@ import Prelude
 import Data.Array as Data.Array
 import Data.FoldableWithIndex as Data.FoldableWithIndex
 import Data.Generic.Rep as Data.Generic.Rep
-import Data.Generic.Rep.Show as Data.Generic.Rep.Show
+import Data.Show.Generic as Data.Show.Generic
 import Data.Map as Data.Map
 import Data.Maybe (Maybe(..))
 import Data.Tuple as Data.Tuple
@@ -33,15 +33,15 @@ derive instance eqIntervalPoint :: Eq IntervalPoint
 derive instance genericIntervalPoint :: Data.Generic.Rep.Generic IntervalPoint _
 
 instance showIntervalPoint :: Show IntervalPoint where
-  show = Data.Generic.Rep.Show.genericShow
+  show = Data.Show.Generic.genericShow
 
 -- | O(n log n)
 fromIntervals ::
   forall a.
   Ord a =>
   Array { start :: a, end :: a } ->
   IntervalTree a
-fromIntervals = Data.Array.foldl insertInterval mempty
+fromIntervals = Data.Array.foldl insertInterval Data.Map.empty
 
 -- | O(log n)
 -- |
@@ -85,7 +85,7 @@ insertInterval old { start, end }
   clearBetween :: IntervalTree a -> IntervalTree a
   clearBetween xs =
     Data.Map.submap Nothing (Just lowerBound) xs
-      <> Data.Map.submap (Just upperBound) Nothing xs
+      `Data.Map.union` Data.Map.submap (Just upperBound) Nothing xs
 
   lowerBound :: a
   lowerBound = case findGreatestLowerBound start old of