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