git.iko.soy/reflex-dom
on develop help sign in
Update to newer reflex; fix warnings
4a65735Ryan Trinkle
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+5−6
compare with develop
unifiedsplit
@@ -7,19 +7,18 @@ module Foreign.JavaScript.Orphans where
7
7
8import Control.Monad.Trans.Class (lift)
8import Control.Monad.Trans.Class (lift)
9import GHCJS.DOM.Types (MonadJSM (..))
9import GHCJS.DOM.Types (MonadJSM (..))
10−import Reflex.DynamicWriter (DynamicWriterT)
10+import Reflex.DynamicWriter.Base (DynamicWriterT)
11−import Reflex.EventWriter (EventWriterT)
11+import Reflex.EventWriter.Base (EventWriterT)
12−import Reflex.Host.Class (HostFrame, ReflexHost)
13import Reflex.PerformEvent.Base (PerformEventT (..))
12import Reflex.PerformEvent.Base (PerformEventT (..))
14import Reflex.PostBuild.Base (PostBuildT)
13import Reflex.PostBuild.Base (PostBuildT)
15import Reflex.Requester.Base (RequesterT)
14import Reflex.Requester.Base (RequesterT)
16import Reflex.TriggerEvent.Base
15import Reflex.TriggerEvent.Base
17import Reflex.Query.Base (QueryT)
16import Reflex.Query.Base (QueryT)
18
17
19−instance (MonadJSM m, ReflexHost t) => MonadJSM (PostBuildT t m) where
18+instance MonadJSM m => MonadJSM (PostBuildT t m) where
19+ liftJSM' = lift . liftJSM'
20+instance MonadJSM m => MonadJSM (PerformEventT t m) where
20 liftJSM' = lift . liftJSM'
21 liftJSM' = lift . liftJSM'
21−instance (MonadJSM (HostFrame t), ReflexHost t) => MonadJSM (PerformEventT t m) where
22− liftJSM' = PerformEventT . lift . liftJSM'
23instance MonadJSM m => MonadJSM (DynamicWriterT t w m) where
22instance MonadJSM m => MonadJSM (DynamicWriterT t w m) where
24 liftJSM' = lift . liftJSM'
23 liftJSM' = lift . liftJSM'
25instance MonadJSM m => MonadJSM (EventWriterT t w m) where
24instance MonadJSM m => MonadJSM (EventWriterT t w m) where
reflex-dom-core/src/Foreign/JavaScript/TH.hs+9−8
@@ -28,8 +28,9 @@ module Foreign.JavaScript.TH ( module Foreign.JavaScript.TH
28import Foreign.JavaScript.Orphans ()
28import Foreign.JavaScript.Orphans ()
29import Prelude hiding ((!!))
29import Prelude hiding ((!!))
30import Reflex.Class
30import Reflex.Class
31+import Reflex.Adjustable.Class
31−import Reflex.DynamicWriter
32+import Reflex.DynamicWriter.Base
32−import Reflex.EventWriter
33+import Reflex.EventWriter.Base
33import Reflex.Host.Class
34import Reflex.Host.Class
34import Reflex.PerformEvent.Base
35import Reflex.PerformEvent.Base
35import Reflex.PerformEvent.Class
36import Reflex.PerformEvent.Class
@@ -110,8 +111,8 @@ instance HasJSContext m => HasJSContext (PostBuildT t m) where
110 type JSContextPhantom (PostBuildT t m) = JSContextPhantom m
111 type JSContextPhantom (PostBuildT t m) = JSContextPhantom m
111 askJSContext = lift askJSContext
112 askJSContext = lift askJSContext
112
113
113−instance (ReflexHost t, HasJSContext (HostFrame t)) => HasJSContext (PerformEventT t m) where
114+instance HasJSContext m => HasJSContext (PerformEventT t m) where
114− type JSContextPhantom (PerformEventT t m) = JSContextPhantom (HostFrame t)
115+ type JSContextPhantom (PerformEventT t m) = JSContextPhantom m
115 askJSContext = PerformEventT $ lift askJSContext
116 askJSContext = PerformEventT $ lift askJSContext
116
117
117instance HasJSContext m => HasJSContext (EventWriterT t w m) where
118instance HasJSContext m => HasJSContext (EventWriterT t w m) where
@@ -242,13 +243,13 @@ instance HasJS x m => HasJS x (ReaderT r m) where
242 type JSX (ReaderT r m) = JSX m
243 type JSX (ReaderT r m) = JSX m
243 liftJS = lift . liftJS
244 liftJS = lift . liftJS
244
245
245−instance (HasJS x m, ReflexHost t) => HasJS x (PostBuildT t m) where
246+instance HasJS x m => HasJS x (PostBuildT t m) where
246 type JSX (PostBuildT t m) = JSX m
247 type JSX (PostBuildT t m) = JSX m
247 liftJS = lift . liftJS
248 liftJS = lift . liftJS
248
249
249−instance (HasJS x (HostFrame t), ReflexHost t) => HasJS x (PerformEventT t m) where
250+instance HasJS x m => HasJS x (PerformEventT t m) where
250− type JSX (PerformEventT t m) = JSX (HostFrame t)
251+ type JSX (PerformEventT t m) = JSX m
251− liftJS = PerformEventT . lift . liftJS
252+ liftJS = lift . liftJS
252
253
253instance HasJS x m => HasJS x (DynamicWriterT t w m) where
254instance HasJS x m => HasJS x (DynamicWriterT t w m) where
254 type JSX (DynamicWriterT t w m) = JSX m
255 type JSX (DynamicWriterT t w m) = JSX m
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+3−2
@@ -29,13 +29,14 @@ module Reflex.Dom.Builder.Class
29 , module Reflex.NotReady.Class
29 , module Reflex.NotReady.Class
30 ) where
30 ) where
31
31
32+import Reflex.Adjustable.Class
32import Reflex.Class as Reflex
33import Reflex.Class as Reflex
33import Reflex.Dom.Builder.Class.Events
34import Reflex.Dom.Builder.Class.Events
34#ifdef USE_TEMPLATE_HASKELL
35#ifdef USE_TEMPLATE_HASKELL
35import Reflex.Dom.Builder.Class.TH
36import Reflex.Dom.Builder.Class.TH
36#endif
37#endif
37−import Reflex.DynamicWriter
38+import Reflex.DynamicWriter.Base
38−import Reflex.EventWriter
39+import Reflex.EventWriter.Base
39import Reflex.NotReady.Class
40import Reflex.NotReady.Class
40import Reflex.PerformEvent.Class
41import Reflex.PerformEvent.Class
41import Reflex.PostBuild.Base
42import Reflex.PostBuild.Base
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+1−8
@@ -90,21 +90,18 @@ module Reflex.Dom.Builder.Immediate
90 ) where
90 ) where
91
91
92import Foreign.JavaScript.TH
92import Foreign.JavaScript.TH
93+import Reflex.Adjustable.Class
93import Reflex.Class as Reflex
94import Reflex.Class as Reflex
94import Reflex.Dom.Builder.Class
95import Reflex.Dom.Builder.Class
95import Reflex.Dynamic
96import Reflex.Dynamic
96−import Reflex.DynamicWriter (DynamicWriterT)
97−import Reflex.EventWriter (EventWriterT)
98import Reflex.Host.Class
97import Reflex.Host.Class
99import qualified Reflex.Patch.DMap as PatchDMap
98import qualified Reflex.Patch.DMap as PatchDMap
100import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
99import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
101import Reflex.PerformEvent.Class
100import Reflex.PerformEvent.Class
102−import Reflex.PostBuild.Base
103import Reflex.PostBuild.Class
101import Reflex.PostBuild.Class
104import Reflex.TriggerEvent.Base hiding (askEvents)
102import Reflex.TriggerEvent.Base hiding (askEvents)
105import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
103import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
106import Reflex.TriggerEvent.Class
104import Reflex.TriggerEvent.Class
107−import Reflex.Query.Base (QueryT)
108
105
109import Control.Concurrent
106import Control.Concurrent
110import Control.Lens hiding (element, ix)
107import Control.Lens hiding (element, ix)
@@ -112,8 +109,6 @@ import Control.Monad.Exception
112import Control.Monad.Primitive
109import Control.Monad.Primitive
113import Control.Monad.Reader
110import Control.Monad.Reader
114import Control.Monad.Ref
111import Control.Monad.Ref
115−import Control.Monad.State.Strict (StateT)
116−import qualified Control.Monad.State as Lazy (StateT)
117#ifndef USE_TEMPLATE_HASKELL
112#ifndef USE_TEMPLATE_HASKELL
118import Data.Functor.Contravariant (phantom)
113import Data.Functor.Contravariant (phantom)
119#endif
114#endif
@@ -133,9 +128,7 @@ import Data.Monoid hiding (Product)
133import Data.Some (Some)
128import Data.Some (Some)
134import qualified Data.Some as Some
129import qualified Data.Some as Some
135import Data.Text (Text)
130import Data.Text (Text)
136−import qualified Data.Text as T
137import qualified GHCJS.DOM as DOM
131import qualified GHCJS.DOM as DOM
138−import GHCJS.DOM.RequestAnimationFrameCallback
139import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode)
132import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode)
140import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS)
133import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS)
141import qualified GHCJS.DOM.Element as Element
134import qualified GHCJS.DOM.Element as Element
reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+2−1
@@ -40,6 +40,7 @@ import Data.Text (Text)
40import Data.Text.Encoding
40import Data.Text.Encoding
41import Data.Tuple
41import Data.Tuple
42import GHC.Generics
42import GHC.Generics
43+import Reflex.Adjustable.Class
43import Reflex.Class
44import Reflex.Class
44import Reflex.Dom.Builder.Class
45import Reflex.Dom.Builder.Class
45import Reflex.Dynamic
46import Reflex.Dynamic
@@ -147,7 +148,7 @@ instance DomSpace StaticDomSpace where
147 type RawSelectElement StaticDomSpace = ()
148 type RawSelectElement StaticDomSpace = ()
148 addEventSpecFlags _ _ _ _ = StaticEventSpec
149 addEventSpecFlags _ _ _ _ = StaticEventSpec
149
150
150−instance Monad m => HasDocument (StaticDomBuilderT t m) where
151+instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilderT t m) where
151 askDocument = pure ()
152 askDocument = pure ()
152
153
153instance (Reflex t, Adjustable t m, MonadHold t m) => Adjustable t (StaticDomBuilderT t m) where
154instance (Reflex t, Adjustable t m, MonadHold t m) => Adjustable t (StaticDomBuilderT t m) where
reflex-dom-core/src/Reflex/Dom/Specializations.hs−1
@@ -20,7 +20,6 @@ import Data.IORef
20import GHCJS.DOM.Types (JSM)
20import GHCJS.DOM.Types (JSM)
21import Data.IntMap.Strict (IntMap)
21import Data.IntMap.Strict (IntMap)
22import qualified Data.IntMap.Strict as IntMap
22import qualified Data.IntMap.Strict as IntMap
23−import Data.FastMutableIntMap
24
23
25import qualified GHCJS.DOM.Element as DOM
24import qualified GHCJS.DOM.Element as DOM
26import qualified GHCJS.DOM.Types as DOM
25import qualified GHCJS.DOM.Types as DOM
reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs−1
@@ -65,7 +65,6 @@ import Reflex.Dom.Builder.Class
65import Reflex.Dom.Class
65import Reflex.Dom.Class
66import Reflex.Dynamic
66import Reflex.Dynamic
67import Reflex.Network
67import Reflex.Network
68−import Reflex.NotReady.Class
69import Reflex.PostBuild.Class
68import Reflex.PostBuild.Class
70import Reflex.Workflow
69import Reflex.Workflow
71
70
reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+1−1
@@ -64,7 +64,7 @@ virtualListWithSelection heightPx rowPx maxIndex i0 setI listTag listAttrs rowTa
64 let indexAndLength = fmap snd window
64 let indexAndLength = fmap snd window
65 return (indexAndLength, sel)
65 return (indexAndLength, sel)
66 where
66 where
67− toStyleAttr m = "style" =: Map.foldWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
67+ toStyleAttr m = "style" =: Map.foldrWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
68 toViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
68 toViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
69 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
69 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
70 toContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
70 toContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")