@@ -2,7 +2,6 @@
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE ConstraintKinds #-}
3{-# LANGUAGE ConstraintKinds #-}
4{-# LANGUAGE DataKinds #-}
4{-# LANGUAGE DataKinds #-}
5−{-# LANGUAGE DeriveTraversable #-}
6{-# LANGUAGE EmptyDataDecls #-}
5{-# LANGUAGE EmptyDataDecls #-}
7{-# LANGUAGE FlexibleContexts #-}
6{-# LANGUAGE FlexibleContexts #-}
8{-# LANGUAGE FlexibleInstances #-}
7{-# LANGUAGE FlexibleInstances #-}
@@ -11,464 +10,211 @@
11{-# LANGUAGE LambdaCase #-}
10{-# LANGUAGE LambdaCase #-}
12{-# LANGUAGE MultiParamTypeClasses #-}
11{-# LANGUAGE MultiParamTypeClasses #-}
13{-# LANGUAGE OverloadedStrings #-}
12{-# LANGUAGE OverloadedStrings #-}
14−{-# LANGUAGE PatternGuards #-}
15{-# LANGUAGE PolyKinds #-}
13{-# LANGUAGE PolyKinds #-}
16{-# LANGUAGE RankNTypes #-}
14{-# LANGUAGE RankNTypes #-}
17{-# LANGUAGE RecursiveDo #-}
15{-# LANGUAGE RecursiveDo #-}
18{-# LANGUAGE ScopedTypeVariables #-}
16{-# LANGUAGE ScopedTypeVariables #-}
17+{-# LANGUAGE StandaloneDeriving #-}
19#ifdef USE_TEMPLATE_HASKELL
18#ifdef USE_TEMPLATE_HASKELL
20{-# LANGUAGE TemplateHaskell #-}
19{-# LANGUAGE TemplateHaskell #-}
22−{-# LANGUAGE TupleSections #-}
23{-# LANGUAGE TypeFamilies #-}
21{-# LANGUAGE TypeFamilies #-}
24{-# LANGUAGE TypeOperators #-}
22{-# LANGUAGE TypeOperators #-}
25{-# LANGUAGE UndecidableInstances #-}
23{-# LANGUAGE UndecidableInstances #-}
27−{-# LANGUAGE ForeignFunctionInterface #-}
28−{-# LANGUAGE JavaScriptFFI #-}
30−-- | This is a builder to be used on the client side. It can be run in two modes:
32−-- 1. in "hydration mode", reusing DOM nodes already in the page (as produced
33−-- by 'Reflex.Dom.Builder.Static.renderStatic')
34−-- 2. in "immediate mode", creating and appending DOM nodes as required
36−-- In "hydration mode", the preexisting DOM __must contain__ what the builder
37−-- will expect at switchover time (the time at which parity with the static
38−-- renderer is reached, and the time after which the page is "live").
40−-- For example, displaying the current time as text should be done inside
41−-- 'Reflex.Dom.Prerender.prerender' to ensure that we don't attempt to hydrate the incorrect text.
42−-- The server will prerender a text node with time A, and the client will expect
43−-- a text node with time B. Barring a miracle, time A and time B will not match,
44−-- and hydration will fail.
45module Reflex.Dom.Builder.Immediate
24module Reflex.Dom.Builder.Immediate
46− ( HydrationDomBuilderT (..)
25+ ( TriggerRef (..)
47− , HydrationDomBuilderEnv (..)
26+ , ImmediateDomBuilderEnv (..)
49− , HydrationRunnerT (..)
50− , runHydrationRunnerT
51− , runHydrationRunnerTWithFailure
52− , ImmediateDomBuilderT
27+ , ImmediateDomBuilderT (..)
53− , runHydrationDomBuilderT
28+ , runImmediateDomBuilderT
54− , getHydrationMode
29+ , askDocument
56− , addHydrationStepWithSetup
58− , insertAfterPreviousNode
60− , askParent
30+ , askParent
61− , askEvents
31+ , askEvents
63− , textNodeInternal
33+ , textNodeInternal
64− , removeSubsequentNodes
65− , deleteBetweenExclusive
34+ , deleteBetweenExclusive
66− , extractBetweenExclusive
35+ , extractBetweenExclusive
67− , deleteUpTo
36+ , deleteUpTo
68− , extractUpTo
37+ , extractUpTo
69− , SupportsHydrationDomBuilder
38+ , SupportsImmediateDomBuilder
70− , collectUpTo
39+ , collectUpTo
71− , collectUpToGivenParent
40+ , collectUpToGivenParent
72− , EventTriggerRef (..)
73− , EventFilterTriggerRef (..)
41+ , EventFilterTriggerRef (..)
75− , elementInternal
43+ , makeElement
78− , GhcjsDomHandler (..)
44+ , GhcjsDomHandler (..)
79− , GhcjsDomHandler1 (..)
45+ , GhcjsDomHandler1 (..)
80− , GhcjsDomEvent (..)
46+ , GhcjsDomEvent (..)
81− , GhcjsEventFilter (..)
48+ , GhcjsEventFilter (..)
82− , Pair1 (..)
49+ , Pair1 (..)
83− , Maybe1 (..)
50+ , Maybe1 (..)
84− , GhcjsEventSpec (..)
51+ , GhcjsEventSpec (..)
86− , ghcjsEventSpec_filters
52+ , ghcjsEventSpec_filters
87− , ghcjsEventSpec_handler
53+ , ghcjsEventSpec_handler
88− , GhcjsEventHandler (..)
54+ , GhcjsEventHandler (..)
55+#ifndef USE_TEMPLATE_HASKELL
89− , drawChildUpdate
58+ , drawChildUpdate
90− , ChildReadyState (..)
91− , mkHasFocus
59+ , mkHasFocus
92− , insertBefore
60+ , insertBefore
93− , EventType
61+ , EventType
94− , defaultDomEventHandler
62+ , defaultDomEventHandler
95− , defaultDomWindowEventHandler
63+ , defaultDomWindowEventHandler
96− , withIsEvent
64+ , withIsEvent
97− , showEventName
65+ , showEventName
98− , elementOnEventName
66+ , elementOnEventName
99− , windowOnEventName
67+ , windowOnEventName
100− , wrapDomEvent
68+ , wrapDomEvent
101− , subscribeDomEvent
69+ , subscribeDomEvent
102− , wrapDomEventMaybe
70+ , wrapDomEventMaybe
103− , wrapDomEventsMaybe
71+ , wrapDomEventsMaybe
104− , getKeyEvent
72+ , getKeyEvent
105− , getMouseEventCoords
73+ , getMouseEventCoords
106− , getTouchEvent
74+ , getTouchEvent
107− , WindowConfig (..)
75+ , WindowConfig (..)
108− , Window (..)
76+ , Window (..)
109− , wrapWindow
77+ , wrapWindow
110− -- * Attributes for controlling hydration
111− , hydratableAttribute
112− , skipHydrationAttribute
114− , traverseDMapWithKeyWithAdjust'
115− , hoistTraverseWithKeyWithAdjust
116− , traverseIntMapWithKeyWithAdjust'
117− , hoistTraverseIntMapWithKeyWithAdjust
80+import Foreign.JavaScript.TH
81+import Reflex.Class as Reflex
82+import Reflex.Dom.Builder.Class
84+import Reflex.Host.Class
85+import qualified Reflex.Patch.DMap as PatchDMap
86+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
87+import Reflex.PerformEvent.Class
88+import Reflex.PostBuild.Class
89+import Reflex.TriggerEvent.Base hiding (askEvents)
90+import Reflex.TriggerEvent.Class
120−import Control.Concurrent
92+import Control.Concurrent.Chan
121−import Control.Exception (bracketOnError)
122−import Control.Lens (Identity(..), imapM_, iforM_, (^.), makeLenses)
93+import Control.Lens hiding (element, ix)
123import Control.Monad.Exception
94import Control.Monad.Exception
124import Control.Monad.Primitive
95import Control.Monad.Primitive
125import Control.Monad.Reader
96import Control.Monad.Reader
126import Control.Monad.Ref
97import Control.Monad.Ref
127−import Control.Monad.State.Strict (StateT, mapStateT, get, modify', gets, runStateT)
98+#ifndef USE_TEMPLATE_HASKELL
99+import Data.Functor.Contravariant (phantom)
128import Data.Bitraversable
101import Data.Bitraversable
129import Data.Default
102import Data.Default
130import Data.Dependent.Map (DMap)
103import Data.Dependent.Map (DMap)
104+import qualified Data.Dependent.Map as DMap
131import Data.Dependent.Sum
105import Data.Dependent.Sum
132−import Data.FastMutableIntMap (PatchIntMap (..))
133−import Data.Foldable (for_, traverse_)
134import Data.Functor.Compose
106import Data.Functor.Compose
135import Data.Functor.Constant
107import Data.Functor.Constant
136import Data.Functor.Misc
108import Data.Functor.Misc
137import Data.Functor.Product
109import Data.Functor.Product
138−import Data.GADT.Compare (GCompare)
139import Data.IORef
110import Data.IORef
140−import Data.IntMap.Strict (IntMap)
111+import qualified Data.Map as Map
141import Data.Maybe
112import Data.Maybe
142−import Data.Monoid ((<>))
113+import Data.Monoid hiding (Product)
143−import Data.Some (Some(..))
114+import Data.Some (Some)
144−import Data.GADT.Compare (GCompare)
115+import qualified Data.Some as Some
145−import Data.String (IsString)
146import Data.Text (Text)
116import Data.Text (Text)
147−import Foreign.JavaScript.Internal.Utils
148−import Foreign.JavaScript.TH
149−import GHCJS.DOM.ClipboardEvent as ClipboardEvent
150−import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
151−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
152−import GHCJS.DOM.EventM (EventM, event, on)
153−import GHCJS.DOM.KeyboardEvent as KeyboardEvent
154−import GHCJS.DOM.MouseEvent
155−import GHCJS.DOM.Node (appendChild_, getOwnerDocumentUnchecked, getParentNodeUnchecked, setNodeValue, toNode)
156−import GHCJS.DOM.Types (liftJSM, askJSM, runJSM, JSM, MonadJSM, FocusEvent, IsElement, IsEvent, IsNode, KeyboardEvent, Node, TouchEvent, WheelEvent, uncheckedCastTo, ClipboardEvent)
157−import GHCJS.DOM.UIEvent
158−import Language.Javascript.JSaddle (call, eval)
159−import Reflex.Adjustable.Class
160−import Reflex.Class as Reflex
161−import Reflex.Dom.Builder.Class
162−import Reflex.Dynamic
163−import Reflex.Host.Class
164−import Reflex.Patch.DMapWithMove (PatchDMapWithMove(..))
165−import Reflex.Patch.MapWithMove (PatchMapWithMove(..))
166−import Reflex.PerformEvent.Base (PerformEventT)
167−import Reflex.PerformEvent.Class
168−import Reflex.PostBuild.Base (PostBuildT)
169−import Reflex.PostBuild.Class
170−#ifdef PROFILE_REFLEX
171−import Reflex.Profiled
173−import Reflex.Requester.Base
174−import Reflex.Requester.Class
175−import Reflex.Spider (Spider, SpiderHost, Global)
176−import Reflex.TriggerEvent.Base hiding (askEvents)
177−import Reflex.TriggerEvent.Class
179−import qualified Data.Dependent.Map as DMap
180−import qualified Data.FastMutableIntMap as FastMutableIntMap
181−import qualified Data.IntMap.Strict as IntMap
182−import qualified Data.Map as Map
183import qualified Data.Text as T
117import qualified Data.Text as T
184−import qualified GHCJS.DOM as DOM
118+import GHCJS.DOM.Document (Document, createDocumentFragmentUnchecked, createElementUnchecked, createElementNSUnchecked, createTextNodeUnchecked)
185−import qualified GHCJS.DOM.DataTransfer as DataTransfer
119+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS)
186−import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
187−import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
188import qualified GHCJS.DOM.Element as Element
120import qualified GHCJS.DOM.Element as Element
189import qualified GHCJS.DOM.Event as Event
121import qualified GHCJS.DOM.Event as Event
122+import GHCJS.DOM.EventM (EventM, event, on)
190import qualified GHCJS.DOM.EventM as DOM
123import qualified GHCJS.DOM.EventM as DOM
191import qualified GHCJS.DOM.FileList as FileList
124import qualified GHCJS.DOM.FileList as FileList
192−import qualified GHCJS.DOM.GlobalEventHandlers as Events
193import qualified GHCJS.DOM.HTMLInputElement as Input
125import qualified GHCJS.DOM.HTMLInputElement as Input
194import qualified GHCJS.DOM.HTMLSelectElement as Select
126import qualified GHCJS.DOM.HTMLSelectElement as Select
195import qualified GHCJS.DOM.HTMLTextAreaElement as TextArea
127import qualified GHCJS.DOM.HTMLTextAreaElement as TextArea
196−import qualified GHCJS.DOM.Node as Node
128+import GHCJS.DOM.MouseEvent
197−import qualified GHCJS.DOM.Text as DOM
198import qualified GHCJS.DOM.Touch as Touch
129import qualified GHCJS.DOM.Touch as Touch
199import qualified GHCJS.DOM.TouchEvent as TouchEvent
130import qualified GHCJS.DOM.TouchEvent as TouchEvent
200import qualified GHCJS.DOM.TouchList as TouchList
131import qualified GHCJS.DOM.TouchList as TouchList
132+import GHCJS.DOM.Node (appendChild_, getOwnerDocumentUnchecked, getParentNodeUnchecked, setNodeValue, toNode)
133+import qualified GHCJS.DOM.Node as DOM (insertBefore_)
134+import GHCJS.DOM.Types
135+ (liftJSM, askJSM, runJSM, JSM, MonadJSM(..),
136+ FocusEvent, IsElement, IsEvent, IsNode, KeyboardEvent, Node,
137+ ToDOMString, TouchEvent, WheelEvent, uncheckedCastTo)
201import qualified GHCJS.DOM.Types as DOM
138import qualified GHCJS.DOM.Types as DOM
139+import GHCJS.DOM.UIEvent
202import qualified GHCJS.DOM.Window as Window
140import qualified GHCJS.DOM.Window as Window
203−import qualified GHCJS.DOM.WheelEvent as WheelEvent
141+import Language.Javascript.JSaddle (call, eval)
204−import qualified Reflex.Patch.DMap as PatchDMap
205−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
206−import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
207−import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
209−#ifndef USE_TEMPLATE_HASKELL
143+import Reflex.Requester.Base
210−import Data.Functor.Contravariant (phantom)
144+import Reflex.Requester.Class
211−import Control.Lens (Lens', Getter)
214−#ifndef ghcjs_HOST_OS
146+data TriggerRef t a = TriggerRef { unTriggerRef :: IORef (Maybe (EventTrigger t a)) }
215−import GHCJS.DOM.Types (MonadJSM (..))
217−instance MonadJSM m => MonadJSM (HydrationRunnerT t m) where
148+data ImmediateDomBuilderEnv t
218− {-# INLINABLE liftJSM' #-}
149+ = ImmediateDomBuilderEnv { _immediateDomBuilderEnv_document :: Document
219− liftJSM' = lift . liftJSM'
150+ , _immediateDomBuilderEnv_parent :: Node
151+ , _immediateDomBuilderEnv_events :: Chan [DSum (TriggerRef t) TriggerInvocation]
152+ , _immediateDomBuilderEnv_unreadyChildren :: IORef Word -- Number of children who still aren't fully rendered
153+ , _immediateDomBuilderEnv_commitAction :: JSM () -- Action to take when all children are ready --TODO: we should probably get rid of this once we invoke it
221−instance MonadJSM m => MonadJSM (HydrationDomBuilderT s t m) where
156+newtype ImmediateDomBuilderT t m a = ImmediateDomBuilderT { unImmediateDomBuilderT :: ReaderT (ImmediateDomBuilderEnv t) (RequesterT t JSM Identity m) a } deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException, MonadAsyncException)
222− {-# INLINABLE liftJSM' #-}
223− liftJSM' = lift . liftJSM'
225−instance MonadJSM m => MonadJSM (DomRenderHookT t m) where
159+instance MonadJSM m => MonadJSM (ImmediateDomBuilderT t m) where
226− {-# INLINABLE liftJSM' #-}
227− liftJSM' = lift . liftJSM'
160+ liftJSM' = ImmediateDomBuilderT . liftJSM'
230−data HydrationDomBuilderEnv t m = HydrationDomBuilderEnv
231− { _hydrationDomBuilderEnv_document :: {-# UNPACK #-} !Document
232− -- ^ Reference to the document
233− , _hydrationDomBuilderEnv_parent :: !(Either Node (IORef Node))
234− -- ^ This is in an IORef because in the time up to hydration we can't actually know what the
235− -- parent is - we populate this reference during the DOM traversal at hydration time
236− , _hydrationDomBuilderEnv_unreadyChildren :: {-# UNPACK #-} !(IORef Word)
237− -- ^ Number of children who still aren't fully rendered
238− , _hydrationDomBuilderEnv_commitAction :: !(JSM ())
239− -- ^ Action to take when all children are ready --TODO: we should probably get rid of this once we invoke it
240− , _hydrationDomBuilderEnv_hydrationMode :: {-# UNPACK #-} !(IORef HydrationMode)
241− -- ^ In hydration mode? Should be switched to `HydrationMode_Immediate` after hydration is finished
242− , _hydrationDomBuilderEnv_switchover :: !(Event t ())
243− , _hydrationDomBuilderEnv_delayed :: {-# UNPACK #-} !(IORef (HydrationRunnerT t m ()))
246−-- | A monad for DomBuilder which just gets the results of children and pushes
247−-- work into an action that is delayed until after postBuild (to match the
248−-- static builder). The action runs in 'HydrationRunnerT', which performs the
249−-- DOM takeover and sets up the events, after which point this monad will
250−-- continue in the vein of 'ImmediateDomBuilderT'.
251−newtype HydrationDomBuilderT s t m a = HydrationDomBuilderT { unHydrationDomBuilderT :: ReaderT (HydrationDomBuilderEnv t m) (DomRenderHookT t m) a }
252− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
253−#if MIN_VERSION_base(4,9,1)
254− , MonadAsyncException
258−instance PrimMonad m => PrimMonad (HydrationDomBuilderT s t m) where
163+instance PrimMonad m => PrimMonad (ImmediateDomBuilderT x m) where
259− type PrimState (HydrationDomBuilderT s t m) = PrimState m
164+ type PrimState (ImmediateDomBuilderT x m) = PrimState m
260 primitive = lift . primitive
165 primitive = lift . primitive
262−instance MonadTrans (HydrationDomBuilderT s t) where
167+instance MonadTrans (ImmediateDomBuilderT t) where
263− lift = HydrationDomBuilderT . lift . lift
168+ lift = ImmediateDomBuilderT . lift . lift
265−instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationDomBuilderT s t m) where
170+instance (PerformEvent t m, PrimMonad m) => DomRenderHook t (ImmediateDomBuilderT t m) where
266− withRenderHook hook = HydrationDomBuilderT . mapReaderT (withRenderHook hook) . unHydrationDomBuilderT
171+ withRenderHook hook (ImmediateDomBuilderT a) = do
267− requestDomAction = HydrationDomBuilderT . lift . requestDomAction
172+ e <- ImmediateDomBuilderT ask
268− requestDomAction_ = HydrationDomBuilderT . lift . requestDomAction_
270−-- | The monad which performs the delayed actions to reuse prerendered nodes and set up events.
271−-- State contains reference to the previous node sibling, if any, and the reader contains reference to the parent node.
272−newtype HydrationRunnerT t m a = HydrationRunnerT { unHydrationRunnerT :: StateT HydrationState (ReaderT Node (DomRenderHookT t m)) a }
273− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
274−#if MIN_VERSION_base(4,9,1)
275− , MonadAsyncException
279−data HydrationState = HydrationState
280− { _hydrationState_previousNode :: !(Maybe Node)
281− , _hydrationState_failed :: !Bool
284−{-# INLINABLE localRunner #-}
285−localRunner :: (MonadJSM m, Monad m) => HydrationRunnerT t m a -> Maybe Node -> Node -> HydrationRunnerT t m a
286−localRunner (HydrationRunnerT m) s parent = do
287− s0 <- HydrationRunnerT get
288− (a, s') <- HydrationRunnerT $ lift $ local (\_ -> parent) $ runStateT m (s0 { _hydrationState_previousNode = s })
289− traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
290− HydrationRunnerT $ modify' $ \hs -> hs { _hydrationState_failed = _hydrationState_failed s' }
293−{-# INLINABLE runHydrationRunnerT #-}
295− :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
296− => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
297−runHydrationRunnerT m = runHydrationRunnerTWithFailure m (pure ())
299−{-# INLINABLE runHydrationRunnerTWithFailure #-}
300−runHydrationRunnerTWithFailure
301− :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
302− => HydrationRunnerT t m a -> IO () -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
303−runHydrationRunnerTWithFailure (HydrationRunnerT m) onFailure s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
304− (a, s') <- runStateT m (HydrationState s False)
305− traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
306− when (_hydrationState_failed s') $ liftIO $ putStrLn "reflex-dom warning: hydration failed: the DOM was not as expected at switchover time. This may be due to invalid HTML which the browser has altered upon parsing, some external JS altering the DOM, or the page being served from an outdated cache."
307− when (_hydrationState_failed s') $ liftIO onFailure
312−instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
313− {-# INLINABLE newEventWithTrigger #-}
314− newEventWithTrigger = lift . newEventWithTrigger
315− {-# INLINABLE newFanEventWithTrigger #-}
316− newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
318−instance MonadTrans (HydrationRunnerT t) where
319− {-# INLINABLE lift #-}
320− lift = HydrationRunnerT . lift . lift . lift
322−instance MonadSample t m => MonadSample t (HydrationRunnerT t m) where
323− {-# INLINABLE sample #-}
324− sample = lift . sample
326−instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
327− withRenderHook hook = HydrationRunnerT . mapStateT (mapReaderT (withRenderHook hook)) . unHydrationRunnerT
328− requestDomAction = HydrationRunnerT . lift . lift . requestDomAction
329− requestDomAction_ = HydrationRunnerT . lift . lift . requestDomAction_
331−-- | Add a hydration step which depends on some computation that should only be
332−-- done *before* the switchover to immediate mode - this is most likely some
333−-- form of 'hold' which we want to remove after hydration is done
334−{-# INLINABLE addHydrationStepWithSetup #-}
335−addHydrationStepWithSetup :: MonadIO m => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
336−addHydrationStepWithSetup setup f = getHydrationMode >>= \case
337− HydrationMode_Immediate -> pure ()
338− HydrationMode_Hydrating -> do
340− addHydrationStep (f s)
342−-- | Add a hydration step
343−{-# INLINABLE addHydrationStep #-}
344−addHydrationStep :: MonadIO m => HydrationRunnerT t m () -> HydrationDomBuilderT s t m ()
345−addHydrationStep m = do
346− delayedRef <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_delayed
347− liftIO $ modifyIORef' delayedRef (>> m)
349−-- | Shared behavior for HydrationDomBuilderT and HydrationRunnerT
350−newtype DomRenderHookT t m a = DomRenderHookT { unDomRenderHookT :: RequesterT t JSM Identity (TriggerEventT t m) a }
351− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
352−#if MIN_VERSION_base(4,9,1)
353− , MonadAsyncException
357−{-# INLINABLE runDomRenderHookT #-}
359− :: (MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m), MonadRef m, Ref m ~ IORef)
360− => DomRenderHookT t m a
361− -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
363−runDomRenderHookT (DomRenderHookT a) events = do
364− flip runTriggerEventT events $ do
365− rec (result, req) <- runRequesterT a rsp
366− rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $
367− traverseRequesterData (fmap Identity) rm
370− runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
371− v <- synchronously x
374−instance MonadTrans (DomRenderHookT t) where
375− {-# INLINABLE lift #-}
376− lift = DomRenderHookT . lift . lift
378−instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where
379− withRenderHook hook (DomRenderHookT a) = do
380− DomRenderHookT $ withRequesting $ \rsp -> do
173+ ImmediateDomBuilderT $ lift $ withRequesting $ \rsp -> do
381− (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
174+ (x, req) <- lift $ runRequesterT (runReaderT a e) $ runIdentity <$> rsp
382− return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
175+ return (ffor req $ \rm -> hook $ DMap.traverseWithKey (\_ r -> Identity <$> r) rm, x)
383− requestDomAction = DomRenderHookT . requestingIdentity
176+ requestDomAction = ImmediateDomBuilderT . lift . requestingIdentity
384− requestDomAction_ = DomRenderHookT . requesting_
177+ requestDomAction_ = ImmediateDomBuilderT . lift . requesting_
386−{-# INLINABLE runHydrationDomBuilderT #-}
179+{-# INLINABLE runImmediateDomBuilderT #-}
387−runHydrationDomBuilderT
180+runImmediateDomBuilderT :: (Reflex t, MonadFix m, PerformEvent t m, MonadJSM (Performable m)) => ImmediateDomBuilderT t m a -> ImmediateDomBuilderEnv t -> m a
388− :: ( MonadFix m
181+runImmediateDomBuilderT (ImmediateDomBuilderT a) env = do
389− , PerformEvent t m
182+ rec (x, req) <- runRequesterT (runReaderT a env) rsp
390− , MonadReflexCreateTrigger t m
183+ rsp <- performEvent $ ffor req $ \rm -> liftJSM $ DMap.traverseWithKey (\_ r -> Identity <$> r) rm
391− , MonadJSM m
184+ return x
392− , MonadJSM (Performable m)
185+
393− , MonadRef m
186+{-# INLINABLE askDocument #-}
394− , Ref m ~ IORef
187+askDocument :: Monad m => ImmediateDomBuilderT t m Document
395− )
188+askDocument = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_document
396− => HydrationDomBuilderT s t m a
397− -> HydrationDomBuilderEnv t m
398− -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
400−runHydrationDomBuilderT (HydrationDomBuilderT a) env = runDomRenderHookT (runReaderT a env)
402−instance (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, Monad m) => HasDocument (HydrationDomBuilderT s t m) where
403− {-# INLINABLE askDocument #-}
404− askDocument = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_document
406{-# INLINABLE askParent #-}
190{-# INLINABLE askParent #-}
407−askParent :: Monad m => HydrationRunnerT t m DOM.Node
191+askParent :: Monad m => ImmediateDomBuilderT t m Node
408−askParent = HydrationRunnerT ask
192+askParent = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_parent
410−{-# INLINABLE getParent #-}
411−getParent :: MonadIO m => HydrationDomBuilderT s t m DOM.Node
412−getParent = either pure (liftIO . readIORef) =<< HydrationDomBuilderT (asks _hydrationDomBuilderEnv_parent)
414{-# INLINABLE askEvents #-}
194{-# INLINABLE askEvents #-}
415−askEvents :: Monad m => HydrationDomBuilderT s t m (Chan [DSum (EventTriggerRef t) TriggerInvocation])
195+askEvents :: Monad m => ImmediateDomBuilderT t m (Chan [DSum (TriggerRef t) TriggerInvocation])
416−askEvents = HydrationDomBuilderT . lift . DomRenderHookT . lift $ TriggerEventT.askEvents
196+askEvents = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_events
418−{-# INLINABLE localEnv #-}
419−localEnv :: Monad m => (HydrationDomBuilderEnv t m -> HydrationDomBuilderEnv t m) -> HydrationDomBuilderT s t m a -> HydrationDomBuilderT s t m a
420−localEnv f = HydrationDomBuilderT . local (f $!) . unHydrationDomBuilderT
422{-# INLINABLE append #-}
198{-# INLINABLE append #-}
423−append :: MonadJSM m => DOM.Node -> HydrationDomBuilderT s t m ()
199+append :: (IsNode n, MonadJSM m) => n -> ImmediateDomBuilderT t m ()
424append n = do
200append n = do
425− p <- getParent
201+ p <- askParent
426− liftJSM $ appendChild_ p n
202+ liftJSM $ appendChild_ p $ Just n
427 return ()
203 return ()
429−{-# SPECIALIZE append
205+{-# INLINABLE textNodeInternal #-}
430− :: DOM.Node
206+textNodeInternal :: (MonadJSM m, ToDOMString contents) => contents -> ImmediateDomBuilderT t m DOM.Text
431− -> HydrationDomBuilderT s Spider HydrationM ()
207+textNodeInternal t = do
432− #-}
208+ doc <- askDocument
433−
209+ n <- liftJSM $ createTextNodeUnchecked doc t
434−data HydrationMode
210+ append n
435− = HydrationMode_Hydrating
211+ return n
436− -- ^ The time from initial load to parity with static builder
437− | HydrationMode_Immediate
438− -- ^ After hydration
439− deriving (Eq, Ord, Show)
441−{-# INLINABLE getPreviousNode #-}
442−getPreviousNode :: Monad m => HydrationRunnerT t m (Maybe DOM.Node)
443−getPreviousNode = HydrationRunnerT $ gets _hydrationState_previousNode
445−{-# INLINABLE setPreviousNode #-}
446−setPreviousNode :: Monad m => Maybe DOM.Node -> HydrationRunnerT t m ()
447−setPreviousNode n = HydrationRunnerT $ modify' (\hs -> hs { _hydrationState_previousNode = n })
449−{-# INLINABLE askUnreadyChildren #-}
450−askUnreadyChildren :: Monad m => HydrationDomBuilderT s t m (IORef Word)
451−askUnreadyChildren = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
453−{-# INLINABLE askCommitAction #-}
454−askCommitAction :: Monad m => HydrationDomBuilderT s t m (JSM ())
455−askCommitAction = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_commitAction
457−{-# INLINABLE getHydrationMode #-}
458−getHydrationMode :: MonadIO m => HydrationDomBuilderT s t m HydrationMode
459−getHydrationMode = liftIO . readIORef =<< HydrationDomBuilderT (asks _hydrationDomBuilderEnv_hydrationMode)
461−-- | Remove all nodes after given node
462−removeSubsequentNodes :: (MonadJSM m, IsNode n) => n -> m ()
463−removeSubsequentNodes n = liftJSM $ do
464− f <- eval ("(function(n) { while (n.nextSibling) { (n.parentNode).removeChild(n.nextSibling); }; })" :: Text)
467-- | s and e must both be children of the same node and s must precede e;
213-- | s and e must both be children of the same node and s must precede e;
468-- all nodes between s and e will be removed, but s and e will not be removed
214-- all nodes between s and e will be removed, but s and e will not be removed
469deleteBetweenExclusive :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m ()
215deleteBetweenExclusive :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m ()
470deleteBetweenExclusive s e = liftJSM $ do
216deleteBetweenExclusive s e = liftJSM $ do
471− df <- createDocumentFragment =<< getOwnerDocumentUnchecked s
217+ df <- createDocumentFragmentUnchecked =<< getOwnerDocumentUnchecked s
472 extractBetweenExclusive df s e -- In many places in ImmediateDomBuilderT, we assume that things always have a parent; by adding them to this DocumentFragment, we maintain that invariant
218 extractBetweenExclusive df s e -- In many places in ImmediateDomBuilderT, we assume that things always have a parent; by adding them to this DocumentFragment, we maintain that invariant
474-- | s and e must both be children of the same node and s must precede e; all
220-- | s and e must both be children of the same node and s must precede e; all
@@ -476,7 +222,16 @@ deleteBetweenExclusive s e = liftJSM $ do
476-- and e will not be moved
222-- and e will not be moved
477extractBetweenExclusive :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
223extractBetweenExclusive :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
478extractBetweenExclusive df s e = liftJSM $ do
224extractBetweenExclusive df s e = liftJSM $ do
479− f <- eval ("(function(df,s,e) { var x; for(;;) { x = s['nextSibling']; if(e===x) { break; }; df['appendChild'](x); } })" :: Text)
225+ f <- eval $ T.unlines
226+ [ "(function(df,s,e){"
229+ , " x = s.nextSibling;"
230+ , " if(e===x) break;"
231+ , " df.appendChild(x);"
480 void $ call f f (df, s, e)
235 void $ call f f (df, s, e)
482-- | s and e must both be children of the same node and s must precede e;
237-- | s and e must both be children of the same node and s must precede e;
@@ -484,23 +239,26 @@ extractBetweenExclusive df s e = liftJSM $ do
484{-# INLINABLE deleteUpTo #-}
239{-# INLINABLE deleteUpTo #-}
485deleteUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m ()
240deleteUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m ()
486deleteUpTo s e = do
241deleteUpTo s e = do
487− df <- createDocumentFragment =<< getOwnerDocumentUnchecked s
242+ df <- createDocumentFragmentUnchecked =<< getOwnerDocumentUnchecked s
488 extractUpTo df s e -- In many places in ImmediateDomBuilderT, we assume that things always have a parent; by adding them to this DocumentFragment, we maintain that invariant
243 extractUpTo df s e -- In many places in ImmediateDomBuilderT, we assume that things always have a parent; by adding them to this DocumentFragment, we maintain that invariant
490extractUpTo :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
245extractUpTo :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
492−--NOTE: Although wrapping this javascript in a function seems unnecessary, GHCJS's optimizer will break it if it is entered without that wrapping (as of 2017-09-04)
493−foreign import javascript unsafe
494− "(function() { var x = $2; while(x !== $3) { var y = x['nextSibling']; $1['appendChild'](x); x = y; } })()"
495− extractUpTo_ :: DOM.DocumentFragment -> DOM.Node -> DOM.Node -> IO ()
496−extractUpTo df s e = liftJSM $ extractUpTo_ df (toNode s) (toNode e)
498extractUpTo df s e = liftJSM $ do
246extractUpTo df s e = liftJSM $ do
499− f <- eval ("(function(df,s,e){ var x = s; var y; for(;;) { y = x['nextSibling']; df['appendChild'](x); if(e===y) { break; } x = y; } })" :: Text)
247+ f <- eval $ T.unlines
248+ [ "(function(df,s,e){"
252+ , " y = x.nextSibling;"
253+ , " df.appendChild(x);"
254+ , " if(e===y) break;"
500 void $ call f f (df, s, e)
259 void $ call f f (df, s, e)
503−type SupportsHydrationDomBuilder t m = (Reflex t, MonadJSM m, MonadHold t m, MonadFix m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref JSM, Adjustable t m, PrimMonad m, PerformEvent t m, MonadJSM (Performable m))
261+type SupportsImmediateDomBuilder t m = (Reflex t, MonadJSM m, MonadJSM (Performable m), MonadHold t m, MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref JSM, MonadAdjust t m, PrimMonad m)
505{-# INLINABLE collectUpTo #-}
263{-# INLINABLE collectUpTo #-}
506collectUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m DOM.DocumentFragment
264collectUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m DOM.DocumentFragment
@@ -512,27 +270,21 @@ collectUpTo s e = do
512collectUpToGivenParent :: (MonadJSM m, IsNode parent, IsNode start, IsNode end) => parent -> start -> end -> m DOM.DocumentFragment
270collectUpToGivenParent :: (MonadJSM m, IsNode parent, IsNode start, IsNode end) => parent -> start -> end -> m DOM.DocumentFragment
513collectUpToGivenParent currentParent s e = do
271collectUpToGivenParent currentParent s e = do
514 doc <- getOwnerDocumentUnchecked currentParent
272 doc <- getOwnerDocumentUnchecked currentParent
515− df <- createDocumentFragment doc
273+ df <- createDocumentFragmentUnchecked doc
516 extractUpTo df s e
274 extractUpTo df s e
517 return df
275 return df
519newtype EventFilterTriggerRef t er (en :: EventTag) = EventFilterTriggerRef (IORef (Maybe (EventTrigger t (er en))))
277newtype EventFilterTriggerRef t er (en :: EventTag) = EventFilterTriggerRef (IORef (Maybe (EventTrigger t (er en))))
521−-- | This 'wrap' is only partial: it doesn't create the 'EventSelector' itself
279+wrap :: forall m er t. SupportsImmediateDomBuilder t m => RawElement GhcjsDomSpace -> RawElementConfig er t (ImmediateDomBuilderT t m) -> ImmediateDomBuilderT t m (Element er GhcjsDomSpace t)
524− :: forall s m er t. (Reflex t, MonadJSM m, MonadReflexCreateTrigger t m, DomRenderHook t m, EventSpec s ~ GhcjsEventSpec)
525− => Chan [DSum (EventTriggerRef t) TriggerInvocation]
527− -> RawElementConfig er t s
528− -> m (DMap EventName (EventFilterTriggerRef t er))
529−wrap events e cfg = do
280+wrap e cfg = do
530 forM_ (_rawElementConfig_modifyAttributes cfg) $ \modifyAttrs -> requestDomAction_ $ ffor modifyAttrs $ imapM_ $ \(AttributeName mAttrNamespace n) mv -> case mAttrNamespace of
282 forM_ (_rawElementConfig_modifyAttributes cfg) $ \modifyAttrs -> requestDomAction_ $ ffor modifyAttrs $ imapM_ $ \(AttributeName mAttrNamespace n) mv -> case mAttrNamespace of
531 Nothing -> maybe (removeAttribute e n) (setAttribute e n) mv
283 Nothing -> maybe (removeAttribute e n) (setAttribute e n) mv
532 Just ns -> maybe (removeAttributeNS e (Just ns) n) (setAttributeNS e (Just ns) n) mv
284 Just ns -> maybe (removeAttributeNS e (Just ns) n) (setAttributeNS e (Just ns) n) mv
533 eventTriggerRefs :: DMap EventName (EventFilterTriggerRef t er) <- liftJSM $ fmap DMap.fromList $ forM (DMap.toList $ _ghcjsEventSpec_filters $ _rawElementConfig_eventSpec cfg) $ \(en :=> GhcjsEventFilter f) -> do
285 eventTriggerRefs :: DMap EventName (EventFilterTriggerRef t er) <- liftJSM $ fmap DMap.fromList $ forM (DMap.toList $ _ghcjsEventSpec_filters $ _rawElementConfig_eventSpec cfg) $ \(en :=> GhcjsEventFilter f) -> do
534 triggerRef <- liftIO $ newIORef Nothing
286 triggerRef <- liftIO $ newIORef Nothing
535− _ <- elementOnEventName en e $ do --TODO: Something safer than this cast
287+ _ <- elementOnEventName en e $ do
536 evt <- DOM.event
288 evt <- DOM.event
537 (flags, k) <- liftJSM $ f $ GhcjsDomEvent evt
289 (flags, k) <- liftJSM $ f $ GhcjsDomEvent evt
538 when (_eventFlags_preventDefault flags) $ withIsEvent en DOM.preventDefault
290 when (_eventFlags_preventDefault flags) $ withIsEvent en DOM.preventDefault
@@ -541,76 +293,49 @@ wrap events e cfg = do
541 Propagation_Stop -> withIsEvent en DOM.stopPropagation
293 Propagation_Stop -> withIsEvent en DOM.stopPropagation
542 Propagation_StopImmediate -> withIsEvent en DOM.stopImmediatePropagation
294 Propagation_StopImmediate -> withIsEvent en DOM.stopImmediatePropagation
543 mv <- liftJSM k --TODO: Only do this when the event is subscribed
295 mv <- liftJSM k --TODO: Only do this when the event is subscribed
544− liftIO $ forM_ mv $ \v -> writeChan events [EventTriggerRef triggerRef :=> TriggerInvocation v (return ())]
296+ liftIO $ forM_ mv $ \v -> writeChan events [TriggerRef triggerRef :=> TriggerInvocation v (return ())]
545 return $ en :=> EventFilterTriggerRef triggerRef
297 return $ en :=> EventFilterTriggerRef triggerRef
546− return eventTriggerRefs
298+ es <- do
547−
299+ let h :: GhcjsEventHandler er
548−{-# SPECIALIZE wrap
300+ !h = _ghcjsEventSpec_handler $ _rawElementConfig_eventSpec cfg -- Note: this needs to be done strictly and outside of the newFanEventWithTrigger, so that the newFanEventWithTrigger doesn't retain the entire cfg, which can cause a cyclic dependency that the GC won't be able to clean up
549− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
301+ ctx <- askJSM
550− -> DOM.Element
302+ newFanEventWithTrigger $ \(WrapArg en) t ->
551− -> RawElementConfig er DomTimeline HydrationDomSpace
552− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
556− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
558− -> RawElementConfig er DomTimeline GhcjsDomSpace
559− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
562−{-# INLINE triggerBody #-}
564− :: forall s er t x. EventSpec s ~ GhcjsEventSpec
566− -> RawElementConfig er t s
567− -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
568− -> DMap EventName (EventFilterTriggerRef t er)
570− -> WrapArg er EventName x
573−triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup en eventTriggerRefs of
303+ case DMap.lookup en eventTriggerRefs of
574− Just (EventFilterTriggerRef r) -> do
304+ Just (EventFilterTriggerRef r) -> do
575− writeIORef r $ Just t
305+ writeIORef r $ Just t
576− return $ do
306+ return $ do
577− writeIORef r Nothing
307+ writeIORef r Nothing
578− Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
308+ Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
579− evt <- DOM.event
309+ evt <- DOM.event
580− mv <- lift $ unGhcjsEventHandler handler (en, GhcjsDomEvent evt)
310+ mv <- lift $ unGhcjsEventHandler h (en, GhcjsDomEvent evt)
581− case mv of
311+ case mv of
582− Nothing -> return ()
312+ Nothing -> return ()
583− Just v -> liftIO $ do
313+ Just v -> liftIO $ do
584− --TODO: I don't think this is quite right: if a new trigger is created between when this is enqueued and when it fires, this may not work quite right
314+ --TODO: I don't think this is quite right: if a new trigger is created between when this is enqueued and when it fires, this may not work quite right
585− ref <- newIORef $ Just t
315+ ref <- newIORef $ Just t
586− writeChan events [EventTriggerRef ref :=> TriggerInvocation v (return ())])
316+ writeChan events [TriggerRef ref :=> TriggerInvocation v (return ())])
587− where
317+ return $ Element
588− -- Note: this needs to be done strictly and outside of the newFanEventWithTrigger, so that the newFanEventWithTrigger doesn't
318+ { _element_events = es
589− -- retain the entire cfg, which can cause a cyclic dependency that the GC won't be able to clean up
319+ , _element_raw = e
590− handler :: GhcjsEventHandler er
320+ }
591− !handler = _ghcjsEventSpec_handler $ _rawElementConfig_eventSpec cfg
321+
592−
322+{-# INLINABLE makeElement #-}
593−{-# SPECIALIZE triggerBody
323+makeElement :: forall er t m a. SupportsImmediateDomBuilder t m => Text -> ElementConfig er t (ImmediateDomBuilderT t m) -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m ((Element er GhcjsDomSpace t, a), DOM.Element)
594− :: DOM.JSContextRef
324+makeElement elementTag cfg child = do
595− -> RawElementConfig er DomTimeline HydrationDomSpace
325+ env <- ImmediateDomBuilderT ask
596− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
326+ let doc = _immediateDomBuilderEnv_document env
597− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
327+ e <- liftJSM $ case cfg ^. namespace of
598− -> DOM.Element
328+ Nothing -> createElementUnchecked doc (Just elementTag)
599− -> WrapArg er EventName x
329+ Just ens -> createElementNSUnchecked doc (Just ens) (Just elementTag)
600− -> EventTrigger DomTimeline x
330+ ImmediateDomBuilderT $ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
601− -> IO (IO ())
331+ Nothing -> lift $ setAttribute e n v
602− #-}
332+ Just ans -> lift $ setAttributeNS e (Just ans) n v
603−
333+ result <- ImmediateDomBuilderT $ lift $ runReaderT (unImmediateDomBuilderT child) $ env
604−{-# SPECIALIZE triggerBody
334+ { _immediateDomBuilderEnv_parent = toNode e
605− :: DOM.JSContextRef
335+ }
606− -> RawElementConfig er DomTimeline GhcjsDomSpace
336+ append e
607− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
337+ wrapped <- wrap e $ extractRawElementConfig cfg
608− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
338+ return ((wrapped, result), e)
610− -> WrapArg er EventName x
611− -> EventTrigger DomTimeline x
615newtype GhcjsDomHandler a b = GhcjsDomHandler { unGhcjsDomHandler :: a -> JSM b }
340newtype GhcjsDomHandler a b = GhcjsDomHandler { unGhcjsDomHandler :: a -> JSM b }
@@ -622,10 +347,9 @@ data GhcjsDomSpace
623instance DomSpace GhcjsDomSpace where
348instance DomSpace GhcjsDomSpace where
624 type EventSpec GhcjsDomSpace = GhcjsEventSpec
349 type EventSpec GhcjsDomSpace = GhcjsEventSpec
625− type RawDocument GhcjsDomSpace = DOM.Document
626 type RawTextNode GhcjsDomSpace = DOM.Text
350 type RawTextNode GhcjsDomSpace = DOM.Text
627− type RawCommentNode GhcjsDomSpace = DOM.Comment
628 type RawElement GhcjsDomSpace = DOM.Element
351 type RawElement GhcjsDomSpace = DOM.Element
352+ type RawFile GhcjsDomSpace = DOM.File
629 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
353 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
630 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
354 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
631 type RawSelectElement GhcjsDomSpace = DOM.HTMLSelectElement
355 type RawSelectElement GhcjsDomSpace = DOM.HTMLSelectElement
@@ -657,11 +381,15 @@ data GhcjsEventSpec er = GhcjsEventSpec
657newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
381newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
659#ifndef USE_TEMPLATE_HASKELL
383#ifndef USE_TEMPLATE_HASKELL
384+phantom2 :: (Functor f, Contravariant f) => f a -> f b
386+{-# INLINE phantom2 #-}
660ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
388ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
661ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
389ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
662{-# INLINE ghcjsEventSpec_filters #-}
390{-# INLINE ghcjsEventSpec_filters #-}
663ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
391ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
664−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
392+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
665{-# INLINE ghcjsEventSpec_handler #-}
393{-# INLINE ghcjsEventSpec_handler #-}
@@ -674,795 +402,135 @@ instance er ~ EventResult => Default (GhcjsEventSpec er) where
674 runReaderT (defaultDomEventHandler e en) evt
402 runReaderT (defaultDomEventHandler e en) evt
677−{-# INLINE makeElement #-}
405+instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t m) where
678−makeElement :: MonadJSM m => Document -> Text -> ElementConfig er t s -> m DOM.Element
406+ type DomBuilderSpace (ImmediateDomBuilderT t m) = GhcjsDomSpace
679−makeElement doc elementTag cfg = do
407+ {-# INLINABLE textNode #-}
680− e <- uncheckedCastTo DOM.Element <$> case cfg ^. namespace of
408+ textNode (TextNodeConfig initialContents mSetContents) = do
681− Nothing -> createElement doc elementTag
409+ n <- textNodeInternal initialContents
682− Just ens -> createElementNS doc (Just ens) elementTag
410+ mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
683− iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
411+ return $ TextNode n
684− Nothing -> setAttribute e n v
412+ {-# INLINABLE element #-}
685− Just ans -> setAttributeNS e (Just ans) n v
413+ element elementTag cfg child = fst <$> makeElement elementTag cfg child
686− pure e
414+ {-# INLINABLE inputElement #-}
687−
415+ inputElement cfg = do
688−{-# INLINE elementImmediate #-}
690− :: ( RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, EventSpec s ~ GhcjsEventSpec
691− , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m )
693− -> ElementConfig er t s
694− -> HydrationDomBuilderT s t m a
695− -> HydrationDomBuilderT s t m (Element er GhcjsDomSpace t, a)
696−elementImmediate elementTag cfg child = do
701− e <- makeElement doc elementTag cfg
702− appendChild_ parent e
703− -- Run the child builder with updated parent and previous sibling references
704− result <- localEnv (\env -> env { _hydrationDomBuilderEnv_parent = Left $ toNode e }) child
705− let rawCfg = extractRawElementConfig cfg
706− eventTriggerRefs <- wrap events e rawCfg
707− es <- newFanEventWithTrigger $ triggerBody ctx rawCfg events eventTriggerRefs e
708− return (Element es e, result)
710−{-# SPECIALIZE elementImmediate
712− -> ElementConfig er DomTimeline HydrationDomSpace
713− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
714− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
717−{-# SPECIALIZE elementImmediate
719− -> ElementConfig er DomTimeline GhcjsDomSpace
720− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM a
721− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
724−-- For specialisation
726−-- | The Reflex timeline for interacting with the DOM
728−#ifdef PROFILE_REFLEX
733−-- | The ReflexHost the DOM lives in
735−#ifdef PROFILE_REFLEX
740−type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (PerformEventT DomTimeline DomHost))
741−type HydrationM = DomCoreWidget ()
743−{-# INLINE elementInternal #-}
745− :: (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
747− -> ElementConfig er t HydrationDomSpace
748− -> HydrationDomBuilderT HydrationDomSpace t m a
749− -> HydrationDomBuilderT HydrationDomSpace t m (Element er HydrationDomSpace t, a)
750−elementInternal elementTag cfg child = getHydrationMode >>= \case
751− HydrationMode_Immediate -> do
752− (Element es _, result) <- elementImmediate elementTag cfg child
753− return (Element es (), result)
754− HydrationMode_Hydrating -> fst <$> hydrateElement elementTag cfg child
756−{-# SPECIALIZE elementInternal
758− -> ElementConfig er DomTimeline HydrationDomSpace
759− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
760− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
763−-- | An attribute which causes hydration to skip over an element completely.
764−skipHydrationAttribute :: IsString s => s
765−skipHydrationAttribute = "data-hydration-skip"
767−-- | An attribute which signals that an element should be hydrated.
768−hydratableAttribute :: IsString s => s
769−hydratableAttribute = "data-ssr"
771−{-# INLINE hydrateElement #-}
773− :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
775− -> ElementConfig er t HydrationDomSpace
776− -> HydrationDomBuilderT HydrationDomSpace t m a
777− -> HydrationDomBuilderT HydrationDomSpace t m ((Element er HydrationDomSpace t, a), IORef DOM.Element)
778−hydrateElement elementTag cfg child = do
781− -- Schedule everything for after postBuild, except for getting the result itself
782− parentRef <- liftIO $ newIORef $ error "Parent not yet initialized"
783− e' <- liftIO $ newIORef $ error "hydrateElement: Element not yet initialized"
784− env <- HydrationDomBuilderT ask
785− childDelayedRef <- liftIO $ newIORef $ pure ()
787− { _hydrationDomBuilderEnv_parent = Right parentRef
788− , _hydrationDomBuilderEnv_delayed = childDelayedRef
790− result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
791− wrapResult <- liftIO newEmptyMVar
792− let -- Determine if we should skip an element. We currently skip elements for
794− -- 1) it was not produced by a static builder which supports hydration
795− -- 2) it is explicitly marked to be skipped
796− shouldSkip :: DOM.Element -> HydrationRunnerT t m Bool
798− skip <- hasAttribute e (skipHydrationAttribute :: DOM.JSString)
799− hydratable <- hasAttribute e (hydratableAttribute :: DOM.JSString)
800− pure $ skip || not hydratable
801− childDom <- liftIO $ readIORef childDelayedRef
802− let rawCfg = extractRawElementConfig cfg
804− addHydrationStep $ do
806− lastHydrationNode <- getPreviousNode
807− let go mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
808− Nothing -> do -- ran out of nodes, create the element
809− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
810− e <- makeElement doc elementTag cfg
811− insertAfterPreviousNode e
813− Just node -> DOM.castTo DOM.Element node >>= \case
814− Nothing -> go (Just node) -- this node is not an element, skip
815− Just e -> shouldSkip e >>= \case
816− True -> go (Just node) -- this element should be skipped by hydration
818− t <- Element.getTagName e
819− -- TODO: check attributes?
820− if T.toCaseFold elementTag == T.toCaseFold t
822− -- we came to some other statically rendered element, so something has gone wrong
824− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
825− n <- makeElement doc elementTag cfg
826− insertAfterPreviousNode n
828− e <- go lastHydrationNode
829− setPreviousNode $ Just $ toNode e
830− -- Update the parent node used by the children
831− liftIO $ writeIORef parentRef $ toNode e
832− liftIO $ writeIORef e' e
833− -- Setup events, store the result so we can wait on it later
834− refs <- wrap events e rawCfg
835− liftIO $ putMVar wrapResult (e, refs)
836− localRunner childDom Nothing $ toNode e
837− -- We need the EventSelector to switch to the real event handler after activation
838− es <- newFanEventWithTrigger $ \(WrapArg en) t -> do
839− cleanup <- newEmptyMVar
840− threadId <- forkIO $ do
841− -- Wait on the data we need from the delayed action
842− (e, eventTriggerRefs) <- readMVar wrapResult
844− -- Run the setup, acquiring the cleanup action
845− (triggerBody ctx rawCfg events eventTriggerRefs e (WrapArg en) t)
846− -- Run the cleanup, if we have it - but only when an exception is
847− -- raised (we might get killed between acquiring the cleanup action
848− -- from 'triggerBody' and putting it in the MVar)
850− -- Try to put this action into the cleanup MVar
853− tryReadMVar cleanup >>= \case
854− Nothing -> killThread threadId
856− return ((Element es (), result), e')
858−{-# SPECIALIZE hydrateElement
860− -> ElementConfig er DomTimeline HydrationDomSpace
861− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
862− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM ((Element er HydrationDomSpace DomTimeline, a), IORef DOM.Element)
865−{-# INLINE inputElementImmediate #-}
866−inputElementImmediate
867− :: ( RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, EventSpec s ~ GhcjsEventSpec
868− , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
869− , MonadRef m, Ref m ~ IORef )
870− => InputElementConfig er t s -> HydrationDomBuilderT s t m (InputElement er GhcjsDomSpace t)
871−inputElementImmediate cfg = do
872− (e@(Element eventSelector domElement), ()) <- elementImmediate "input" (_inputElementConfig_elementConfig cfg) $ return ()
873− let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
874− Input.setValue domInputElement $ cfg ^. inputElementConfig_initialValue
875− v0 <- Input.getValue domInputElement
876− let getMyValue = Input.getValue domInputElement
877− valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select eventSelector (WrapArg Input)
878− valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
879− Nothing -> return never
880− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
881− Input.setValue domInputElement v'
882− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
883− v <- holdDyn v0 $ leftmost
884− [ valueChangedBySetValue
887− Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
888− checkedChangedByUI <- wrapDomEvent domInputElement (`on` Events.click) $ do
889− Input.getChecked domInputElement
890− checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
891− Nothing -> return never
892− Just eNewchecked -> requestDomAction $ ffor eNewchecked $ \newChecked -> do
893− oldChecked <- Input.getChecked domInputElement
894− Input.setChecked domInputElement newChecked
895− return $ if newChecked /= oldChecked
896− then Just newChecked
898− c <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
899− [ fmapMaybe id checkedChangedBySetChecked
900− , checkedChangedByUI
902− hasFocus <- mkHasFocus e
903− files <- holdDyn mempty <=< wrapDomEvent domInputElement (`on` Events.change) $ do
904− mfiles <- Input.getFiles domInputElement
905− let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
906− maybe (return []) getMyFiles mfiles
907− checked <- holdUniqDyn c
908− return $ InputElement
909− { _inputElement_value = v
910− , _inputElement_checked = checked
911− , _inputElement_checkedChange = checkedChangedByUI
912− , _inputElement_input = valueChangedByUI
913− , _inputElement_hasFocus = hasFocus
914− , _inputElement_element = e
915− , _inputElement_raw = domInputElement
916− , _inputElement_files = files
919−{-# INLINE inputElementInternal #-}
921− :: ( MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
922− , MonadRef m, Ref m ~ IORef )
923− => InputElementConfig er t HydrationDomSpace -> HydrationDomBuilderT HydrationDomSpace t m (InputElement er HydrationDomSpace t)
924−inputElementInternal cfg = getHydrationMode >>= \case
925− HydrationMode_Immediate -> ffor (inputElementImmediate cfg) $ \result -> result
926− { _inputElement_element = Element (_element_events $ _inputElement_element result) ()
927− , _inputElement_raw = ()
929− HydrationMode_Hydrating -> do
930− ((e, _), domElementRef) <- hydrateElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
416+ ((e, _), domElement) <- makeElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
931− (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
932− (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
933− (focusChange, triggerFocusChange) <- newTriggerEvent
934− (checkedChangedByUI, triggerCheckedChangedByUI) <- newTriggerEvent
935− (checkedChangedBySetChecked, triggerCheckedChangedBySetChecked) <- newTriggerEvent
936− (fileChange, triggerFileChange) <- newTriggerEvent
938− -- Expected initial value from config
939− let v0 = _inputElementConfig_initialValue cfg
940− c0 = _inputElementConfig_initialChecked cfg
941− valuesAtSwitchover = do
942− v <- maybe (pure $ pure v0) (hold v0) (_inputElementConfig_setValue cfg)
943− c <- maybe (pure $ pure c0) (hold c0) (_inputElementConfig_setChecked cfg)
945− addHydrationStepWithSetup valuesAtSwitchover $ \(switchoverValue', switchoverChecked') -> do
946− switchoverValue <- sample switchoverValue'
947− switchoverChecked <- sample switchoverChecked'
948− domElement <- liftIO $ readIORef domElementRef
949 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
417 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
950− getValue = Input.getValue domInputElement
418+ Input.setValue domInputElement $ Just (cfg ^. inputElementConfig_initialValue)
951− -- When the value has been updated by setValue before switchover, we must
419+ v0 <- Input.getValueUnchecked domInputElement
952− -- send an update here to remain in sync. This is because the later
420+ let getMyValue = fromMaybe "" <$> Input.getValue domInputElement
953− -- requestDomAction based on the setValue event will not capture events
954− -- happening before postBuild, because this code runs after switchover.
955− when (v0 /= switchoverValue) $ liftIO $ triggerChangeBySetValue switchoverValue
956− -- The user could have altered the value before switchover. This must be
957− -- triggered after the setValue one in order for the events to be in the
959− liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
960− -- Watch for user interaction and trigger event accordingly
961− requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
421+ valueChangedByUI <- performEvent $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
962− for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
422+ valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
423+ Nothing -> return never
963− requestDomAction_ $ ffor eSetValue $ \v' -> do
424+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
964− Input.setValue domInputElement v'
425+ Input.setValue domInputElement $ Just v'
965− v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
426+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
966− liftIO $ triggerChangeBySetValue v
967− let focusChange' = leftmost
427+ v <- holdDyn v0 $ leftmost
968− [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
428+ [ valueChangedBySetValue
969− , True <$ Reflex.select (_element_events e) (WrapArg Focus)
429+ , valueChangedByUI
971− liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
431+ Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
972− requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
973− -- When the checked state has been updated by setChecked before
974− -- switchover, we must send an update here to remain in sync. This is
975− -- because the later requestDomAction based on the setChecked event will not
976− -- capture events happening before postBuild, because this code runs after
978− when (c0 /= switchoverChecked) $ liftIO $ triggerCheckedChangedBySetChecked switchoverChecked
979− -- The user could have clicked the checkbox before switchover, we only
980− -- detect cases where they flipped the state. This must be triggered after
981− -- the setValue one in order for the events to be in the correct order.
982− liftJSM (Input.getChecked domInputElement) >>= \realChecked -> when (realChecked /= switchoverChecked) $
983− liftIO $ triggerCheckedChangedByUI realChecked
984− _ <- liftJSM $ domInputElement `on` Events.click $ do
432+ checkedChangedByUI <- wrapDomEvent domInputElement (`on` Element.click) $ do
985− liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
433+ Input.getChecked domInputElement
986− for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
434+ checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
435+ Nothing -> return never
987− requestDomAction $ ffor eNewchecked $ \newChecked -> do
436+ Just eNewchecked -> requestDomAction $ ffor eNewchecked $ \newChecked -> do
988 oldChecked <- Input.getChecked domInputElement
437 oldChecked <- Input.getChecked domInputElement
989 Input.setChecked domInputElement newChecked
438 Input.setChecked domInputElement newChecked
990− when (newChecked /= oldChecked) $ liftIO $ triggerCheckedChangedBySetChecked newChecked
439+ return $ if newChecked /= oldChecked
440+ then Just newChecked
442+ c <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
443+ [ fmapMaybe id checkedChangedBySetChecked
444+ , checkedChangedByUI
446+ let initialFocus = False --TODO: Is this correct?
447+ hasFocus <- holdDyn initialFocus $ leftmost
448+ [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
449+ , True <$ Reflex.select (_element_events e) (WrapArg Focus)
991− _ <- liftJSM $ domInputElement `on` Events.change $ do
451+ files <- holdDyn mempty <=< wrapDomEvent domInputElement (`on` Element.change) $ do
992 mfiles <- Input.getFiles domInputElement
452 mfiles <- Input.getFiles domInputElement
993 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
453 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
994− liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
454+ maybe (return []) getMyFiles mfiles
996− checked' <- holdDyn c0 $ leftmost
997− [ checkedChangedBySetChecked
998− , checkedChangedByUI
1000− checked <- holdUniqDyn checked'
1001− let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1002− hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1003− v <- holdDyn v0 $ leftmost
1004− [ valueChangedBySetValue
1007− files <- holdDyn mempty fileChange
1008− return $ InputElement
455+ return $ InputElement
1009− { _inputElement_value = v
456+ { _inputElement_value = v
1010− , _inputElement_checked = checked
457+ , _inputElement_checked = uniqDyn c
1011− , _inputElement_checkedChange = checkedChangedByUI
458+ , _inputElement_checkedChange = checkedChangedByUI
1012− , _inputElement_input = valueChangedByUI
459+ , _inputElement_input = valueChangedByUI
1013− , _inputElement_hasFocus = hasFocus
460+ , _inputElement_hasFocus = hasFocus
1014− , _inputElement_element = e
461+ , _inputElement_element = e
1015− , _inputElement_raw = ()
462+ , _inputElement_raw = domInputElement
1016− , _inputElement_files = files
463+ , _inputElement_files = files
1018−
465+ {-# INLINABLE textAreaElement #-}
1019−{-# INLINE textAreaElementImmediate #-}
466+ textAreaElement cfg = do --TODO
1020−textAreaElementImmediate
1021− :: ( RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, EventSpec s ~ GhcjsEventSpec
1022− , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
1023− , MonadRef m, Ref m ~ IORef )
1024− => TextAreaElementConfig er t s -> HydrationDomBuilderT s t m (TextAreaElement er GhcjsDomSpace t)
1025−textAreaElementImmediate cfg = do
1026− (e@(Element eventSelector domElement), _) <- elementImmediate "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
1027− let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
1028− TextArea.setValue domTextAreaElement $ cfg ^. textAreaElementConfig_initialValue
1029− v0 <- TextArea.getValue domTextAreaElement
1030− let getMyValue = TextArea.getValue domTextAreaElement
1031− valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select eventSelector (WrapArg Input)
1032− valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
1033− Nothing -> return never
1034− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1035− TextArea.setValue domTextAreaElement v'
1036− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1037− v <- holdDyn v0 $ leftmost
1038− [ valueChangedBySetValue
1041− hasFocus <- mkHasFocus e
1042− return $ TextAreaElement
1043− { _textAreaElement_value = v
1044− , _textAreaElement_input = valueChangedByUI
1045− , _textAreaElement_hasFocus = hasFocus
1046− , _textAreaElement_element = e
1047− , _textAreaElement_raw = domTextAreaElement
1050−{-# INLINE textAreaElementInternal #-}
1051−textAreaElementInternal
1052− :: ( MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
1053− , MonadRef m, Ref m ~ IORef )
1054− => TextAreaElementConfig er t HydrationDomSpace -> HydrationDomBuilderT HydrationDomSpace t m (TextAreaElement er HydrationDomSpace t)
1055−textAreaElementInternal cfg = getHydrationMode >>= \case
1056− HydrationMode_Immediate -> ffor (textAreaElementImmediate cfg) $ \result -> result
1057− { _textAreaElement_element = Element (_element_events $ _textAreaElement_element result) ()
1058− , _textAreaElement_raw = ()
1060− HydrationMode_Hydrating -> do
1061− ((e, _), domElementRef) <- hydrateElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
467+ ((e, _), domElement) <- makeElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
1062− (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
1063− (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
1064− (focusChange, triggerFocusChange) <- newTriggerEvent
1066− -- Expected initial value from config
1067− let v0 = _textAreaElementConfig_initialValue cfg
1068− valueAtSwitchover = maybe (pure $ pure v0) (hold v0) (_textAreaElementConfig_setValue cfg)
1069− addHydrationStepWithSetup valueAtSwitchover $ \switchoverValue' -> do
1070− switchoverValue <- sample switchoverValue'
1071− domElement <- liftIO $ readIORef domElementRef
1072 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
468 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
1073− getValue = TextArea.getValue domTextAreaElement
469+ TextArea.setValue domTextAreaElement $ Just (cfg ^. textAreaElementConfig_initialValue)
1074− -- When the value has been updated by setValue before switchover, we must
470+ v0 <- TextArea.getValueUnchecked domTextAreaElement
1075− -- send an update here to remain in sync. This is because the later
471+ let getMyValue = fromMaybe "" <$> TextArea.getValue domTextAreaElement
1076− -- requestDomAction based on the setValue event will not capture events
1077− -- happening before postBuild, because this code runs after switchover.
1078− when (v0 /= switchoverValue) $ liftIO $ triggerChangeBySetValue switchoverValue
1079− -- The user could have altered the value before switchover. This must be
1080− -- triggered after the setValue one in order for the events to be in the
1082− liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
1083− -- Watch for user interaction and trigger event accordingly
1084− requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
472+ valueChangedByUI <- performEvent $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
1085− for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
473+ valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
474+ Nothing -> return never
1086− requestDomAction_ $ ffor eSetValue $ \v' -> do
475+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1087− TextArea.setValue domTextAreaElement v'
476+ TextArea.setValue domTextAreaElement $ Just v'
1088− v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
477+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1089− liftIO $ triggerChangeBySetValue v
1090− let focusChange' = leftmost
478+ v <- holdDyn v0 $ leftmost
1091− [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
479+ [ valueChangedBySetValue
1092− , True <$ Reflex.select (_element_events e) (WrapArg Focus)
480+ , valueChangedByUI
1094− liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
482+ hasFocus <- mkHasFocus e
1095− requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
1096− let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1097− hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1098− v <- holdDyn v0 $ leftmost
1099− [ valueChangedBySetValue
1102− return $ TextAreaElement
483+ return $ TextAreaElement
1103− { _textAreaElement_value = v
484+ { _textAreaElement_value = v
1104− , _textAreaElement_input = valueChangedByUI
485+ , _textAreaElement_input = valueChangedByUI
1105− , _textAreaElement_hasFocus = hasFocus
486+ , _textAreaElement_hasFocus = hasFocus
1106− , _textAreaElement_element = e
487+ , _textAreaElement_element = e
1107− , _textAreaElement_raw = ()
488+ , _textAreaElement_raw = domTextAreaElement
1110−{-# INLINE selectElementImmediate #-}
1111−selectElementImmediate
1112− :: ( EventSpec s ~ GhcjsEventSpec, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
1113− , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m )
1114− => SelectElementConfig er t s
1115− -> HydrationDomBuilderT s t m a
1116− -> HydrationDomBuilderT s t m (SelectElement er GhcjsDomSpace t, a)
1117−selectElementImmediate cfg child = do
1118− (e@(Element eventSelector domElement), result) <- elementImmediate "select" (cfg ^. selectElementConfig_elementConfig) child
1119− let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
1120− Select.setValue domSelectElement $ cfg ^. selectElementConfig_initialValue
1121− v0 <- Select.getValue domSelectElement
1122− let getMyValue = Select.getValue domSelectElement
1123− valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select eventSelector (WrapArg Change)
1124− valueChangedBySetValue <- case _selectElementConfig_setValue cfg of
1125− Nothing -> return never
1126− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1127− Select.setValue domSelectElement v'
1128− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1129− v <- holdDyn v0 $ leftmost
1130− [ valueChangedBySetValue
1133− hasFocus <- mkHasFocus e
1134− let wrapped = SelectElement
1135− { _selectElement_value = v
1136− , _selectElement_change = valueChangedByUI
1137− , _selectElement_hasFocus = hasFocus
1138− , _selectElement_element = e
1139− , _selectElement_raw = domSelectElement
1141− return (wrapped, result)
490+ {-# INLINABLE selectElement #-}
1142−
491+ selectElement cfg child = do
1143−{-# INLINE selectElementInternal #-}
1144−selectElementInternal
1145− :: ( MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
1146− , MonadRef m, Ref m ~ IORef )
1147− => SelectElementConfig er t HydrationDomSpace
1148− -> HydrationDomBuilderT HydrationDomSpace t m a
1149− -> HydrationDomBuilderT HydrationDomSpace t m (SelectElement er HydrationDomSpace t, a)
1150−selectElementInternal cfg child = getHydrationMode >>= \case
1151− HydrationMode_Immediate -> ffor (selectElementImmediate cfg child) $ \(e, result) -> (e
1152− { _selectElement_element = Element (_element_events $ _selectElement_element e) ()
1153− , _selectElement_raw = ()
1155− HydrationMode_Hydrating -> do
1156− ((e, result), domElementRef) <- hydrateElement "select" (cfg ^. selectElementConfig_elementConfig) child
492+ ((e, result), domElement) <- makeElement "select" (cfg ^. selectElementConfig_elementConfig) child
1157− (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
1158− (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
1159− (focusChange, triggerFocusChange) <- newTriggerEvent
1161− -- Expected initial value from config
1162− let v0 = _selectElementConfig_initialValue cfg
1163− addHydrationStep $ do
1164− domElement <- liftIO $ readIORef domElementRef
1165 let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
493 let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
1166− getValue = Select.getValue domSelectElement
494+ Select.setValue domSelectElement $ Just (cfg ^. selectElementConfig_initialValue)
1167− -- The browser might have messed with the value, or the user could have
495+ Just v0 <- Select.getValue domSelectElement
1168− -- altered it before activation, so we set it if it isn't what we expect
496+ let getMyValue = fromMaybe "" <$> Select.getValue domSelectElement
1169− liftJSM getValue >>= \v0' -> do
1170− when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
1171− -- Watch for user interaction and trigger event accordingly
1172− requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Change)
497+ valueChangedByUI <- performEvent $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Change)
1173− for_ (_selectElementConfig_setValue cfg) $ \eSetValue ->
498+ valueChangedBySetValue <- case _selectElementConfig_setValue cfg of
499+ Nothing -> return never
1174− requestDomAction_ $ ffor eSetValue $ \v' -> do
500+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1175− Select.setValue domSelectElement v'
501+ Select.setValue domSelectElement $ Just v'
1176− v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
502+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1177− liftIO $ triggerChangeBySetValue v
1178− let focusChange' = leftmost
1179− [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
1180− , True <$ Reflex.select (_element_events e) (WrapArg Focus)
1182− liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
1183− requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
1184− let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1185− hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1186− v <- holdDyn v0 $ leftmost
503+ v <- holdDyn v0 $ leftmost
1187− [ valueChangedBySetValue
504+ [ valueChangedBySetValue
1188− , valueChangedByUI
505+ , valueChangedByUI
507+ hasFocus <- mkHasFocus e
1190− return $ (,result) $ SelectElement
508+ let wrapped = SelectElement
1191− { _selectElement_value = v
509+ { _selectElement_value = v
1192− , _selectElement_change = valueChangedByUI
510+ , _selectElement_change = valueChangedByUI
1193− , _selectElement_hasFocus = hasFocus
511+ , _selectElement_hasFocus = hasFocus
1194− , _selectElement_element = e
512+ , _selectElement_element = e
1195− , _selectElement_raw = ()
513+ , _selectElement_raw = domSelectElement
1198−{-# INLINE textNodeImmediate #-}
1200− :: (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, MonadJSM m, Reflex t, MonadFix m)
1201− => TextNodeConfig t -> HydrationDomBuilderT s t m DOM.Text
1202−textNodeImmediate (TextNodeConfig !t mSetContents) = do
1205− n <- createTextNode doc t
1207− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1210−{-# SPECIALIZE textNodeImmediate
1211− :: TextNodeConfig DomTimeline
1212− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM DOM.Text
1215−{-# SPECIALIZE textNodeImmediate
1216− :: TextNodeConfig DomTimeline
1217− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM DOM.Text
1220−{-# INLINE textNodeInternal #-}
1222− :: (Adjustable t m, MonadHold t m, MonadJSM m, MonadFix m, Reflex t)
1223− => TextNodeConfig t -> HydrationDomBuilderT HydrationDomSpace t m (TextNode HydrationDomSpace t)
1224−textNodeInternal tc@(TextNodeConfig !t mSetContents) = do
1226− getHydrationMode >>= \case
1227− HydrationMode_Immediate -> void $ textNodeImmediate tc
1228− HydrationMode_Hydrating -> addHydrationStepWithSetup (maybe (pure $ pure t) (hold t) mSetContents) $ \currentText -> do
1229− n <- hydrateTextNode doc =<< sample currentText
1230− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1233−{-# SPECIALIZE textNodeInternal
1234− :: TextNodeConfig DomTimeline
1235− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (TextNode HydrationDomSpace DomTimeline)
1238−-- | The static builder mashes adjacent text nodes into one node: we check the
1239−-- text content of each node we come to, comparing it to the content we
1240−-- expect. We also have a special case for empty text nodes - we always create
1241−-- the and add them after the previous node reference.
1242−{-# INLINE hydrateTextNode #-}
1243−hydrateTextNode :: MonadJSM m => Document -> Text -> HydrationRunnerT t m DOM.Text
1244−hydrateTextNode doc t@"" = do
1245− tn <- createTextNode doc t
1246− insertAfterPreviousNode tn
1248−hydrateTextNode doc t = do
1249− n <- join $ go <$> askParent <*> getPreviousNode
1250− setPreviousNode $ Just $ toNode n
1251− return n
515+ return (wrapped, result)
1252− where
516+ placeRawElement = append
1253− go parent mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
517+ wrapRawElement = wrap
1255− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1256− n <- createTextNode doc t
1257− insertAfterPreviousNode n
1259− Just node -> DOM.castTo DOM.Text node >>= \case
1260− Nothing -> go parent $ Just node
1261− Just originalNode -> do
1262− originalText <- Node.getTextContentUnchecked originalNode
1263− case T.stripPrefix t originalText of
1264− Just "" -> return originalNode
1266− -- If we have the right prefix, we split the text node into a node containing the
1267− -- required text and a subsequent sibling node containing the rest of the text.
1268− DOM.splitText_ originalNode $ fromIntegral $ T.length t
1269− return originalNode
1271− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1272− n <- createTextNode doc t
1273− insertAfterPreviousNode n
1276−{-# INLINE commentNodeImmediate #-}
1277−commentNodeImmediate
1278− :: (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, MonadJSM m, Reflex t, MonadFix m)
1279− => CommentNodeConfig t -> HydrationDomBuilderT s t m DOM.Comment
1280−commentNodeImmediate (CommentNodeConfig !t mSetContents) = do
1283− n <- createComment doc t
1285− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1288−{-# INLINE commentNodeInternal #-}
1290− :: (Ref m ~ IORef, MonadRef m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadJSM (Performable m), MonadJSM m, MonadFix m, Reflex t, Adjustable t m, MonadHold t m, MonadSample t m)
1291− => CommentNodeConfig t -> HydrationDomBuilderT HydrationDomSpace t m (CommentNode HydrationDomSpace t)
1292−commentNodeInternal tc@(CommentNodeConfig t0 mSetContents) = do
1294− getHydrationMode >>= \case
1295− HydrationMode_Immediate -> void $ commentNodeInternal tc
1296− HydrationMode_Hydrating -> addHydrationStepWithSetup (maybe (pure $ pure t0) (hold t0) mSetContents) $ \bt -> do
1298− void $ hydrateComment doc t mSetContents
1299− pure $ CommentNode ()
1301−{-# INLINE hydrateComment #-}
1302−hydrateComment :: (MonadJSM m, Reflex t, MonadFix m) => Document -> Text -> Maybe (Event t Text) -> HydrationRunnerT t m DOM.Comment
1303−hydrateComment doc t mSetContents = do
1304− parent <- askParent
1305− let go mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1307− c <- createComment doc t
1308− insertAfterPreviousNode c
1310− Just node -> DOM.castTo DOM.Comment node >>= \case
1311− Nothing -> go (Just node)
1313− t' <- Node.getTextContentUnchecked c
1317− c' <- createComment doc t
1318− insertAfterPreviousNode c'
1320− n <- go =<< getPreviousNode
1321− setPreviousNode $ Just $ toNode n
1322− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1325−-- | We leave markers in the static builder as comments, and rip these comments
1326−-- out at hydration time, replacing them with empty text nodes.
1327−{-# INLINABLE skipToAndReplaceComment #-}
1328−skipToAndReplaceComment
1329− :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1331− -> IORef (Maybe Text)
1332− -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1333−skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
1334− HydrationMode_Immediate -> do
1335− -- If we're in immediate mode, we don't try to replace an existing comment,
1336− -- and just return a dummy key
1337− t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
1339− textNodeRef <- liftIO $ newIORef t
1340− keyRef <- liftIO $ newIORef Nothing
1341− pure (pure (), textNodeRef, keyRef)
1342− HydrationMode_Hydrating -> do
1344− textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
1345− keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1348− tn <- createTextNode doc ("" :: Text)
1349− insertAfterPreviousNode tn
1350− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1352− go (Just key0) mLastNode = do
1353− parent <- askParent
1354− maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1355− Nothing -> go Nothing Nothing
1356− Just node -> DOM.castTo DOM.Comment node >>= \case
1358− commentText <- fromMaybe (error "Cannot get text content of comment node") <$> Node.getTextContent comment
1359− case T.stripPrefix (prefix <> key0) commentText of -- 'key0' may be @""@ in which case we're just finding the actual key; TODO: Don't be clever.
1361− -- Replace the comment with an (invisible) text node
1362− tn <- createTextNode doc ("" :: Text)
1363− Node.replaceChild_ parent tn comment
1364− pure (tn, Just key)
1366− go (Just key0) (Just node)
1368− go (Just key0) (Just node)
1370− key0 <- liftIO $ readIORef key0Ref
1371− (tn, key) <- go key0 =<< getPreviousNode
1372− setPreviousNode $ Just $ toNode tn
1374− writeIORef textNodeRef tn
1375− writeIORef keyRef key
1376− pure (switchComment, textNodeRef, keyRef)
1378−{-# INLINABLE skipToReplaceStart #-}
1379−skipToReplaceStart :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1380−skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef $ Just "") -- TODO: Don't rely on clever usage @""@ to make this work.
1382−{-# INLINABLE skipToReplaceEnd #-}
1383−skipToReplaceEnd :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => IORef (Maybe Text) -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text)
1384−skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
1386−instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
1387 notReadyUntil e = do
518 notReadyUntil e = do
1388 eOnce <- headE e
519 eOnce <- headE e
1389− unreadyChildren <- askUnreadyChildren
520+ env <- ImmediateDomBuilderT ask
1390− commitAction <- askCommitAction
521+ let unreadyChildren = _immediateDomBuilderEnv_unreadyChildren env
1391 liftIO $ modifyIORef' unreadyChildren succ
522 liftIO $ modifyIORef' unreadyChildren succ
1392 let ready = do
523 let ready = do
1393 old <- liftIO $ readIORef unreadyChildren
524 old <- liftIO $ readIORef unreadyChildren
1394 let new = pred old
525 let new = pred old
1395 liftIO $ writeIORef unreadyChildren $! new
526 liftIO $ writeIORef unreadyChildren $! new
1396− when (new == 0) commitAction
527+ when (new == 0) $ _immediateDomBuilderEnv_commitAction env
1397 requestDomAction_ $ ready <$ eOnce
528 requestDomAction_ $ ready <$ eOnce
1398 notReady = do
529 notReady = do
1399− unreadyChildren <- askUnreadyChildren
530+ env <- ImmediateDomBuilderT ask
531+ let unreadyChildren = _immediateDomBuilderEnv_unreadyChildren env
1400 liftIO $ modifyIORef' unreadyChildren succ
532 liftIO $ modifyIORef' unreadyChildren succ
1402−data HydrationDomSpace
1404−instance DomSpace HydrationDomSpace where
1405− type EventSpec HydrationDomSpace = GhcjsEventSpec
1406− type RawDocument HydrationDomSpace = DOM.Document
1407− type RawTextNode HydrationDomSpace = ()
1408− type RawCommentNode HydrationDomSpace = ()
1409− type RawElement HydrationDomSpace = ()
1410− type RawInputElement HydrationDomSpace = ()
1411− type RawTextAreaElement HydrationDomSpace = ()
1412− type RawSelectElement HydrationDomSpace = ()
1413− addEventSpecFlags _ en f es = es
1414− { _ghcjsEventSpec_filters =
1415− let f' = Just . GhcjsEventFilter . \case
1416− Nothing -> \evt -> do
1417− mEventResult <- unGhcjsEventHandler (_ghcjsEventSpec_handler es) (en, evt)
1418− return (f mEventResult, return mEventResult)
1419− Just (GhcjsEventFilter oldFilter) -> \evt -> do
1420− (oldFlags, oldContinuation) <- oldFilter evt
1421− mEventResult <- oldContinuation
1422− let newFlags = oldFlags <> f mEventResult
1423− return (newFlags, return mEventResult)
1424− in DMap.alter f' en $ _ghcjsEventSpec_filters es
1427−instance SupportsHydrationDomBuilder t m => DomBuilder t (HydrationDomBuilderT HydrationDomSpace t m) where
1428− type DomBuilderSpace (HydrationDomBuilderT HydrationDomSpace t m) = HydrationDomSpace
1429− {-# INLINABLE element #-}
1430− element = elementInternal
1431− {-# INLINABLE textNode #-}
1432− textNode = textNodeInternal
1433− {-# INLINABLE commentNode #-}
1434− commentNode = commentNodeInternal
1435− {-# INLINABLE inputElement #-}
1436− inputElement = inputElementInternal
1437− {-# INLINABLE textAreaElement #-}
1438− textAreaElement = textAreaElementInternal
1439− {-# INLINABLE selectElement #-}
1440− selectElement = selectElementInternal
1441− placeRawElement () = pure ()
1442− wrapRawElement () _cfg = pure $ Element (EventSelector $ const never) ()
1444−instance SupportsHydrationDomBuilder t m => DomBuilder t (HydrationDomBuilderT GhcjsDomSpace t m) where
1445− type DomBuilderSpace (HydrationDomBuilderT GhcjsDomSpace t m) = GhcjsDomSpace
1446− {-# INLINABLE element #-}
1447− element = elementImmediate
1448− {-# INLINABLE textNode #-}
1449− textNode = fmap TextNode . textNodeImmediate
1450− {-# INLINABLE commentNode #-}
1451− commentNode = fmap CommentNode . commentNodeImmediate
1452− {-# INLINABLE inputElement #-}
1453− inputElement = inputElementImmediate
1454− {-# INLINABLE textAreaElement #-}
1455− textAreaElement = textAreaElementImmediate
1456− {-# INLINABLE selectElement #-}
1457− selectElement = selectElementImmediate
1458− placeRawElement = append . toNode
1459− wrapRawElement e rawCfg = do
1460− events <- askEvents
1462− eventTriggerRefs <- wrap events e rawCfg
1463− es <- newFanEventWithTrigger $ triggerBody ctx rawCfg events eventTriggerRefs e
1464− pure $ Element es e
1466data FragmentState
534data FragmentState
1467 = FragmentState_Unmounted
535 = FragmentState_Unmounted
1468 | FragmentState_Mounted (DOM.Text, DOM.Text)
536 | FragmentState_Mounted (DOM.Text, DOM.Text)
@@ -1481,42 +549,35 @@ extractFragment fragment = do
1481 extractBetweenExclusive (_immediateDomFragment_document fragment) before after
549 extractBetweenExclusive (_immediateDomFragment_document fragment) before after
1482 liftIO $ writeIORef (_immediateDomFragment_state fragment) FragmentState_Unmounted
550 liftIO $ writeIORef (_immediateDomFragment_state fragment) FragmentState_Unmounted
1484−instance SupportsHydrationDomBuilder t m => MountableDomBuilder t (HydrationDomBuilderT GhcjsDomSpace t m) where
552+instance SupportsImmediateDomBuilder t m => MountableDomBuilder t (ImmediateDomBuilderT t m) where
1485− type DomFragment (HydrationDomBuilderT GhcjsDomSpace t m) = ImmediateDomFragment
553+ type DomFragment (ImmediateDomBuilderT t m) = ImmediateDomFragment
1486 buildDomFragment w = do
554 buildDomFragment w = do
1487− df <- createDocumentFragment =<< askDocument
555+ initialEnv <- ImmediateDomBuilderT ask
1488− result <- flip localEnv w $ \env -> env
556+ df <- createDocumentFragmentUnchecked $ _immediateDomBuilderEnv_document initialEnv
1489− { _hydrationDomBuilderEnv_parent = Left $ toNode df
557+ result <- lift $ runImmediateDomBuilderT w $ initialEnv
558+ { _immediateDomBuilderEnv_parent = toNode df
1491 state <- liftIO $ newIORef FragmentState_Unmounted
560 state <- liftIO $ newIORef FragmentState_Unmounted
1492 return (ImmediateDomFragment df state, result)
561 return (ImmediateDomFragment df state, result)
1493 mountDomFragment fragment setFragment = do
562 mountDomFragment fragment setFragment = do
1494− parent <- getParent
563+ parent <- askParent
1495 extractFragment fragment
564 extractFragment fragment
1496− before <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
565+ before <- textNodeInternal ("" :: Text)
1497− appendChild_ parent $ _immediateDomFragment_document fragment
566+ appendChild_ parent $ Just $ _immediateDomFragment_document fragment
1498− after <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
567+ after <- textNodeInternal ("" :: Text)
1499 xs <- foldDyn (\new (previous, _) -> (new, Just previous)) (fragment, Nothing) setFragment
568 xs <- foldDyn (\new (previous, _) -> (new, Just previous)) (fragment, Nothing) setFragment
1500− requestDomAction_ $ ffor (updated xs) $ \(childFragment, Just previousFragment) -> do
569+ performEvent_ $ ffor (updated xs) $ \(childFragment, Just previousFragment) -> do
1501 extractFragment previousFragment
570 extractFragment previousFragment
1502 extractFragment childFragment
571 extractFragment childFragment
1503 insertBefore (_immediateDomFragment_document childFragment) after
572 insertBefore (_immediateDomFragment_document childFragment) after
1504 liftIO $ writeIORef (_immediateDomFragment_state childFragment) $ FragmentState_Mounted (before, after)
573 liftIO $ writeIORef (_immediateDomFragment_state childFragment) $ FragmentState_Mounted (before, after)
1505 liftIO $ writeIORef (_immediateDomFragment_state fragment) $ FragmentState_Mounted (before, after)
574 liftIO $ writeIORef (_immediateDomFragment_state fragment) $ FragmentState_Mounted (before, after)
1507−instance (Reflex t, Monad m, Adjustable t m, MonadHold t m, MonadFix m) => Adjustable t (DomRenderHookT t m) where
576+instance (Reflex t, MonadAdjust t m, MonadJSM m, MonadHold t m, PerformEvent t m, MonadJSM (Performable m), MonadFix m, PrimMonad m) => MonadAdjust t (ImmediateDomBuilderT t m) where
1508− runWithReplace a0 a' = DomRenderHookT $ runWithReplace (unDomRenderHookT a0) (fmapCheap unDomRenderHookT a')
1509− traverseIntMapWithKeyWithAdjust f m = DomRenderHookT . traverseIntMapWithKeyWithAdjust (\k -> unDomRenderHookT . f k) m
1510− traverseDMapWithKeyWithAdjust f m = DomRenderHookT . traverseDMapWithKeyWithAdjust (\k -> unDomRenderHookT . f k) m
1511− traverseDMapWithKeyWithAdjustWithMove f m = DomRenderHookT . traverseDMapWithKeyWithAdjustWithMove (\k -> unDomRenderHookT . f k) m
1513−instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => Adjustable t (HydrationDomBuilderT s t m) where
1514− {-# INLINABLE runWithReplace #-}
1515 runWithReplace a0 a' = do
577 runWithReplace a0 a' = do
1516− initialEnv <- HydrationDomBuilderT ask
578+ initialEnv <- ImmediateDomBuilderT ask
1517− let hydrating = _hydrationDomBuilderEnv_hydrationMode initialEnv
579+ before <- textNodeInternal ("" :: Text)
1518− (hydrateStart, before, beforeKey) <- skipToReplaceStart
1519− let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
580+ let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
1520 haveEverBeenReady <- liftIO $ newIORef False
581 haveEverBeenReady <- liftIO $ newIORef False
1521 currentCohort <- liftIO $ newIORef (-1 :: Int) -- Equal to the cohort currently in the DOM
582 currentCohort <- liftIO $ newIORef (-1 :: Int) -- Equal to the cohort currently in the DOM
1522 let myCommitAction = do
583 let myCommitAction = do
@@ -1527,117 +588,96 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1527 old <- liftIO $ readIORef parentUnreadyChildren
588 old <- liftIO $ readIORef parentUnreadyChildren
1528 let new = pred old
589 let new = pred old
1529 liftIO $ writeIORef parentUnreadyChildren $! new
590 liftIO $ writeIORef parentUnreadyChildren $! new
1530− when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
591+ when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
1531 -- We draw 'after' in this roundabout way to avoid using MonadFix
592 -- We draw 'after' in this roundabout way to avoid using MonadFix
1532− doc <- askDocument
593+ after <- createTextNodeUnchecked (_immediateDomBuilderEnv_document initialEnv) ("" :: Text)
1533− parent <- getParent
1534− (hydrateEnd, after) <- skipToReplaceEnd beforeKey
1535 let drawInitialChild = do
594 let drawInitialChild = do
1536− h <- liftIO $ readIORef hydrating
1538− HydrationMode_Hydrating -> pure parent
1539− HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
1540 unreadyChildren <- liftIO $ newIORef 0
595 unreadyChildren <- liftIO $ newIORef 0
1541− let a0' = case h of
596+ let f = do
1542− HydrationMode_Hydrating -> a0
597+ result <- a0
1543− HydrationMode_Immediate -> do
598+ append after
1544− a <- a0
599+ return result
1545− insertBefore p' =<< liftIO (readIORef after)
600+ result <- runImmediateDomBuilderT f $ initialEnv
1546− pure a
601+ { _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
1547− delayed <- case h of
602+ , _immediateDomBuilderEnv_commitAction = myCommitAction
1548− HydrationMode_Hydrating -> liftIO $ newIORef $ pure ()
1549− HydrationMode_Immediate -> pure $ _hydrationDomBuilderEnv_delayed initialEnv
1550− result <- runReaderT (unHydrationDomBuilderT a0') initialEnv
1551− { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
1552− , _hydrationDomBuilderEnv_commitAction = myCommitAction
1553− , _hydrationDomBuilderEnv_parent = Left p'
1554− , _hydrationDomBuilderEnv_delayed = delayed
1557− HydrationMode_Hydrating -> liftIO $ readIORef delayed
1558− HydrationMode_Immediate -> pure $ pure ()
1559 liftIO $ readIORef unreadyChildren >>= \case
604 liftIO $ readIORef unreadyChildren >>= \case
1560 0 -> writeIORef haveEverBeenReady True
605 0 -> writeIORef haveEverBeenReady True
1561 _ -> modifyIORef' parentUnreadyChildren succ
606 _ -> modifyIORef' parentUnreadyChildren succ
1562− return (dom, result)
607+ return result
1563 a'' <- numberOccurrences a'
608 a'' <- numberOccurrences a'
1564− ((hydrate0, result0), child') <- HydrationDomBuilderT $ lift $ runWithReplace drawInitialChild $ ffor a'' $ \(cohortId, child) -> do
609+ (result0, result') <- lift $ runWithReplace drawInitialChild $ ffor a'' $ \(cohortId, child) -> do
1565− h <- liftIO $ readIORef hydrating
610+ df <- createDocumentFragmentUnchecked $ _immediateDomBuilderEnv_document initialEnv
1567− HydrationMode_Hydrating -> pure parent
1568− HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
1569 unreadyChildren <- liftIO $ newIORef 0
611 unreadyChildren <- liftIO $ newIORef 0
1570 let commitAction = do
612 let commitAction = do
1571 c <- liftIO $ readIORef currentCohort
613 c <- liftIO $ readIORef currentCohort
1572 when (c <= cohortId) $ do -- If a newer cohort has already been committed, just ignore this
614 when (c <= cohortId) $ do -- If a newer cohort has already been committed, just ignore this
1573− !before' <- liftIO $ readIORef before
1574− !after' <- liftIO $ readIORef after
1575− deleteBetweenExclusive before' after'
615+ deleteBetweenExclusive before after
1576− insertBefore p' after'
616+ insertBefore df after
1577 liftIO $ writeIORef currentCohort cohortId
617 liftIO $ writeIORef currentCohort cohortId
1578 myCommitAction
618 myCommitAction
1579− delayed <- case h of
1580− HydrationMode_Hydrating -> liftIO $ newIORef $ pure ()
1581− HydrationMode_Immediate -> pure $ _hydrationDomBuilderEnv_delayed initialEnv
1582− result <- runReaderT (unHydrationDomBuilderT child) $ initialEnv
619+ result <- runImmediateDomBuilderT child $ initialEnv
1583− { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
620+ { _immediateDomBuilderEnv_parent = toNode df
1584− , _hydrationDomBuilderEnv_commitAction = case h of
621+ , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
1585− HydrationMode_Hydrating -> myCommitAction
622+ , _immediateDomBuilderEnv_commitAction = commitAction
1586− HydrationMode_Immediate -> commitAction
1587− , _hydrationDomBuilderEnv_parent = Left p'
1588− , _hydrationDomBuilderEnv_delayed = delayed
1590− dom <- case h of
624+ liftIO (readIORef unreadyChildren) >>= \case
1591− HydrationMode_Hydrating -> liftIO $ readIORef delayed
625+ 0 -> liftJSM commitAction
1592− HydrationMode_Immediate -> pure $ pure ()
626+ _ -> return () -- Whoever decrements it to 0 will handle it
1593− uc <- liftIO $ readIORef unreadyChildren
1594− let commitActionToRunNow = if uc == 0
1595− then Just $ commitAction
1596− else Nothing -- A child will run it when unreadyChildren is decremented to 0
1597− actions = case h of
1598− HydrationMode_Hydrating -> Left dom
1599− HydrationMode_Immediate -> Right commitActionToRunNow
1600− return (actions, result)
627+ return result
1601− let (hydrate', commitAction) = fanEither $ fmap fst child'
1602− addHydrationStepWithSetup (hold hydrate0 hydrate') $ \contents -> do
1604− join $ sample contents
1606− requestDomAction_ $ fmapMaybe id commitAction
1607− return (result0, snd <$> child')
628+ return (result0, result')
1608−
629+ traverseDMapWithKeyWithAdjust = do
1609− {-# INLINABLE traverseIntMapWithKeyWithAdjust #-}
630+ let updateChildUnreadiness (p :: PatchDMap k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) old = do
1610− traverseIntMapWithKeyWithAdjust = traverseIntMapWithKeyWithAdjust'
631+ let new :: forall a. k a -> ComposeMaybe (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState k))) a)
1611− {-# INLINABLE traverseDMapWithKeyWithAdjust #-}
632+ new k (ComposeMaybe m) = ComposeMaybe <$> case m of
1612− traverseDMapWithKeyWithAdjust = traverseDMapWithKeyWithAdjust'
633+ Nothing -> return Nothing
1613− {-# INLINABLE traverseDMapWithKeyWithAdjustWithMove #-}
634+ Just (Compose (_, _, sRef, _)) -> do
635+ readIORef sRef >>= \case
636+ ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
637+ ChildReadyState_Unready _ -> do
638+ writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
639+ return $ Just $ Constant sRef
640+ delete _ (Constant sRef) = do
641+ writeIORef sRef $ ChildReadyState_Unready Nothing
642+ return $ Constant ()
643+ p' <- fmap PatchDMap $ DMap.traverseWithKey new $ unPatchDMap p
644+ _ <- DMap.traverseWithKey delete $ PatchDMap.getDeletions p old
645+ return $ applyAlways p' old
646+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholderRef (PatchDMap p) -> do
647+ phs <- liftIO $ readIORef placeholders
648+ forM_ (DMap.toList p) $ \(k :=> ComposeMaybe mv) -> do
649+ lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
650+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phs
651+ forM_ (Map.lookup (Some.This k) phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
652+ forM_ mv $ \(Compose (df, _, _, _)) -> df `insertBefore` nextPlaceholder
653+ liftIO $ writeIORef placeholders $! fromMaybe phs $ apply (weakenPatchDMapWith (\(Compose (_, ph, _, _)) -> ph) $ PatchDMap p) phs
1614 traverseDMapWithKeyWithAdjustWithMove = do
654 traverseDMapWithKeyWithAdjustWithMove = do
1615− let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) old = do
655+ let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) old = do
1616− let new :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> IO (PatchDMapWithMove.NodeInfo k (Constant (IORef (ChildReadyState (Some k)))) a)
656+ let new :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> IO (PatchDMapWithMove.NodeInfo k (Constant (IORef (ChildReadyState k))) a)
1617 new k = PatchDMapWithMove.nodeInfoMapFromM $ \case
657 new k = PatchDMapWithMove.nodeInfoMapFromM $ \case
1618− PatchDMapWithMove.From_Insert (Compose (TraverseChild (Left _hydration) _)) -> return PatchDMapWithMove.From_Delete
658+ PatchDMapWithMove.From_Insert (Compose (_, _, sRef, _)) -> do
1619− PatchDMapWithMove.From_Insert (Compose (TraverseChild (Right immediate) _)) -> do
659+ readIORef sRef >>= \case
1620− readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1621 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
660 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
1622 ChildReadyState_Unready _ -> do
661 ChildReadyState_Unready _ -> do
1623− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
662+ writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
1624− return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
663+ return $ PatchDMapWithMove.From_Insert $ Constant sRef
1625 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
664 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
1626 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
665 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
1627− deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
666+ deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState k))) (ComposeMaybe k) a -> IO (Constant () a)
1628 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
667 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1629− writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
668+ writeIORef sRef $ ChildReadyState_Unready $ Some.This <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1630 return $ Constant ()
669 return $ Constant ()
1631 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
670 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
1632 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
671 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
1633 return $ applyAlways p' old
672 return $ applyAlways p' old
1634− hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove updateChildUnreadiness $ \placeholders lastPlaceholder (p_ :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) -> do
673+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove updateChildUnreadiness $ \placeholders lastPlaceholderRef (p_ :: PatchDMapWithMove k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) -> do
1635 let p = unPatchDMapWithMove p_
674 let p = unPatchDMapWithMove p_
1636 phsBefore <- liftIO $ readIORef placeholders
675 phsBefore <- liftIO $ readIORef placeholders
676+ lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
1637− let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
677+ let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
1638 collectIfMoved k e = do
678 collectIfMoved k e = do
1639− let mThisPlaceholder = Map.lookup (Some k) phsBefore -- Will be Nothing if this element wasn't present before
679+ let mThisPlaceholder = Map.lookup (Some.This k) phsBefore -- Will be Nothing if this element wasn't present before
1640− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsBefore
680+ nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsBefore
1641 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
681 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
1642 False -> do
682 False -> do
1643 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
683 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -1645,22 +685,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1645 True -> do
685 True -> do
1646 Constant <$> mapM (`collectUpTo` nextPlaceholder) mThisPlaceholder
686 Constant <$> mapM (`collectUpTo` nextPlaceholder) mThisPlaceholder
1647 collected <- DMap.traverseWithKey collectIfMoved p
687 collected <- DMap.traverseWithKey collectIfMoved p
1648− let !phsAfter = fromMaybe phsBefore $ apply filtered phsBefore
688+ let !phsAfter = fromMaybe phsBefore $ apply (weakenPatchDMapWithMoveWith (\(Compose (_, ph, _, _)) -> ph) p_) phsBefore --TODO: Don't recompute this
1649− weakened :: PatchMapWithMove (Some k) (Either (TraverseChildHydration t m) (TraverseChildImmediate (Some k)))
1650− weakened = weakenPatchDMapWithMoveWith (_traverseChild_mode . getCompose) p_
1651− filtered :: PatchMapWithMove (Some k) DOM.Text
1652− filtered = PatchMapWithMove $ flip Map.mapMaybe (unPatchMapWithMove weakened) $ \(PatchMapWithMove.NodeInfo from to) -> flip PatchMapWithMove.NodeInfo to <$> case from of
1653− PatchMapWithMove.From_Insert (Left _hydration) -> Nothing
1654− PatchMapWithMove.From_Insert (Right immediate) -> Just $ PatchMapWithMove.From_Insert $ _traverseChildImmediate_placeholder immediate
1655− PatchMapWithMove.From_Delete -> Just $ PatchMapWithMove.From_Delete
1656− PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
1657− let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
689+ let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> JSM (Constant () a)
1658 placeFragment k e = do
690 placeFragment k e = do
1659− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
691+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsAfter
1660 case PatchDMapWithMove._nodeInfo_from e of
692 case PatchDMapWithMove._nodeInfo_from e of
1661− PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
693+ PatchDMapWithMove.From_Insert (Compose (df, _, _, _)) -> do
1663− Right immediate -> _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
694+ df `insertBefore` nextPlaceholder
1664 PatchDMapWithMove.From_Delete -> do
695 PatchDMapWithMove.From_Delete -> do
1665 return ()
696 return ()
1666 PatchDMapWithMove.From_Move fromKey -> do
697 PatchDMapWithMove.From_Move fromKey -> do
@@ -1670,167 +701,48 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1670 mapM_ (\(k :=> v) -> void $ placeFragment k v) $ DMap.toDescList p -- We need to go in reverse order here, to make sure the placeholders are in the right spot at the right time
701 mapM_ (\(k :=> v) -> void $ placeFragment k v) $ DMap.toDescList p -- We need to go in reverse order here, to make sure the placeholders are in the right spot at the right time
1671 liftIO $ writeIORef placeholders $! phsAfter
702 liftIO $ writeIORef placeholders $! phsAfter
1673−{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
1674−traverseDMapWithKeyWithAdjust'
1675− :: 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)
1676− => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
1678− -> Event t (PatchDMap k v)
1679− -> HydrationDomBuilderT s t m (DMap k v', Event t (PatchDMap k v'))
1680−traverseDMapWithKeyWithAdjust' = do
1681− let updateChildUnreadiness (p :: PatchDMap k (Compose (TraverseChild t m (Some k)) v')) old = do
1682− let new :: forall a. k a -> ComposeMaybe (Compose (TraverseChild t m (Some k)) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState (Some k)))) a)
1683− new k (ComposeMaybe m) = ComposeMaybe <$> case m of
1684− Nothing -> return Nothing
1685− Just (Compose (TraverseChild (Left _hydration) _)) -> pure Nothing
1686− Just (Compose (TraverseChild (Right immediate) _)) -> do
1687− readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1688− ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1689− ChildReadyState_Unready _ -> do
1690− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1691− return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1692− delete _ (Constant sRef) = do
1693− writeIORef sRef $ ChildReadyState_Unready Nothing
1694− return $ Constant ()
1695− p' <- fmap PatchDMap $ DMap.traverseWithKey new $ unPatchDMap p
1696− _ <- DMap.traverseWithKey delete $ PatchDMap.getDeletions p old
1697− return $ applyAlways p' old
1698− hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
1699− phs <- liftIO $ readIORef placeholders
1700− forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1701− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
1703− forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
1704− thisPlaceholder `deleteUpTo` nextPlaceholder
1706− forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
1707− Left _hydration -> pure ()
1708− Right immediate -> do
1709− _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
1710− let weakened :: PatchMap (Some k) (Either (TraverseChildHydration t m) (TraverseChildImmediate (Some k)))
1711− weakened = weakenPatchDMapWith (_traverseChild_mode . getCompose) $ PatchDMap patch
1712− filtered :: PatchMap (Some k) DOM.Text
1713− filtered = PatchMap $ flip Map.mapMaybe (unPatchMap weakened) $ \case
1714− Nothing -> Just Nothing -- deletion
1715− Just (Left _) -> Nothing
1716− Just (Right immediate) -> Just $ Just $ _traverseChildImmediate_placeholder immediate
1717− liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
1719−{-# INLINABLE traverseIntMapWithKeyWithAdjust' #-}
1720−traverseIntMapWithKeyWithAdjust'
1721− :: forall s t m v v'. (Adjustable t m, MonadJSM m, MonadFix m, PrimMonad m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1722− => (IntMap.Key -> v -> HydrationDomBuilderT s t m v')
1724− -> Event t (PatchIntMap v)
1725− -> HydrationDomBuilderT s t m (IntMap v', Event t (PatchIntMap v'))
1726−traverseIntMapWithKeyWithAdjust' = do
1727− let updateChildUnreadiness (p@(PatchIntMap pInner) :: PatchIntMap (TraverseChild t m Int v')) old = do
1728− let new :: IntMap.Key -> Maybe (TraverseChild t m Int v') -> IO (Maybe (IORef (ChildReadyState Int)))
1729− new k m = case m of
1730− Nothing -> return Nothing
1731− Just (TraverseChild (Left _hydration) _) -> pure Nothing
1732− Just (TraverseChild (Right immediate) _) -> do
1733− let sRef = _traverseChildImmediate_childReadyState immediate
1734− readIORef sRef >>= \case
1735− ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1736− ChildReadyState_Unready _ -> do
1737− writeIORef sRef $ ChildReadyState_Unready $ Just k
1740− writeIORef sRef $ ChildReadyState_Unready Nothing
1742− p' <- PatchIntMap <$> IntMap.traverseWithKey new pInner
1743− _ <- IntMap.traverseWithKey delete $ FastMutableIntMap.getDeletions p old
1744− return $ applyAlways p' old
1745− hoistTraverseIntMapWithKeyWithAdjust traverseIntMapWithKeyWithAdjust updateChildUnreadiness $ \placeholders lastPlaceholder (PatchIntMap p) -> do
1746− phs <- liftIO $ readIORef placeholders
1747− forM_ (IntMap.toList p) $ \(k, mv) -> do
1748− let nextPlaceholder = maybe lastPlaceholder snd $ IntMap.lookupGT k phs
1750− forM_ (IntMap.lookup k phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
1752− forM_ mv $ \(TraverseChild e _) -> case e of
1753− Left _hydration -> pure ()
1754− Right immediate -> do
1755− _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
1756− let filtered :: PatchIntMap DOM.Text
1757− filtered = PatchIntMap $ flip IntMap.mapMaybe p $ \case
1758− Nothing -> Just Nothing -- deletion
1760− | Right immediate <- _traverseChild_mode tc -> Just $ Just $ _traverseChildImmediate_placeholder immediate
1761− | otherwise -> Nothing
1762− liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
1764−{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1765− :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1767− -> Event DomTimeline (PatchIntMap v)
1768− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1771−{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1772− :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1774− -> Event DomTimeline (PatchIntMap v)
1775− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1778−data ChildReadyState a
704+data ChildReadyState k
1779 = ChildReadyState_Ready
705 = ChildReadyState_Ready
1780− | ChildReadyState_Unready !(Maybe a)
706+ | ChildReadyState_Unready !(Maybe (Some k))
1781 deriving (Show, Read, Eq, Ord)
707 deriving (Show, Read, Eq, Ord)
1783−insertAfterPreviousNode :: (Monad m, MonadJSM m) => DOM.IsNode node => node -> HydrationRunnerT t m ()
709+hoistTraverseWithKeyWithAdjust :: forall (k :: * -> *) v v' t m p.
1784−insertAfterPreviousNode node = do
710+ ( PerformEvent t m
1785− parent <- askParent
711+ , MonadAdjust t m
1786− nextNode <- maybe (Node.getFirstChild parent) Node.getNextSibling =<< getPreviousNode
1787− Node.insertBefore_ parent node nextNode
1788− setPreviousNode $ Just $ toNode node
1790−{-# INLINABLE hoistTraverseWithKeyWithAdjust #-}
1791−hoistTraverseWithKeyWithAdjust
1794 , MonadHold t m
712 , MonadHold t m
1795− , GCompare k
713+ , DMap.GCompare k
714+ , MonadIO (Performable m)
1796 , MonadIO m
715 , MonadIO m
1797 , MonadJSM m
716 , MonadJSM m
1798 , PrimMonad m
717 , PrimMonad m
1799 , MonadFix m
718 , MonadFix m
1800 , Patch (p k v)
719 , Patch (p k v)
1801− , Patch (p k (Constant Int))
1802 , PatchTarget (p k (Constant Int)) ~ DMap k (Constant Int)
720 , PatchTarget (p k (Constant Int)) ~ DMap k (Constant Int)
1803− , Patch (p k (Compose (TraverseChild t m (Some k)) v'))
721+ , Monoid (p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v'))
1804− , PatchTarget (p k (Compose (TraverseChild t m (Some k)) v')) ~ DMap k (Compose (TraverseChild t m (Some k)) v')
722+ , Patch (p k (Constant Int))
1805− , Monoid (p k (Compose (TraverseChild t m (Some k)) v'))
1806− , RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
1808 => (forall vv vv'.
724 => (forall vv vv'.
1809− (forall a. k a -> vv a -> DomRenderHookT t m (vv' a))
725+ (forall a. k a -> vv a -> RequesterT t JSM Identity m (vv' a))
1810 -> DMap k vv
726 -> DMap k vv
1811 -> Event t (p k vv)
727 -> Event t (p k vv)
1812− -> DomRenderHookT t m (DMap k vv', Event t (p k vv')))
728+ -> RequesterT t JSM Identity m (DMap k vv', Event t (p k vv'))
1813− -- ^ The base monad's traversal
729+ ) -- ^ The base monad's traversal
1814− -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv')
730+ -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv') -- ^ A way of mapping over the patch type
1815− -- ^ A way of mapping over the patch type
1816− -> (p k (Compose (TraverseChild t m (Some k)) v') -> DMap k (Constant (IORef (ChildReadyState (Some k)))) -> IO (DMap k (Constant (IORef (ChildReadyState (Some k))))))
1817− -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
731+ -> (p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') -> DMap k (Constant (IORef (ChildReadyState k))) -> IO (DMap k (Constant (IORef (ChildReadyState k))))) -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
1818− -> (IORef (Map.Map (Some k) DOM.Text) -> DOM.Text -> p k (Compose (TraverseChild t m (Some k)) v') -> JSM ())
732+ -> (IORef (Map.Map (Some.Some k) DOM.Text) -> IORef DOM.Text -> p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') -> JSM ()) -- ^ Apply a patch to the DOM
1819− -- ^ Apply a patch to the DOM
1820− -> (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
733+ -> (forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a))
1821 -> DMap k v
734 -> DMap k v
1822 -> Event t (p k v)
735 -> Event t (p k v)
1823− -> HydrationDomBuilderT s t m (DMap k v', Event t (p k v'))
736+ -> ImmediateDomBuilderT t m (DMap k v', Event t (p k v'))
1824−hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
737+hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpdate_ (f :: forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a)) (dm0 :: DMap k v) dm' = do
1825− doc <- askDocument
738+ initialEnv <- ImmediateDomBuilderT ask
1826− initialEnv <- HydrationDomBuilderT ask
1827− let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
739+ let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
1828− pendingChange :: IORef (DMap k (Constant (IORef (ChildReadyState (Some k)))), p k (Compose (TraverseChild t m (Some k)) v')) <- liftIO $ newIORef mempty
740+ pendingChange :: IORef (DMap k (Constant (IORef (ChildReadyState k))), p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) <- liftIO $ newIORef mempty
1829 haveEverBeenReady <- liftIO $ newIORef False
741 haveEverBeenReady <- liftIO $ newIORef False
1830− placeholders <- liftIO $ newIORef Map.empty
742+ placeholders <- liftIO $ newIORef $ error "placeholders not yet initialized"
1831− lastPlaceholder <- createTextNode doc ("" :: Text)
743+ lastPlaceholderRef <- liftIO $ newIORef $ error "lastPlaceholderRef not yet initialized"
1832 let applyDomUpdate p = do
744 let applyDomUpdate p = do
1833− applyDomUpdate_ placeholders lastPlaceholder p
745+ applyDomUpdate_ placeholders lastPlaceholderRef p
1834 markSelfReady
746 markSelfReady
1835 liftIO $ writeIORef pendingChange $! mempty
747 liftIO $ writeIORef pendingChange $! mempty
1836 markSelfReady = do
748 markSelfReady = do
@@ -1841,8 +753,8 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
1841 old <- liftIO $ readIORef parentUnreadyChildren
753 old <- liftIO $ readIORef parentUnreadyChildren
1842 let new = pred old
754 let new = pred old
1843 liftIO $ writeIORef parentUnreadyChildren $! new
755 liftIO $ writeIORef parentUnreadyChildren $! new
1844− when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
756+ when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
1845− markChildReady :: IORef (ChildReadyState (Some k)) -> JSM ()
757+ markChildReady :: IORef (ChildReadyState k) -> JSM ()
1846 markChildReady childReadyState = do
758 markChildReady childReadyState = do
1847 liftIO (readIORef childReadyState) >>= \case
759 liftIO (readIORef childReadyState) >>= \case
1848 ChildReadyState_Ready -> return ()
760 ChildReadyState_Ready -> return ()
@@ -1850,42 +762,32 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
1850 liftIO $ writeIORef childReadyState ChildReadyState_Ready
762 liftIO $ writeIORef childReadyState ChildReadyState_Ready
1851 case countedAt of
763 case countedAt of
1852 Nothing -> return ()
764 Nothing -> return ()
1853− Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
765+ Just (Some.This k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1854 (oldUnready, p) <- liftIO $ readIORef pendingChange
766 (oldUnready, p) <- liftIO $ readIORef pendingChange
1855 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
767 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
1856 let newUnready = DMap.delete k oldUnready
768 let newUnready = DMap.delete k oldUnready
1857 liftIO $ writeIORef pendingChange (newUnready, p)
769 liftIO $ writeIORef pendingChange (newUnready, p)
1858 when (DMap.null newUnready) $ do
770 when (DMap.null newUnready) $ do
1859 applyDomUpdate p
771 applyDomUpdate p
1860− (children0 :: DMap k (Compose (TraverseChild t m (Some k)) v'), children' :: Event t (p k (Compose (TraverseChild t m (Some k)) v')))
1861− <- HydrationDomBuilderT $ lift $ base (\k v -> drawChildUpdate initialEnv markChildReady $ f k v) dm0 dm'
772+ (children0, children') <- ImmediateDomBuilderT $ lift $ base (\k v -> drawChildUpdate initialEnv markChildReady $ f k v) dm0 dm'
1862− let processChild k (Compose (TraverseChild e _)) = case e of
773+ let processChild k (Compose (_, _, sRef, _)) = ComposeMaybe <$> do
1863− Left _ -> pure $ ComposeMaybe Nothing
774+ readIORef sRef >>= \case
1864− Right immediate -> ComposeMaybe <$> do
1865− readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1866− ChildReadyState_Ready -> return Nothing
775+ ChildReadyState_Ready -> return Nothing
1867− ChildReadyState_Unready _ -> do
776+ ChildReadyState_Unready _ -> do
1868− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
777+ writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
1869− return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
778+ return $ Just $ Constant sRef
1870 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
779 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
1871 liftIO $ if DMap.null initialUnready
780 liftIO $ if DMap.null initialUnready
1872 then writeIORef haveEverBeenReady True
781 then writeIORef haveEverBeenReady True
1874 modifyIORef' parentUnreadyChildren succ
783 modifyIORef' parentUnreadyChildren succ
1875 writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
784 writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
1876− getHydrationMode >>= \case
785+ let result0 = DMap.map (\(Compose (_, _, _, v)) -> v) children0
1877− HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
786+ placeholders0 = weakenDMapWith (\(Compose (_, ph, _, _)) -> ph) children0
1878− dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
787+ result' = ffor children' $ mapPatch $ \(Compose (_, _, _, r)) -> r
1879− phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
788+ liftIO $ writeIORef placeholders $! placeholders0
1880− liftIO $ writeIORef placeholders $! phs
789+ _ <- DMap.traverseWithKey (\_ (Compose (df, _, _, _)) -> Constant () <$ append df) children0
1881− insertAfterPreviousNode lastPlaceholder
790+ liftIO . writeIORef lastPlaceholderRef =<< textNodeInternal ("" :: Text)
1882− HydrationMode_Immediate -> do
1883− let activate i = do
1884− append $ toNode $ _traverseChildImmediate_fragment i
1885− pure $ _traverseChildImmediate_placeholder i
1886− phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1887− liftIO $ writeIORef placeholders $! phs
1888− append $ toNode lastPlaceholder
1889 requestDomAction_ $ ffor children' $ \p -> do
791 requestDomAction_ $ ffor children' $ \p -> do
1890 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
792 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
1891 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
793 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
@@ -1893,257 +795,29 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
1893 liftIO $ writeIORef pendingChange (newUnready, newP)
795 liftIO $ writeIORef pendingChange (newUnready, newP)
1894 when (DMap.null newUnready) $ do
796 when (DMap.null newUnready) $ do
1895 applyDomUpdate newP
797 applyDomUpdate newP
1896− let result0 = DMap.map (_traverseChild_result . getCompose) children0
1897− result' = ffor children' $ mapPatch $ _traverseChild_result . getCompose
1898 return (result0, result')
798 return (result0, result')
1900−{-# INLINE hoistTraverseIntMapWithKeyWithAdjust #-}
800+drawChildUpdate :: (MonadIO m, MonadJSM m)
1901−hoistTraverseIntMapWithKeyWithAdjust ::
801+ => ImmediateDomBuilderEnv t
1907− , Monoid (p (TraverseChild t m Int v'))
1909− , PatchTarget (p (HydrationRunnerT t m ())) ~ IntMap (HydrationRunnerT t m ())
1910− , PatchTarget (p (TraverseChild t m Int v')) ~ IntMap (TraverseChild t m Int v')
1911− , Patch (p (HydrationRunnerT t m ()))
1912− , Patch (p (TraverseChild t m Int v'))
1913− , RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
1915− => ((IntMap.Key -> v -> DomRenderHookT t m (TraverseChild t m Int v'))
1918− -> DomRenderHookT t m (IntMap (TraverseChild t m Int v'), Event t (p (TraverseChild t m Int v'))))
1919− -- ^ The base monad's traversal
1920− -> (p (TraverseChild t m Int v')
1921− -> IntMap (IORef (ChildReadyState Int))
1922− -> IO (IntMap (IORef (ChildReadyState Int))))
1923− -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
1924− -> (IORef (IntMap DOM.Text)
1926− -> p (TraverseChild t m Int v')
1928− -- ^ Apply a patch to the DOM
1929− -> (IntMap.Key -> v -> HydrationDomBuilderT s t m v')
1932− -> HydrationDomBuilderT s t m (IntMap v', Event t (p v'))
1933−hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
1935− initialEnv <- HydrationDomBuilderT ask
1936− let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
1937− pendingChange :: IORef (IntMap (IORef (ChildReadyState Int)), p (TraverseChild t m Int v')) <- liftIO $ newIORef mempty
1938− haveEverBeenReady <- liftIO $ newIORef False
1939− placeholders <- liftIO $ newIORef IntMap.empty
1940− lastPlaceholder <- createTextNode doc ("" :: Text)
1941− let applyDomUpdate p = do
1942− applyDomUpdate_ placeholders lastPlaceholder p
1944− liftIO $ writeIORef pendingChange $! mempty
1946− liftIO (readIORef haveEverBeenReady) >>= \case
1949− liftIO $ writeIORef haveEverBeenReady True
1950− old <- liftIO $ readIORef parentUnreadyChildren
1952− liftIO $ writeIORef parentUnreadyChildren $! new
1953− when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
1954− markChildReady :: IORef (ChildReadyState Int) -> JSM ()
1955− markChildReady childReadyState = do
1956− liftIO (readIORef childReadyState) >>= \case
1957− ChildReadyState_Ready -> return ()
1958− ChildReadyState_Unready countedAt -> do
1959− liftIO $ writeIORef childReadyState ChildReadyState_Ready
1961− Nothing -> return ()
1962− Just k -> do -- This child has been counted as unready, so we need to remove it from the unready set
1963− (oldUnready, p) <- liftIO $ readIORef pendingChange
1964− when (not $ IntMap.null oldUnready) $ do -- This shouldn't actually ever be null
1965− let newUnready = IntMap.delete k oldUnready
1966− liftIO $ writeIORef pendingChange (newUnready, p)
1967− when (IntMap.null newUnready) $ do
1969− (children0 :: IntMap (TraverseChild t m Int v'), children' :: Event t (p (TraverseChild t m Int v')))
1970− <- HydrationDomBuilderT $ lift $ base (\k v -> drawChildUpdateInt initialEnv markChildReady $ f k v) dm0 dm'
1971− let processChild k (TraverseChild e _) = case e of
1972− Left _ -> pure Nothing
1973− Right immediate -> do
1974− readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1975− ChildReadyState_Ready -> return Nothing
1976− ChildReadyState_Unready _ -> do
1977− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just k
1978− return $ Just (_traverseChildImmediate_childReadyState immediate)
1979− initialUnready <- liftIO $ IntMap.mapMaybe id <$> IntMap.traverseWithKey processChild children0
1980− liftIO $ if IntMap.null initialUnready
1981− then writeIORef haveEverBeenReady True
1983− modifyIORef' parentUnreadyChildren succ
1984− writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
1985− getHydrationMode >>= \case
1986− HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
1987− dm :: IntMap (TraverseChild t m Int v') <- sample $ currentIncremental children
1988− phs <- traverse (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode) dm
1989− liftIO $ writeIORef placeholders $! phs
1990− insertAfterPreviousNode lastPlaceholder
1991− HydrationMode_Immediate -> do
1992− let activate i = do
1993− append $ toNode $ _traverseChildImmediate_fragment i
1994− pure $ _traverseChildImmediate_placeholder i
1995− phs <- traverse (either (error "impossible") activate . _traverseChild_mode) children0
1996− liftIO $ writeIORef placeholders $! phs
1997− append $ toNode lastPlaceholder
1998− requestDomAction_ $ ffor children' $ \p -> do
1999− (oldUnready, oldP) <- liftIO $ readIORef pendingChange
2000− newUnready <- liftIO $ updateChildUnreadiness p oldUnready
2001− let !newP = p <> oldP
2002− liftIO $ writeIORef pendingChange (newUnready, newP)
2003− when (IntMap.null newUnready) $ do
2004− applyDomUpdate newP
2005− let result0 = IntMap.map _traverseChild_result children0
2006− result' = ffor children' $ fmap $ _traverseChild_result
2007− return (result0, result')
2009−{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2010− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
2012− -> Event DomTimeline (PatchIntMap v)
2013− -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2014− -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2015− -> IntMap (IORef (ChildReadyState Int))
2016− -> IO (IntMap (IORef (ChildReadyState Int))))
2017− -> (IORef (IntMap DOM.Text)
2019− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2021− -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
2023− -> Event DomTimeline (PatchIntMap v)
2024− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
2027−{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2028− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
2030− -> Event DomTimeline (PatchIntMap v)
2031− -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2032− -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2033− -> IntMap (IORef (ChildReadyState Int))
2034− -> IO (IntMap (IORef (ChildReadyState Int))))
2035− -> (IORef (IntMap DOM.Text)
2037− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2039− -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
2041− -> Event DomTimeline (PatchIntMap v)
2042− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
2045−data TraverseChildImmediate k = TraverseChildImmediate
2046− { _traverseChildImmediate_fragment :: {-# UNPACK #-} !DOM.DocumentFragment
2047− -- ^ Child is appended to this fragment
2048− , _traverseChildImmediate_placeholder :: {-# UNPACK #-} !DOM.Text
2049− -- ^ Placeholder reference
2050− , _traverseChildImmediate_childReadyState :: {-# UNPACK #-} !(IORef (ChildReadyState k))
2053−newtype TraverseChildHydration t m = TraverseChildHydration
2054− { _traverseChildHydration_delayed :: HydrationRunnerT t m DOM.Text
2055− -- ^ Action to run at switchover, returns the placeholder
2058−data TraverseChild t m k a = TraverseChild
2059− { _traverseChild_mode :: !(Either (TraverseChildHydration t m) (TraverseChildImmediate k))
2060− , _traverseChild_result :: !a
2063−{-# INLINABLE drawChildUpdate #-}
2064−drawChildUpdate :: (MonadJSM m, Reflex t)
2065− => HydrationDomBuilderEnv t m
2066 -> (IORef (ChildReadyState k) -> JSM ()) -- This will NOT be called if the child is ready at initialization time; instead, the ChildReadyState return value will be ChildReadyState_Ready
802 -> (IORef (ChildReadyState k) -> JSM ()) -- This will NOT be called if the child is ready at initialization time; instead, the ChildReadyState return value will be ChildReadyState_Ready
2067− -> HydrationDomBuilderT s t m (f a)
803+ -> ImmediateDomBuilderT t m (v' a)
2068− -> DomRenderHookT t m (Compose (TraverseChild t m k) f a)
804+ -> RequesterT t JSM Identity m (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v' a)
2069drawChildUpdate initialEnv markReady child = do
805drawChildUpdate initialEnv markReady child = do
2070− let doc = _hydrationDomBuilderEnv_document initialEnv
806+ childReadyState <- liftIO $ newIORef $ ChildReadyState_Unready Nothing
2071 unreadyChildren <- liftIO $ newIORef 0
807 unreadyChildren <- liftIO $ newIORef 0
2072− liftIO (readIORef $ _hydrationDomBuilderEnv_hydrationMode initialEnv) >>= \case
808+ df <- createDocumentFragmentUnchecked $ _immediateDomBuilderEnv_document initialEnv
2073− HydrationMode_Hydrating -> do
809+ (placeholder, result) <- runReaderT (unImmediateDomBuilderT $ (,) <$> textNodeInternal ("" :: Text) <*> child) $ initialEnv
2074− childDelayedRef <- liftIO $ newIORef $ pure ()
810+ { _immediateDomBuilderEnv_parent = toNode df
2075− result <- runReaderT (unHydrationDomBuilderT child) initialEnv
811+ , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
2076− { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
2077− , _hydrationDomBuilderEnv_delayed = childDelayedRef
2079− childDelayed <- liftIO $ readIORef childDelayedRef
2080− return $ Compose $ TraverseChild
2081− { _traverseChild_result = result
2082− , _traverseChild_mode = Left TraverseChildHydration
2083− { _traverseChildHydration_delayed = do
2084− placeholder <- createTextNode doc ("" :: Text)
2085− insertAfterPreviousNode placeholder
2090− HydrationMode_Immediate -> do
2091− childReadyState <- liftIO $ newIORef $ ChildReadyState_Unready Nothing
2092− df <- createDocumentFragment doc
2093− placeholder <- createTextNode doc ("" :: Text)
2094− Node.appendChild_ df placeholder
2095− result <- runReaderT (unHydrationDomBuilderT child) initialEnv
2096− { _hydrationDomBuilderEnv_parent = Left $ toNode df
2097− , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
2098− , _hydrationDomBuilderEnv_commitAction = markReady childReadyState
812+ , _immediateDomBuilderEnv_commitAction = markReady childReadyState
2100− u <- liftIO $ readIORef unreadyChildren
814+ u <- liftIO $ readIORef unreadyChildren
2101− when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyState_Ready
815+ when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyState_Ready
2102− return $ Compose $ TraverseChild
816+ return $ Compose (df, placeholder, childReadyState, result)
2103− { _traverseChild_result = result
2104− , _traverseChild_mode = Right TraverseChildImmediate
2105− { _traverseChildImmediate_fragment = df
2106− , _traverseChildImmediate_placeholder = placeholder
2107− , _traverseChildImmediate_childReadyState = childReadyState
2111−{-# SPECIALIZE drawChildUpdate
2112− :: HydrationDomBuilderEnv DomTimeline HydrationM
2113− -> (IORef (ChildReadyState Int) -> JSM ())
2114− -> HydrationDomBuilderT s DomTimeline HydrationM (Identity a)
2115− -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM Int) Identity a)
2118−{-# SPECIALIZE drawChildUpdate
2119− :: HydrationDomBuilderEnv DomTimeline HydrationM
2120− -> (IORef (ChildReadyState (Some k)) -> JSM ())
2121− -> HydrationDomBuilderT s DomTimeline HydrationM (f a)
2122− -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM (Some k)) f a)
2125−{-# INLINABLE drawChildUpdateInt #-}
2126−drawChildUpdateInt :: (MonadIO m, MonadJSM m, Reflex t)
2127− => HydrationDomBuilderEnv t m
2128− -> (IORef (ChildReadyState k) -> JSM ())
2129− -> HydrationDomBuilderT s t m v
2130− -> DomRenderHookT t m (TraverseChild t m k v)
2131−drawChildUpdateInt env mark m = fmap runIdentity . getCompose <$> drawChildUpdate env mark (Identity <$> m)
2133−{-# SPECIALIZE drawChildUpdateInt
2134− :: HydrationDomBuilderEnv DomTimeline HydrationM
2135− -> (IORef (ChildReadyState k) -> JSM ())
2136− -> HydrationDomBuilderT s DomTimeline HydrationM v
2137− -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM k v)
2140−{-# INLINE mkHasFocus #-}
2142− :: (HasDocument m, MonadJSM m, IsNode (RawElement d), MonadHold t m, Reflex t, DOM.IsDocumentOrShadowRoot (RawDocument (DomBuilderSpace m)))
2143− => Element er d t -> m (Dynamic t Bool)
818+mkHasFocus :: (MonadHold t m, Reflex t) => Element er d t -> m (Dynamic t Bool)
2144mkHasFocus e = do
819mkHasFocus e = do
2145− doc <- askDocument
820+ let initialFocus = False --TODO: Actually get the initial focus of the element
2146− initialFocus <- Node.isSameNode (toNode $ _element_raw e) . fmap toNode =<< Document.getActiveElement doc
2147 holdDyn initialFocus $ leftmost
821 holdDyn initialFocus $ leftmost
2148 [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
822 [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
2149 , True <$ Reflex.select (_element_events e) (WrapArg Focus)
823 , True <$ Reflex.select (_element_events e) (WrapArg Focus)
@@ -2152,49 +826,48 @@ mkHasFocus e = do
2152insertBefore :: (MonadJSM m, IsNode new, IsNode existing) => new -> existing -> m ()
826insertBefore :: (MonadJSM m, IsNode new, IsNode existing) => new -> existing -> m ()
2153insertBefore new existing = do
827insertBefore new existing = do
2154 p <- getParentNodeUnchecked existing
828 p <- getParentNodeUnchecked existing
2155− Node.insertBefore_ p new (Just existing) -- If there's no parent, that means we've been removed from the DOM; this should not happen if the we're removing ourselves from the performEvent properly
829+ DOM.insertBefore_ p (Just new) (Just existing) -- If there's no parent, that means we've been removed from the DOM; this should not happen if the we're removing ourselves from the performEvent properly
2157−type ImmediateDomBuilderT = HydrationDomBuilderT GhcjsDomSpace
2159−instance PerformEvent t m => PerformEvent t (HydrationDomBuilderT s t m) where
831+instance PerformEvent t m => PerformEvent t (ImmediateDomBuilderT t m) where
2160− type Performable (HydrationDomBuilderT s t m) = Performable m
832+ type Performable (ImmediateDomBuilderT t m) = Performable m
2161 {-# INLINABLE performEvent_ #-}
833 {-# INLINABLE performEvent_ #-}
2162 performEvent_ e = lift $ performEvent_ e
834 performEvent_ e = lift $ performEvent_ e
2163 {-# INLINABLE performEvent #-}
835 {-# INLINABLE performEvent #-}
2164 performEvent e = lift $ performEvent e
836 performEvent e = lift $ performEvent e
2166−instance PostBuild t m => PostBuild t (HydrationDomBuilderT s t m) where
838+instance PostBuild t m => PostBuild t (ImmediateDomBuilderT t m) where
2167 {-# INLINABLE getPostBuild #-}
839 {-# INLINABLE getPostBuild #-}
2168 getPostBuild = lift getPostBuild
840 getPostBuild = lift getPostBuild
2170−instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationDomBuilderT s t m) where
842+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (ImmediateDomBuilderT t m) where
2171 {-# INLINABLE newEventWithTrigger #-}
843 {-# INLINABLE newEventWithTrigger #-}
2172 newEventWithTrigger = lift . newEventWithTrigger
844 newEventWithTrigger = lift . newEventWithTrigger
2173 {-# INLINABLE newFanEventWithTrigger #-}
845 {-# INLINABLE newFanEventWithTrigger #-}
2174 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
846 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
2176−instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (HydrationDomBuilderT s t m) where
848+instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (ImmediateDomBuilderT t m) where
2177− {-# INLINABLE newTriggerEvent #-}
2178− newTriggerEvent = HydrationDomBuilderT . lift $ newTriggerEvent
2179− {-# INLINABLE newTriggerEventWithOnComplete #-}
2180− newTriggerEventWithOnComplete = HydrationDomBuilderT . lift $ newTriggerEventWithOnComplete
2181− {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
2182− newEventWithLazyTriggerWithOnComplete f = HydrationDomBuilderT . lift $ newEventWithLazyTriggerWithOnComplete f
2184−instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (DomRenderHookT t m) where
2185 {-# INLINABLE newTriggerEvent #-}
849 {-# INLINABLE newTriggerEvent #-}
2186− newTriggerEvent = DomRenderHookT . lift $ newTriggerEvent
850+ newTriggerEvent = do
851+ (e, t) <- newTriggerEventWithOnComplete
852+ return (e, \a -> t a $ return ())
2187 {-# INLINABLE newTriggerEventWithOnComplete #-}
853 {-# INLINABLE newTriggerEventWithOnComplete #-}
2188− newTriggerEventWithOnComplete = DomRenderHookT . lift $ newTriggerEventWithOnComplete
854+ newTriggerEventWithOnComplete = do
856+ (eResult, reResultTrigger) <- lift newEventWithTriggerRef
857+ return $ (,) eResult $ \a cb -> writeChan events [TriggerRef reResultTrigger :=> TriggerInvocation a (liftIO cb)]
2189 {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
858 {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
2190− newEventWithLazyTriggerWithOnComplete f = DomRenderHookT . lift $ newEventWithLazyTriggerWithOnComplete f
859+ newEventWithLazyTriggerWithOnComplete f = do
861+ lift $ newEventWithTrigger $ \t -> f $ \a cb -> do
862+ reResultTrigger <- newIORef $ Just t
863+ writeChan events [TriggerRef reResultTrigger :=> TriggerInvocation a (liftIO cb)]
2192−instance HasJSContext m => HasJSContext (HydrationDomBuilderT s t m) where
865+instance HasJSContext m => HasJSContext (ImmediateDomBuilderT t m) where
2193− type JSContextPhantom (HydrationDomBuilderT s t m) = JSContextPhantom m
866+ type JSContextPhantom (ImmediateDomBuilderT t m) = JSContextPhantom m
2194 askJSContext = lift askJSContext
867 askJSContext = lift askJSContext
2196−instance MonadRef m => MonadRef (HydrationDomBuilderT s t m) where
869+instance MonadRef m => MonadRef (ImmediateDomBuilderT t m) where
2197− type Ref (HydrationDomBuilderT s t m) = Ref m
870+ type Ref (ImmediateDomBuilderT t m) = Ref m
2198 {-# INLINABLE newRef #-}
871 {-# INLINABLE newRef #-}
2199 newRef = lift . newRef
872 newRef = lift . newRef
2200 {-# INLINABLE readRef #-}
873 {-# INLINABLE readRef #-}
@@ -2202,12 +875,12 @@ instance MonadRef m => MonadRef (HydrationDomBuilderT s t m) where
2202 {-# INLINABLE writeRef #-}
875 {-# INLINABLE writeRef #-}
2203 writeRef r = lift . writeRef r
876 writeRef r = lift . writeRef r
2205−instance MonadAtomicRef m => MonadAtomicRef (HydrationDomBuilderT s t m) where
878+instance MonadAtomicRef m => MonadAtomicRef (ImmediateDomBuilderT t m) where
2206 {-# INLINABLE atomicModifyRef #-}
879 {-# INLINABLE atomicModifyRef #-}
2207 atomicModifyRef r = lift . atomicModifyRef r
880 atomicModifyRef r = lift . atomicModifyRef r
2209−instance (HasJS x m, ReflexHost t) => HasJS x (HydrationDomBuilderT s t m) where
882+instance (HasJS x m, ReflexHost t) => HasJS x (ImmediateDomBuilderT t m) where
2210− type JSX (HydrationDomBuilderT s t m) = JSX m
883+ type JSX (ImmediateDomBuilderT t m) = JSX m
2211 liftJS = lift . liftJS
884 liftJS = lift . liftJS
2213type family EventType en where
886type family EventType en where
@@ -2244,12 +917,12 @@ type family EventType en where
2244 EventType 'SelectTag = UIEvent
917 EventType 'SelectTag = UIEvent
2245 EventType 'SubmitTag = DOM.Event
918 EventType 'SubmitTag = DOM.Event
2246 EventType 'WheelTag = WheelEvent
919 EventType 'WheelTag = WheelEvent
2247− EventType 'BeforecutTag = ClipboardEvent
920+ EventType 'BeforecutTag = DOM.Event
2248− EventType 'CutTag = ClipboardEvent
921+ EventType 'CutTag = DOM.Event
2249− EventType 'BeforecopyTag = ClipboardEvent
922+ EventType 'BeforecopyTag = DOM.Event
2250− EventType 'CopyTag = ClipboardEvent
923+ EventType 'CopyTag = DOM.Event
2251− EventType 'BeforepasteTag = ClipboardEvent
924+ EventType 'BeforepasteTag = DOM.Event
2252− EventType 'PasteTag = ClipboardEvent
925+ EventType 'PasteTag = DOM.Event
2253 EventType 'ResetTag = DOM.Event
926 EventType 'ResetTag = DOM.Event
2254 EventType 'SearchTag = DOM.Event
927 EventType 'SearchTag = DOM.Event
2255 EventType 'SelectstartTag = DOM.Event
928 EventType 'SelectstartTag = DOM.Event
@@ -2264,7 +937,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
2264 Click -> return ()
937 Click -> return ()
2265 Dblclick -> getMouseEventCoords
938 Dblclick -> getMouseEventCoords
2266 Keypress -> getKeyEvent
939 Keypress -> getKeyEvent
2267− Scroll -> fromIntegral <$> getScrollTop e
940+ Scroll -> getScrollTop e
2268 Keydown -> getKeyEvent
941 Keydown -> getKeyEvent
2269 Keyup -> getKeyEvent
942 Keyup -> getKeyEvent
2270 Mousemove -> getMouseEventCoords
943 Mousemove -> getMouseEventCoords
@@ -2297,7 +970,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
2297 Beforecopy -> return ()
970 Beforecopy -> return ()
2298 Copy -> return ()
971 Copy -> return ()
2299 Beforepaste -> return ()
972 Beforepaste -> return ()
2300− Paste -> getPasteData
973+ Paste -> return ()
2301 Reset -> return ()
974 Reset -> return ()
2302 Search -> return ()
975 Search -> return ()
2303 Selectstart -> return ()
976 Selectstart -> return ()
@@ -2306,7 +979,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
2306 Touchend -> getTouchEvent
979 Touchend -> getTouchEvent
2307 Touchcancel -> getTouchEvent
980 Touchcancel -> getTouchEvent
2308 Mousewheel -> return ()
981 Mousewheel -> return ()
2309− Wheel -> getWheelEvent
982+ Wheel -> return ()
2311{-# INLINABLE defaultDomWindowEventHandler #-}
984{-# INLINABLE defaultDomWindowEventHandler #-}
2312defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
985defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2347,7 +1020,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
2347 Beforecopy -> return ()
1020 Beforecopy -> return ()
2348 Copy -> return ()
1021 Copy -> return ()
2349 Beforepaste -> return ()
1022 Beforepaste -> return ()
2350− Paste -> getPasteData
1023+ Paste -> return ()
2351 Reset -> return ()
1024 Reset -> return ()
2352 Search -> return ()
1025 Search -> return ()
2353 Selectstart -> return ()
1026 Selectstart -> return ()
@@ -2356,7 +1029,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
2356 Touchend -> getTouchEvent
1029 Touchend -> getTouchEvent
2357 Touchcancel -> getTouchEvent
1030 Touchcancel -> getTouchEvent
2358 Mousewheel -> return ()
1031 Mousewheel -> return ()
2359− Wheel -> getWheelEvent
1032+ Wheel -> return ()
2361{-# INLINABLE withIsEvent #-}
1034{-# INLINABLE withIsEvent #-}
2362withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
1035withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2457,114 +1130,105 @@ showEventName en = case en of
2457 Touchend -> "Touchend"
1130 Touchend -> "Touchend"
2458 Touchcancel -> "Touchcancel"
1131 Touchcancel -> "Touchcancel"
2460−--TODO: Get rid of this hack
2461−-- ElementEventTarget is here to allow us to treat SVG and HTML elements as the same thing; without it, we'll break any existing SVG code.
2462−newtype ElementEventTarget = ElementEventTarget DOM.Element deriving (DOM.IsGObject, DOM.ToJSVal, DOM.IsSlotable, DOM.IsParentNode, DOM.IsNonDocumentTypeChildNode, DOM.IsChildNode, DOM.IsAnimatable, IsNode, IsElement)
2463−instance DOM.FromJSVal ElementEventTarget where
2464− fromJSVal = fmap (fmap ElementEventTarget) . DOM.fromJSVal
2465−instance DOM.IsEventTarget ElementEventTarget
2466−instance DOM.IsGlobalEventHandlers ElementEventTarget
2467−instance DOM.IsDocumentAndElementEventHandlers ElementEventTarget
2469{-# INLINABLE elementOnEventName #-}
1133{-# INLINABLE elementOnEventName #-}
2470elementOnEventName :: IsElement e => EventName en -> e -> EventM e (EventType en) () -> JSM (JSM ())
1134elementOnEventName :: IsElement e => EventName en -> e -> EventM e (EventType en) () -> JSM (JSM ())
2471−elementOnEventName en e_ = let e = ElementEventTarget (DOM.toElement e_) in case en of
1135+elementOnEventName en e = case en of
2472− Abort -> on e Events.abort
1136+ Abort -> on e Element.abort
2473− Blur -> on e Events.blur
1137+ Blur -> on e Element.blurEvent
2474− Change -> on e Events.change
1138+ Change -> on e Element.change
2475− Click -> on e Events.click
1139+ Click -> on e Element.click
2476− Contextmenu -> on e Events.contextMenu
1140+ Contextmenu -> on e Element.contextMenu
2477− Dblclick -> on e Events.dblClick
1141+ Dblclick -> on e Element.dblClick
2478− Drag -> on e Events.drag
1142+ Drag -> on e Element.drag
2479− Dragend -> on e Events.dragEnd
1143+ Dragend -> on e Element.dragEnd
2480− Dragenter -> on e Events.dragEnter
1144+ Dragenter -> on e Element.dragEnter
2481− Dragleave -> on e Events.dragLeave
1145+ Dragleave -> on e Element.dragLeave
2482− Dragover -> on e Events.dragOver
1146+ Dragover -> on e Element.dragOver
2483− Dragstart -> on e Events.dragStart
1147+ Dragstart -> on e Element.dragStart
2484− Drop -> on e Events.drop
1148+ Drop -> on e Element.drop
2485− Error -> on e Events.error
1149+ Error -> on e Element.error
2486− Focus -> on e Events.focus
1150+ Focus -> on e Element.focusEvent
2487− Input -> on e Events.input
1151+ Input -> on e Element.input
2488− Invalid -> on e Events.invalid
1152+ Invalid -> on e Element.invalid
2489− Keydown -> on e Events.keyDown
1153+ Keydown -> on e Element.keyDown
2490− Keypress -> on e Events.keyPress
1154+ Keypress -> on e Element.keyPress
2491− Keyup -> on e Events.keyUp
1155+ Keyup -> on e Element.keyUp
2492− Load -> on e Events.load
1156+ Load -> on e Element.load
2493− Mousedown -> on e Events.mouseDown
1157+ Mousedown -> on e Element.mouseDown
2494− Mouseenter -> on e Events.mouseEnter
1158+ Mouseenter -> on e Element.mouseEnter
2495− Mouseleave -> on e Events.mouseLeave
1159+ Mouseleave -> on e Element.mouseLeave
2496− Mousemove -> on e Events.mouseMove
1160+ Mousemove -> on e Element.mouseMove
2497− Mouseout -> on e Events.mouseOut
1161+ Mouseout -> on e Element.mouseOut
2498− Mouseover -> on e Events.mouseOver
1162+ Mouseover -> on e Element.mouseOver
2499− Mouseup -> on e Events.mouseUp
1163+ Mouseup -> on e Element.mouseUp
2500− Mousewheel -> on e Events.mouseWheel
1164+ Mousewheel -> on e Element.mouseWheel
2501− Scroll -> on e Events.scroll
1165+ Scroll -> on e Element.scroll
2502− Select -> on e Events.select
1166+ Select -> on e Element.select
2503− Submit -> on e Events.submit
1167+ Submit -> on e Element.submit
2504− Wheel -> on e Events.wheel
1168+ Wheel -> on e Element.wheel
2505− Beforecut -> on e Events.beforeCut
1169+ Beforecut -> on e Element.beforeCut
2506− Cut -> on e Events.cut
1170+ Cut -> on e Element.cut
2507− Beforecopy -> on e Events.beforeCopy
1171+ Beforecopy -> on e Element.beforeCopy
2508− Copy -> on e Events.copy
1172+ Copy -> on e Element.copy
2509− Beforepaste -> on e Events.beforePaste
1173+ Beforepaste -> on e Element.beforePaste
2510− Paste -> on e Events.paste
1174+ Paste -> on e Element.paste
2511− Reset -> on e Events.reset
1175+ Reset -> on e Element.reset
2512− Search -> on e Events.search
1176+ Search -> on e Element.search
2513 Selectstart -> on e Element.selectStart
1177 Selectstart -> on e Element.selectStart
2514− Touchstart -> on e Events.touchStart
1178+ Touchstart -> on e Element.touchStart
2515− Touchmove -> on e Events.touchMove
1179+ Touchmove -> on e Element.touchMove
2516− Touchend -> on e Events.touchEnd
1180+ Touchend -> on e Element.touchEnd
2517− Touchcancel -> on e Events.touchCancel
1181+ Touchcancel -> on e Element.touchCancel
2519{-# INLINABLE windowOnEventName #-}
1183{-# INLINABLE windowOnEventName #-}
2520windowOnEventName :: EventName en -> DOM.Window -> EventM DOM.Window (EventType en) () -> JSM (JSM ())
1184windowOnEventName :: EventName en -> DOM.Window -> EventM DOM.Window (EventType en) () -> JSM (JSM ())
2521windowOnEventName en e = case en of
1185windowOnEventName en e = case en of
2522− Abort -> on e Events.abort
1186+ Abort -> on e Window.abort
2523− Blur -> on e Events.blur
1187+ Blur -> on e Window.blurEvent
2524− Change -> on e Events.change
1188+ Change -> on e Window.change
2525− Click -> on e Events.click
1189+ Click -> on e Window.click
2526− Contextmenu -> on e Events.contextMenu
1190+ Contextmenu -> on e Window.contextMenu
2527− Dblclick -> on e Events.dblClick
1191+ Dblclick -> on e Window.dblClick
2528− Drag -> on e Events.drag
1192+ Drag -> on e Window.drag
2529− Dragend -> on e Events.dragEnd
1193+ Dragend -> on e Window.dragEnd
2530− Dragenter -> on e Events.dragEnter
1194+ Dragenter -> on e Window.dragEnter
2531− Dragleave -> on e Events.dragLeave
1195+ Dragleave -> on e Window.dragLeave
2532− Dragover -> on e Events.dragOver
1196+ Dragover -> on e Window.dragOver
2533− Dragstart -> on e Events.dragStart
1197+ Dragstart -> on e Window.dragStart
2534− Drop -> on e Events.drop
1198+ Drop -> on e Window.drop
2535− Error -> on e Events.error
1199+ Error -> on e Window.error
2536− Focus -> on e Events.focus
1200+ Focus -> on e Window.focusEvent
2537− Input -> on e Events.input
1201+ Input -> on e Window.input
2538− Invalid -> on e Events.invalid
1202+ Invalid -> on e Window.invalid
2539− Keydown -> on e Events.keyDown
1203+ Keydown -> on e Window.keyDown
2540− Keypress -> on e Events.keyPress
1204+ Keypress -> on e Window.keyPress
2541− Keyup -> on e Events.keyUp
1205+ Keyup -> on e Window.keyUp
2542− Load -> on e Events.load
1206+ Load -> on e Window.load
2543− Mousedown -> on e Events.mouseDown
1207+ Mousedown -> on e Window.mouseDown
2544− Mouseenter -> on e Events.mouseEnter
1208+ Mouseenter -> on e Window.mouseEnter
2545− Mouseleave -> on e Events.mouseLeave
1209+ Mouseleave -> on e Window.mouseLeave
2546− Mousemove -> on e Events.mouseMove
1210+ Mousemove -> on e Window.mouseMove
2547− Mouseout -> on e Events.mouseOut
1211+ Mouseout -> on e Window.mouseOut
2548− Mouseover -> on e Events.mouseOver
1212+ Mouseover -> on e Window.mouseOver
2549− Mouseup -> on e Events.mouseUp
1213+ Mouseup -> on e Window.mouseUp
2550− Mousewheel -> on e Events.mouseWheel
1214+ Mousewheel -> on e Window.mouseWheel
2551− Scroll -> on e Events.scroll
1215+ Scroll -> on e Window.scrollEvent
2552− Select -> on e Events.select
1216+ Select -> on e Window.select
2553− Submit -> on e Events.submit
1217+ Submit -> on e Window.submit
2554− Wheel -> on e Events.wheel
1218+ Wheel -> on e Window.wheel
2555 Beforecut -> const $ return $ return () --TODO
1219 Beforecut -> const $ return $ return () --TODO
2556 Cut -> const $ return $ return () --TODO
1220 Cut -> const $ return $ return () --TODO
2557 Beforecopy -> const $ return $ return () --TODO
1221 Beforecopy -> const $ return $ return () --TODO
2558 Copy -> const $ return $ return () --TODO
1222 Copy -> const $ return $ return () --TODO
2559 Beforepaste -> const $ return $ return () --TODO
1223 Beforepaste -> const $ return $ return () --TODO
2560 Paste -> const $ return $ return () --TODO
1224 Paste -> const $ return $ return () --TODO
2561− Reset -> on e Events.reset
1225+ Reset -> on e Window.reset
2562− Search -> on e Events.search
1226+ Search -> on e Window.search
2563 Selectstart -> const $ return $ return () --TODO
1227 Selectstart -> const $ return $ return () --TODO
2564− Touchstart -> on e Events.touchStart
1228+ Touchstart -> on e Window.touchStart
2565− Touchmove -> on e Events.touchMove
1229+ Touchmove -> on e Window.touchMove
2566− Touchend -> on e Events.touchEnd
1230+ Touchend -> on e Window.touchEnd
2567− Touchcancel -> on e Events.touchCancel
1231+ Touchcancel -> on e Window.touchCancel
2569{-# INLINABLE wrapDomEvent #-}
1233{-# INLINABLE wrapDomEvent #-}
2570wrapDomEvent :: (TriggerEvent t m, MonadJSM m) => e -> (e -> EventM e event () -> JSM (JSM ())) -> EventM e event a -> m (Event t a)
1234wrapDomEvent :: (TriggerEvent t m, MonadJSM m) => e -> (e -> EventM e event () -> JSM (JSM ())) -> EventM e event a -> m (Event t a)
@@ -2573,7 +1237,7 @@ wrapDomEvent el elementOnevent getValue = wrapDomEventMaybe el elementOnevent $
2573{-# INLINABLE subscribeDomEvent #-}
1237{-# INLINABLE subscribeDomEvent #-}
2574subscribeDomEvent :: (EventM e event () -> JSM (JSM ()))
1238subscribeDomEvent :: (EventM e event () -> JSM (JSM ()))
2575 -> EventM e event (Maybe a)
1239 -> EventM e event (Maybe a)
2576− -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
1240+ -> Chan [DSum (TriggerRef t) TriggerInvocation]
2577 -> EventTrigger t a
1241 -> EventTrigger t a
2578 -> JSM (JSM ())
1242 -> JSM (JSM ())
2579subscribeDomEvent elementOnevent getValue eventChan et = elementOnevent $ do
1243subscribeDomEvent elementOnevent getValue eventChan et = elementOnevent $ do
@@ -2581,7 +1245,7 @@ subscribeDomEvent elementOnevent getValue eventChan et = elementOnevent $ do
2581 forM_ mv $ \v -> liftIO $ do
1245 forM_ mv $ \v -> liftIO $ do
2582 --TODO: I don't think this is quite right: if a new trigger is created between when this is enqueued and when it fires, this may not work quite right
1246 --TODO: I don't think this is quite right: if a new trigger is created between when this is enqueued and when it fires, this may not work quite right
2583 etr <- newIORef $ Just et
1247 etr <- newIORef $ Just et
2584− writeChan eventChan [EventTriggerRef etr :=> TriggerInvocation v (return ())]
1248+ writeChan eventChan [TriggerRef etr :=> TriggerInvocation v (return ())]
2586{-# INLINABLE wrapDomEventMaybe #-}
1250{-# INLINABLE wrapDomEventMaybe #-}
2587wrapDomEventMaybe :: (TriggerEvent t m, MonadJSM m)
1251wrapDomEventMaybe :: (TriggerEvent t m, MonadJSM m)
@@ -2609,10 +1273,10 @@ wrapDomEventsMaybe target handlers onEventName = do
2609 return $! e
1273 return $! e
2611{-# INLINABLE getKeyEvent #-}
1275{-# INLINABLE getKeyEvent #-}
2612−getKeyEvent :: EventM e KeyboardEvent Word
1276+getKeyEvent :: EventM e KeyboardEvent Int
2613getKeyEvent = do
1277getKeyEvent = do
2614 e <- event
1278 e <- event
2615− which <- KeyboardEvent.getWhich e
1279+ which <- getWhich e
2616 if which /= 0 then return which else do
1280 if which /= 0 then return which else do
2617 charCode <- getCharCode e
1281 charCode <- getCharCode e
2618 if charCode /= 0 then return charCode else
1282 if charCode /= 0 then return charCode else
@@ -2624,38 +1288,32 @@ getMouseEventCoords = do
2624 e <- event
1288 e <- event
2625 bisequence (getClientX e, getClientY e)
1289 bisequence (getClientX e, getClientY e)
2627−{-# INLINABLE getPasteData #-}
2628−getPasteData :: EventM e ClipboardEvent (Maybe Text)
2631− mdt <- ClipboardEvent.getClipboardData e
2633− Nothing -> return Nothing
2634− Just dt -> Just <$> DataTransfer.getData dt ("text" :: Text)
2636{-# INLINABLE getTouchEvent #-}
1291{-# INLINABLE getTouchEvent #-}
2637getTouchEvent :: EventM e TouchEvent TouchEventResult
1292getTouchEvent :: EventM e TouchEvent TouchEventResult
2638getTouchEvent = do
1293getTouchEvent = do
2639− let touchResults ts = do
1294+ let touchResults = \case
1295+ Nothing -> return []
2640 n <- TouchList.getLength ts
1297 n <- TouchList.getLength ts
2641− forM (takeWhile (< n) [0..]) $ \ix -> do
1298+ fmap catMaybes . forM (takeWhile (< n) [0..]) $ \ix -> do
2642− t <- TouchList.item ts ix
1299+ mt <- TouchList.item ts ix
2643− identifier <- Touch.getIdentifier t
1301+ identifier <- Touch.getIdentifier t
2644− screenX <- Touch.getScreenX t
1302+ screenX <- Touch.getScreenX t
2645− screenY <- Touch.getScreenY t
1303+ screenY <- Touch.getScreenY t
2646− clientX <- Touch.getClientX t
1304+ clientX <- Touch.getClientX t
2647− clientY <- Touch.getClientY t
1305+ clientY <- Touch.getClientY t
2648− pageX <- Touch.getPageX t
1306+ pageX <- Touch.getPageX t
2649− pageY <- Touch.getPageY t
1307+ pageY <- Touch.getPageY t
2650− return TouchResult
1308+ return $ TouchResult
2651− { _touchResult_identifier = identifier
1309+ { _touchResult_identifier = identifier
2652− , _touchResult_screenX = screenX
1310+ , _touchResult_screenX = screenX
2653− , _touchResult_screenY = screenY
1311+ , _touchResult_screenY = screenY
2654− , _touchResult_clientX = clientX
1312+ , _touchResult_clientX = clientX
2655− , _touchResult_clientY = clientY
1313+ , _touchResult_clientY = clientY
2656− , _touchResult_pageX = pageX
1314+ , _touchResult_pageX = pageX
2657− , _touchResult_pageY = pageY
1315+ , _touchResult_pageY = pageY
2659 e <- event
1317 e <- event
2660 altKey <- TouchEvent.getAltKey e
1318 altKey <- TouchEvent.getAltKey e
2661 ctrlKey <- TouchEvent.getCtrlKey e
1319 ctrlKey <- TouchEvent.getCtrlKey e
@@ -2674,41 +1332,17 @@ getTouchEvent = do
2674 , _touchEventResult_touches = touches
1332 , _touchEventResult_touches = touches
2677−{-# INLINABLE getWheelEvent #-}
2678−getWheelEvent :: EventM e WheelEvent WheelEventResult
2681− dx :: Double <- WheelEvent.getDeltaX e
2682− dy :: Double <- WheelEvent.getDeltaY e
2683− dz :: Double <- WheelEvent.getDeltaZ e
2684− deltaMode :: Word <- WheelEvent.getDeltaMode e
2685− return $ WheelEventResult
2686− { _wheelEventResult_deltaX = dx
2687− , _wheelEventResult_deltaY = dy
2688− , _wheelEventResult_deltaZ = dz
2689− , _wheelEventResult_deltaMode = case deltaMode of
2693− -- See https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/deltaMode
2694− _ -> error "getWheelEvent: impossible encoding"
2697−instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
1335+instance MonadSample t m => MonadSample t (ImmediateDomBuilderT t m) where
2698 {-# INLINABLE sample #-}
1336 {-# INLINABLE sample #-}
2699 sample = lift . sample
1337 sample = lift . sample
2701−instance MonadHold t m => MonadHold t (HydrationDomBuilderT s t m) where
1339+instance MonadHold t m => MonadHold t (ImmediateDomBuilderT t m) where
2702 {-# INLINABLE hold #-}
1340 {-# INLINABLE hold #-}
2703 hold v0 v' = lift $ hold v0 v'
1341 hold v0 v' = lift $ hold v0 v'
2704 {-# INLINABLE holdDyn #-}
1342 {-# INLINABLE holdDyn #-}
2705 holdDyn v0 v' = lift $ holdDyn v0 v'
1343 holdDyn v0 v' = lift $ holdDyn v0 v'
2706 {-# INLINABLE holdIncremental #-}
1344 {-# INLINABLE holdIncremental #-}
2707 holdIncremental v0 v' = lift $ holdIncremental v0 v'
1345 holdIncremental v0 v' = lift $ holdIncremental v0 v'
2708− {-# INLINABLE buildDynamic #-}
2709− buildDynamic a0 = lift . buildDynamic a0
2710− {-# INLINABLE headE #-}
2711− headE = lift . headE
2713data WindowConfig t = WindowConfig -- No config options yet
1347data WindowConfig t = WindowConfig -- No config options yet
@@ -2720,7 +1354,7 @@ data Window t = Window
2720 , _window_raw :: DOM.Window
1354 , _window_raw :: DOM.Window
2723−wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> HydrationDomBuilderT GhcjsDomSpace t m (Window t)
1357+wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> ImmediateDomBuilderT t m (Window t)
2724wrapWindow wv _ = do
1358wrapWindow wv _ = do
2725 events <- wrapDomEventsMaybe wv (defaultDomWindowEventHandler wv) windowOnEventName
1359 events <- wrapDomEventsMaybe wv (defaultDomWindowEventHandler wv) windowOnEventName
2726 return $ Window
1360 return $ Window