66b6d35 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Update for Reflex reorganization

commit66b6d35773fcb337ab38ebce02c4b23baeae721e authorRyan Trinkle <ryan.trinkle@gmail.com> dateMon 14 Nov 2016, 16:51 (10 years ago) parent37b94bd

13 files changed+26−17

compare with develop

unifiedsplit

reflex-dom.cabal+1 src/Foreign/JavaScript/TH.hs+6−5 src/Reflex/Dom.hs+1−1 src/Reflex/Dom/Builder/Class.hs+6−6 src/Reflex/Dom/Builder/Immediate.hs+2−2 src/Reflex/Dom/Builder/Static.hs+2−1 src/Reflex/Dom/Internal.hs+2−1 src/Reflex/Dom/Old.hs+1 src/Reflex/Dom/Time.hs+1 src/Reflex/Dom/WebSocket.hs+1 src/Reflex/Dom/Widget/Input.hs+1−1 src/Reflex/Dom/Widget/Resize.hs+1 src/Reflex/Dom/Xhr.hs+1

reflex-dom.cabal+1

@@ -108,6 +108,7 @@ library

108108

109109 other-extensions: TemplateHaskell

110110 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans

111+

111112 if flag(use-reflex-optimizer)

112113 ghc-options: -fplugin=Reflex.Optimizer

113114

src/Foreign/JavaScript/TH.hs+6−5

@@ -25,7 +25,8 @@ import Reflex.DynamicWriter

2525import Reflex.Host.Class

2626import Reflex.PerformEvent.Base

2727import Reflex.PerformEvent.Class

28−import Reflex.PostBuild.Class

28+import Reflex.PostBuild.Base

29+import Reflex.Requester.Base

2930

3031import Language.Haskell.TH

3132

@@ -109,8 +110,8 @@ instance HasWebView m => HasWebView (DynamicWriterT t w m) where

109110 type WebViewPhantom (DynamicWriterT t w m) = WebViewPhantom m

110111 askWebView = lift askWebView

111112

112−instance HasWebView m => HasWebView (RequestT t request response m) where

113− type WebViewPhantom (RequestT t request response m) = WebViewPhantom m

113+instance HasWebView m => HasWebView (RequesterT t request response m) where

114+ type WebViewPhantom (RequesterT t request response m) = WebViewPhantom m

114115 askWebView = lift askWebView

115116

116117newtype WithWebView x m a = WithWebView { unWithWebView :: ReaderT (WebViewSingleton x) m a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadTrans, MonadException, MonadAsyncException)

@@ -226,8 +227,8 @@ instance HasJS x m => HasJS x (DynamicWriterT t w m) where

226227 type JSM (DynamicWriterT t w m) = JSM m

227228 liftJS = lift . liftJS

228229

229−instance HasJS x m => HasJS x (RequestT t request response m) where

230− type JSM (RequestT t request response m) = JSM m

230+instance HasJS x m => HasJS x (RequesterT t request response m) where

231+ type JSM (RequesterT t request response m) = JSM m

231232 liftJS = lift . liftJS

232233

233234-- | A Monad that is capable of executing JavaScript

src/Reflex/Dom.hs+1−1

@@ -1,6 +1,6 @@

11module Reflex.Dom (module X) where

3−import Reflex as X

3+import Reflex as X hiding (askEvents)

44import Reflex.Dom.Builder.Class as X

55import Reflex.Dom.Builder.Immediate as X

66import Reflex.Dom.Builder.InputDisabled as X

src/Reflex/Dom/Builder/Class.hs+6−6

@@ -23,9 +23,9 @@ module Reflex.Dom.Builder.Class

2323import Reflex.Class as Reflex

2424import Reflex.Dom.Builder.Class.Events

2525import Reflex.DynamicWriter

26−import Reflex.PerformEvent.Base

2726import Reflex.PerformEvent.Class

28−import Reflex.PostBuild.Class

27+import Reflex.PostBuild.Base

28+import Reflex.Requester.Base

2929

3030import qualified Control.Category

3131import Control.Lens hiding (element)

