git.iko.soy/reflex-dom
on develop help sign in
Merge branch 'develop' into ls-fix-dropdown-initialValue
eda9b99Elliot Cameron
reflex-dom-core/ChangeLog.md+17−17
compare with develop
unifiedsplit
@@ -2,26 +2,26 @@
2
2
3## Unreleased
3## Unreleased
4
4
5−* Support GHC 8.8.
5+* ([#353](https://github.com/reflex-frp/reflex-dom/pull/353)) Support GHC 8.8.
6−
7−* Fix attribute support for explicitly namespaced elements
6+* ([#358](https://github.com/reflex-frp/reflex-dom/pull/358)) Fix attribute support for explicitly namespaced elements.
8−
9−* Remove deprecation warnings for the following widgets in
7+* ([#363](https://github.com/reflex-frp/reflex-dom/pull/363)) Remove deprecation warnings for the following widgets in
10 `Reflex.Dom.Widget.Basic`:
8 `Reflex.Dom.Widget.Basic`:
11
9
12− * `Link`
10+ * `Link`
13− * `button`
11+ * `button`
14− * `dtdd`
12+ * `dtdd`
15− * `linkClass`
13+ * `linkClass`
16− * `link`
14+ * `link`
17− * `tabDisplay`
15+ * `tabDisplay`
18− * `tableDynAttr`
16+ * `tableDynAttr`
19−
20−* Fix bug in hydration when dealing with unexpected HTML ([#361](https://github.com/reflex-frp/reflex-dom/pull/361)).
17+* ([#361](https://github.com/reflex-frp/reflex-dom/pull/361)) Fix bug in hydration causing the JavaScript to crash when dealing with unexpected HTML.
18+* ([#364](https://github.com/reflex-frp/reflex-dom/pull/364)) Export attributes used for controlling hydration at the element level:
19+ * "data-ssr" is now available as `Reflex.Dom.Builder.Immediate.hydratableAttribute`.
20+ * "data-hydration-skip" is now available as `Reflex.Dom.Builder.Immediate.skipHydrationAttribute`.
21+* ([#348](https://github.com/reflex-frp/reflex-dom/pull/348)) **(Breaking change)** Make XHR response headers case insensitive by changing `_xhrResponse_headers :: Map Text Text` to `_xhrResponse_headers :: Map (CI Text) Text`.
22+* ([#225](https://github.com/reflex-frp/reflex-dom/pull/225)) **(Breaking change)** Add a functional dependency to `HasDomEvent`.
23+* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
21
24
22−* Export attributes used for controlling hydration at the element level
23− * "data-ssr" is now available as `Reflex.Dom.Builder.Immediate.hydratableAttribute`
24− * "data-hydration-skip" is now available as `Reflex.Dom.Builder.Immediate.skipHydrationAttribute`
25
25
26## 0.5.3
26## 0.5.3
27
27
reflex-dom-core/reflex-dom-core.cabal+2−2
@@ -53,7 +53,7 @@ library
53 bimap >= 0.3 && < 0.4,
53 bimap >= 0.3 && < 0.4,
54 blaze-builder,
54 blaze-builder,
55 bytestring == 0.10.*,
55 bytestring == 0.10.*,
56− case-insensitive,
56+ case-insensitive < 1.3,
57 containers >= 0.6 && < 0.7,
57 containers >= 0.6 && < 0.7,
58 constraints >= 0.9 && < 0.12,
58 constraints >= 0.9 && < 0.12,
59 contravariant >= 1.4 && < 1.6,
59 contravariant >= 1.4 && < 1.6,
@@ -73,7 +73,7 @@ library
73 primitive >= 0.5 && < 0.8,
73 primitive >= 0.5 && < 0.8,
74 random,
74 random,
75 ref-tf == 0.4.*,
75 ref-tf == 0.4.*,
76− reflex >= 0.6.2 && < 0.7,
76+ reflex >= 0.6.2 && < 0.8,
77 semigroups >= 0.16 && < 0.20,
77 semigroups >= 0.16 && < 0.20,
78 stm >= 2.4 && < 2.6,
78 stm >= 2.4 && < 2.6,
79 text == 1.2.*,
79 text == 1.2.*,
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+1−1
@@ -638,7 +638,7 @@ instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive
638
638
639-- * Convenience functions
639-- * Convenience functions
640
640
641−class HasDomEvent t target eventName where
641+class HasDomEvent t target eventName | target -> t where
642 type DomEventType target eventName :: *
642 type DomEventType target eventName :: *
643 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
643 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
644
644
reflex-dom-core/src/Reflex/Dom/Class.hs+4−7
@@ -4,8 +4,7 @@ module Reflex.Dom.Class ( module Reflex.Dom.Class
4 , module Web.KeyCode
4 , module Web.KeyCode
5 ) where
5 ) where
6
6
7−import Data.Map (Map)
7+import Control.Lens
8−import qualified Data.Map as Map
9import Reflex.Class
8import Reflex.Class
10import Web.KeyCode
9import Web.KeyCode
11
10
@@ -13,11 +12,9 @@ import Foreign.JavaScript.TH
13import Reflex.PerformEvent.Class
12import Reflex.PerformEvent.Class
14import Reflex.PostBuild.Class
13import Reflex.PostBuild.Class
15
14
16−import Prelude hiding (concat, mapM, mapM_, sequence)
17−
18−-- | Alias for Data.Map.singleton
15+-- | Previously an alias for 'Data.Map.singleton', but now generalised to 'At'
19−(=:) :: k -> a -> Map k a
16+(=:) :: (At m, Monoid m) => Index m -> IxValue m -> m
20−(=:) = Map.singleton
17+k =: a = at k ?~ a $ mempty
21infixr 7 =: -- Ought to bind tighter than <>, which is infixr 6
18infixr 7 =: -- Ought to bind tighter than <>, which is infixr 6
22
19
23{-# DEPRECATED keycodeEnter "Instead of `x == keycodeEnter`, use `keyCodeLookup x == Enter`" #-}
20{-# DEPRECATED keycodeEnter "Instead of `x == keycodeEnter`, use `keyCodeLookup x == Enter`" #-}
reflex-dom-core/src/Reflex/Dom/Xhr.hs+1−1
@@ -446,7 +446,7 @@ xhrResponse_responseText :: Lens' XhrResponse (Maybe Text)
446xhrResponse_responseText f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 y x5) <$> f x4
446xhrResponse_responseText f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 y x5) <$> f x4
447{-# INLINE xhrResponse_responseText #-}
447{-# INLINE xhrResponse_responseText #-}
448
448
449−xhrResponse_headers :: Lens' XhrResponse (Map Text Text)
449+xhrResponse_headers :: Lens' XhrResponse (Map (CI Text) Text)
450xhrResponse_headers f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 x4 y) <$> f x5
450xhrResponse_headers f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 x4 y) <$> f x5
451{-# INLINE xhrResponse_headers #-}
451{-# INLINE xhrResponse_headers #-}
452
452
reflex-dom/ChangeLog.md+4
@@ -1,5 +1,9 @@
1# Revision history for reflex-dom
1# Revision history for reflex-dom
2
2
3+## Unreleased
4+
5+* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
6+
3## 0.5.3
7## 0.5.3
4
8
5* On Android, enable prompting the user for geolocation
9* On Android, enable prompting the user for geolocation
reflex-dom/reflex-dom.cabal+9−4
@@ -59,7 +59,7 @@ library
59 build-depends:
59 build-depends:
60 base >= 4.7 && < 4.13,
60 base >= 4.7 && < 4.13,
61 bytestring == 0.10.*,
61 bytestring == 0.10.*,
62− reflex >= 0.6.2 && < 0.7,
62+ reflex >= 0.6.2 && < 0.8,
63 reflex-dom-core >=0.5.2 && < 0.6,
63 reflex-dom-core >=0.5.2 && < 0.6,
64 text == 1.2.*
64 text == 1.2.*
65 if !impl(ghcjs)
65 if !impl(ghcjs)
@@ -74,13 +74,18 @@ library
74 jsaddle,
74 jsaddle,
75 jsaddle-wkwebview
75 jsaddle-wkwebview
76 else
76 else
77− if flag(webkit2gtk)
77+ if arch(wasm32)
78 build-depends:
78 build-depends:
79− jsaddle-webkit2gtk
79+ jsaddle,
80+ jsaddle-wasm
80 else
81 else
81− if !os(android)
82+ if flag(webkit2gtk)
82 build-depends:
83 build-depends:
83 jsaddle-webkit2gtk
84 jsaddle-webkit2gtk
85+ else
86+ if !os(android)
87+ build-depends:
88+ jsaddle-webkit2gtk
84
89
85 exposed-modules:
90 exposed-modules:
86 Reflex.Dom
91 Reflex.Dom
reflex-dom/src/Reflex/Dom/Internal.hs+5
@@ -80,6 +80,11 @@ run jsm = do
80 startMainWidget a startPage jsm
80 startMainWidget a startPage jsm
81 }
81 }
82 forever $ threadDelay 1000000000
82 forever $ threadDelay 1000000000
83+#elif defined(wasm32_HOST_ARCH)
84+import qualified Language.Javascript.JSaddle.Wasm as Wasm (run)
85+import Language.Javascript.JSaddle (JSM)
86+run :: JSM () -> IO ()
87+run = Wasm.run 0
83#else
88#else
84import Language.Javascript.JSaddle.WebKitGTK (run)
89import Language.Javascript.JSaddle.WebKitGTK (run)
85#endif
90#endif