git.iko.soy/reflex-dom
on develop help sign in
Update to newer reflex; fix warnings
commit4a65735dab7cc23962621a536fef4aaf983b3881 authorRyan Trinkle <ryan.trinkle@gmail.com> dateSun 5 Aug 2018, 19:33 (8 years ago) parent0dc8462
8 files changed+21−28
compare with develop
unifiedsplit
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+5−6 reflex-dom-core/src/Foreign/JavaScript/TH.hs+9−8 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+3−2 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+1−8 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+2−1 reflex-dom-core/src/Reflex/Dom/Specializations.hs−1 reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs−1 reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+1−1
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+5−6
@@ -7,19 +7,18 @@ module Foreign.JavaScript.Orphans where
77
88import Control.Monad.Trans.Class (lift)
99import GHCJS.DOM.Types (MonadJSM (..))
10−import Reflex.DynamicWriter (DynamicWriterT)
11−import Reflex.EventWriter (EventWriterT)
12−import Reflex.Host.Class (HostFrame, ReflexHost)
10+import Reflex.DynamicWriter.Base (DynamicWriterT)
11+import Reflex.EventWriter.Base (EventWriterT)
1312import Reflex.PerformEvent.Base (PerformEventT (..))
1413import Reflex.PostBuild.Base (PostBuildT)
1514import Reflex.Requester.Base (RequesterT)
1615import Reflex.TriggerEvent.Base
1716import Reflex.Query.Base (QueryT)
1817
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
2021 liftJSM' = lift . liftJSM'
21−instance (MonadJSM (HostFrame t), ReflexHost t) => MonadJSM (PerformEventT t m) where
22− liftJSM' = PerformEventT . lift . liftJSM'
2322instance MonadJSM m => MonadJSM (DynamicWriterT t w m) where
2423 liftJSM' = lift . liftJSM'
2524instance 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
2828import Foreign.JavaScript.Orphans ()
2929import Prelude hiding ((!!))
3030import Reflex.Class
31−import Reflex.DynamicWriter
32−import Reflex.EventWriter
31+import Reflex.Adjustable.Class
32+import Reflex.DynamicWriter.Base
33+import Reflex.EventWriter.Base
3334import Reflex.Host.Class
3435import Reflex.PerformEvent.Base
3536import Reflex.PerformEvent.Class
@@ -110,8 +111,8 @@ instance HasJSContext m => HasJSContext (PostBuildT t m) where
110111 type JSContextPhantom (PostBuildT t m) = JSContextPhantom m
111112 askJSContext = lift askJSContext
112113
113−instance (ReflexHost t, HasJSContext (HostFrame t)) => HasJSContext (PerformEventT t m) where
114− type JSContextPhantom (PerformEventT t m) = JSContextPhantom (HostFrame t)
114+instance HasJSContext m => HasJSContext (PerformEventT t m) where
115+ type JSContextPhantom (PerformEventT t m) = JSContextPhantom m
115116 askJSContext = PerformEventT $ lift askJSContext
116117
117118instance HasJSContext m => HasJSContext (EventWriterT t w m) where
@@ -242,13 +243,13 @@ instance HasJS x m => HasJS x (ReaderT r m) where
242243 type JSX (ReaderT r m) = JSX m
243244 liftJS = lift . liftJS
244245
245−instance (HasJS x m, ReflexHost t) => HasJS x (PostBuildT t m) where
246+instance HasJS x m => HasJS x (PostBuildT t m) where
246247 type JSX (PostBuildT t m) = JSX m
247248 liftJS = lift . liftJS
248249
249−instance (HasJS x (HostFrame t), ReflexHost t) => HasJS x (PerformEventT t m) where
250− type JSX (PerformEventT t m) = JSX (HostFrame t)
251− liftJS = PerformEventT . lift . liftJS
250+instance HasJS x m => HasJS x (PerformEventT t m) where
251+ type JSX (PerformEventT t m) = JSX m
252+ liftJS = lift . liftJS
252253
253254instance HasJS x m => HasJS x (DynamicWriterT t w m) where
254255 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
2929 , module Reflex.NotReady.Class
3030 ) where
3131
32+import Reflex.Adjustable.Class
3233import Reflex.Class as Reflex
3334import Reflex.Dom.Builder.Class.Events
3435#ifdef USE_TEMPLATE_HASKELL
3536import Reflex.Dom.Builder.Class.TH
3637#endif
37−import Reflex.DynamicWriter
38−import Reflex.EventWriter
38+import Reflex.DynamicWriter.Base
39+import Reflex.EventWriter.Base
3940import Reflex.NotReady.Class
4041import Reflex.PerformEvent.Class
4142import Reflex.PostBuild.Base
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+1−8
@@ -90,21 +90,18 @@ module Reflex.Dom.Builder.Immediate
9090 ) where
9191
9292import Foreign.JavaScript.TH
93+import Reflex.Adjustable.Class
9394import Reflex.Class as Reflex
9495import Reflex.Dom.Builder.Class
9596import Reflex.Dynamic
96−import Reflex.DynamicWriter (DynamicWriterT)
97−import Reflex.EventWriter (EventWriterT)
9897import Reflex.Host.Class
9998import qualified Reflex.Patch.DMap as PatchDMap
10099import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
101100import Reflex.PerformEvent.Class
102−import Reflex.PostBuild.Base
103101import Reflex.PostBuild.Class
104102import Reflex.TriggerEvent.Base hiding (askEvents)
105103import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
106104import Reflex.TriggerEvent.Class
107−import Reflex.Query.Base (QueryT)
108105
109106import Control.Concurrent
110107import Control.Lens hiding (element, ix)
@@ -112,8 +109,6 @@ import Control.Monad.Exception
112109import Control.Monad.Primitive
113110import Control.Monad.Reader
114111import Control.Monad.Ref
115−import Control.Monad.State.Strict (StateT)
116−import qualified Control.Monad.State as Lazy (StateT)
117112#ifndef USE_TEMPLATE_HASKELL
118113import Data.Functor.Contravariant (phantom)
119114#endif
@@ -133,9 +128,7 @@ import Data.Monoid hiding (Product)
133128import Data.Some (Some)
134129import qualified Data.Some as Some
135130import Data.Text (Text)
136−import qualified Data.Text as T
137131import qualified GHCJS.DOM as DOM
138−import GHCJS.DOM.RequestAnimationFrameCallback
139132import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode)
140133import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS)
141134import 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)
4040import Data.Text.Encoding
4141import Data.Tuple
4242import GHC.Generics
43+import Reflex.Adjustable.Class
4344import Reflex.Class
4445import Reflex.Dom.Builder.Class
4546import Reflex.Dynamic
@@ -147,7 +148,7 @@ instance DomSpace StaticDomSpace where
147148 type RawSelectElement StaticDomSpace = ()
148149 addEventSpecFlags _ _ _ _ = StaticEventSpec
149150
150−instance Monad m => HasDocument (StaticDomBuilderT t m) where
151+instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilderT t m) where
151152 askDocument = pure ()
152153
153154instance (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
2020import GHCJS.DOM.Types (JSM)
2121import Data.IntMap.Strict (IntMap)
2222import qualified Data.IntMap.Strict as IntMap
23−import Data.FastMutableIntMap
2423
2524import qualified GHCJS.DOM.Element as DOM
2625import 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
6565import Reflex.Dom.Class
6666import Reflex.Dynamic
6767import Reflex.Network
68−import Reflex.NotReady.Class
6968import Reflex.PostBuild.Class
7069import Reflex.Workflow
7170
reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+1−1
@@ -64,7 +64,7 @@ virtualListWithSelection heightPx rowPx maxIndex i0 setI listTag listAttrs rowTa
6464 let indexAndLength = fmap snd window
6565 return (indexAndLength, sel)
6666 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
6868 toViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
6969 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
7070 toContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")