@@ -425,10 +425,10 @@ instance (DomBuilder t m, Monoid w, MonadHold t m, MonadFix m) => DomBuilder t (

425425 { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg

426426 }

427427

428−instance (DomBuilder t m, MonadHold t m, MonadFix m) => DomBuilder t (RequestT t request response m) where

429− type DomBuilderSpace (RequestT t request response m) = DomBuilderSpace m

428+instance (DomBuilder t m, MonadHold t m, MonadFix m) => DomBuilder t (RequesterT t request response m) where

429+ type DomBuilderSpace (RequesterT t request response m) = DomBuilderSpace m

430430 textNode = liftTextNode

431− element elementTag cfg (RequestT child) = RequestT $ do

431+ element elementTag cfg (RequesterT child) = RequesterT $ do

432432 r <- ask

433433 s <- get

434434 let cfg' = liftElementConfig cfg

@@ -437,7 +437,7 @@ instance (DomBuilder t m, MonadHold t m, MonadFix m) => DomBuilder t (RequestT t

437437 return (el, a)

438438 inputElement cfg = lift $ inputElement $ cfg & inputElementConfig_elementConfig %~ liftElementConfig

439439 textAreaElement cfg = lift $ textAreaElement $ cfg & textAreaElementConfig_elementConfig %~ liftElementConfig

440− selectElement cfg (RequestT child) = RequestT $ do

440+ selectElement cfg (RequesterT child) = RequesterT $ do

441441 r <- ask

442442 s <- get

443443 let cfg' = cfg & selectElementConfig_elementConfig %~ liftElementConfig

src/Reflex/Dom/Builder/Immediate.hs+2−2

@@ -24,6 +24,8 @@ import Reflex.Dynamic

2424import Reflex.Host.Class

2525import Reflex.PerformEvent.Class

2626import Reflex.PostBuild.Class

27+import Reflex.TriggerEvent.Class

28+import Reflex.TriggerEvent.Base hiding (askEvents)

2729

2830import Control.Concurrent.Chan

2931import Control.Lens hiding (element)

@@ -71,8 +73,6 @@ import Debug.Trace hiding (traceEvent)

7173

7274data TriggerRef t a = TriggerRef { unTriggerRef :: IORef (Maybe (EventTrigger t a)) }

7375

74−data TriggerInvocation a = TriggerInvocation a (IO ())

75−

7676data ImmediateDomBuilderEnv t

7777 = ImmediateDomBuilderEnv { _immediateDomBuilderEnv_document :: Document

7878 , _immediateDomBuilderEnv_parent :: Node

src/Reflex/Dom/Builder/Static.hs+2−1

@@ -46,8 +46,9 @@ import Reflex.Dynamic

4646import Reflex.Host.Class

4747import Reflex.PerformEvent.Base

4848import Reflex.PerformEvent.Class

49−import Reflex.PostBuild.Class

49+import Reflex.PostBuild.Base

5050import Reflex.Spider

51+import Reflex.TriggerEvent.Class

5152

5253newtype StaticDomBuilderT t m a = StaticDomBuilderT

5354 { unStaticDomBuilderT :: StateT [Behavior t Builder] m a -- Accumulated Html will be in reversed order

src/Reflex/Dom/Internal.hs+2−1

@@ -21,8 +21,9 @@ import Reflex.Dom.Class

2121import Reflex.Dom.Internal.Foreign

2222import Reflex.Host.Class

2323import Reflex.PerformEvent.Base

24−import Reflex.PostBuild.Class

24+import Reflex.PostBuild.Base

2525import Reflex.Spider (Global, Spider, SpiderHost, runSpiderHost)

26+import Reflex.TriggerEvent.Base

2627

2728import Control.Concurrent

2829import Control.Lens

src/Reflex/Dom/Old.hs+1

@@ -73,6 +73,7 @@ import Reflex.Dom.Widget.Basic

7373import Reflex.Host.Class

7474import Reflex.PerformEvent.Class

7575import Reflex.PostBuild.Class

76+import Reflex.TriggerEvent.Class

7677

7778data ElConfig attrs = ElConfig

7879 { _elConfig_namespace :: Maybe Text

src/Reflex/Dom/Time.hs+1

@@ -10,6 +10,7 @@ import Reflex.Class

1010import Reflex.Dynamic

1111import Reflex.PerformEvent.Class

1212import Reflex.PostBuild.Class

13+import Reflex.TriggerEvent.Class

1314

1415import Control.Concurrent

1516import qualified Control.Concurrent.Thread.Delay as Concurrent

src/Reflex/Dom/WebSocket.hs+1

@@ -28,6 +28,7 @@ import Reflex.Dom.Class

2828import Reflex.Dom.WebSocket.Foreign

2929import Reflex.PerformEvent.Class

3030import Reflex.PostBuild.Class

31+import Reflex.TriggerEvent.Class

3132

3233import Control.Concurrent

3334import Control.Concurrent.STM

src/Reflex/Dom/Widget/Input.hs+1−1

@@ -43,8 +43,8 @@ import Reflex.Dom.Builder.Immediate

4343import Reflex.Dom.Class

4444import Reflex.Dom.Widget.Basic

4545import Reflex.Dynamic

46−import Reflex.PerformEvent.Class

4746import Reflex.PostBuild.Class

47+import Reflex.TriggerEvent.Class

4848import qualified Text.Read as T

4949

5050import qualified GHCJS.DOM.Event as Event

src/Reflex/Dom/Widget/Resize.hs+1

@@ -12,6 +12,7 @@ import Reflex.Dom.Class

1212import Reflex.Dom.Widget.Basic

1313import Reflex.PerformEvent.Class

1414import Reflex.PostBuild.Class

15+import Reflex.TriggerEvent.Class

1516

1617import Control.Monad

1718import Control.Monad.Fix

src/Reflex/Dom/Xhr.hs+1

@@ -65,6 +65,7 @@ import Reflex.Dom.Xhr.Exception

6565import Reflex.Dom.Xhr.Foreign

6666import Reflex.Dom.Xhr.ResponseType

6767import Reflex.PerformEvent.Class

68+import Reflex.TriggerEvent.Class

6869

6970import Control.Concurrent

7071import Control.Exception (handle)