git.iko.soy/obelisk
on master help sign in
Add Obelisk.Route.Frontend.routeLinkDynAttr
commit24057790e079c3deafa727fd9ea1ef39ab2c6efe authorElliot Cameron <eacameron@gmail.com> dateTue 5 Nov 2019, 11:44 (7 years ago) parentf90ed2e
2 files changed+23−6
compare with master
unifiedsplit
ChangeLog.md+1 lib/route/src/Obelisk/Route/Frontend.hs+22−6
ChangeLog.md+1
@@ -19,6 +19,7 @@ This project's release branch is `master`. This log is written from the perspect
1919 use `ob run`, as we provide one for you.
2020* `ob` commands now complain less on systems with umasks other than `0022`.
2121* Ignore package environment files in `ob run` and `ob repl`
22+* Add `Obelisk.Route.Frontend.routeLinkDynAttr`.
2223
2324## v0.2.0.0 - 2019-8-17
2425
lib/route/src/Obelisk/Route/Frontend.hs+22−6
@@ -53,6 +53,7 @@ module Obelisk.Route.Frontend
5353 , runRouteToUrlT
5454 , mapRouteToUrlT
5555 , routeLink
56+ , routeLinkDynAttr
5657 , dynRouteLink
5758 , adaptedUriPath
5859 , setAdaptedUriPath
@@ -74,6 +75,7 @@ import Control.Monad.Trans.Control
7475import Data.Coerce
7576import Data.Dependent.Sum (DSum (..))
7677import Data.GADT.Compare
78+import Data.Map (Map)
7779import Data.Monoid
7880import Data.Proxy
7981import Data.Text (Text)
@@ -526,9 +528,7 @@ routeLink r w = do
526528 setRoute $ r <$ domEvent Click e
527529 return a
528530
529−-- | A link widget that, when clicked, sets the route to current value of the
530−-- provided dynamic route. In non-javascript contexts the value of the dynamic post
531−-- build is used so the link still works like 'routeLink'.
531+-- | Like 'routeLinkDynAttr' but without custom attributes.
532532dynRouteLink
533533 :: forall t m a route.
534534 ( DomBuilder t m
@@ -537,11 +537,27 @@ dynRouteLink
537537 , SetRoute t (R route) m
538538 )
539539 => Dynamic t (R route) -- ^ Target route
540− -> m a -- ^ Child widget
540+ -> m a -- ^ Child widget of the @a@ element
541+ -> m a
542+dynRouteLink = routeLinkDynAttr mempty
543+
544+-- | An @a@-tag link widget that, when clicked, sets the route to current value of the
545+-- provided dynamic route. In non-JavaScript contexts the value of the dynamic post
546+-- build is used so the link still works like 'routeLink'.
547+routeLinkDynAttr
548+ :: forall t m a route.
549+ ( DomBuilder t m
550+ , PostBuild t m
551+ , RouteToUrl (R route) m
552+ , SetRoute t (R route) m
553+ )
554+ => Dynamic t (Map AttributeName Text) -- ^ Attributes for @a@ element. Note that if @href@ is present it will be ignored
555+ -> Dynamic t (R route) -- ^ Target route
556+ -> m a -- ^ Child widget of the @a@ element
541557 -> m a
542−dynRouteLink dr w = do
558+routeLinkDynAttr dAttr dr w = do
543559 enc <- askRouteToUrl
544− er <- dynamicAttributesToModifyAttributes $ ("href" =:) . enc <$> dr
560+ er <- dynamicAttributesToModifyAttributes $ zipDynWith (<>) (("href" =:) . enc <$> dr) dAttr
545561 let cfg = (def :: ElementConfig EventResult t (DomBuilderSpace m))
546562 & elementConfig_eventSpec %~ addEventSpecFlags (Proxy :: Proxy (DomBuilderSpace m)) Click (\_ -> preventDefault)
547563 & elementConfig_modifyAttributes .~ er