@@ -2,7 +2,7 @@
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE ConstraintKinds #-}
3{-# LANGUAGE ConstraintKinds #-}
4{-# LANGUAGE DataKinds #-}
4{-# LANGUAGE DataKinds #-}
5−{-# LANGUAGE DefaultSignatures #-}
5+{-# LANGUAGE DeriveTraversable #-}
6{-# LANGUAGE EmptyDataDecls #-}
6{-# LANGUAGE EmptyDataDecls #-}
7{-# LANGUAGE FlexibleContexts #-}
7{-# LANGUAGE FlexibleContexts #-}
8{-# LANGUAGE FlexibleInstances #-}
8{-# LANGUAGE FlexibleInstances #-}
@@ -11,14 +11,15 @@
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12{-# LANGUAGE MultiParamTypeClasses #-}
12{-# LANGUAGE MultiParamTypeClasses #-}
13{-# LANGUAGE OverloadedStrings #-}
13{-# LANGUAGE OverloadedStrings #-}
14+{-# LANGUAGE PatternGuards #-}
14{-# LANGUAGE PolyKinds #-}
15{-# LANGUAGE PolyKinds #-}
15{-# LANGUAGE RankNTypes #-}
16{-# LANGUAGE RankNTypes #-}
16{-# LANGUAGE RecursiveDo #-}
17{-# LANGUAGE RecursiveDo #-}
17{-# LANGUAGE ScopedTypeVariables #-}
18{-# LANGUAGE ScopedTypeVariables #-}
18−{-# LANGUAGE StandaloneDeriving #-}
19#ifdef USE_TEMPLATE_HASKELL
19#ifdef USE_TEMPLATE_HASKELL
20{-# LANGUAGE TemplateHaskell #-}
20{-# LANGUAGE TemplateHaskell #-}
22+{-# LANGUAGE TupleSections #-}
22{-# LANGUAGE TypeFamilies #-}
23{-# LANGUAGE TypeFamilies #-}
23{-# LANGUAGE TypeOperators #-}
24{-# LANGUAGE TypeOperators #-}
24{-# LANGUAGE UndecidableInstances #-}
25{-# LANGUAGE UndecidableInstances #-}
@@ -26,191 +27,364 @@
26{-# LANGUAGE ForeignFunctionInterface #-}
27{-# LANGUAGE ForeignFunctionInterface #-}
27{-# LANGUAGE JavaScriptFFI #-}
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.
29module Reflex.Dom.Builder.Immediate
45module Reflex.Dom.Builder.Immediate
30− ( EventTriggerRef (..)
46+ ( HydrationDomBuilderT (..)
31− , ImmediateDomBuilderEnv (..)
47+ , HydrationDomBuilderEnv (..)
49+ , HydrationRunnerT (..)
50+ , runHydrationRunnerT
51+ , runHydrationRunnerTWithFailure
32− , ImmediateDomBuilderT (..)
52+ , ImmediateDomBuilderT
33− , runImmediateDomBuilderT
53+ , runHydrationDomBuilderT
56+ , addHydrationStepWithSetup
58+ , insertAfterPreviousNode
34− , askParent
60+ , askParent
35− , askEvents
61+ , askEvents
37− , textNodeInternal
63+ , textNodeInternal
64+ , removeSubsequentNodes
38− , deleteBetweenExclusive
65+ , deleteBetweenExclusive
39− , extractBetweenExclusive
66+ , extractBetweenExclusive
40− , deleteUpTo
67+ , deleteUpTo
41− , extractUpTo
68+ , extractUpTo
42− , SupportsImmediateDomBuilder
69+ , SupportsHydrationDomBuilder
43− , collectUpTo
70+ , collectUpTo
44− , collectUpToGivenParent
71+ , collectUpToGivenParent
72+ , EventTriggerRef (..)
45− , EventFilterTriggerRef (..)
73+ , EventFilterTriggerRef (..)
47− , makeElement
75+ , elementInternal
48− , GhcjsDomHandler (..)
78+ , GhcjsDomHandler (..)
49− , GhcjsDomHandler1 (..)
79+ , GhcjsDomHandler1 (..)
50− , GhcjsDomEvent (..)
80+ , GhcjsDomEvent (..)
52− , GhcjsEventFilter (..)
81+ , GhcjsEventFilter (..)
53− , Pair1 (..)
82+ , Pair1 (..)
54− , Maybe1 (..)
83+ , Maybe1 (..)
55− , GhcjsEventSpec (..)
84+ , GhcjsEventSpec (..)
56− , HasDocument (..)
85+ , HasDocument (..)
57− , ghcjsEventSpec_filters
86+ , ghcjsEventSpec_filters
58− , ghcjsEventSpec_handler
87+ , ghcjsEventSpec_handler
59− , GhcjsEventHandler (..)
88+ , GhcjsEventHandler (..)
60−#ifndef USE_TEMPLATE_HASKELL
63− , drawChildUpdate
89+ , drawChildUpdate
64− , ChildReadyState (..)
90+ , ChildReadyState (..)
65− , ChildReadyStateInt (..)
66− , mkHasFocus
91+ , mkHasFocus
67− , insertBefore
92+ , insertBefore
68− , EventType
93+ , EventType
69− , defaultDomEventHandler
94+ , defaultDomEventHandler
70− , defaultDomWindowEventHandler
95+ , defaultDomWindowEventHandler
71− , withIsEvent
96+ , withIsEvent
72− , showEventName
97+ , showEventName
73− , elementOnEventName
98+ , elementOnEventName
74− , windowOnEventName
99+ , windowOnEventName
75− , wrapDomEvent
100+ , wrapDomEvent
76− , subscribeDomEvent
101+ , subscribeDomEvent
77− , wrapDomEventMaybe
102+ , wrapDomEventMaybe
78− , wrapDomEventsMaybe
103+ , wrapDomEventsMaybe
79− , getKeyEvent
104+ , getKeyEvent
80− , getMouseEventCoords
105+ , getMouseEventCoords
81− , getTouchEvent
106+ , getTouchEvent
82− , WindowConfig (..)
107+ , WindowConfig (..)
83− , Window (..)
108+ , Window (..)
84− , wrapWindow
109+ , wrapWindow
110+ -- * Attributes for controlling hydration
111+ , hydratableAttribute
112+ , skipHydrationAttribute
85− -- * Internal
113+ -- * Internal
86− , traverseDMapWithKeyWithAdjust'
114+ , traverseDMapWithKeyWithAdjust'
87− , hoistTraverseWithKeyWithAdjust
115+ , hoistTraverseWithKeyWithAdjust
88− , traverseIntMapWithKeyWithAdjust'
116+ , traverseIntMapWithKeyWithAdjust'
89− , hoistTraverseIntMapWithKeyWithAdjust
117+ , hoistTraverseIntMapWithKeyWithAdjust
92−import Foreign.JavaScript.TH
93−import Reflex.Class as Reflex
94−import Reflex.Dom.Builder.Class
96−import Reflex.DynamicWriter (DynamicWriterT)
97−import Reflex.EventWriter (EventWriterT)
98−import Reflex.Host.Class
99−import qualified Reflex.Patch.DMap as PatchDMap
100−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
101−import Reflex.PerformEvent.Class
102−import Reflex.PostBuild.Base
103−import Reflex.PostBuild.Class
104−import Reflex.TriggerEvent.Base hiding (askEvents)
105−import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
106−import Reflex.TriggerEvent.Class
107−import Reflex.Query.Base (QueryT)
109import Control.Concurrent
120import Control.Concurrent
110−import Control.Lens hiding (element, ix)
121+import Control.Exception (bracketOnError)
122+import Control.Lens (Identity(..), imapM_, iforM_, (^.), makeLenses)
111import Control.Monad.Exception
123import Control.Monad.Exception
112import Control.Monad.Primitive
124import Control.Monad.Primitive
113import Control.Monad.Reader
125import Control.Monad.Reader
114import Control.Monad.Ref
126import Control.Monad.Ref
115−import Control.Monad.State.Strict (StateT)
127+import Control.Monad.State.Strict (StateT, mapStateT, get, modify', gets, runStateT)
116−import qualified Control.Monad.State as Lazy (StateT)
117−#ifndef USE_TEMPLATE_HASKELL
118−import Data.Functor.Contravariant (phantom)
120import Data.Bitraversable
128import Data.Bitraversable
121import Data.Default
129import Data.Default
122import Data.Dependent.Map (DMap)
130import Data.Dependent.Map (DMap)
123−import qualified Data.Dependent.Map as DMap
124import Data.Dependent.Sum
131import Data.Dependent.Sum
132+import Data.FastMutableIntMap (PatchIntMap (..))
133+import Data.Foldable (for_, traverse_)
125import Data.Functor.Compose
134import Data.Functor.Compose
126import Data.Functor.Constant
135import Data.Functor.Constant
127import Data.Functor.Misc
136import Data.Functor.Misc
128import Data.Functor.Product
137import Data.Functor.Product
138+import Data.GADT.Compare (GCompare)
129import Data.IORef
139import Data.IORef
130−import qualified Data.Map as Map
140+import Data.IntMap.Strict (IntMap)
131import Data.Maybe
141import Data.Maybe
132−import Data.Monoid hiding (Product)
142+import Data.Monoid ((<>))
133−import Data.Some (Some)
143+import Data.Some (Some(..))
134−import qualified Data.Some as Some
144+import Data.GADT.Compare (GCompare)
145+import Data.String (IsString)
135import Data.Text (Text)
146import 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
136import qualified Data.Text as T
183import qualified Data.Text as T
137import qualified GHCJS.DOM as DOM
184import qualified GHCJS.DOM as DOM
138−import GHCJS.DOM.RequestAnimationFrameCallback
185+import qualified GHCJS.DOM.DataTransfer as DataTransfer
139−import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode)
186+import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
140−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS)
187+import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
141import qualified GHCJS.DOM.Element as Element
188import qualified GHCJS.DOM.Element as Element
142import qualified GHCJS.DOM.Event as Event
189import qualified GHCJS.DOM.Event as Event
143−import qualified GHCJS.DOM.GlobalEventHandlers as Events
144−import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
145−import GHCJS.DOM.EventM (EventM, event, on)
146import qualified GHCJS.DOM.EventM as DOM
190import qualified GHCJS.DOM.EventM as DOM
147import qualified GHCJS.DOM.FileList as FileList
191import qualified GHCJS.DOM.FileList as FileList
192+import qualified GHCJS.DOM.GlobalEventHandlers as Events
148import qualified GHCJS.DOM.HTMLInputElement as Input
193import qualified GHCJS.DOM.HTMLInputElement as Input
149import qualified GHCJS.DOM.HTMLSelectElement as Select
194import qualified GHCJS.DOM.HTMLSelectElement as Select
150import qualified GHCJS.DOM.HTMLTextAreaElement as TextArea
195import qualified GHCJS.DOM.HTMLTextAreaElement as TextArea
151−import GHCJS.DOM.MouseEvent
196+import qualified GHCJS.DOM.Node as Node
197+import qualified GHCJS.DOM.Text as DOM
152import qualified GHCJS.DOM.Touch as Touch
198import qualified GHCJS.DOM.Touch as Touch
153import qualified GHCJS.DOM.TouchEvent as TouchEvent
199import qualified GHCJS.DOM.TouchEvent as TouchEvent
154import qualified GHCJS.DOM.TouchList as TouchList
200import qualified GHCJS.DOM.TouchList as TouchList
155−import GHCJS.DOM.Node (appendChild_, getOwnerDocumentUnchecked, getParentNodeUnchecked, setNodeValue, toNode)
156−import qualified GHCJS.DOM.Node as DOM (insertBefore_)
157−import GHCJS.DOM.Types
158− (liftJSM, askJSM, runJSM, JSM, MonadJSM,
159− FocusEvent, IsElement, IsEvent, IsNode, KeyboardEvent, Node,
160− ToDOMString, TouchEvent, WheelEvent, uncheckedCastTo, ClipboardEvent)
161import qualified GHCJS.DOM.Types as DOM
201import qualified GHCJS.DOM.Types as DOM
162−import GHCJS.DOM.UIEvent
163−import GHCJS.DOM.KeyboardEvent as KeyboardEvent
164import qualified GHCJS.DOM.Window as Window
202import qualified GHCJS.DOM.Window as Window
165−import Language.Javascript.JSaddle (call, eval)
203+import qualified GHCJS.DOM.WheelEvent as WheelEvent
166−import Data.IntMap.Strict (IntMap)
204+import qualified Reflex.Patch.DMap as PatchDMap
167−import qualified Data.IntMap.Strict as IntMap
205+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
168−import Data.FastMutableIntMap (PatchIntMap (..))
206+import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
169−import qualified Data.FastMutableIntMap as FastMutableIntMap
207+import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
171−import Reflex.Requester.Base
209+#ifndef USE_TEMPLATE_HASKELL
172−import Reflex.Requester.Class
210+import Data.Functor.Contravariant (phantom)
173−import Foreign.JavaScript.Internal.Utils
211+import Control.Lens (Lens', Getter)
175#ifndef ghcjs_HOST_OS
214#ifndef ghcjs_HOST_OS
176import GHCJS.DOM.Types (MonadJSM (..))
215import GHCJS.DOM.Types (MonadJSM (..))
178−instance MonadJSM m => MonadJSM (ImmediateDomBuilderT t m) where
217+instance MonadJSM m => MonadJSM (HydrationRunnerT t m) where
218+ {-# INLINABLE liftJSM' #-}
219+ liftJSM' = lift . liftJSM'
221+instance MonadJSM m => MonadJSM (HydrationDomBuilderT s t m) where
222+ {-# INLINABLE liftJSM' #-}
223+ liftJSM' = lift . liftJSM'
225+instance MonadJSM m => MonadJSM (DomRenderHookT t m) where
226+ {-# INLINABLE liftJSM' #-}
179− liftJSM' = ImmediateDomBuilderT . liftJSM'
227+ liftJSM' = lift . liftJSM'
182−data ImmediateDomBuilderEnv t
230+data HydrationDomBuilderEnv t m = HydrationDomBuilderEnv
183− = ImmediateDomBuilderEnv { _immediateDomBuilderEnv_document :: {-# UNPACK #-} !Document
231+ { _hydrationDomBuilderEnv_document :: {-# UNPACK #-} !Document
184− , _immediateDomBuilderEnv_parent :: {-# UNPACK #-} !Node
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)
185− , _immediateDomBuilderEnv_unreadyChildren :: {-# UNPACK #-} !(IORef Word) -- Number of children who still aren't fully rendered
237+ -- ^ Number of children who still aren't fully rendered
238+ , _hydrationDomBuilderEnv_commitAction :: !(JSM ())
186− , _immediateDomBuilderEnv_commitAction :: !(JSM ()) -- Action to take when all children are ready --TODO: we should probably get rid of this once we invoke it
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 ()))
189−newtype ImmediateDomBuilderT t m a = ImmediateDomBuilderT { unImmediateDomBuilderT :: ReaderT (ImmediateDomBuilderEnv t) (RequesterT t JSM Identity (TriggerEventT t m)) a }
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 }
190 deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
252 deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
191#if MIN_VERSION_base(4,9,1)
253#if MIN_VERSION_base(4,9,1)
192 , MonadAsyncException
254 , MonadAsyncException
196−instance PrimMonad m => PrimMonad (ImmediateDomBuilderT x m) where
258+instance PrimMonad m => PrimMonad (HydrationDomBuilderT s t m) where
197− type PrimState (ImmediateDomBuilderT x m) = PrimState m
259+ type PrimState (HydrationDomBuilderT s t m) = PrimState m
198 primitive = lift . primitive
260 primitive = lift . primitive
200−instance MonadTrans (ImmediateDomBuilderT t) where
262+instance MonadTrans (HydrationDomBuilderT s t) where
201− lift = ImmediateDomBuilderT . lift . lift . lift
263+ lift = HydrationDomBuilderT . lift . lift
265+instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationDomBuilderT s t m) where
266+ withRenderHook hook = HydrationDomBuilderT . mapReaderT (withRenderHook hook) . unHydrationDomBuilderT
267+ requestDomAction = HydrationDomBuilderT . lift . requestDomAction
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
203−instance (Reflex t, MonadFix m) => DomRenderHook t (ImmediateDomBuilderT t m) where
326+instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
204− withRenderHook hook (ImmediateDomBuilderT a) = do
327+ withRenderHook hook = HydrationRunnerT . mapStateT (mapReaderT (withRenderHook hook)) . unHydrationRunnerT
205− e <- ImmediateDomBuilderT ask
328+ requestDomAction = HydrationRunnerT . lift . lift . requestDomAction
206− ImmediateDomBuilderT $ lift $ withRequesting $ \rsp -> do
329+ requestDomAction_ = HydrationRunnerT . lift . lift . requestDomAction_
207− (x, req) <- lift $ runRequesterT (runReaderT a e) $ runIdentity <$> rsp
330+
208− return (ffor req $ \rm -> hook $ traverseRequesterData (\r -> Identity <$> r) rm, x)
331+-- | Add a hydration step which depends on some computation that should only be
209− requestDomAction = ImmediateDomBuilderT . lift . requestingIdentity
332+-- done *before* the switchover to immediate mode - this is most likely some
210− requestDomAction_ = ImmediateDomBuilderT . lift . requesting_
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
212−{-# INLINABLE runImmediateDomBuilderT #-}
357+{-# INLINABLE runDomRenderHookT #-}
213−runImmediateDomBuilderT
358+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
381+ (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
382+ return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
383+ requestDomAction = DomRenderHookT . requestingIdentity
384+ requestDomAction_ = DomRenderHookT . requesting_
386+{-# INLINABLE runHydrationDomBuilderT #-}
387+runHydrationDomBuilderT
214 :: ( MonadFix m
388 :: ( MonadFix m
215 , PerformEvent t m
389 , PerformEvent t m
216 , MonadReflexCreateTrigger t m
390 , MonadReflexCreateTrigger t m
@@ -219,75 +393,76 @@ runImmediateDomBuilderT
219 , MonadRef m
393 , MonadRef m
220 , Ref m ~ IORef
394 , Ref m ~ IORef
222− => ImmediateDomBuilderT t m a
396+ => HydrationDomBuilderT s t m a
223− -> ImmediateDomBuilderEnv t
397+ -> HydrationDomBuilderEnv t m
224 -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
398 -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
226−runImmediateDomBuilderT (ImmediateDomBuilderT a) env eventChan = do
400+runHydrationDomBuilderT (HydrationDomBuilderT a) env = runDomRenderHookT (runReaderT a env)
227− handlersMVar <- liftIO $ newMVar []
401+
228− flip runTriggerEventT eventChan $ do
402+instance (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, Monad m) => HasDocument (HydrationDomBuilderT s t m) where
229− win <- DOM.currentWindowUnchecked
230− rec (x, req) <- runRequesterT (runReaderT a env) rsp
231− rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame handlersMVar win f $
232− traverseRequesterData (\r -> Identity <$> r) rm
235− runInAnimationFrame handlersMVar win f x = do
236− handlers <- liftIO $ takeMVar handlersMVar
237− when (null handlers) $ do
238− rec cb <- newRequestAnimationFrameCallbackSync $ \_ -> do
239− freeRequestAnimationFrameCallback cb
240− handlersToRun <- liftIO $ takeMVar handlersMVar
241− liftIO $ putMVar handlersMVar []
242− sequence_ (reverse handlersToRun)
243− void $ Window.requestAnimationFrame win cb
244− liftIO $ putMVar handlersMVar ((do
245− v <- synchronously x
246− void . liftIO $ f v) : handlers)
248−class Monad m => HasDocument m where
249− askDocument :: m Document
250− default askDocument :: (m ~ f m', MonadTrans f, Monad m', HasDocument m') => m Document
251− askDocument = lift askDocument
253−instance HasDocument m => HasDocument (ReaderT r m)
254−instance HasDocument m => HasDocument (StateT s m)
255−instance HasDocument m => HasDocument (Lazy.StateT s m)
256−instance HasDocument m => HasDocument (EventWriterT t w m)
257−instance HasDocument m => HasDocument (DynamicWriterT t w m)
258−instance HasDocument m => HasDocument (PostBuildT t m)
259−instance HasDocument m => HasDocument (RequesterT t request response m)
260−instance HasDocument m => HasDocument (QueryT t q m)
262−instance Monad m => HasDocument (ImmediateDomBuilderT t m) where
263 {-# INLINABLE askDocument #-}
403 {-# INLINABLE askDocument #-}
264− askDocument = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_document
404+ askDocument = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_document
266{-# INLINABLE askParent #-}
406{-# INLINABLE askParent #-}
267−askParent :: Monad m => ImmediateDomBuilderT t m Node
407+askParent :: Monad m => HydrationRunnerT t m DOM.Node
268−askParent = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_parent
408+askParent = HydrationRunnerT ask
410+{-# INLINABLE getParent #-}
411+getParent :: MonadIO m => HydrationDomBuilderT s t m DOM.Node
412+getParent = either pure (liftIO . readIORef) =<< HydrationDomBuilderT (asks _hydrationDomBuilderEnv_parent)
270{-# INLINABLE askEvents #-}
414{-# INLINABLE askEvents #-}
271−askEvents :: Monad m => ImmediateDomBuilderT t m (Chan [DSum (EventTriggerRef t) TriggerInvocation])
415+askEvents :: Monad m => HydrationDomBuilderT s t m (Chan [DSum (EventTriggerRef t) TriggerInvocation])
272−askEvents = ImmediateDomBuilderT . lift . lift $ TriggerEventT.askEvents
416+askEvents = HydrationDomBuilderT . lift . DomRenderHookT . lift $ TriggerEventT.askEvents
274−localEnv :: Monad m => (ImmediateDomBuilderEnv t -> ImmediateDomBuilderEnv t) -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m a
418+{-# INLINABLE localEnv #-}
275−localEnv f = ImmediateDomBuilderT . local f . unImmediateDomBuilderT
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
277{-# INLINABLE append #-}
422{-# INLINABLE append #-}
278−append :: MonadJSM m => DOM.Node -> ImmediateDomBuilderT t m ()
423+append :: MonadJSM m => DOM.Node -> HydrationDomBuilderT s t m ()
279append n = do
424append n = do
280− p <- askParent
425+ p <- getParent
281 liftJSM $ appendChild_ p n
426 liftJSM $ appendChild_ p n
282 return ()
427 return ()
284−{-# INLINABLE textNodeInternal #-}
429+{-# SPECIALIZE append
285−textNodeInternal :: (MonadJSM m, ToDOMString contents) => contents -> ImmediateDomBuilderT t m DOM.Text
430+ :: DOM.Node
286−textNodeInternal !t = do
431+ -> HydrationDomBuilderT s Spider HydrationM ()
287− doc <- askDocument
432+ #-}
288− n <- liftJSM $ createTextNode doc t
433+
289− append $ toNode n
434+data HydrationMode
290− return n
435+ = HydrationMode_Hydrating
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)
292-- | s and e must both be children of the same node and s must precede e;
467-- | s and e must both be children of the same node and s must precede e;
293-- all nodes between s and e will be removed, but s and e will not be removed
468-- all nodes between s and e will be removed, but s and e will not be removed
@@ -325,7 +500,7 @@ extractUpTo df s e = liftJSM $ do
325 void $ call f f (df, s, e)
500 void $ call f f (df, s, e)
328−type SupportsImmediateDomBuilder 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)
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))
330{-# INLINABLE collectUpTo #-}
505{-# INLINABLE collectUpTo #-}
331collectUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m DOM.DocumentFragment
506collectUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m DOM.DocumentFragment
@@ -343,10 +518,15 @@ collectUpToGivenParent currentParent s e = do
344newtype EventFilterTriggerRef t er (en :: EventTag) = EventFilterTriggerRef (IORef (Maybe (EventTrigger t (er en))))
519newtype EventFilterTriggerRef t er (en :: EventTag) = EventFilterTriggerRef (IORef (Maybe (EventTrigger t (er en))))
346−{-# INLINABLE wrap #-}
521+-- | This 'wrap' is only partial: it doesn't create the 'EventSelector' itself
347−wrap :: forall m er t. (Reflex t, MonadFix m, MonadJSM m, MonadReflexCreateTrigger t m) => RawElement GhcjsDomSpace -> RawElementConfig er t GhcjsDomSpace -> 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))
348−wrap e cfg = do
529+wrap events e cfg = do
350 forM_ (_rawElementConfig_modifyAttributes cfg) $ \modifyAttrs -> requestDomAction_ $ ffor modifyAttrs $ imapM_ $ \(AttributeName mAttrNamespace n) mv -> case mAttrNamespace of
530 forM_ (_rawElementConfig_modifyAttributes cfg) $ \modifyAttrs -> requestDomAction_ $ ffor modifyAttrs $ imapM_ $ \(AttributeName mAttrNamespace n) mv -> case mAttrNamespace of
351 Nothing -> maybe (removeAttribute e n) (setAttribute e n) mv
531 Nothing -> maybe (removeAttribute e n) (setAttribute e n) mv
352 Just ns -> maybe (removeAttributeNS e (Just ns) n) (setAttributeNS e (Just ns) n) mv
532 Just ns -> maybe (removeAttributeNS e (Just ns) n) (setAttributeNS e (Just ns) n) mv
@@ -363,46 +543,74 @@ wrap e cfg = do
363 mv <- liftJSM k --TODO: Only do this when the event is subscribed
543 mv <- liftJSM k --TODO: Only do this when the event is subscribed
364 liftIO $ forM_ mv $ \v -> writeChan events [EventTriggerRef triggerRef :=> TriggerInvocation v (return ())]
544 liftIO $ forM_ mv $ \v -> writeChan events [EventTriggerRef triggerRef :=> TriggerInvocation v (return ())]
365 return $ en :=> EventFilterTriggerRef triggerRef
545 return $ en :=> EventFilterTriggerRef triggerRef
366− es <- do
546+ return eventTriggerRefs
367− let h :: GhcjsEventHandler er
547+
368− !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
548+{-# SPECIALIZE wrap
369− ctx <- askJSM
549+ :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
370− newFanEventWithTrigger $ \(WrapArg en) t ->
550+ -> DOM.Element
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
371− case DMap.lookup en eventTriggerRefs of
573+triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup en eventTriggerRefs of
372− Just (EventFilterTriggerRef r) -> do
574+ Just (EventFilterTriggerRef r) -> do
373− writeIORef r $ Just t
575+ writeIORef r $ Just t
374− return $ do
576+ return $ do
375− writeIORef r Nothing
577+ writeIORef r Nothing
376− Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
578+ Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
377− evt <- DOM.event
579+ evt <- DOM.event
378− mv <- lift $ unGhcjsEventHandler h (en, GhcjsDomEvent evt)
580+ mv <- lift $ unGhcjsEventHandler handler (en, GhcjsDomEvent evt)
379− case mv of
581+ case mv of
380− Nothing -> return ()
582+ Nothing -> return ()
381− Just v -> liftIO $ do
583+ Just v -> liftIO $ do
382− --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
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
383− ref <- newIORef $ Just t
585+ ref <- newIORef $ Just t
384− writeChan events [EventTriggerRef ref :=> TriggerInvocation v (return ())])
586+ writeChan events [EventTriggerRef ref :=> TriggerInvocation v (return ())])
385− return $ Element
587+ where
386− { _element_events = es
588+ -- Note: this needs to be done strictly and outside of the newFanEventWithTrigger, so that the newFanEventWithTrigger doesn't
387− , _element_raw = e
589+ -- retain the entire cfg, which can cause a cyclic dependency that the GC won't be able to clean up
388− }
590+ handler :: GhcjsEventHandler er
389−
591+ !handler = _ghcjsEventSpec_handler $ _rawElementConfig_eventSpec cfg
390−{-# INLINABLE makeElement #-}
592+
391−makeElement :: forall er t m a. (MonadJSM m, MonadFix m, MonadReflexCreateTrigger t m, Adjustable t m) => Text -> ElementConfig er t GhcjsDomSpace -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m ((Element er GhcjsDomSpace t, a), DOM.Element)
593+{-# SPECIALIZE triggerBody
392−makeElement elementTag cfg child = do
594+ :: DOM.JSContextRef
393− doc <- askDocument
595+ -> RawElementConfig er DomTimeline HydrationDomSpace
394− e <- liftJSM $ uncheckedCastTo DOM.Element <$> case cfg ^. namespace of
596+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
395− Nothing -> createElement doc elementTag
597+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
396− Just ens -> createElementNS doc (Just ens) elementTag
598+ -> DOM.Element
397− ImmediateDomBuilderT $ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
599+ -> WrapArg er EventName x
398− Nothing -> lift $ setAttribute e n v
600+ -> EventTrigger DomTimeline x
399− Just ans -> lift $ setAttributeNS e (Just ans) n v
601+ -> IO (IO ())
400− result <- flip localEnv child $ \env -> env
602+ #-}
401− { _immediateDomBuilderEnv_parent = toNode e
603+
402− }
604+{-# SPECIALIZE triggerBody
403− append $ toNode e
605+ :: DOM.JSContextRef
404− wrapped <- wrap e $ extractRawElementConfig cfg
606+ -> RawElementConfig er DomTimeline GhcjsDomSpace
405− return ((wrapped, result), e)
607+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
608+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
610+ -> WrapArg er EventName x
611+ -> EventTrigger DomTimeline x
407newtype GhcjsDomHandler a b = GhcjsDomHandler { unGhcjsDomHandler :: a -> JSM b }
615newtype GhcjsDomHandler a b = GhcjsDomHandler { unGhcjsDomHandler :: a -> JSM b }
@@ -414,9 +622,10 @@ data GhcjsDomSpace
415instance DomSpace GhcjsDomSpace where
623instance DomSpace GhcjsDomSpace where
416 type EventSpec GhcjsDomSpace = GhcjsEventSpec
624 type EventSpec GhcjsDomSpace = GhcjsEventSpec
625+ type RawDocument GhcjsDomSpace = DOM.Document
417 type RawTextNode GhcjsDomSpace = DOM.Text
626 type RawTextNode GhcjsDomSpace = DOM.Text
627+ type RawCommentNode GhcjsDomSpace = DOM.Comment
418 type RawElement GhcjsDomSpace = DOM.Element
628 type RawElement GhcjsDomSpace = DOM.Element
419− type RawFile GhcjsDomSpace = DOM.File
420 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
629 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
421 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
630 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
422 type RawSelectElement GhcjsDomSpace = DOM.HTMLSelectElement
631 type RawSelectElement GhcjsDomSpace = DOM.HTMLSelectElement
@@ -448,15 +657,11 @@ data GhcjsEventSpec er = GhcjsEventSpec
448newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
657newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
450#ifndef USE_TEMPLATE_HASKELL
659#ifndef USE_TEMPLATE_HASKELL
451−phantom2 :: (Functor f, Contravariant f) => f a -> f b
453−{-# INLINE phantom2 #-}
455ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
660ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
456ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
661ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
457{-# INLINE ghcjsEventSpec_filters #-}
662{-# INLINE ghcjsEventSpec_filters #-}
458ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
663ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
459−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
664+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
460{-# INLINE ghcjsEventSpec_handler #-}
665{-# INLINE ghcjsEventSpec_handler #-}
@@ -469,136 +674,795 @@ instance er ~ EventResult => Default (GhcjsEventSpec er) where
469 runReaderT (defaultDomEventHandler e en) evt
674 runReaderT (defaultDomEventHandler e en) evt
472−instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t m) where
677+{-# INLINE makeElement #-}
473− type DomBuilderSpace (ImmediateDomBuilderT t m) = GhcjsDomSpace
678+makeElement :: MonadJSM m => Document -> Text -> ElementConfig er t s -> m DOM.Element
474− {-# INLINABLE textNode #-}
679+makeElement doc elementTag cfg = do
475− textNode (TextNodeConfig initialContents mSetContents) = do
680+ e <- uncheckedCastTo DOM.Element <$> case cfg ^. namespace of
476− n <- textNodeInternal initialContents
681+ Nothing -> createElement doc elementTag
477− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
682+ Just ens -> createElementNS doc (Just ens) elementTag
478− return $ TextNode n
683+ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
479− {-# INLINABLE element #-}
684+ Nothing -> setAttribute e n v
480− element elementTag cfg child = fst <$> makeElement elementTag cfg child
685+ Just ans -> setAttributeNS e (Just ans) n v
481− {-# INLINABLE inputElement #-}
686+ pure e
482− inputElement cfg = do
687+
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
483− ((e, _), domElement) <- makeElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
930+ ((e, _), domElementRef) <- hydrateElement "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
484 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
949 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
485− Input.setValue domInputElement $ cfg ^. inputElementConfig_initialValue
486− v0 <- Input.getValue domInputElement
487− let getMyValue = Input.getValue domInputElement
950+ getValue = Input.getValue domInputElement
951+ -- When the value has been updated by setValue before switchover, we must
952+ -- send an update here to remain in sync. This is because the later
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
488− valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
961+ requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
489− valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
962+ for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
490− Nothing -> return never
491− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
963+ requestDomAction_ $ ffor eSetValue $ \v' -> do
492 Input.setValue domInputElement v'
964 Input.setValue domInputElement v'
493− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
965+ v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
966+ liftIO $ triggerChangeBySetValue v
494− v <- holdDyn v0 $ leftmost
967+ let focusChange' = leftmost
495− [ valueChangedBySetValue
968+ [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
496− , valueChangedByUI
969+ , True <$ Reflex.select (_element_events e) (WrapArg Focus)
498− Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
971+ liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
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
499− checkedChangedByUI <- wrapDomEvent domInputElement (`on` Events.click) $ do
984+ _ <- liftJSM $ domInputElement `on` Events.click $ do
500− Input.getChecked domInputElement
985+ liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
501− checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
986+ for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
502− Nothing -> return never
503− Just eNewchecked -> requestDomAction $ ffor eNewchecked $ \newChecked -> do
987+ requestDomAction $ ffor eNewchecked $ \newChecked -> do
504 oldChecked <- Input.getChecked domInputElement
988 oldChecked <- Input.getChecked domInputElement
505 Input.setChecked domInputElement newChecked
989 Input.setChecked domInputElement newChecked
506− return $ if newChecked /= oldChecked
990+ when (newChecked /= oldChecked) $ liftIO $ triggerCheckedChangedBySetChecked newChecked
507− then Just newChecked
509− c <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
510− [ fmapMaybe id checkedChangedBySetChecked
511− , checkedChangedByUI
513− let initialFocus = False --TODO: Is this correct?
514− hasFocus <- holdDyn initialFocus $ leftmost
515− [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
516− , True <$ Reflex.select (_element_events e) (WrapArg Focus)
518− files <- holdDyn mempty <=< wrapDomEvent domInputElement (`on` Events.change) $ do
991+ _ <- liftJSM $ domInputElement `on` Events.change $ do
519 mfiles <- Input.getFiles domInputElement
992 mfiles <- Input.getFiles domInputElement
520 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
993 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
521− maybe (return []) getMyFiles mfiles
994+ liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
522− checked <- holdUniqDyn c
995+ return ()
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
523− return $ InputElement
1008+ return $ InputElement
524− { _inputElement_value = v
1009+ { _inputElement_value = v
525− , _inputElement_checked = checked
1010+ , _inputElement_checked = checked
526− , _inputElement_checkedChange = checkedChangedByUI
1011+ , _inputElement_checkedChange = checkedChangedByUI
527− , _inputElement_input = valueChangedByUI
1012+ , _inputElement_input = valueChangedByUI
528− , _inputElement_hasFocus = hasFocus
1013+ , _inputElement_hasFocus = hasFocus
529− , _inputElement_element = e
1014+ , _inputElement_element = e
530− , _inputElement_raw = domInputElement
1015+ , _inputElement_raw = ()
531− , _inputElement_files = files
1016+ , _inputElement_files = files
533− {-# INLINABLE textAreaElement #-}
1018+
534− textAreaElement cfg = do --TODO
1019+{-# INLINE textAreaElementImmediate #-}
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
535− ((e, _), domElement) <- makeElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
1061+ ((e, _), domElementRef) <- hydrateElement "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
536 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
1072 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
537− TextArea.setValue domTextAreaElement $ cfg ^. textAreaElementConfig_initialValue
1073+ getValue = TextArea.getValue domTextAreaElement
538− v0 <- TextArea.getValue domTextAreaElement
1074+ -- When the value has been updated by setValue before switchover, we must
539− let getMyValue = TextArea.getValue domTextAreaElement
1075+ -- send an update here to remain in sync. This is because the later
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
540− valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
1084+ requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
541− valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
1085+ for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
542− Nothing -> return never
543− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1086+ requestDomAction_ $ ffor eSetValue $ \v' -> do
544 TextArea.setValue domTextAreaElement v'
1087 TextArea.setValue domTextAreaElement v'
545− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1088+ v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
1089+ liftIO $ triggerChangeBySetValue v
546− v <- holdDyn v0 $ leftmost
1090+ let focusChange' = leftmost
547− [ valueChangedBySetValue
1091+ [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
548− , valueChangedByUI
1092+ , True <$ Reflex.select (_element_events e) (WrapArg Focus)
550− hasFocus <- mkHasFocus e
1094+ liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
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
551− return $ TextAreaElement
1102+ return $ TextAreaElement
552− { _textAreaElement_value = v
1103+ { _textAreaElement_value = v
553− , _textAreaElement_input = valueChangedByUI
1104+ , _textAreaElement_input = valueChangedByUI
554− , _textAreaElement_hasFocus = hasFocus
1105+ , _textAreaElement_hasFocus = hasFocus
555− , _textAreaElement_element = e
1106+ , _textAreaElement_element = e
556− , _textAreaElement_raw = domTextAreaElement
1107+ , _textAreaElement_raw = ()
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
558− {-# INLINABLE selectElement #-}
1141+ return (wrapped, result)
559− selectElement cfg child = do
1142+
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
560− ((e, result), domElement) <- makeElement "select" (cfg ^. selectElementConfig_elementConfig) child
1156+ ((e, result), domElementRef) <- hydrateElement "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
561 let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
1165 let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
562− Select.setValue domSelectElement $ cfg ^. selectElementConfig_initialValue
563− v0 <- Select.getValue domSelectElement
564− let getMyValue = Select.getValue domSelectElement
1166+ getValue = Select.getValue domSelectElement
1167+ -- The browser might have messed with the value, or the user could have
1168+ -- altered it before activation, so we set it if it isn't what we expect
1169+ liftJSM getValue >>= \v0' -> do
1170+ when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
1171+ -- Watch for user interaction and trigger event accordingly
565− valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Change)
1172+ requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Change)
566− valueChangedBySetValue <- case _selectElementConfig_setValue cfg of
1173+ for_ (_selectElementConfig_setValue cfg) $ \eSetValue ->
567− Nothing -> return never
568− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1174+ requestDomAction_ $ ffor eSetValue $ \v' -> do
569 Select.setValue domSelectElement v'
1175 Select.setValue domSelectElement v'
570− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1176+ v <- getValue -- 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
571− v <- holdDyn v0 $ leftmost
1186+ v <- holdDyn v0 $ leftmost
572− [ valueChangedBySetValue
1187+ [ valueChangedBySetValue
573− , valueChangedByUI
1188+ , valueChangedByUI
575− hasFocus <- mkHasFocus e
576− let wrapped = SelectElement
1190+ return $ (,result) $ SelectElement
577− { _selectElement_value = v
1191+ { _selectElement_value = v
578− , _selectElement_change = valueChangedByUI
1192+ , _selectElement_change = valueChangedByUI
579− , _selectElement_hasFocus = hasFocus
1193+ , _selectElement_hasFocus = hasFocus
580− , _selectElement_element = e
1194+ , _selectElement_element = e
581− , _selectElement_raw = domSelectElement
1195+ , _selectElement_raw = ()
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
583− return (wrapped, result)
1251+ return n
1253+ go parent mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
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
584− placeRawElement = append . toNode
1338+ append $ toNode t
585− wrapRawElement = wrap
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
586 notReadyUntil e = do
1387 notReadyUntil e = do
587 eOnce <- headE e
1388 eOnce <- headE e
588− env <- ImmediateDomBuilderT ask
1389+ unreadyChildren <- askUnreadyChildren
589− let unreadyChildren = _immediateDomBuilderEnv_unreadyChildren env
1390+ commitAction <- askCommitAction
590 liftIO $ modifyIORef' unreadyChildren succ
1391 liftIO $ modifyIORef' unreadyChildren succ
591 let ready = do
1392 let ready = do
592 old <- liftIO $ readIORef unreadyChildren
1393 old <- liftIO $ readIORef unreadyChildren
593 let new = pred old
1394 let new = pred old
594 liftIO $ writeIORef unreadyChildren $! new
1395 liftIO $ writeIORef unreadyChildren $! new
595− when (new == 0) $ _immediateDomBuilderEnv_commitAction env
1396+ when (new == 0) commitAction
596 requestDomAction_ $ ready <$ eOnce
1397 requestDomAction_ $ ready <$ eOnce
597 notReady = do
1398 notReady = do
598− env <- ImmediateDomBuilderT ask
1399+ unreadyChildren <- askUnreadyChildren
599− let unreadyChildren = _immediateDomBuilderEnv_unreadyChildren env
600 liftIO $ modifyIORef' unreadyChildren succ
1400 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
602data FragmentState
1466data FragmentState
603 = FragmentState_Unmounted
1467 = FragmentState_Unmounted
604 | FragmentState_Mounted (DOM.Text, DOM.Text)
1468 | FragmentState_Mounted (DOM.Text, DOM.Text)
@@ -617,21 +1481,21 @@ extractFragment fragment = do
617 extractBetweenExclusive (_immediateDomFragment_document fragment) before after
1481 extractBetweenExclusive (_immediateDomFragment_document fragment) before after
618 liftIO $ writeIORef (_immediateDomFragment_state fragment) FragmentState_Unmounted
1482 liftIO $ writeIORef (_immediateDomFragment_state fragment) FragmentState_Unmounted
620−instance SupportsImmediateDomBuilder t m => MountableDomBuilder t (ImmediateDomBuilderT t m) where
1484+instance SupportsHydrationDomBuilder t m => MountableDomBuilder t (HydrationDomBuilderT GhcjsDomSpace t m) where
621− type DomFragment (ImmediateDomBuilderT t m) = ImmediateDomFragment
1485+ type DomFragment (HydrationDomBuilderT GhcjsDomSpace t m) = ImmediateDomFragment
622 buildDomFragment w = do
1486 buildDomFragment w = do
623 df <- createDocumentFragment =<< askDocument
1487 df <- createDocumentFragment =<< askDocument
624 result <- flip localEnv w $ \env -> env
1488 result <- flip localEnv w $ \env -> env
625− { _immediateDomBuilderEnv_parent = toNode df
1489+ { _hydrationDomBuilderEnv_parent = Left $ toNode df
627 state <- liftIO $ newIORef FragmentState_Unmounted
1491 state <- liftIO $ newIORef FragmentState_Unmounted
628 return (ImmediateDomFragment df state, result)
1492 return (ImmediateDomFragment df state, result)
629 mountDomFragment fragment setFragment = do
1493 mountDomFragment fragment setFragment = do
630− parent <- askParent
1494+ parent <- getParent
631 extractFragment fragment
1495 extractFragment fragment
632− before <- textNodeInternal ("" :: Text)
1496+ before <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
633 appendChild_ parent $ _immediateDomFragment_document fragment
1497 appendChild_ parent $ _immediateDomFragment_document fragment
634− after <- textNodeInternal ("" :: Text)
1498+ after <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
635 xs <- foldDyn (\new (previous, _) -> (new, Just previous)) (fragment, Nothing) setFragment
1499 xs <- foldDyn (\new (previous, _) -> (new, Just previous)) (fragment, Nothing) setFragment
636 requestDomAction_ $ ffor (updated xs) $ \(childFragment, Just previousFragment) -> do
1500 requestDomAction_ $ ffor (updated xs) $ \(childFragment, Just previousFragment) -> do
637 extractFragment previousFragment
1501 extractFragment previousFragment
@@ -640,12 +1504,19 @@ instance SupportsImmediateDomBuilder t m => MountableDomBuilder t (ImmediateDomB
640 liftIO $ writeIORef (_immediateDomFragment_state childFragment) $ FragmentState_Mounted (before, after)
1504 liftIO $ writeIORef (_immediateDomFragment_state childFragment) $ FragmentState_Mounted (before, after)
641 liftIO $ writeIORef (_immediateDomFragment_state fragment) $ FragmentState_Mounted (before, after)
1505 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
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
643−instance (Reflex t, Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m) => Adjustable t (ImmediateDomBuilderT t m) where
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
644 {-# INLINABLE runWithReplace #-}
1514 {-# INLINABLE runWithReplace #-}
645 runWithReplace a0 a' = do
1515 runWithReplace a0 a' = do
646− initialEnv <- ImmediateDomBuilderT ask
1516+ initialEnv <- HydrationDomBuilderT ask
647− before <- textNodeInternal ("" :: Text)
1517+ let hydrating = _hydrationDomBuilderEnv_hydrationMode initialEnv
1518+ (hydrateStart, before, beforeKey) <- skipToReplaceStart
648− let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
1519+ let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
649 haveEverBeenReady <- liftIO $ newIORef False
1520 haveEverBeenReady <- liftIO $ newIORef False
650 currentCohort <- liftIO $ newIORef (-1 :: Int) -- Equal to the cohort currently in the DOM
1521 currentCohort <- liftIO $ newIORef (-1 :: Int) -- Equal to the cohort currently in the DOM
651 let myCommitAction = do
1522 let myCommitAction = do
@@ -656,79 +1527,117 @@ instance (Reflex t, Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimM
656 old <- liftIO $ readIORef parentUnreadyChildren
1527 old <- liftIO $ readIORef parentUnreadyChildren
657 let new = pred old
1528 let new = pred old
658 liftIO $ writeIORef parentUnreadyChildren $! new
1529 liftIO $ writeIORef parentUnreadyChildren $! new
659− when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
1530+ when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
660 -- We draw 'after' in this roundabout way to avoid using MonadFix
1531 -- We draw 'after' in this roundabout way to avoid using MonadFix
661 doc <- askDocument
1532 doc <- askDocument
662− after <- createTextNode doc ("" :: Text)
1533+ parent <- getParent
1534+ (hydrateEnd, after) <- skipToReplaceEnd beforeKey
663 let drawInitialChild = do
1535 let drawInitialChild = do
1536+ h <- liftIO $ readIORef hydrating
1538+ HydrationMode_Hydrating -> pure parent
1539+ HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
664 unreadyChildren <- liftIO $ newIORef 0
1540 unreadyChildren <- liftIO $ newIORef 0
665− let f = do
1541+ let a0' = case h of
666− result <- a0
1542+ HydrationMode_Hydrating -> a0
667− append $ toNode after
1543+ HydrationMode_Immediate -> do
668− return result
1544+ a <- a0
1545+ insertBefore p' =<< liftIO (readIORef after)
1547+ delayed <- case h of
1548+ HydrationMode_Hydrating -> liftIO $ newIORef $ pure ()
1549+ HydrationMode_Immediate -> pure $ _hydrationDomBuilderEnv_delayed initialEnv
669− result <- runReaderT (unImmediateDomBuilderT f) $ initialEnv
1550+ result <- runReaderT (unHydrationDomBuilderT a0') initialEnv
670− { _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
1551+ { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
671− , _immediateDomBuilderEnv_commitAction = myCommitAction
1552+ , _hydrationDomBuilderEnv_commitAction = myCommitAction
1553+ , _hydrationDomBuilderEnv_parent = Left p'
1554+ , _hydrationDomBuilderEnv_delayed = delayed
1557+ HydrationMode_Hydrating -> liftIO $ readIORef delayed
1558+ HydrationMode_Immediate -> pure $ pure ()
673 liftIO $ readIORef unreadyChildren >>= \case
1559 liftIO $ readIORef unreadyChildren >>= \case
674 0 -> writeIORef haveEverBeenReady True
1560 0 -> writeIORef haveEverBeenReady True
675 _ -> modifyIORef' parentUnreadyChildren succ
1561 _ -> modifyIORef' parentUnreadyChildren succ
676− return result
1562+ return (dom, result)
677 a'' <- numberOccurrences a'
1563 a'' <- numberOccurrences a'
678− (result0, child') <- ImmediateDomBuilderT $ lift $ runWithReplace drawInitialChild $ ffor a'' $ \(cohortId, child) -> do
1564+ ((hydrate0, result0), child') <- HydrationDomBuilderT $ lift $ runWithReplace drawInitialChild $ ffor a'' $ \(cohortId, child) -> do
1565+ h <- liftIO $ readIORef hydrating
1567+ HydrationMode_Hydrating -> pure parent
679− df <- createDocumentFragment doc
1568+ HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
680 unreadyChildren <- liftIO $ newIORef 0
1569 unreadyChildren <- liftIO $ newIORef 0
681 let commitAction = do
1570 let commitAction = do
682 c <- liftIO $ readIORef currentCohort
1571 c <- liftIO $ readIORef currentCohort
683 when (c <= cohortId) $ do -- If a newer cohort has already been committed, just ignore this
1572 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
684− deleteBetweenExclusive before after
1575+ deleteBetweenExclusive before' after'
685− insertBefore df after
1576+ insertBefore p' after'
686 liftIO $ writeIORef currentCohort cohortId
1577 liftIO $ writeIORef currentCohort cohortId
687 myCommitAction
1578 myCommitAction
1579+ delayed <- case h of
1580+ HydrationMode_Hydrating -> liftIO $ newIORef $ pure ()
1581+ HydrationMode_Immediate -> pure $ _hydrationDomBuilderEnv_delayed initialEnv
688− result <- runReaderT (unImmediateDomBuilderT child) $ initialEnv
1582+ result <- runReaderT (unHydrationDomBuilderT child) $ initialEnv
689− { _immediateDomBuilderEnv_parent = toNode df
1583+ { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
690− , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
1584+ , _hydrationDomBuilderEnv_commitAction = case h of
691− , _immediateDomBuilderEnv_commitAction = commitAction
1585+ HydrationMode_Hydrating -> myCommitAction
1586+ HydrationMode_Immediate -> commitAction
1587+ , _hydrationDomBuilderEnv_parent = Left p'
1588+ , _hydrationDomBuilderEnv_delayed = delayed
1591+ HydrationMode_Hydrating -> liftIO $ readIORef delayed
1592+ HydrationMode_Immediate -> pure $ pure ()
693 uc <- liftIO $ readIORef unreadyChildren
1593 uc <- liftIO $ readIORef unreadyChildren
694 let commitActionToRunNow = if uc == 0
1594 let commitActionToRunNow = if uc == 0
695− then Just commitAction
1595+ then Just $ commitAction
696 else Nothing -- A child will run it when unreadyChildren is decremented to 0
1596 else Nothing -- A child will run it when unreadyChildren is decremented to 0
1597+ actions = case h of
1598+ HydrationMode_Hydrating -> Left dom
697− return (commitActionToRunNow, result)
1599+ HydrationMode_Immediate -> Right commitActionToRunNow
1600+ return (actions, result)
1601+ let (hydrate', commitAction) = fanEither $ fmap fst child'
1602+ addHydrationStepWithSetup (hold hydrate0 hydrate') $ \contents -> do
1604+ join $ sample contents
698− requestDomAction_ $ fmapMaybe fst child'
1606+ requestDomAction_ $ fmapMaybe id commitAction
699 return (result0, snd <$> child')
1607 return (result0, snd <$> child')
700 {-# INLINABLE traverseIntMapWithKeyWithAdjust #-}
1609 {-# INLINABLE traverseIntMapWithKeyWithAdjust #-}
701 traverseIntMapWithKeyWithAdjust = traverseIntMapWithKeyWithAdjust'
1610 traverseIntMapWithKeyWithAdjust = traverseIntMapWithKeyWithAdjust'
702 {-# INLINABLE traverseDMapWithKeyWithAdjust #-}
1611 {-# INLINABLE traverseDMapWithKeyWithAdjust #-}
703 traverseDMapWithKeyWithAdjust = traverseDMapWithKeyWithAdjust'
1612 traverseDMapWithKeyWithAdjust = traverseDMapWithKeyWithAdjust'
704 {-# INLINABLE traverseDMapWithKeyWithAdjustWithMove #-}
1613 {-# INLINABLE traverseDMapWithKeyWithAdjustWithMove #-}
705 traverseDMapWithKeyWithAdjustWithMove = do
1614 traverseDMapWithKeyWithAdjustWithMove = do
706− let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) old = do
1615+ let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) old = do
707− 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)
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)
708 new k = PatchDMapWithMove.nodeInfoMapFromM $ \case
1617 new k = PatchDMapWithMove.nodeInfoMapFromM $ \case
709− PatchDMapWithMove.From_Insert (Compose (_, _, sRef, _)) -> do
1618+ PatchDMapWithMove.From_Insert (Compose (TraverseChild (Left _hydration) _)) -> return PatchDMapWithMove.From_Delete
710− readIORef sRef >>= \case
1619+ PatchDMapWithMove.From_Insert (Compose (TraverseChild (Right immediate) _)) -> do
1620+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
711 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
1621 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
712 ChildReadyState_Unready _ -> do
1622 ChildReadyState_Unready _ -> do
713− writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
1623+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
714− return $ PatchDMapWithMove.From_Insert $ Constant sRef
1624+ return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
715 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
1625 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
716 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
1626 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
717− deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState k))) (ComposeMaybe k) a -> IO (Constant () a)
1627+ deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
718 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1628 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
719− writeIORef sRef $ ChildReadyState_Unready $ Some.This <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1629+ writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
720 return $ Constant ()
1630 return $ Constant ()
721 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
1631 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
722 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
1632 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
723 return $ applyAlways p' old
1633 return $ applyAlways p' old
724− hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove updateChildUnreadiness $ \placeholders lastPlaceholderRef (p_ :: PatchDMapWithMove k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) -> do
1634+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove updateChildUnreadiness $ \placeholders lastPlaceholder (p_ :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) -> do
725 let p = unPatchDMapWithMove p_
1635 let p = unPatchDMapWithMove p_
726 phsBefore <- liftIO $ readIORef placeholders
1636 phsBefore <- liftIO $ readIORef placeholders
727− lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
728− 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)
1637+ let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
729 collectIfMoved k e = do
1638 collectIfMoved k e = do
730− let mThisPlaceholder = Map.lookup (Some.This k) phsBefore -- Will be Nothing if this element wasn't present before
1639+ let mThisPlaceholder = Map.lookup (Some k) phsBefore -- Will be Nothing if this element wasn't present before
731− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsBefore
1640+ nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsBefore
732 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
1641 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
733 False -> do
1642 False -> do
734 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
1643 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -736,13 +1645,22 @@ instance (Reflex t, Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimM
736 True -> do
1645 True -> do
737 Constant <$> mapM (`collectUpTo` nextPlaceholder) mThisPlaceholder
1646 Constant <$> mapM (`collectUpTo` nextPlaceholder) mThisPlaceholder
738 collected <- DMap.traverseWithKey collectIfMoved p
1647 collected <- DMap.traverseWithKey collectIfMoved p
739− let !phsAfter = fromMaybe phsBefore $ apply (weakenPatchDMapWithMoveWith (\(Compose (_, ph, _, _)) -> ph) p_) phsBefore --TODO: Don't recompute this
1648+ let !phsAfter = fromMaybe phsBefore $ apply filtered phsBefore
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
740− let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> JSM (Constant () a)
1657+ let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
741 placeFragment k e = do
1658 placeFragment k e = do
742− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsAfter
1659+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
743 case PatchDMapWithMove._nodeInfo_from e of
1660 case PatchDMapWithMove._nodeInfo_from e of
744− PatchDMapWithMove.From_Insert (Compose (df, _, _, _)) -> do
1661+ PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
745− df `insertBefore` nextPlaceholder
1663+ Right immediate -> _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
746 PatchDMapWithMove.From_Delete -> do
1664 PatchDMapWithMove.From_Delete -> do
747 return ()
1665 return ()
748 PatchDMapWithMove.From_Move fromKey -> do
1666 PatchDMapWithMove.From_Move fromKey -> do
@@ -753,105 +1671,166 @@ instance (Reflex t, Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimM
753 liftIO $ writeIORef placeholders $! phsAfter
1671 liftIO $ writeIORef placeholders $! phsAfter
755{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
1673{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
1674+traverseDMapWithKeyWithAdjust'
756−traverseDMapWithKeyWithAdjust' :: forall t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadIO m, MonadJSM m, PrimMonad m, DMap.GCompare k) => (forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> ImmediateDomBuilderT t m (DMap k v', Event t (PatchDMap k v'))
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'))
757traverseDMapWithKeyWithAdjust' = do
1680traverseDMapWithKeyWithAdjust' = do
758− let updateChildUnreadiness (p :: PatchDMap k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) old = do
1681+ let updateChildUnreadiness (p :: PatchDMap k (Compose (TraverseChild t m (Some k)) v')) old = do
759− let new :: forall a. k a -> ComposeMaybe (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState k))) a)
1682+ let new :: forall a. k a -> ComposeMaybe (Compose (TraverseChild t m (Some k)) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState (Some k)))) a)
760 new k (ComposeMaybe m) = ComposeMaybe <$> case m of
1683 new k (ComposeMaybe m) = ComposeMaybe <$> case m of
761 Nothing -> return Nothing
1684 Nothing -> return Nothing
762− Just (Compose (_, _, sRef, _)) -> do
1685+ Just (Compose (TraverseChild (Left _hydration) _)) -> pure Nothing
763− readIORef sRef >>= \case
1686+ Just (Compose (TraverseChild (Right immediate) _)) -> do
1687+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
764 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1688 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
765 ChildReadyState_Unready _ -> do
1689 ChildReadyState_Unready _ -> do
766− writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
1690+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
767− return $ Just $ Constant sRef
1691+ return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
768 delete _ (Constant sRef) = do
1692 delete _ (Constant sRef) = do
769 writeIORef sRef $ ChildReadyState_Unready Nothing
1693 writeIORef sRef $ ChildReadyState_Unready Nothing
770 return $ Constant ()
1694 return $ Constant ()
771 p' <- fmap PatchDMap $ DMap.traverseWithKey new $ unPatchDMap p
1695 p' <- fmap PatchDMap $ DMap.traverseWithKey new $ unPatchDMap p
772 _ <- DMap.traverseWithKey delete $ PatchDMap.getDeletions p old
1696 _ <- DMap.traverseWithKey delete $ PatchDMap.getDeletions p old
773 return $ applyAlways p' old
1697 return $ applyAlways p' old
774− hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholderRef (PatchDMap p) -> do
1698+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
775 phs <- liftIO $ readIORef placeholders
1699 phs <- liftIO $ readIORef placeholders
776− forM_ (DMap.toList p) $ \(k :=> ComposeMaybe mv) -> do
1700+ forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
777− lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
778− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phs
1701+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
1703+ forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
779− forM_ (Map.lookup (Some.This k) phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
1704+ thisPlaceholder `deleteUpTo` nextPlaceholder
1706+ forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
1707+ Left _hydration -> pure ()
1708+ Right immediate -> do
780− forM_ mv $ \(Compose (df, _, _, _)) -> df `insertBefore` nextPlaceholder
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
781− liftIO $ writeIORef placeholders $! fromMaybe phs $ apply (weakenPatchDMapWith (\(Compose (_, ph, _, _)) -> ph) $ PatchDMap p) phs
1717+ liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
783{-# INLINABLE traverseIntMapWithKeyWithAdjust' #-}
1719{-# INLINABLE traverseIntMapWithKeyWithAdjust' #-}
784−traverseIntMapWithKeyWithAdjust' :: forall t m v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadIO m, MonadJSM m, PrimMonad m) => (IntMap.Key -> v -> ImmediateDomBuilderT t m v') -> IntMap v -> Event t (PatchIntMap v) -> ImmediateDomBuilderT t m (IntMap v', Event t (PatchIntMap v'))
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'))
785traverseIntMapWithKeyWithAdjust' = do
1726traverseIntMapWithKeyWithAdjust' = do
786− let updateChildUnreadiness (p@(PatchIntMap pInner) :: PatchIntMap (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')) old = do
1727+ let updateChildUnreadiness (p@(PatchIntMap pInner) :: PatchIntMap (TraverseChild t m Int v')) old = do
787− let new :: IntMap.Key -> Maybe (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v') -> IO (Maybe (IORef ChildReadyStateInt))
1728+ let new :: IntMap.Key -> Maybe (TraverseChild t m Int v') -> IO (Maybe (IORef (ChildReadyState Int)))
788 new k m = case m of
1729 new k m = case m of
789 Nothing -> return Nothing
1730 Nothing -> return Nothing
790− Just (_, _, sRef, _) -> do
1731+ Just (TraverseChild (Left _hydration) _) -> pure Nothing
1732+ Just (TraverseChild (Right immediate) _) -> do
1733+ let sRef = _traverseChildImmediate_childReadyState immediate
791 readIORef sRef >>= \case
1734 readIORef sRef >>= \case
792− ChildReadyStateInt_Ready -> return Nothing -- Delete this child, since it's ready
1735+ ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
793− ChildReadyStateInt_Unready _ -> do
1736+ ChildReadyState_Unready _ -> do
794− writeIORef sRef $ ChildReadyStateInt_Unready $ Just k
1737+ writeIORef sRef $ ChildReadyState_Unready $ Just k
795 return $ Just sRef
1738 return $ Just sRef
796 delete _ sRef = do
1739 delete _ sRef = do
797− writeIORef sRef $ ChildReadyStateInt_Unready Nothing
1740+ writeIORef sRef $ ChildReadyState_Unready Nothing
798 return ()
1741 return ()
799 p' <- PatchIntMap <$> IntMap.traverseWithKey new pInner
1742 p' <- PatchIntMap <$> IntMap.traverseWithKey new pInner
800 _ <- IntMap.traverseWithKey delete $ FastMutableIntMap.getDeletions p old
1743 _ <- IntMap.traverseWithKey delete $ FastMutableIntMap.getDeletions p old
801 return $ applyAlways p' old
1744 return $ applyAlways p' old
802− hoistTraverseIntMapWithKeyWithAdjust traverseIntMapWithKeyWithAdjust updateChildUnreadiness $ \placeholders lastPlaceholderRef (PatchIntMap p) -> do
1745+ hoistTraverseIntMapWithKeyWithAdjust traverseIntMapWithKeyWithAdjust updateChildUnreadiness $ \placeholders lastPlaceholder (PatchIntMap p) -> do
803 phs <- liftIO $ readIORef placeholders
1746 phs <- liftIO $ readIORef placeholders
804 forM_ (IntMap.toList p) $ \(k, mv) -> do
1747 forM_ (IntMap.toList p) $ \(k, mv) -> do
805− lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
806 let nextPlaceholder = maybe lastPlaceholder snd $ IntMap.lookupGT k phs
1748 let nextPlaceholder = maybe lastPlaceholder snd $ IntMap.lookupGT k phs
807 forM_ (IntMap.lookup k phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
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
808− forM_ mv $ \(df, _, _, _) -> df `insertBefore` nextPlaceholder
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
809− liftIO $ writeIORef placeholders $! fromMaybe phs $ apply ((\(_, ph, _, _) -> ph) <$> PatchIntMap p) phs
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'))
811−#if MIN_VERSION_base(4,9,0)
1771+{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
812−data ChildReadyState k
1772+ :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
813−#else
1773+ -> IntMap v
814−data ChildReadyState (k :: * -> *)
1774+ -> Event DomTimeline (PatchIntMap v)
815−#endif
1775+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1778+data ChildReadyState a
816 = ChildReadyState_Ready
1779 = ChildReadyState_Ready
817− | ChildReadyState_Unready !(Maybe (Some k))
1780+ | ChildReadyState_Unready !(Maybe a)
818 deriving (Show, Read, Eq, Ord)
1781 deriving (Show, Read, Eq, Ord)
820−data ChildReadyStateInt
1783+insertAfterPreviousNode :: (Monad m, MonadJSM m) => DOM.IsNode node => node -> HydrationRunnerT t m ()
821− = ChildReadyStateInt_Ready
1784+insertAfterPreviousNode node = do
822− | ChildReadyStateInt_Unready !(Maybe Int)
1785+ parent <- askParent
823− deriving (Show, Read, Eq, Ord)
1786+ nextNode <- maybe (Node.getFirstChild parent) Node.getNextSibling =<< getPreviousNode
1787+ Node.insertBefore_ parent node nextNode
1788+ setPreviousNode $ Just $ toNode node
825−{-# INLINE hoistTraverseIntMapWithKeyWithAdjust #-}
1790+{-# INLINABLE hoistTraverseWithKeyWithAdjust #-}
826−hoistTraverseIntMapWithKeyWithAdjust :: forall v v' t m p.
1791+hoistTraverseWithKeyWithAdjust
827 ( Adjustable t m
1793 ( Adjustable t m
828 , MonadIO m
1796 , MonadIO m
829 , MonadJSM m
1797 , MonadJSM m
831 , PrimMonad m
1798 , PrimMonad m
832− , Monoid (p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v'))
1799+ , MonadFix m
833− , Functor p
1800+ , Patch (p k v)
1801+ , Patch (p k (Constant Int))
1802+ , PatchTarget (p k (Constant Int)) ~ DMap k (Constant Int)
1803+ , Patch (p k (Compose (TraverseChild t m (Some k)) v'))
1804+ , PatchTarget (p k (Compose (TraverseChild t m (Some k)) v')) ~ DMap k (Compose (TraverseChild t m (Some k)) v')
1805+ , Monoid (p k (Compose (TraverseChild t m (Some k)) v'))
1806+ , RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
835− => ( (IntMap.Key -> v -> RequesterT t JSM Identity (TriggerEventT t m) (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v'))
1808+ => (forall vv vv'.
836− -> IntMap v
1809+ (forall a. k a -> vv a -> DomRenderHookT t m (vv' a))
837− -> Event t (p v)
1811+ -> Event t (p k vv)
838− -> RequesterT t JSM Identity (TriggerEventT t m) (IntMap (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v'), Event t (p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')))
1812+ -> DomRenderHookT t m (DMap k vv', Event t (p k vv')))
839− ) -- ^ The base monad's traversal
1813+ -- ^ The base monad's traversal
1814+ -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv')
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))))))
840− -> (p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v') -> IntMap (IORef ChildReadyStateInt) -> IO (IntMap (IORef ChildReadyStateInt))) -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
1817+ -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
841− -> (IORef (IntMap DOM.Text) -> IORef DOM.Text -> p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v') -> JSM ()) -- ^ Apply a patch to the DOM
1818+ -> (IORef (Map.Map (Some k) DOM.Text) -> DOM.Text -> p k (Compose (TraverseChild t m (Some k)) v') -> JSM ())
842− -> (IntMap.Key -> v -> ImmediateDomBuilderT t m v')
1819+ -- ^ Apply a patch to the DOM
843− -> IntMap v
1820+ -> (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
844− -> Event t (p v)
1822+ -> Event t (p k v)
845− -> ImmediateDomBuilderT t m (IntMap v', Event t (p v'))
1823+ -> HydrationDomBuilderT s t m (DMap k v', Event t (p k v'))
846−hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
1824+hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
847− initialEnv <- ImmediateDomBuilderT ask
1825+ doc <- askDocument
1826+ initialEnv <- HydrationDomBuilderT ask
848− let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
1827+ let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
849− pendingChange :: IORef (IntMap (IORef ChildReadyStateInt), p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')) <- liftIO $ newIORef mempty
1828+ pendingChange :: IORef (DMap k (Constant (IORef (ChildReadyState (Some k)))), p k (Compose (TraverseChild t m (Some k)) v')) <- liftIO $ newIORef mempty
850 haveEverBeenReady <- liftIO $ newIORef False
1829 haveEverBeenReady <- liftIO $ newIORef False
851− placeholders <- liftIO $ newIORef $ error "placeholders not yet initialized"
1830+ placeholders <- liftIO $ newIORef Map.empty
852− lastPlaceholderRef <- liftIO $ newIORef $ error "lastPlaceholderRef not yet initialized"
1831+ lastPlaceholder <- createTextNode doc ("" :: Text)
853 let applyDomUpdate p = do
1832 let applyDomUpdate p = do
854− applyDomUpdate_ placeholders lastPlaceholderRef p
1833+ applyDomUpdate_ placeholders lastPlaceholder p
855 markSelfReady
1834 markSelfReady
856 liftIO $ writeIORef pendingChange $! mempty
1835 liftIO $ writeIORef pendingChange $! mempty
857 markSelfReady = do
1836 markSelfReady = do
@@ -862,86 +1841,105 @@ hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_
862 old <- liftIO $ readIORef parentUnreadyChildren
1841 old <- liftIO $ readIORef parentUnreadyChildren
863 let new = pred old
1842 let new = pred old
864 liftIO $ writeIORef parentUnreadyChildren $! new
1843 liftIO $ writeIORef parentUnreadyChildren $! new
865− when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
1844+ when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
866− markChildReady :: IORef ChildReadyStateInt -> JSM ()
1845+ markChildReady :: IORef (ChildReadyState (Some k)) -> JSM ()
867 markChildReady childReadyState = do
1846 markChildReady childReadyState = do
868 liftIO (readIORef childReadyState) >>= \case
1847 liftIO (readIORef childReadyState) >>= \case
869− ChildReadyStateInt_Ready -> return ()
1848+ ChildReadyState_Ready -> return ()
870− ChildReadyStateInt_Unready countedAt -> do
1849+ ChildReadyState_Unready countedAt -> do
871− liftIO $ writeIORef childReadyState ChildReadyStateInt_Ready
1850+ liftIO $ writeIORef childReadyState ChildReadyState_Ready
872 case countedAt of
1851 case countedAt of
873 Nothing -> return ()
1852 Nothing -> return ()
874− Just k -> do -- This child has been counted as unready, so we need to remove it from the unready set
1853+ Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
875 (oldUnready, p) <- liftIO $ readIORef pendingChange
1854 (oldUnready, p) <- liftIO $ readIORef pendingChange
876− when (not $ IntMap.null oldUnready) $ do -- This shouldn't actually ever be null
1855+ when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
877− let newUnready = IntMap.delete k oldUnready
1856+ let newUnready = DMap.delete k oldUnready
878 liftIO $ writeIORef pendingChange (newUnready, p)
1857 liftIO $ writeIORef pendingChange (newUnready, p)
879− when (IntMap.null newUnready) $ do
1858+ when (DMap.null newUnready) $ do
880 applyDomUpdate p
1859 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')))
881− (children0, children') <- ImmediateDomBuilderT $ lift $ base (\k v -> drawChildUpdateInt initialEnv markChildReady $ f k v) dm0 dm'
1861+ <- HydrationDomBuilderT $ lift $ base (\k v -> drawChildUpdate initialEnv markChildReady $ f k v) dm0 dm'
882− let processChild k (_, _, sRef, _) = do
1862+ let processChild k (Compose (TraverseChild e _)) = case e of
883− readIORef sRef >>= \case
1863+ Left _ -> pure $ ComposeMaybe Nothing
884− ChildReadyStateInt_Ready -> return Nothing
1864+ Right immediate -> ComposeMaybe <$> do
885− ChildReadyStateInt_Unready _ -> do
1865+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
886− writeIORef sRef $ ChildReadyStateInt_Unready $ Just k
1866+ ChildReadyState_Ready -> return Nothing
887− return $ Just sRef
1867+ ChildReadyState_Unready _ -> do
1868+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1869+ return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
888− initialUnready <- liftIO $ IntMap.mapMaybe id <$> IntMap.traverseWithKey processChild children0
1870+ initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
889− liftIO $ if IntMap.null initialUnready
1871+ liftIO $ if DMap.null initialUnready
890 then writeIORef haveEverBeenReady True
1872 then writeIORef haveEverBeenReady True
892 modifyIORef' parentUnreadyChildren succ
1874 modifyIORef' parentUnreadyChildren succ
893 writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
1875 writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
894− let result0 = IntMap.map (\(_, _, _, v) -> v) children0
1876+ getHydrationMode >>= \case
895− placeholders0 = fmap (\(_, ph, _, _) -> ph) children0
1877+ HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
896− result' = ffor children' $ fmap $ \(_, _, _, r) -> r
1878+ dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
897− liftIO $ writeIORef placeholders $! placeholders0
1879+ phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
898− _ <- IntMap.traverseWithKey (\_ (df, _, _, _) -> void $ append $ toNode df) children0
1880+ liftIO $ writeIORef placeholders $! phs
899− liftIO . writeIORef lastPlaceholderRef =<< textNodeInternal ("" :: Text)
1881+ insertAfterPreviousNode lastPlaceholder
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
900 requestDomAction_ $ ffor children' $ \p -> do
1889 requestDomAction_ $ ffor children' $ \p -> do
901 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
1890 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
902 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
1891 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
903 let !newP = p <> oldP
1892 let !newP = p <> oldP
904 liftIO $ writeIORef pendingChange (newUnready, newP)
1893 liftIO $ writeIORef pendingChange (newUnready, newP)
905− when (IntMap.null newUnready) $ do
1894+ when (DMap.null newUnready) $ do
906 applyDomUpdate newP
1895 applyDomUpdate newP
1896+ let result0 = DMap.map (_traverseChild_result . getCompose) children0
1897+ result' = ffor children' $ mapPatch $ _traverseChild_result . getCompose
907 return (result0, result')
1898 return (result0, result')
909−{-# INLINABLE hoistTraverseWithKeyWithAdjust #-}
1900+{-# INLINE hoistTraverseIntMapWithKeyWithAdjust #-}
910−hoistTraverseWithKeyWithAdjust :: forall (k :: * -> *) v v' t m p.
1901+hoistTraverseIntMapWithKeyWithAdjust ::
911 ( Adjustable t m
1902 ( Adjustable t m
912 , MonadHold t m
1903 , MonadHold t m
915 , MonadJSM m
1904 , MonadJSM m
917 , MonadFix m
1905 , MonadFix m
918− , Patch (p k v)
1906+ , PrimMonad m
919− , PatchTarget (p k (Constant Int)) ~ DMap k (Constant Int)
1907+ , Monoid (p (TraverseChild t m Int v'))
920− , Monoid (p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v'))
1908+ , Functor p
921− , Patch (p k (Constant Int))
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
923− => (forall vv vv'.
1915+ => ((IntMap.Key -> v -> DomRenderHookT t m (TraverseChild t m Int v'))
924− (forall a. k a -> vv a -> RequesterT t JSM Identity (TriggerEventT t m) (vv' a))
1916+ -> IntMap v
926− -> Event t (p k vv)
1917+ -> Event t (p v)
927− -> RequesterT t JSM Identity (TriggerEventT t m) (DMap k vv', Event t (p k vv'))
1918+ -> DomRenderHookT t m (IntMap (TraverseChild t m Int v'), Event t (p (TraverseChild t m Int v'))))
928− ) -- ^ The base monad's traversal
1919+ -- ^ The base monad's traversal
929− -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv') -- ^ A way of mapping over the patch type
1920+ -> (p (TraverseChild t m Int v')
1921+ -> IntMap (IORef (ChildReadyState Int))
1922+ -> IO (IntMap (IORef (ChildReadyState Int))))
930− -> (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
1923+ -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
931− -> (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
1924+ -> (IORef (IntMap DOM.Text)
932− -> (forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a))
1925+ -> DOM.Text
933− -> DMap k v
1926+ -> p (TraverseChild t m Int v')
1928+ -- ^ Apply a patch to the DOM
1929+ -> (IntMap.Key -> v -> HydrationDomBuilderT s t m v')
934− -> Event t (p k v)
1931+ -> Event t (p v)
935− -> ImmediateDomBuilderT t m (DMap k v', Event t (p k v'))
1932+ -> HydrationDomBuilderT s t m (IntMap v', Event t (p v'))
936−hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpdate_ (f :: forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a)) (dm0 :: DMap k v) dm' = do
1933+hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
937− initialEnv <- ImmediateDomBuilderT ask
1934+ doc <- askDocument
1935+ initialEnv <- HydrationDomBuilderT ask
938− let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
1936+ let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
939− pendingChange :: IORef (DMap k (Constant (IORef (ChildReadyState k))), p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) <- liftIO $ newIORef mempty
1937+ pendingChange :: IORef (IntMap (IORef (ChildReadyState Int)), p (TraverseChild t m Int v')) <- liftIO $ newIORef mempty
940 haveEverBeenReady <- liftIO $ newIORef False
1938 haveEverBeenReady <- liftIO $ newIORef False
941− placeholders <- liftIO $ newIORef $ error "placeholders not yet initialized"
1939+ placeholders <- liftIO $ newIORef IntMap.empty
942− lastPlaceholderRef <- liftIO $ newIORef $ error "lastPlaceholderRef not yet initialized"
1940+ lastPlaceholder <- createTextNode doc ("" :: Text)
943 let applyDomUpdate p = do
1941 let applyDomUpdate p = do
944− applyDomUpdate_ placeholders lastPlaceholderRef p
1942+ applyDomUpdate_ placeholders lastPlaceholder p
945 markSelfReady
1943 markSelfReady
946 liftIO $ writeIORef pendingChange $! mempty
1944 liftIO $ writeIORef pendingChange $! mempty
947 markSelfReady = do
1945 markSelfReady = do
@@ -952,8 +1950,8 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
952 old <- liftIO $ readIORef parentUnreadyChildren
1950 old <- liftIO $ readIORef parentUnreadyChildren
953 let new = pred old
1951 let new = pred old
954 liftIO $ writeIORef parentUnreadyChildren $! new
1952 liftIO $ writeIORef parentUnreadyChildren $! new
955− when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
1953+ when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
956− markChildReady :: IORef (ChildReadyState k) -> JSM ()
1954+ markChildReady :: IORef (ChildReadyState Int) -> JSM ()
957 markChildReady childReadyState = do
1955 markChildReady childReadyState = do
958 liftIO (readIORef childReadyState) >>= \case
1956 liftIO (readIORef childReadyState) >>= \case
959 ChildReadyState_Ready -> return ()
1957 ChildReadyState_Ready -> return ()
@@ -961,82 +1959,191 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
961 liftIO $ writeIORef childReadyState ChildReadyState_Ready
1959 liftIO $ writeIORef childReadyState ChildReadyState_Ready
962 case countedAt of
1960 case countedAt of
963 Nothing -> return ()
1961 Nothing -> return ()
964− Just (Some.This k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1962+ Just k -> do -- This child has been counted as unready, so we need to remove it from the unready set
965 (oldUnready, p) <- liftIO $ readIORef pendingChange
1963 (oldUnready, p) <- liftIO $ readIORef pendingChange
966− when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
1964+ when (not $ IntMap.null oldUnready) $ do -- This shouldn't actually ever be null
967− let newUnready = DMap.delete k oldUnready
1965+ let newUnready = IntMap.delete k oldUnready
968 liftIO $ writeIORef pendingChange (newUnready, p)
1966 liftIO $ writeIORef pendingChange (newUnready, p)
969− when (DMap.null newUnready) $ do
1967+ when (IntMap.null newUnready) $ do
970 applyDomUpdate p
1968 applyDomUpdate p
1969+ (children0 :: IntMap (TraverseChild t m Int v'), children' :: Event t (p (TraverseChild t m Int v')))
971− (children0, children') <- ImmediateDomBuilderT $ lift $ base (\k v -> drawChildUpdate initialEnv markChildReady $ f k v) dm0 dm'
1970+ <- HydrationDomBuilderT $ lift $ base (\k v -> drawChildUpdateInt initialEnv markChildReady $ f k v) dm0 dm'
972− let processChild k (Compose (_, _, sRef, _)) = ComposeMaybe <$> do
1971+ let processChild k (TraverseChild e _) = case e of
973− readIORef sRef >>= \case
1972+ Left _ -> pure Nothing
1973+ Right immediate -> do
1974+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
974− ChildReadyState_Ready -> return Nothing
1975+ ChildReadyState_Ready -> return Nothing
975− ChildReadyState_Unready _ -> do
1976+ ChildReadyState_Unready _ -> do
976− writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
1977+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just k
977− return $ Just $ Constant sRef
1978+ return $ Just (_traverseChildImmediate_childReadyState immediate)
978− initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
1979+ initialUnready <- liftIO $ IntMap.mapMaybe id <$> IntMap.traverseWithKey processChild children0
979− liftIO $ if DMap.null initialUnready
1980+ liftIO $ if IntMap.null initialUnready
980 then writeIORef haveEverBeenReady True
1981 then writeIORef haveEverBeenReady True
982 modifyIORef' parentUnreadyChildren succ
1983 modifyIORef' parentUnreadyChildren succ
983 writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
1984 writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
984− let result0 = DMap.map (\(Compose (_, _, _, v)) -> v) children0
1985+ getHydrationMode >>= \case
985− placeholders0 = weakenDMapWith (\(Compose (_, ph, _, _)) -> ph) children0
1986+ HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
986− result' = ffor children' $ mapPatch $ \(Compose (_, _, _, r)) -> r
1987+ dm :: IntMap (TraverseChild t m Int v') <- sample $ currentIncremental children
987− liftIO $ writeIORef placeholders $! placeholders0
1988+ phs <- traverse (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode) dm
988− _ <- DMap.traverseWithKey (\_ (Compose (df, _, _, _)) -> Constant () <$ append (toNode df)) children0
1989+ liftIO $ writeIORef placeholders $! phs
989− liftIO . writeIORef lastPlaceholderRef =<< textNodeInternal ("" :: Text)
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
990 requestDomAction_ $ ffor children' $ \p -> do
1998 requestDomAction_ $ ffor children' $ \p -> do
991 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
1999 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
992 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
2000 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
993 let !newP = p <> oldP
2001 let !newP = p <> oldP
994 liftIO $ writeIORef pendingChange (newUnready, newP)
2002 liftIO $ writeIORef pendingChange (newUnready, newP)
995− when (DMap.null newUnready) $ do
2003+ when (IntMap.null newUnready) $ do
996 applyDomUpdate newP
2004 applyDomUpdate newP
2005+ let result0 = IntMap.map _traverseChild_result children0
2006+ result' = ffor children' $ fmap $ _traverseChild_result
997 return (result0, 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
999{-# INLINABLE drawChildUpdate #-}
2063{-# INLINABLE drawChildUpdate #-}
1000−drawChildUpdate :: (MonadIO m, MonadJSM m)
2064+drawChildUpdate :: (MonadJSM m, Reflex t)
1001− => ImmediateDomBuilderEnv t
2065+ => HydrationDomBuilderEnv t m
1002 -> (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
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
1003− -> ImmediateDomBuilderT t m (v' a)
2067+ -> HydrationDomBuilderT s t m (f a)
1004− -> RequesterT t JSM Identity (TriggerEventT t m) (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v' a)
2068+ -> DomRenderHookT t m (Compose (TraverseChild t m k) f a)
1005drawChildUpdate initialEnv markReady child = do
2069drawChildUpdate initialEnv markReady child = do
1006− childReadyState <- liftIO $ newIORef $ ChildReadyState_Unready Nothing
2070+ let doc = _hydrationDomBuilderEnv_document initialEnv
1007 unreadyChildren <- liftIO $ newIORef 0
2071 unreadyChildren <- liftIO $ newIORef 0
2072+ liftIO (readIORef $ _hydrationDomBuilderEnv_hydrationMode initialEnv) >>= \case
2073+ HydrationMode_Hydrating -> do
2074+ childDelayedRef <- liftIO $ newIORef $ pure ()
2075+ result <- runReaderT (unHydrationDomBuilderT child) initialEnv
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
1008− df <- createDocumentFragment $ _immediateDomBuilderEnv_document initialEnv
2092+ df <- createDocumentFragment doc
1009− (placeholder, result) <- runReaderT (unImmediateDomBuilderT $ (,) <$> textNodeInternal ("" :: Text) <*> child) $ initialEnv
2093+ placeholder <- createTextNode doc ("" :: Text)
1010− { _immediateDomBuilderEnv_parent = toNode df
2094+ Node.appendChild_ df placeholder
1011− , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
2095+ result <- runReaderT (unHydrationDomBuilderT child) initialEnv
2096+ { _hydrationDomBuilderEnv_parent = Left $ toNode df
2097+ , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
1012− , _immediateDomBuilderEnv_commitAction = markReady childReadyState
2098+ , _hydrationDomBuilderEnv_commitAction = markReady childReadyState
1014− u <- liftIO $ readIORef unreadyChildren
2100+ u <- liftIO $ readIORef unreadyChildren
1015− when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyState_Ready
2101+ when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyState_Ready
1016− return $ Compose (df, placeholder, childReadyState, result)
2102+ return $ Compose $ TraverseChild
2103+ { _traverseChild_result = result
2104+ , _traverseChild_mode = Right TraverseChildImmediate
2105+ { _traverseChildImmediate_fragment = df
2106+ , _traverseChildImmediate_placeholder = placeholder
2107+ , _traverseChildImmediate_childReadyState = childReadyState
1018−{-# INLINABLE drawChildUpdateInt #-}
2111+{-# SPECIALIZE drawChildUpdate
1019−drawChildUpdateInt :: (MonadIO m, MonadJSM m)
2112+ :: HydrationDomBuilderEnv DomTimeline HydrationM
1020− => ImmediateDomBuilderEnv t
2113+ -> (IORef (ChildReadyState Int) -> JSM ())
1021− -> (IORef ChildReadyStateInt -> JSM ()) -- This will NOT be called if the child is ready at initialization time; instead, the ChildReadyState return value will be ChildReadyState_Ready
2114+ -> HydrationDomBuilderT s DomTimeline HydrationM (Identity a)
1022− -> ImmediateDomBuilderT t m v'
2115+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM Int) Identity a)
1023− -> RequesterT t JSM Identity (TriggerEventT t m) (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')
2116+ #-}
1024−drawChildUpdateInt initialEnv markReady child = do
2117+
1025− childReadyState <- liftIO $ newIORef $ ChildReadyStateInt_Unready Nothing
2118+{-# SPECIALIZE drawChildUpdate
1026− unreadyChildren <- liftIO $ newIORef 0
2119+ :: HydrationDomBuilderEnv DomTimeline HydrationM
1027− df <- createDocumentFragment $ _immediateDomBuilderEnv_document initialEnv
2120+ -> (IORef (ChildReadyState (Some k)) -> JSM ())
1028− (placeholder, result) <- runReaderT (unImmediateDomBuilderT $ (,) <$> textNodeInternal ("" :: Text) <*> child) $ initialEnv
2121+ -> HydrationDomBuilderT s DomTimeline HydrationM (f a)
1029− { _immediateDomBuilderEnv_parent = toNode df
2122+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM (Some k)) f a)
1030− , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
2123+ #-}
1031− , _immediateDomBuilderEnv_commitAction = markReady childReadyState
1033− u <- liftIO $ readIORef unreadyChildren
1034− when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyStateInt_Ready
1035− return (df, placeholder, childReadyState, result)
1037−mkHasFocus :: (MonadHold t m, Reflex t) => Element er d t -> m (Dynamic t Bool)
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)
1038mkHasFocus e = do
2144mkHasFocus e = do
1039− let initialFocus = False --TODO: Actually get the initial focus of the element
2145+ doc <- askDocument
2146+ initialFocus <- Node.isSameNode (toNode $ _element_raw e) . fmap toNode =<< Document.getActiveElement doc
1040 holdDyn initialFocus $ leftmost
2147 holdDyn initialFocus $ leftmost
1041 [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
2148 [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
1042 , True <$ Reflex.select (_element_events e) (WrapArg Focus)
2149 , True <$ Reflex.select (_element_events e) (WrapArg Focus)
@@ -1045,39 +2152,49 @@ mkHasFocus e = do
1045insertBefore :: (MonadJSM m, IsNode new, IsNode existing) => new -> existing -> m ()
2152insertBefore :: (MonadJSM m, IsNode new, IsNode existing) => new -> existing -> m ()
1046insertBefore new existing = do
2153insertBefore new existing = do
1047 p <- getParentNodeUnchecked existing
2154 p <- getParentNodeUnchecked existing
1048− DOM.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
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
2157+type ImmediateDomBuilderT = HydrationDomBuilderT GhcjsDomSpace
1050−instance PerformEvent t m => PerformEvent t (ImmediateDomBuilderT t m) where
2159+instance PerformEvent t m => PerformEvent t (HydrationDomBuilderT s t m) where
1051− type Performable (ImmediateDomBuilderT t m) = Performable m
2160+ type Performable (HydrationDomBuilderT s t m) = Performable m
1052 {-# INLINABLE performEvent_ #-}
2161 {-# INLINABLE performEvent_ #-}
1053 performEvent_ e = lift $ performEvent_ e
2162 performEvent_ e = lift $ performEvent_ e
1054 {-# INLINABLE performEvent #-}
2163 {-# INLINABLE performEvent #-}
1055 performEvent e = lift $ performEvent e
2164 performEvent e = lift $ performEvent e
1057−instance PostBuild t m => PostBuild t (ImmediateDomBuilderT t m) where
2166+instance PostBuild t m => PostBuild t (HydrationDomBuilderT s t m) where
1058 {-# INLINABLE getPostBuild #-}
2167 {-# INLINABLE getPostBuild #-}
1059 getPostBuild = lift getPostBuild
2168 getPostBuild = lift getPostBuild
1061−instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (ImmediateDomBuilderT t m) where
2170+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationDomBuilderT s t m) where
1062 {-# INLINABLE newEventWithTrigger #-}
2171 {-# INLINABLE newEventWithTrigger #-}
1063 newEventWithTrigger = lift . newEventWithTrigger
2172 newEventWithTrigger = lift . newEventWithTrigger
1064 {-# INLINABLE newFanEventWithTrigger #-}
2173 {-# INLINABLE newFanEventWithTrigger #-}
1065 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
2174 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
1067−instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (ImmediateDomBuilderT t m) where
2176+instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (HydrationDomBuilderT s t m) where
1068 {-# INLINABLE newTriggerEvent #-}
2177 {-# INLINABLE newTriggerEvent #-}
1069− newTriggerEvent = ImmediateDomBuilderT . lift . lift $ newTriggerEvent
2178+ newTriggerEvent = HydrationDomBuilderT . lift $ newTriggerEvent
1070 {-# INLINABLE newTriggerEventWithOnComplete #-}
2179 {-# INLINABLE newTriggerEventWithOnComplete #-}
1071− newTriggerEventWithOnComplete = ImmediateDomBuilderT . lift . lift $ newTriggerEventWithOnComplete
2180+ newTriggerEventWithOnComplete = HydrationDomBuilderT . lift $ newTriggerEventWithOnComplete
1072 {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
2181 {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
1073− newEventWithLazyTriggerWithOnComplete f = ImmediateDomBuilderT . lift . lift $ newEventWithLazyTriggerWithOnComplete f
2182+ newEventWithLazyTriggerWithOnComplete f = HydrationDomBuilderT . lift $ newEventWithLazyTriggerWithOnComplete f
1075−instance HasJSContext m => HasJSContext (ImmediateDomBuilderT t m) where
2184+instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (DomRenderHookT t m) where
1076− type JSContextPhantom (ImmediateDomBuilderT t m) = JSContextPhantom m
2185+ {-# INLINABLE newTriggerEvent #-}
2186+ newTriggerEvent = DomRenderHookT . lift $ newTriggerEvent
2187+ {-# INLINABLE newTriggerEventWithOnComplete #-}
2188+ newTriggerEventWithOnComplete = DomRenderHookT . lift $ newTriggerEventWithOnComplete
2189+ {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
2190+ newEventWithLazyTriggerWithOnComplete f = DomRenderHookT . lift $ newEventWithLazyTriggerWithOnComplete f
2192+instance HasJSContext m => HasJSContext (HydrationDomBuilderT s t m) where
2193+ type JSContextPhantom (HydrationDomBuilderT s t m) = JSContextPhantom m
1077 askJSContext = lift askJSContext
2194 askJSContext = lift askJSContext
1079−instance MonadRef m => MonadRef (ImmediateDomBuilderT t m) where
2196+instance MonadRef m => MonadRef (HydrationDomBuilderT s t m) where
1080− type Ref (ImmediateDomBuilderT t m) = Ref m
2197+ type Ref (HydrationDomBuilderT s t m) = Ref m
1081 {-# INLINABLE newRef #-}
2198 {-# INLINABLE newRef #-}
1082 newRef = lift . newRef
2199 newRef = lift . newRef
1083 {-# INLINABLE readRef #-}
2200 {-# INLINABLE readRef #-}
@@ -1085,12 +2202,12 @@ instance MonadRef m => MonadRef (ImmediateDomBuilderT t m) where
1085 {-# INLINABLE writeRef #-}
2202 {-# INLINABLE writeRef #-}
1086 writeRef r = lift . writeRef r
2203 writeRef r = lift . writeRef r
1088−instance MonadAtomicRef m => MonadAtomicRef (ImmediateDomBuilderT t m) where
2205+instance MonadAtomicRef m => MonadAtomicRef (HydrationDomBuilderT s t m) where
1089 {-# INLINABLE atomicModifyRef #-}
2206 {-# INLINABLE atomicModifyRef #-}
1090 atomicModifyRef r = lift . atomicModifyRef r
2207 atomicModifyRef r = lift . atomicModifyRef r
1092−instance (HasJS x m, ReflexHost t) => HasJS x (ImmediateDomBuilderT t m) where
2209+instance (HasJS x m, ReflexHost t) => HasJS x (HydrationDomBuilderT s t m) where
1093− type JSX (ImmediateDomBuilderT t m) = JSX m
2210+ type JSX (HydrationDomBuilderT s t m) = JSX m
1094 liftJS = lift . liftJS
2211 liftJS = lift . liftJS
1096type family EventType en where
2213type family EventType en where
@@ -1180,7 +2297,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
1180 Beforecopy -> return ()
2297 Beforecopy -> return ()
1181 Copy -> return ()
2298 Copy -> return ()
1182 Beforepaste -> return ()
2299 Beforepaste -> return ()
1183− Paste -> return ()
2300+ Paste -> getPasteData
1184 Reset -> return ()
2301 Reset -> return ()
1185 Search -> return ()
2302 Search -> return ()
1186 Selectstart -> return ()
2303 Selectstart -> return ()
@@ -1189,7 +2306,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
1189 Touchend -> getTouchEvent
2306 Touchend -> getTouchEvent
1190 Touchcancel -> getTouchEvent
2307 Touchcancel -> getTouchEvent
1191 Mousewheel -> return ()
2308 Mousewheel -> return ()
1192− Wheel -> return ()
2309+ Wheel -> getWheelEvent
1194{-# INLINABLE defaultDomWindowEventHandler #-}
2311{-# INLINABLE defaultDomWindowEventHandler #-}
1195defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
2312defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -1230,7 +2347,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
1230 Beforecopy -> return ()
2347 Beforecopy -> return ()
1231 Copy -> return ()
2348 Copy -> return ()
1232 Beforepaste -> return ()
2349 Beforepaste -> return ()
1233− Paste -> return ()
2350+ Paste -> getPasteData
1234 Reset -> return ()
2351 Reset -> return ()
1235 Search -> return ()
2352 Search -> return ()
1236 Selectstart -> return ()
2353 Selectstart -> return ()
@@ -1239,7 +2356,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
1239 Touchend -> getTouchEvent
2356 Touchend -> getTouchEvent
1240 Touchcancel -> getTouchEvent
2357 Touchcancel -> getTouchEvent
1241 Mousewheel -> return ()
2358 Mousewheel -> return ()
1242− Wheel -> return ()
2359+ Wheel -> getWheelEvent
1244{-# INLINABLE withIsEvent #-}
2361{-# INLINABLE withIsEvent #-}
1245withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
2362withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -1507,6 +2624,15 @@ getMouseEventCoords = do
1507 e <- event
2624 e <- event
1508 bisequence (getClientX e, getClientY e)
2625 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)
1510{-# INLINABLE getTouchEvent #-}
2636{-# INLINABLE getTouchEvent #-}
1511getTouchEvent :: EventM e TouchEvent TouchEventResult
2637getTouchEvent :: EventM e TouchEvent TouchEventResult
1512getTouchEvent = do
2638getTouchEvent = do
@@ -1548,11 +2674,31 @@ getTouchEvent = do
1548 , _touchEventResult_touches = touches
2674 , _touchEventResult_touches = touches
1551−instance MonadSample t m => MonadSample t (ImmediateDomBuilderT t m) where
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
1552 {-# INLINABLE sample #-}
2698 {-# INLINABLE sample #-}
1553 sample = lift . sample
2699 sample = lift . sample
1555−instance MonadHold t m => MonadHold t (ImmediateDomBuilderT t m) where
2701+instance MonadHold t m => MonadHold t (HydrationDomBuilderT s t m) where
1556 {-# INLINABLE hold #-}
2702 {-# INLINABLE hold #-}
1557 hold v0 v' = lift $ hold v0 v'
2703 hold v0 v' = lift $ hold v0 v'
1558 {-# INLINABLE holdDyn #-}
2704 {-# INLINABLE holdDyn #-}
@@ -1574,7 +2720,7 @@ data Window t = Window
1574 , _window_raw :: DOM.Window
2720 , _window_raw :: DOM.Window
1577−wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> ImmediateDomBuilderT t m (Window t)
2723+wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> HydrationDomBuilderT GhcjsDomSpace t m (Window t)
1578wrapWindow wv _ = do
2724wrapWindow wv _ = do
1579 events <- wrapDomEventsMaybe wv (defaultDomWindowEventHandler wv) windowOnEventName
2725 events <- wrapDomEventsMaybe wv (defaultDomWindowEventHandler wv) windowOnEventName
1580 return $ Window
2726 return $ Window