git.iko.soy/reflex-dom
on develop help sign in
Merge branch 'develop' into patch-1
commit9df7e21b90dbeca61906040db953f8d391d026e4 authorAli Abrar <aliabrar@gmail.com> dateFri 6 Nov 2020, 10:14 (6 years ago) parent9e8d1d3ddf8977
4 files changed+8−7
compare with develop
unifiedsplit
reflex-dom-core/reflex-dom-core.cabal+1−1 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+3−2 reflex-dom-core/src/Reflex/Dom/Prerender.hs+2−2 reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+2−2
reflex-dom-core/reflex-dom-core.cabal+1−1
@@ -68,7 +68,7 @@ library
6868 constraints >= 0.9 && < 0.13,
6969 contravariant >= 1.4 && < 1.6,
7070 data-default >= 0.5 && < 0.8,
71− dependent-map >= 0.3 && < 0.4,
71+ dependent-map >= 0.3 && < 0.5,
7272 dependent-sum >= 0.6 && < 0.8,
7373 dependent-sum-template >= 0.1 && < 0.2,
7474 directory >= 1.2 && < 1.4,
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+3−2
@@ -140,6 +140,7 @@ import Data.IntMap.Strict (IntMap)
140140import Data.Maybe
141141import Data.Monoid ((<>))
142142import Data.Some (Some(..))
143+import Data.GADT.Compare (GCompare)
143144import Data.String (IsString)
144145import Data.Text (Text)
145146import Foreign.JavaScript.Internal.Utils
@@ -1632,7 +1633,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16321633
16331634{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
16341635traverseDMapWithKeyWithAdjust'
1635− :: forall s t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadJSM m, PrimMonad m, DMap.GCompare k, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1636+ :: forall s t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadJSM m, PrimMonad m, GCompare k, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
16361637 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
16371638 -> DMap k v
16381639 -> Event t (PatchDMap k v)
@@ -1752,7 +1753,7 @@ hoistTraverseWithKeyWithAdjust
17521753 ::
17531754 ( Adjustable t m
17541755 , MonadHold t m
1755− , DMap.GCompare k
1756+ , GCompare k
17561757 , MonadIO m
17571758 , MonadJSM m
17581759 , PrimMonad m
reflex-dom-core/src/Reflex/Dom/Prerender.hs+2−2
@@ -205,7 +205,7 @@ instance Monad m => MonadReflexCreateTrigger t (UnrunnableT js t m) where
205205 newFanEventWithTrigger _ = unrunnable
206206instance Monad m => MonadFix (UnrunnableT js t m) where
207207 mfix _ = unrunnable
208−instance Monad m => MonadHold t (UnrunnableT js t m) where
208+instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
209209 hold _ _ = unrunnable
210210 holdDyn _ _ = unrunnable
211211 holdIncremental _ _ = unrunnable
@@ -229,7 +229,7 @@ instance (Reflex t, Monad m) => DomRenderHook t (UnrunnableT js t m) where
229229 withRenderHook _ _ = unrunnable
230230 requestDomAction _ = unrunnable
231231 requestDomAction_ _ = unrunnable
232−instance (Reflex t, Monad m) => Prerender JS' t (UnrunnableT js t m) where
232+instance (Reflex t, Monad m, MonadHold t m) => Prerender JS' t (UnrunnableT js t m) where
233233 type Client (UnrunnableT js t m) = UnrunnableT js t m
234234 prerender _ _ = unrunnable
235235
reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+2−2
@@ -15,7 +15,7 @@ import Data.Text (Text)
1515import Data.ByteString (ByteString)
1616import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
1717import GHCJS.DOM.Enums
18−import GHCJS.DOM.EventM (EventM, on)
18+import GHCJS.DOM.EventM (EventM, on, onSync)
1919import GHCJS.DOM.EventTarget (dispatchEvent)
2020import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
2121import GHCJS.DOM.XMLHttpRequest
@@ -114,7 +114,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
114114xmlHttpRequestOntimeout = (`on` timeout)
115115
116116xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
117−xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
117+xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
118118
119119xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
120120xmlHttpRequestSetTimeout = setTimeout