@@ -2,7 +2,7 @@
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE ConstraintKinds #-}
44{-# LANGUAGE DataKinds #-}
5−{-# LANGUAGE DeriveTraversable #-}
5+{-# LANGUAGE DefaultSignatures #-}
66{-# LANGUAGE EmptyDataDecls #-}
77{-# LANGUAGE FlexibleContexts #-}
88{-# LANGUAGE FlexibleInstances #-}
@@ -11,380 +11,204 @@
1111{-# LANGUAGE LambdaCase #-}
1212{-# LANGUAGE MultiParamTypeClasses #-}
1313{-# LANGUAGE OverloadedStrings #-}
14−{-# LANGUAGE PatternGuards #-}
1514{-# LANGUAGE PolyKinds #-}
1615{-# LANGUAGE RankNTypes #-}
1716{-# LANGUAGE RecursiveDo #-}
1817{-# LANGUAGE ScopedTypeVariables #-}
18+{-# LANGUAGE StandaloneDeriving #-}
1919#ifdef USE_TEMPLATE_HASKELL
2020{-# LANGUAGE TemplateHaskell #-}
2121#endif
22−{-# LANGUAGE TupleSections #-}
2322{-# LANGUAGE TypeFamilies #-}
2423{-# LANGUAGE TypeOperators #-}
2524{-# LANGUAGE UndecidableInstances #-}
26−#ifdef ghcjs_HOST_OS
27−{-# LANGUAGE ForeignFunctionInterface #-}
28−{-# LANGUAGE JavaScriptFFI #-}
29−#endif
30−-- | This is a builder to be used on the client side. It can be run in two modes:
31−--
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
35−--
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").
39−--
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.
4525module Reflex.Dom.Builder.Immediate
46− ( HydrationDomBuilderT (..)
47− , HydrationDomBuilderEnv (..)
48− , HydrationMode (..)
49− , HydrationRunnerT (..)
50− , runHydrationRunnerT
51− , runHydrationRunnerTWithFailure
52− , ImmediateDomBuilderT
53− , runHydrationDomBuilderT
54− , getHydrationMode
55− , addHydrationStep
56− , addHydrationStepWithSetup
57− , setPreviousNode
58− , insertAfterPreviousNode
59− , hydrateComment
60− , askParent
61− , askEvents
62− , append
63− , textNodeInternal
64− , removeSubsequentNodes
65− , deleteBetweenExclusive
66− , extractBetweenExclusive
67− , deleteUpTo
68− , extractUpTo
69− , SupportsHydrationDomBuilder
70− , collectUpTo
71− , collectUpToGivenParent
72− , EventTriggerRef (..)
73− , EventFilterTriggerRef (..)
74− , wrap
75− , elementInternal
76− , HydrationDomSpace
77− , GhcjsDomSpace
78− , GhcjsDomHandler (..)
79− , GhcjsDomHandler1 (..)
80− , GhcjsDomEvent (..)
81− , GhcjsEventFilter (..)
82− , Pair1 (..)
83− , Maybe1 (..)
84− , GhcjsEventSpec (..)
85− , HasDocument (..)
86− , ghcjsEventSpec_filters
87− , ghcjsEventSpec_handler
88− , GhcjsEventHandler (..)
89− , drawChildUpdate
90− , ChildReadyState (..)
91− , mkHasFocus
92− , insertBefore
93− , EventType
94− , defaultDomEventHandler
95− , defaultDomWindowEventHandler
96− , withIsEvent
97− , showEventName
98− , elementOnEventName
99− , windowOnEventName
100− , wrapDomEvent
101− , subscribeDomEvent
102− , wrapDomEventMaybe
103− , wrapDomEventsMaybe
104− , getKeyEvent
105− , getMouseEventCoords
106− , getTouchEvent
107− , WindowConfig (..)
108− , Window (..)
109− , wrapWindow
110− -- * Attributes for controlling hydration
111− , hydratableAttribute
112− , skipHydrationAttribute
113− -- * Internal
114− , traverseDMapWithKeyWithAdjust'
115− , hoistTraverseWithKeyWithAdjust
116− , traverseIntMapWithKeyWithAdjust'
117− , hoistTraverseIntMapWithKeyWithAdjust
118− ) where
26+ ( EventTriggerRef (..)
27+ , ImmediateDomBuilderEnv (..)
28+ , ImmediateDomBuilderT (..)
29+ , runImmediateDomBuilderT
30+ , askParent
31+ , askEvents
32+ , append
33+ , textNodeInternal
34+ , deleteBetweenExclusive
35+ , extractBetweenExclusive
36+ , deleteUpTo
37+ , extractUpTo
38+ , SupportsImmediateDomBuilder
39+ , collectUpTo
40+ , collectUpToGivenParent
41+ , EventFilterTriggerRef (..)
42+ , wrap
43+ , makeElement
44+ , GhcjsDomHandler (..)
45+ , GhcjsDomHandler1 (..)
46+ , GhcjsDomEvent (..)
47+ , GhcjsDomSpace
48+ , GhcjsEventFilter (..)
49+ , Pair1 (..)
50+ , Maybe1 (..)
51+ , GhcjsEventSpec (..)
52+ , HasDocument (..)
53+ , ghcjsEventSpec_filters
54+ , ghcjsEventSpec_handler
55+ , GhcjsEventHandler (..)
56+#ifndef USE_TEMPLATE_HASKELL
57+ , phantom2
58+#endif
59+ , drawChildUpdate
60+ , ChildReadyState (..)
61+ , ChildReadyStateInt (..)
62+ , mkHasFocus
63+ , insertBefore
64+ , EventType
65+ , defaultDomEventHandler
66+ , defaultDomWindowEventHandler
67+ , withIsEvent
68+ , showEventName
69+ , elementOnEventName
70+ , windowOnEventName
71+ , wrapDomEvent
72+ , subscribeDomEvent
73+ , wrapDomEventMaybe
74+ , wrapDomEventsMaybe
75+ , getKeyEvent
76+ , getMouseEventCoords
77+ , getTouchEvent
78+ , WindowConfig (..)
79+ , Window (..)
80+ , wrapWindow
81+ -- * Internal
82+ , traverseDMapWithKeyWithAdjust'
83+ , hoistTraverseWithKeyWithAdjust
84+ , traverseIntMapWithKeyWithAdjust'
85+ , hoistTraverseIntMapWithKeyWithAdjust
86+ ) where
87+
88+import Foreign.JavaScript.TH
89+import Reflex.Class as Reflex
90+import Reflex.Dom.Builder.Class
91+import Reflex.Dynamic
92+import Reflex.DynamicWriter (DynamicWriterT)
93+import Reflex.EventWriter (EventWriterT)
94+import Reflex.Host.Class
95+import qualified Reflex.Patch.DMap as PatchDMap
96+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
97+import Reflex.PerformEvent.Class
98+import Reflex.PostBuild.Base
99+import Reflex.PostBuild.Class
100+import Reflex.TriggerEvent.Base hiding (askEvents)
101+import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
102+import Reflex.TriggerEvent.Class
103+import Reflex.Query.Base (QueryT)
119104
120105import Control.Concurrent
121−import Control.Exception (bracketOnError)
122−import Control.Lens (Identity(..), imapM_, iforM_, (^.), makeLenses)
106+import Control.Lens hiding (element, ix)
123107import Control.Monad.Exception
124108import Control.Monad.Primitive
125109import Control.Monad.Reader
126110import Control.Monad.Ref
127−import Control.Monad.State.Strict (StateT, mapStateT, get, modify', gets, runStateT)
111+import Control.Monad.State.Strict (StateT)
112+import qualified Control.Monad.State as Lazy (StateT)
113+#ifndef USE_TEMPLATE_HASKELL
114+import Data.Functor.Contravariant (phantom)
115+#endif
128116import Data.Bitraversable
129117import Data.Default
130118import Data.Dependent.Map (DMap)
119+import qualified Data.Dependent.Map as DMap
131120import Data.Dependent.Sum
132−import Data.FastMutableIntMap (PatchIntMap (..))
133−import Data.Foldable (for_, traverse_)
134121import Data.Functor.Compose
135122import Data.Functor.Constant
136123import Data.Functor.Misc
137124import Data.Functor.Product
138−import Data.GADT.Compare (GCompare)
139125import Data.IORef
140−import Data.IntMap.Strict (IntMap)
126+import qualified Data.Map as Map
141127import Data.Maybe
142−import Data.Monoid ((<>))
143−import Data.Some (Some(..))
144−import Data.GADT.Compare (GCompare)
145−import Data.String (IsString)
128+import Data.Monoid hiding (Product)
129+import Data.Some (Some)
130+import qualified Data.Some as Some
146131import 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
172−#endif
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
178−
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
183132import qualified Data.Text as T
184133import qualified GHCJS.DOM as DOM
185−import qualified GHCJS.DOM.DataTransfer as DataTransfer
186−import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
187−import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
134+import GHCJS.DOM.RequestAnimationFrameCallback
135+import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode)
136+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS)
188137import qualified GHCJS.DOM.Element as Element
189138import qualified GHCJS.DOM.Event as Event
139+import qualified GHCJS.DOM.GlobalEventHandlers as Events
140+import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
141+import GHCJS.DOM.EventM (EventM, event, on)
190142import qualified GHCJS.DOM.EventM as DOM
191143import qualified GHCJS.DOM.FileList as FileList
192−import qualified GHCJS.DOM.GlobalEventHandlers as Events
193144import qualified GHCJS.DOM.HTMLInputElement as Input
194145import qualified GHCJS.DOM.HTMLSelectElement as Select
195146import qualified GHCJS.DOM.HTMLTextAreaElement as TextArea
196−import qualified GHCJS.DOM.Node as Node
197−import qualified GHCJS.DOM.Text as DOM
147+import GHCJS.DOM.MouseEvent
198148import qualified GHCJS.DOM.Touch as Touch
199149import qualified GHCJS.DOM.TouchEvent as TouchEvent
200150import qualified GHCJS.DOM.TouchList as TouchList
151+import GHCJS.DOM.Node (appendChild_, getOwnerDocumentUnchecked, getParentNodeUnchecked, setNodeValue, toNode)
152+import qualified GHCJS.DOM.Node as DOM (insertBefore_)
153+import GHCJS.DOM.Types
154+ (liftJSM, askJSM, runJSM, JSM, MonadJSM,
155+ FocusEvent, IsElement, IsEvent, IsNode, KeyboardEvent, Node,
156+ ToDOMString, TouchEvent, WheelEvent, uncheckedCastTo, ClipboardEvent)
201157import qualified GHCJS.DOM.Types as DOM
158+import GHCJS.DOM.UIEvent
159+import GHCJS.DOM.KeyboardEvent as KeyboardEvent
202160import qualified GHCJS.DOM.Window as Window
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)
161+import Language.Javascript.JSaddle (call, eval)
162+import Data.IntMap.Strict (IntMap)
163+import qualified Data.IntMap.Strict as IntMap
164+import Data.FastMutableIntMap (PatchIntMap (..))
165+import qualified Data.FastMutableIntMap as FastMutableIntMap
208166
209−#ifndef USE_TEMPLATE_HASKELL
210−import Data.Functor.Contravariant (phantom)
211−import Control.Lens (Lens', Getter)
212−#endif
167+import Reflex.Requester.Base
168+import Reflex.Requester.Class
169+import Foreign.JavaScript.Internal.Utils
213170
214171#ifndef ghcjs_HOST_OS
215172import GHCJS.DOM.Types (MonadJSM (..))
216173
217−instance MonadJSM m => MonadJSM (HydrationRunnerT t m) where
218− {-# INLINABLE liftJSM' #-}
219− liftJSM' = lift . liftJSM'
220−
221−instance MonadJSM m => MonadJSM (HydrationDomBuilderT s t m) where
222− {-# INLINABLE liftJSM' #-}
223− liftJSM' = lift . liftJSM'
224−
225−instance MonadJSM m => MonadJSM (DomRenderHookT t m) where
226− {-# INLINABLE liftJSM' #-}
227− liftJSM' = lift . liftJSM'
174+instance MonadJSM m => MonadJSM (ImmediateDomBuilderT t m) where
175+ liftJSM' = ImmediateDomBuilderT . liftJSM'
228176#endif
229177
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 ()))
244− }
178+data ImmediateDomBuilderEnv t
179+ = ImmediateDomBuilderEnv { _immediateDomBuilderEnv_document :: {-# UNPACK #-} !Document
180+ , _immediateDomBuilderEnv_parent :: {-# UNPACK #-} !Node
181+ , _immediateDomBuilderEnv_unreadyChildren :: {-# UNPACK #-} !(IORef Word) -- Number of children who still aren't fully rendered
182+ , _immediateDomBuilderEnv_commitAction :: !(JSM ()) -- Action to take when all children are ready --TODO: we should probably get rid of this once we invoke it
183+ }
245184
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 }
185+newtype ImmediateDomBuilderT t m a = ImmediateDomBuilderT { unImmediateDomBuilderT :: ReaderT (ImmediateDomBuilderEnv t) (RequesterT t JSM Identity (TriggerEventT t m)) a }
252186 deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
253187#if MIN_VERSION_base(4,9,1)
254188 , MonadAsyncException
255189#endif
256190 )
257191
258−instance PrimMonad m => PrimMonad (HydrationDomBuilderT s t m) where
259− type PrimState (HydrationDomBuilderT s t m) = PrimState m
192+instance PrimMonad m => PrimMonad (ImmediateDomBuilderT x m) where
193+ type PrimState (ImmediateDomBuilderT x m) = PrimState m
260194 primitive = lift . primitive
261195
262−instance MonadTrans (HydrationDomBuilderT s t) where
263− lift = HydrationDomBuilderT . lift . lift
264−
265−instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationDomBuilderT s t m) where
266− withRenderHook hook = HydrationDomBuilderT . mapReaderT (withRenderHook hook) . unHydrationDomBuilderT
267− requestDomAction = HydrationDomBuilderT . lift . requestDomAction
268− requestDomAction_ = HydrationDomBuilderT . lift . requestDomAction_
269−
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
276−#endif
277− )
278−
279−data HydrationState = HydrationState
280− { _hydrationState_previousNode :: !(Maybe Node)
281− , _hydrationState_failed :: !Bool
282− }
283−
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' }
291− pure a
292−
293−{-# INLINABLE runHydrationRunnerT #-}
294−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 ())
298−
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
308− pure a
309−
310−
311−
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
317−
318−instance MonadTrans (HydrationRunnerT t) where
319− {-# INLINABLE lift #-}
320− lift = HydrationRunnerT . lift . lift . lift
321−
322−instance MonadSample t m => MonadSample t (HydrationRunnerT t m) where
323− {-# INLINABLE sample #-}
324− sample = lift . sample
325−
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_
330−
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
339− s <- lift setup
340− addHydrationStep (f s)
341−
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)
348−
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
354−#endif
355− )
356−
357−{-# INLINABLE runDomRenderHookT #-}
358−runDomRenderHookT
359− :: (MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m), MonadRef m, Ref m ~ IORef)
360− => DomRenderHookT t m a
361− -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
362− -> m a
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
368− return result
369− where
370− runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
371− v <- synchronously x
372− void . liftIO $ f v
373−
374−instance MonadTrans (DomRenderHookT t) where
375− {-# INLINABLE lift #-}
376− lift = DomRenderHookT . lift . lift
377−
378−instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where
379− withRenderHook hook (DomRenderHookT a) = do
380− DomRenderHookT $ withRequesting $ \rsp -> do
381− (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
382− return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
383− requestDomAction = DomRenderHookT . requestingIdentity
384− requestDomAction_ = DomRenderHookT . requesting_
385−
386−{-# INLINABLE runHydrationDomBuilderT #-}
387−runHydrationDomBuilderT
196+instance MonadTrans (ImmediateDomBuilderT t) where
197+ lift = ImmediateDomBuilderT . lift . lift . lift
198+
199+instance (Reflex t, PrimMonad m) => DomRenderHook t (ImmediateDomBuilderT t m) where
200+ {-
201+ withRenderHook hook (ImmediateDomBuilderT a) = do
202+ e <- ImmediateDomBuilderT ask
203+ ImmediateDomBuilderT $ lift $ withRequesting $ \rsp -> do
204+ (x, req) <- lift $ runRequesterT (runReaderT a e) $ runIdentity <$> rsp
205+ return (ffor req $ \rm -> hook $ traverseRequesterData (\r -> Identity <$> r) rm, x)
206+-}
207+ requestDomAction = ImmediateDomBuilderT . lift . requestingIdentity
208+ requestDomAction_ = ImmediateDomBuilderT . lift . requesting_
209+
210+{-# INLINABLE runImmediateDomBuilderT #-}
211+runImmediateDomBuilderT
388212 :: ( MonadFix m
389213 , PerformEvent t m
390214 , MonadReflexCreateTrigger t m
@@ -393,76 +217,75 @@ runHydrationDomBuilderT
393217 , MonadRef m
394218 , Ref m ~ IORef
395219 )
396− => HydrationDomBuilderT s t m a
397− -> HydrationDomBuilderEnv t m
220+ => ImmediateDomBuilderT t m a
221+ -> ImmediateDomBuilderEnv t
398222 -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
399223 -> m a
400−runHydrationDomBuilderT (HydrationDomBuilderT a) env = runDomRenderHookT (runReaderT a env)
401−
402−instance (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, Monad m) => HasDocument (HydrationDomBuilderT s t m) where
224+runImmediateDomBuilderT (ImmediateDomBuilderT a) env eventChan = do
225+ handlersMVar <- liftIO $ newMVar []
226+ flip runTriggerEventT eventChan $ do
227+ win <- DOM.currentWindowUnchecked
228+ rec (x, req) <- runRequesterT (runReaderT a env) rsp
229+ rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame handlersMVar win f $
230+ traverseRequesterData (\r -> Identity <$> r) rm
231+ return x
232+ where
233+ runInAnimationFrame handlersMVar win f x = do
234+ handlers <- liftIO $ takeMVar handlersMVar
235+ when (null handlers) $ do
236+ rec cb <- newRequestAnimationFrameCallbackSync $ \_ -> do
237+ freeRequestAnimationFrameCallback cb
238+ handlersToRun <- liftIO $ takeMVar handlersMVar
239+ liftIO $ putMVar handlersMVar []
240+ sequence_ (reverse handlersToRun)
241+ void $ Window.requestAnimationFrame win cb
242+ liftIO $ putMVar handlersMVar ((do
243+ v <- synchronously x
244+ void . liftIO $ f v) : handlers)
245+
246+class Monad m => HasDocument m where
247+ askDocument :: m Document
248+ default askDocument :: (m ~ f m', MonadTrans f, Monad m', HasDocument m') => f m' Document
249+ askDocument = lift askDocument
250+
251+instance HasDocument m => HasDocument (ReaderT r m)
252+instance HasDocument m => HasDocument (StateT s m)
253+instance HasDocument m => HasDocument (Lazy.StateT s m)
254+instance HasDocument m => HasDocument (EventWriterT t w m)
255+instance HasDocument m => HasDocument (DynamicWriterT t w m)
256+instance HasDocument m => HasDocument (PostBuildT t m)
257+instance HasDocument m => HasDocument (RequesterT t request response m)
258+instance HasDocument m => HasDocument (QueryT t q m)
259+
260+instance Monad m => HasDocument (ImmediateDomBuilderT t m) where
403261 {-# INLINABLE askDocument #-}
404− askDocument = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_document
262+ askDocument = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_document
405263
406264{-# INLINABLE askParent #-}
407−askParent :: Monad m => HydrationRunnerT t m DOM.Node
408−askParent = HydrationRunnerT ask
409−
410−{-# INLINABLE getParent #-}
411−getParent :: MonadIO m => HydrationDomBuilderT s t m DOM.Node
412−getParent = either pure (liftIO . readIORef) =<< HydrationDomBuilderT (asks _hydrationDomBuilderEnv_parent)
265+askParent :: Monad m => ImmediateDomBuilderT t m Node
266+askParent = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_parent
413267
414268{-# INLINABLE askEvents #-}
415−askEvents :: Monad m => HydrationDomBuilderT s t m (Chan [DSum (EventTriggerRef t) TriggerInvocation])
416−askEvents = HydrationDomBuilderT . lift . DomRenderHookT . lift $ TriggerEventT.askEvents
269+askEvents :: Monad m => ImmediateDomBuilderT t m (Chan [DSum (EventTriggerRef t) TriggerInvocation])
270+askEvents = ImmediateDomBuilderT . lift . lift $ TriggerEventT.askEvents
417271
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
272+localEnv :: Monad m => (ImmediateDomBuilderEnv t -> ImmediateDomBuilderEnv t) -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m a
273+localEnv f = ImmediateDomBuilderT . local f . unImmediateDomBuilderT
421274
422275{-# INLINABLE append #-}
423−append :: MonadJSM m => DOM.Node -> HydrationDomBuilderT s t m ()
276+append :: (IsNode n, MonadJSM m) => n -> ImmediateDomBuilderT t m ()
424277append n = do
425− p <- getParent
278+ p <- askParent
426279 liftJSM $ appendChild_ p n
427280 return ()
428281
429−{-# SPECIALIZE append
430− :: DOM.Node
431− -> HydrationDomBuilderT s Spider HydrationM ()
432− #-}
433−
434−data HydrationMode
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)
440−
441−{-# INLINABLE getPreviousNode #-}
442−getPreviousNode :: Monad m => HydrationRunnerT t m (Maybe DOM.Node)
443−getPreviousNode = HydrationRunnerT $ gets _hydrationState_previousNode
444−
445−{-# INLINABLE setPreviousNode #-}
446−setPreviousNode :: Monad m => Maybe DOM.Node -> HydrationRunnerT t m ()
447−setPreviousNode n = HydrationRunnerT $ modify' (\hs -> hs { _hydrationState_previousNode = n })
448−
449−{-# INLINABLE askUnreadyChildren #-}
450−askUnreadyChildren :: Monad m => HydrationDomBuilderT s t m (IORef Word)
451−askUnreadyChildren = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
452−
453−{-# INLINABLE askCommitAction #-}
454−askCommitAction :: Monad m => HydrationDomBuilderT s t m (JSM ())
455−askCommitAction = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_commitAction
456−
457−{-# INLINABLE getHydrationMode #-}
458−getHydrationMode :: MonadIO m => HydrationDomBuilderT s t m HydrationMode
459−getHydrationMode = liftIO . readIORef =<< HydrationDomBuilderT (asks _hydrationDomBuilderEnv_hydrationMode)
460−
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)
465− void $ call f f [n]
282+{-# INLINABLE textNodeInternal #-}
283+textNodeInternal :: (MonadJSM m, ToDOMString contents) => contents -> ImmediateDomBuilderT t m DOM.Text
284+textNodeInternal !t = do
285+ doc <- askDocument
286+ n <- liftJSM $ createTextNode doc t
287+ append n
288+ return n
466289
467290-- | s and e must both be children of the same node and s must precede e;
468291-- all nodes between s and e will be removed, but s and e will not be removed
@@ -476,7 +299,16 @@ deleteBetweenExclusive s e = liftJSM $ do
476299-- and e will not be moved
477300extractBetweenExclusive :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
478301extractBetweenExclusive df s e = liftJSM $ do
479− f <- eval ("(function(df,s,e) { var x; for(;;) { x = s['nextSibling']; if(e===x) { break; }; df['appendChild'](x); } })" :: Text)
302+ f <- eval $ T.unlines
303+ [ "(function(df,s,e){"
304+ , " var x;"
305+ , " for(;;){"
306+ , " x = s.nextSibling;"
307+ , " if(e===x) break;"
308+ , " df.appendChild(x);"
309+ , " }"
310+ , "})"
311+ ]
480312 void $ call f f (df, s, e)
481313
482314-- | s and e must both be children of the same node and s must precede e;
@@ -488,19 +320,22 @@ deleteUpTo s e = do
488320 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
489321
490322extractUpTo :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
491−#ifdef ghcjs_HOST_OS
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)
497−#else
498323extractUpTo df s e = liftJSM $ do
499− f <- eval ("(function(df,s,e){ var x = s; var y; for(;;) { y = x['nextSibling']; df['appendChild'](x); if(e===y) { break; } x = y; } })" :: Text)
324+ f <- eval $ T.unlines
325+ [ "(function(df,s,e){"
326+ , " var x = s;"
327+ , " var y;"
328+ , " for(;;) {"
329+ , " y = x.nextSibling;"
330+ , " df.appendChild(x);"
331+ , " if(e===y) break;"
332+ , " x = y;"
333+ , " }"
334+ , "})"
335+ ]
500336 void $ call f f (df, s, e)
501−#endif
502337
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))
338+type SupportsImmediateDomBuilder t m = (Reflex t, MonadJSM m, MonadHold t m, MonadFix m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref JSM, MonadAdjust t m, PrimMonad m)
504339
505340{-# INLINABLE collectUpTo #-}
506341collectUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m DOM.DocumentFragment
@@ -518,15 +353,10 @@ collectUpToGivenParent currentParent s e = do
518353
519354newtype EventFilterTriggerRef t er (en :: EventTag) = EventFilterTriggerRef (IORef (Maybe (EventTrigger t (er en))))
520355
521−-- | This 'wrap' is only partial: it doesn't create the 'EventSelector' itself
522−{-# INLINE wrap #-}
523−wrap
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]
526− -> DOM.Element
527− -> RawElementConfig er t s
528− -> m (DMap EventName (EventFilterTriggerRef t er))
529−wrap events e cfg = do
356+{-# INLINABLE wrap #-}
357+wrap :: forall m er t. SupportsImmediateDomBuilder t m => RawElement GhcjsDomSpace -> RawElementConfig er t GhcjsDomSpace -> ImmediateDomBuilderT t m (Element er GhcjsDomSpace t)
358+wrap e cfg = do
359+ events <- askEvents
530360 forM_ (_rawElementConfig_modifyAttributes cfg) $ \modifyAttrs -> requestDomAction_ $ ffor modifyAttrs $ imapM_ $ \(AttributeName mAttrNamespace n) mv -> case mAttrNamespace of
531361 Nothing -> maybe (removeAttribute e n) (setAttribute e n) mv
532362 Just ns -> maybe (removeAttributeNS e (Just ns) n) (setAttributeNS e (Just ns) n) mv
@@ -543,74 +373,46 @@ wrap events e cfg = do
543373 mv <- liftJSM k --TODO: Only do this when the event is subscribed
544374 liftIO $ forM_ mv $ \v -> writeChan events [EventTriggerRef triggerRef :=> TriggerInvocation v (return ())]
545375 return $ en :=> EventFilterTriggerRef triggerRef
546− return eventTriggerRefs
547−
548−{-# SPECIALIZE wrap
549− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
550− -> DOM.Element
551− -> RawElementConfig er DomTimeline HydrationDomSpace
552− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
553− #-}
554−
555−{-# SPECIALIZE wrap
556− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
557− -> DOM.Element
558− -> RawElementConfig er DomTimeline GhcjsDomSpace
559− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
560− #-}
561−
562−{-# INLINE triggerBody #-}
563−triggerBody
564− :: forall s er t x. EventSpec s ~ GhcjsEventSpec
565− => DOM.JSContextRef
566− -> RawElementConfig er t s
567− -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
568− -> DMap EventName (EventFilterTriggerRef t er)
569− -> DOM.Element
570− -> WrapArg er EventName x
571− -> EventTrigger t x
572− -> IO (IO ())
573−triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup en eventTriggerRefs of
574− Just (EventFilterTriggerRef r) -> do
575− writeIORef r $ Just t
576− return $ do
577− writeIORef r Nothing
578− Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
579− evt <- DOM.event
580− mv <- lift $ unGhcjsEventHandler handler (en, GhcjsDomEvent evt)
581− case mv of
582− Nothing -> return ()
583− Just v -> liftIO $ do
584− --TODO: I don't think this is quite right: if a new trigger is created between when this is enqueued and when it fires, this may not work quite right
585− ref <- newIORef $ Just t
586− writeChan events [EventTriggerRef ref :=> TriggerInvocation v (return ())])
587− where
588− -- Note: this needs to be done strictly and outside of the newFanEventWithTrigger, so that the newFanEventWithTrigger doesn't
589− -- retain the entire cfg, which can cause a cyclic dependency that the GC won't be able to clean up
590− handler :: GhcjsEventHandler er
591− !handler = _ghcjsEventSpec_handler $ _rawElementConfig_eventSpec cfg
592−
593−{-# SPECIALIZE triggerBody
594− :: DOM.JSContextRef
595− -> RawElementConfig er DomTimeline HydrationDomSpace
596− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
597− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
598− -> DOM.Element
599− -> WrapArg er EventName x
600− -> EventTrigger DomTimeline x
601− -> IO (IO ())
602− #-}
603−
604−{-# SPECIALIZE triggerBody
605− :: DOM.JSContextRef
606− -> RawElementConfig er DomTimeline GhcjsDomSpace
607− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
608− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
609− -> DOM.Element
610− -> WrapArg er EventName x
611− -> EventTrigger DomTimeline x
612− -> IO (IO ())
613− #-}
376+ es <- do
377+ let h :: GhcjsEventHandler er
378+ !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
379+ ctx <- askJSM
380+ newFanEventWithTrigger $ \(WrapArg en) t ->
381+ case DMap.lookup en eventTriggerRefs of
382+ Just (EventFilterTriggerRef r) -> do
383+ writeIORef r $ Just t
384+ return $ do
385+ writeIORef r Nothing
386+ Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
387+ evt <- DOM.event
388+ mv <- lift $ unGhcjsEventHandler h (en, GhcjsDomEvent evt)
389+ case mv of
390+ Nothing -> return ()
391+ Just v -> liftIO $ do
392+ --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
393+ ref <- newIORef $ Just t
394+ writeChan events [EventTriggerRef ref :=> TriggerInvocation v (return ())])
395+ return $ Element
396+ { _element_events = es
397+ , _element_raw = e
398+ }
399+
400+{-# INLINABLE makeElement #-}
401+makeElement :: forall er t m a. (Reflex t, MonadJSM m, MonadHold t m, MonadFix m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref JSM, MonadAdjust t m, PrimMonad m) => Text -> ElementConfig er t GhcjsDomSpace -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m ((Element er GhcjsDomSpace t, a), DOM.Element)
402+makeElement elementTag cfg child = do
403+ doc <- askDocument
404+ e <- liftJSM $ uncheckedCastTo DOM.Element <$> case cfg ^. namespace of
405+ Nothing -> createElement doc elementTag
406+ Just ens -> createElementNS doc (Just ens) elementTag
407+ ImmediateDomBuilderT $ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
408+ Nothing -> lift $ setAttribute e n v
409+ Just ans -> lift $ setAttributeNS e (Just ans) n v
410+ result <- flip localEnv child $ \env -> env
411+ { _immediateDomBuilderEnv_parent = toNode e
412+ }
413+ append e
414+ wrapped <- wrap e $ extractRawElementConfig cfg
415+ return ((wrapped, result), e)
614416
615417newtype GhcjsDomHandler a b = GhcjsDomHandler { unGhcjsDomHandler :: a -> JSM b }
616418
@@ -622,10 +424,9 @@ data GhcjsDomSpace
622424
623425instance DomSpace GhcjsDomSpace where
624426 type EventSpec GhcjsDomSpace = GhcjsEventSpec
625− type RawDocument GhcjsDomSpace = DOM.Document
626427 type RawTextNode GhcjsDomSpace = DOM.Text
627− type RawCommentNode GhcjsDomSpace = DOM.Comment
628428 type RawElement GhcjsDomSpace = DOM.Element
429+ type RawFile GhcjsDomSpace = DOM.File
629430 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
630431 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
631432 type RawSelectElement GhcjsDomSpace = DOM.HTMLSelectElement
@@ -657,11 +458,15 @@ data GhcjsEventSpec er = GhcjsEventSpec
657458newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
658459
659460#ifndef USE_TEMPLATE_HASKELL
461+phantom2 :: (Functor f, Contravariant f) => f a -> f b
462+phantom2 = phantom
463+{-# INLINE phantom2 #-}
464+
660465ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
661466ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
662467{-# INLINE ghcjsEventSpec_filters #-}
663468ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
664−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
469+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
665470{-# INLINE ghcjsEventSpec_handler #-}
666471#endif
667472
@@ -674,795 +479,136 @@ instance er ~ EventResult => Default (GhcjsEventSpec er) where
674479 runReaderT (defaultDomEventHandler e en) evt
675480 }
676481
677−{-# INLINE makeElement #-}
678−makeElement :: MonadJSM m => Document -> Text -> ElementConfig er t s -> m DOM.Element
679−makeElement doc elementTag cfg = do
680− e <- uncheckedCastTo DOM.Element <$> case cfg ^. namespace of
681− Nothing -> createElement doc elementTag
682− Just ens -> createElementNS doc (Just ens) elementTag
683− iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
684− Nothing -> setAttribute e n v
685− Just ans -> setAttributeNS e (Just ans) n v
686− pure e
687−
688−{-# INLINE elementImmediate #-}
689−elementImmediate
690− :: ( RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, EventSpec s ~ GhcjsEventSpec
691− , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m )
692− => Text
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
697− doc <- askDocument
698− ctx <- askJSM
699− events <- askEvents
700− parent <- getParent
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)
709−
710−{-# SPECIALIZE elementImmediate
711− :: Text
712− -> ElementConfig er DomTimeline HydrationDomSpace
713− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
714− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
715− #-}
716−
717−{-# SPECIALIZE elementImmediate
718− :: Text
719− -> ElementConfig er DomTimeline GhcjsDomSpace
720− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM a
721− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
722− #-}
723−
724−-- For specialisation
725−
726−-- | The Reflex timeline for interacting with the DOM
727−type DomTimeline =
728−#ifdef PROFILE_REFLEX
729− ProfiledTimeline
730−#endif
731− Spider
732−
733−-- | The ReflexHost the DOM lives in
734−type DomHost =
735−#ifdef PROFILE_REFLEX
736− ProfiledM
737−#endif
738− (SpiderHost Global)
739−
740−type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (PerformEventT DomTimeline DomHost))
741−type HydrationM = DomCoreWidget ()
742−
743−{-# INLINE elementInternal #-}
744−elementInternal
745− :: (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
746− => Text
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
755−
756−{-# SPECIALIZE elementInternal
757− :: Text
758− -> ElementConfig er DomTimeline HydrationDomSpace
759− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
760− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
761− #-}
762−
763−-- | An attribute which causes hydration to skip over an element completely.
764−skipHydrationAttribute :: IsString s => s
765−skipHydrationAttribute = "data-hydration-skip"
766−
767−-- | An attribute which signals that an element should be hydrated.
768−hydratableAttribute :: IsString s => s
769−hydratableAttribute = "data-ssr"
770−
771−{-# INLINE hydrateElement #-}
772−hydrateElement
773− :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
774− => Text
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
779− ctx <- askJSM
780− events <- askEvents
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 ()
786− let env' = env
787− { _hydrationDomBuilderEnv_parent = Right parentRef
788− , _hydrationDomBuilderEnv_delayed = childDelayedRef
789− }
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
793− -- two reasons:
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
797− shouldSkip e = do
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
803− doc <- askDocument
804− addHydrationStep $ do
805− parent <- askParent
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
812− pure 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
817− False -> do
818− t <- Element.getTagName e
819− -- TODO: check attributes?
820− if T.toCaseFold elementTag == T.toCaseFold t
821− then pure e
822− -- we came to some other statically rendered element, so something has gone wrong
823− else do
824− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
825− n <- makeElement doc elementTag cfg
826− insertAfterPreviousNode n
827− pure 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
843− bracketOnError
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)
849− id
850− -- Try to put this action into the cleanup MVar
851− (putMVar cleanup)
852− pure $ do
853− tryReadMVar cleanup >>= \case
854− Nothing -> killThread threadId
855− Just c -> c
856− return ((Element es (), result), e')
857−
858−{-# SPECIALIZE hydrateElement
859− :: Text
860− -> ElementConfig er DomTimeline HydrationDomSpace
861− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
862− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM ((Element er HydrationDomSpace DomTimeline, a), IORef DOM.Element)
863− #-}
864−
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
885− , valueChangedByUI
886− ]
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
897− else Nothing
898− c <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
899− [ fmapMaybe id checkedChangedBySetChecked
900− , checkedChangedByUI
901− ]
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
917− }
918−
919−{-# INLINE inputElementInternal #-}
920−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 = ()
928− }
929− HydrationMode_Hydrating -> do
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
937− doc <- askDocument
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)
944− pure (v, c)
945− addHydrationStepWithSetup valuesAtSwitchover $ \(switchoverValue', switchoverChecked') -> do
946− switchoverValue <- sample switchoverValue'
947− switchoverChecked <- sample switchoverChecked'
948− domElement <- liftIO $ readIORef domElementRef
482+instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t m) where
483+ type DomBuilderSpace (ImmediateDomBuilderT t m) = GhcjsDomSpace
484+ {-# INLINABLE textNode #-}
485+ textNode (TextNodeConfig initialContents mSetContents) = do
486+ n <- textNodeInternal initialContents
487+ mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
488+ return $ TextNode n
489+ {-# INLINABLE element #-}
490+ element elementTag cfg child = fst <$> makeElement elementTag cfg child
491+ {-# INLINABLE inputElement #-}
492+ inputElement cfg = do
493+ ((e, _), domElement) <- makeElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
949494 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
950− getValue = Input.getValue domInputElement
951− -- When the value has been updated by setValue before switchover, we must
952− -- send an update here to remain in sync. This is because the later
953− -- requestDomAction based on the setValue event will not capture events
954− -- happening before postBuild, because this code runs after switchover.
955− when (v0 /= switchoverValue) $ liftIO $ triggerChangeBySetValue switchoverValue
956− -- The user could have altered the value before switchover. This must be
957− -- triggered after the setValue one in order for the events to be in the
958− -- correct order.
959− liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
960− -- Watch for user interaction and trigger event accordingly
961− requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
962− for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
963− requestDomAction_ $ ffor eSetValue $ \v' -> do
495+ Input.setValue domInputElement $ cfg ^. inputElementConfig_initialValue
496+ v0 <- Input.getValue domInputElement
497+ let getMyValue = Input.getValue domInputElement
498+ valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
499+ valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
500+ Nothing -> return never
501+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
964502 Input.setValue domInputElement v'
965− v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
966− liftIO $ triggerChangeBySetValue v
967− let focusChange' = leftmost
968− [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
969− , True <$ Reflex.select (_element_events e) (WrapArg Focus)
970− ]
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
977− -- switchover.
978− when (c0 /= switchoverChecked) $ liftIO $ triggerCheckedChangedBySetChecked switchoverChecked
979− -- The user could have clicked the checkbox before switchover, we only
980− -- detect cases where they flipped the state. This must be triggered after
981− -- the setValue one in order for the events to be in the correct order.
982− liftJSM (Input.getChecked domInputElement) >>= \realChecked -> when (realChecked /= switchoverChecked) $
983− liftIO $ triggerCheckedChangedByUI realChecked
984− _ <- liftJSM $ domInputElement `on` Events.click $ do
985− liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
986− for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
987− requestDomAction $ ffor eNewchecked $ \newChecked -> do
503+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
504+ v <- holdDyn v0 $ leftmost
505+ [ valueChangedBySetValue
506+ , valueChangedByUI
507+ ]
508+ Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
509+ checkedChangedByUI <- wrapDomEvent domInputElement (`on` Events.click) $ do
510+ Input.getChecked domInputElement
511+ checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
512+ Nothing -> return never
513+ Just eNewchecked -> requestDomAction $ ffor eNewchecked $ \newChecked -> do
988514 oldChecked <- Input.getChecked domInputElement
989515 Input.setChecked domInputElement newChecked
990− when (newChecked /= oldChecked) $ liftIO $ triggerCheckedChangedBySetChecked newChecked
991− _ <- liftJSM $ domInputElement `on` Events.change $ do
516+ return $ if newChecked /= oldChecked
517+ then Just newChecked
518+ else Nothing
519+ c <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
520+ [ fmapMaybe id checkedChangedBySetChecked
521+ , checkedChangedByUI
522+ ]
523+ let initialFocus = False --TODO: Is this correct?
524+ hasFocus <- holdDyn initialFocus $ leftmost
525+ [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
526+ , True <$ Reflex.select (_element_events e) (WrapArg Focus)
527+ ]
528+ files <- holdDyn mempty <=< wrapDomEvent domInputElement (`on` Events.change) $ do
992529 mfiles <- Input.getFiles domInputElement
993530 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
994− liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
995− return ()
996− checked' <- holdDyn c0 $ leftmost
997− [ checkedChangedBySetChecked
998− , checkedChangedByUI
999− ]
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
1005− , valueChangedByUI
1006− ]
1007− files <- holdDyn mempty fileChange
1008− return $ InputElement
1009− { _inputElement_value = v
1010− , _inputElement_checked = checked
1011− , _inputElement_checkedChange = checkedChangedByUI
1012− , _inputElement_input = valueChangedByUI
1013− , _inputElement_hasFocus = hasFocus
1014− , _inputElement_element = e
1015− , _inputElement_raw = ()
1016− , _inputElement_files = files
1017− }
1018−
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
1039− , valueChangedByUI
1040− ]
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
1048− }
1049−
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 = ()
1059− }
1060− HydrationMode_Hydrating -> do
1061− ((e, _), domElementRef) <- hydrateElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
1062− (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
1063− (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
1064− (focusChange, triggerFocusChange) <- newTriggerEvent
1065− doc <- askDocument
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
531+ maybe (return []) getMyFiles mfiles
532+ checked <- holdUniqDyn c
533+ return $ InputElement
534+ { _inputElement_value = v
535+ , _inputElement_checked = checked
536+ , _inputElement_checkedChange = checkedChangedByUI
537+ , _inputElement_input = valueChangedByUI
538+ , _inputElement_hasFocus = hasFocus
539+ , _inputElement_element = e
540+ , _inputElement_raw = domInputElement
541+ , _inputElement_files = files
542+ }
543+ {-# INLINABLE textAreaElement #-}
544+ textAreaElement cfg = do --TODO
545+ ((e, _), domElement) <- makeElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
1072546 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
1073− getValue = TextArea.getValue domTextAreaElement
1074− -- When the value has been updated by setValue before switchover, we must
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
1081− -- correct order.
1082− liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
1083− -- Watch for user interaction and trigger event accordingly
1084− requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
1085− for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
1086− requestDomAction_ $ ffor eSetValue $ \v' -> do
547+ TextArea.setValue domTextAreaElement $ cfg ^. textAreaElementConfig_initialValue
548+ v0 <- TextArea.getValue domTextAreaElement
549+ let getMyValue = TextArea.getValue domTextAreaElement
550+ valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
551+ valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
552+ Nothing -> return never
553+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1087554 TextArea.setValue domTextAreaElement v'
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)
1093− ]
1094− liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
1095− requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
1096− let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1097− hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1098− v <- holdDyn v0 $ leftmost
1099− [ valueChangedBySetValue
1100− , valueChangedByUI
1101− ]
1102− return $ TextAreaElement
1103− { _textAreaElement_value = v
1104− , _textAreaElement_input = valueChangedByUI
1105− , _textAreaElement_hasFocus = hasFocus
1106− , _textAreaElement_element = e
1107− , _textAreaElement_raw = ()
1108− }
1109−
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
1131− , valueChangedByUI
1132− ]
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
1140− }
1141− return (wrapped, result)
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 = ()
1154− }, result)
1155− HydrationMode_Hydrating -> do
1156− ((e, result), domElementRef) <- hydrateElement "select" (cfg ^. selectElementConfig_elementConfig) child
1157− (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
1158− (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
1159− (focusChange, triggerFocusChange) <- newTriggerEvent
1160− doc <- askDocument
1161− -- Expected initial value from config
1162− let v0 = _selectElementConfig_initialValue cfg
1163− addHydrationStep $ do
1164− domElement <- liftIO $ readIORef domElementRef
555+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
556+ v <- holdDyn v0 $ leftmost
557+ [ valueChangedBySetValue
558+ , valueChangedByUI
559+ ]
560+ hasFocus <- mkHasFocus e
561+ return $ TextAreaElement
562+ { _textAreaElement_value = v
563+ , _textAreaElement_input = valueChangedByUI
564+ , _textAreaElement_hasFocus = hasFocus
565+ , _textAreaElement_element = e
566+ , _textAreaElement_raw = domTextAreaElement
567+ }
568+ {-# INLINABLE selectElement #-}
569+ selectElement cfg child = do
570+ ((e, result), domElement) <- makeElement "select" (cfg ^. selectElementConfig_elementConfig) child
1165571 let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
1166− getValue = Select.getValue domSelectElement
1167− -- The browser might have messed with the value, or the user could have
1168− -- altered it before activation, so we set it if it isn't what we expect
1169− liftJSM getValue >>= \v0' -> do
1170− when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
1171− -- Watch for user interaction and trigger event accordingly
1172− requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Change)
1173− for_ (_selectElementConfig_setValue cfg) $ \eSetValue ->
1174− requestDomAction_ $ ffor eSetValue $ \v' -> do
572+ Select.setValue domSelectElement $ cfg ^. selectElementConfig_initialValue
573+ v0 <- Select.getValue domSelectElement
574+ let getMyValue = Select.getValue domSelectElement
575+ valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Change)
576+ valueChangedBySetValue <- case _selectElementConfig_setValue cfg of
577+ Nothing -> return never
578+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1175579 Select.setValue domSelectElement v'
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)
1181− ]
1182− liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
1183− requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
1184− let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1185− hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1186− v <- holdDyn v0 $ leftmost
1187− [ valueChangedBySetValue
1188− , valueChangedByUI
1189− ]
1190− return $ (,result) $ SelectElement
1191− { _selectElement_value = v
1192− , _selectElement_change = valueChangedByUI
1193− , _selectElement_hasFocus = hasFocus
1194− , _selectElement_element = e
1195− , _selectElement_raw = ()
1196− }
1197−
1198−{-# INLINE textNodeImmediate #-}
1199−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
1203− p <- getParent
1204− doc <- askDocument
1205− n <- createTextNode doc t
1206− appendChild_ p n
1207− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1208− pure n
1209−
1210−{-# SPECIALIZE textNodeImmediate
1211− :: TextNodeConfig DomTimeline
1212− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM DOM.Text
1213− #-}
1214−
1215−{-# SPECIALIZE textNodeImmediate
1216− :: TextNodeConfig DomTimeline
1217− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM DOM.Text
1218− #-}
1219−
1220−{-# INLINE textNodeInternal #-}
1221−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
1225− doc <- askDocument
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
1231− pure $ TextNode ()
1232−
1233−{-# SPECIALIZE textNodeInternal
1234− :: TextNodeConfig DomTimeline
1235− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (TextNode HydrationDomSpace DomTimeline)
1236− #-}
1237−
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
1247− pure tn
1248−hydrateTextNode doc t = do
1249− n <- join $ go <$> askParent <*> getPreviousNode
1250− setPreviousNode $ Just $ toNode n
1251− return n
1252− where
1253− go parent mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1254− Nothing -> do
1255− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1256− n <- createTextNode doc t
1257− insertAfterPreviousNode n
1258− pure 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
1265− Just _ -> do
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
1270− Nothing -> do
1271− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1272− n <- createTextNode doc t
1273− insertAfterPreviousNode n
1274− pure n
1275−
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
1281− p <- getParent
1282− doc <- askDocument
1283− n <- createComment doc t
1284− appendChild_ p n
1285− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1286− pure n
1287−
1288−{-# INLINE commentNodeInternal #-}
1289−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
1293− doc <- askDocument
1294− getHydrationMode >>= \case
1295− HydrationMode_Immediate -> void $ commentNodeInternal tc
1296− HydrationMode_Hydrating -> addHydrationStepWithSetup (maybe (pure $ pure t0) (hold t0) mSetContents) $ \bt -> do
1297− t <- sample bt
1298− void $ hydrateComment doc t mSetContents
1299− pure $ CommentNode ()
1300−
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
1306− Nothing -> do
1307− c <- createComment doc t
1308− insertAfterPreviousNode c
1309− pure c
1310− Just node -> DOM.castTo DOM.Comment node >>= \case
1311− Nothing -> go (Just node)
1312− Just c -> do
1313− t' <- Node.getTextContentUnchecked c
1314− if t == t'
1315− then pure c
1316− else do
1317− c' <- createComment doc t
1318− insertAfterPreviousNode c'
1319− pure c'
1320− n <- go =<< getPreviousNode
1321− setPreviousNode $ Just $ toNode n
1322− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1323− pure n
1324−
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)
1330− => Text
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
1338− append $ toNode t
1339− textNodeRef <- liftIO $ newIORef t
1340− keyRef <- liftIO $ newIORef Nothing
1341− pure (pure (), textNodeRef, keyRef)
1342− HydrationMode_Hydrating -> do
1343− doc <- askDocument
1344− textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
1345− keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1346− let
1347− go Nothing _ = do
1348− tn <- createTextNode doc ("" :: Text)
1349− insertAfterPreviousNode tn
1350− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1351− pure (tn, Nothing)
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
1357− Just comment -> do
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.
1360− Just key -> do
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)
1365− Nothing -> do
1366− go (Just key0) (Just node)
1367− Nothing -> do
1368− go (Just key0) (Just node)
1369− switchComment = do
1370− key0 <- liftIO $ readIORef key0Ref
1371− (tn, key) <- go key0 =<< getPreviousNode
1372− setPreviousNode $ Just $ toNode tn
1373− liftIO $ do
1374− writeIORef textNodeRef tn
1375− writeIORef keyRef key
1376− pure (switchComment, textNodeRef, keyRef)
1377−
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.
1381−
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
1385−
1386−instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
580+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
581+ v <- holdDyn v0 $ leftmost
582+ [ valueChangedBySetValue
583+ , valueChangedByUI
584+ ]
585+ hasFocus <- mkHasFocus e
586+ let wrapped = SelectElement
587+ { _selectElement_value = v
588+ , _selectElement_change = valueChangedByUI
589+ , _selectElement_hasFocus = hasFocus
590+ , _selectElement_element = e
591+ , _selectElement_raw = domSelectElement
592+ }
593+ return (wrapped, result)
594+ placeRawElement = append
595+ wrapRawElement = wrap
1387596 notReadyUntil e = do
1388597 eOnce <- headE e
1389− unreadyChildren <- askUnreadyChildren
1390− commitAction <- askCommitAction
598+ env <- ImmediateDomBuilderT ask
599+ let unreadyChildren = _immediateDomBuilderEnv_unreadyChildren env
1391600 liftIO $ modifyIORef' unreadyChildren succ
1392601 let ready = do
1393602 old <- liftIO $ readIORef unreadyChildren
1394603 let new = pred old
1395604 liftIO $ writeIORef unreadyChildren $! new
1396− when (new == 0) commitAction
605+ when (new == 0) $ _immediateDomBuilderEnv_commitAction env
1397606 requestDomAction_ $ ready <$ eOnce
1398607 notReady = do
1399− unreadyChildren <- askUnreadyChildren
608+ env <- ImmediateDomBuilderT ask
609+ let unreadyChildren = _immediateDomBuilderEnv_unreadyChildren env
1400610 liftIO $ modifyIORef' unreadyChildren succ
1401611
1402−data HydrationDomSpace
1403−
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
1425− }
1426−
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) ()
1443−
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
1461− ctx <- askJSM
1462− eventTriggerRefs <- wrap events e rawCfg
1463− es <- newFanEventWithTrigger $ triggerBody ctx rawCfg events eventTriggerRefs e
1464− pure $ Element es e
1465−
1466612data FragmentState
1467613 = FragmentState_Unmounted
1468614 | FragmentState_Mounted (DOM.Text, DOM.Text)
@@ -1481,21 +627,21 @@ extractFragment fragment = do
1481627 extractBetweenExclusive (_immediateDomFragment_document fragment) before after
1482628 liftIO $ writeIORef (_immediateDomFragment_state fragment) FragmentState_Unmounted
1483629
1484−instance SupportsHydrationDomBuilder t m => MountableDomBuilder t (HydrationDomBuilderT GhcjsDomSpace t m) where
1485− type DomFragment (HydrationDomBuilderT GhcjsDomSpace t m) = ImmediateDomFragment
630+instance SupportsImmediateDomBuilder t m => MountableDomBuilder t (ImmediateDomBuilderT t m) where
631+ type DomFragment (ImmediateDomBuilderT t m) = ImmediateDomFragment
1486632 buildDomFragment w = do
1487633 df <- createDocumentFragment =<< askDocument
1488634 result <- flip localEnv w $ \env -> env
1489− { _hydrationDomBuilderEnv_parent = Left $ toNode df
635+ { _immediateDomBuilderEnv_parent = toNode df
1490636 }
1491637 state <- liftIO $ newIORef FragmentState_Unmounted
1492638 return (ImmediateDomFragment df state, result)
1493639 mountDomFragment fragment setFragment = do
1494− parent <- getParent
640+ parent <- askParent
1495641 extractFragment fragment
1496− before <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
642+ before <- textNodeInternal ("" :: Text)
1497643 appendChild_ parent $ _immediateDomFragment_document fragment
1498− after <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
644+ after <- textNodeInternal ("" :: Text)
1499645 xs <- foldDyn (\new (previous, _) -> (new, Just previous)) (fragment, Nothing) setFragment
1500646 requestDomAction_ $ ffor (updated xs) $ \(childFragment, Just previousFragment) -> do
1501647 extractFragment previousFragment
@@ -1504,19 +650,12 @@ instance SupportsHydrationDomBuilder t m => MountableDomBuilder t (HydrationDomB
1504650 liftIO $ writeIORef (_immediateDomFragment_state childFragment) $ FragmentState_Mounted (before, after)
1505651 liftIO $ writeIORef (_immediateDomFragment_state fragment) $ FragmentState_Mounted (before, after)
1506652
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
1512−
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
653+instance (Reflex t, MonadAdjust t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m) => MonadAdjust t (ImmediateDomBuilderT t m) where
1514654 {-# INLINABLE runWithReplace #-}
1515655 runWithReplace a0 a' = do
1516− initialEnv <- HydrationDomBuilderT ask
1517− let hydrating = _hydrationDomBuilderEnv_hydrationMode initialEnv
1518− (hydrateStart, before, beforeKey) <- skipToReplaceStart
1519− let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
656+ initialEnv <- ImmediateDomBuilderT ask
657+ before <- textNodeInternal ("" :: Text)
658+ let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
1520659 haveEverBeenReady <- liftIO $ newIORef False
1521660 currentCohort <- liftIO $ newIORef (-1 :: Int) -- Equal to the cohort currently in the DOM
1522661 let myCommitAction = do
@@ -1527,117 +666,79 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1527666 old <- liftIO $ readIORef parentUnreadyChildren
1528667 let new = pred old
1529668 liftIO $ writeIORef parentUnreadyChildren $! new
1530− when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
669+ when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
1531670 -- We draw 'after' in this roundabout way to avoid using MonadFix
1532671 doc <- askDocument
1533− parent <- getParent
1534− (hydrateEnd, after) <- skipToReplaceEnd beforeKey
672+ after <- createTextNode doc ("" :: Text)
1535673 let drawInitialChild = do
1536− h <- liftIO $ readIORef hydrating
1537− p' <- case h of
1538− HydrationMode_Hydrating -> pure parent
1539− HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
1540674 unreadyChildren <- liftIO $ newIORef 0
1541− let a0' = case h of
1542− HydrationMode_Hydrating -> a0
1543− HydrationMode_Immediate -> do
1544− a <- a0
1545− insertBefore p' =<< liftIO (readIORef after)
1546− pure a
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
675+ let f = do
676+ result <- a0
677+ append after
678+ return result
679+ result <- runReaderT (unImmediateDomBuilderT f) $ initialEnv
680+ { _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
681+ , _immediateDomBuilderEnv_commitAction = myCommitAction
1555682 }
1556− dom <- case h of
1557− HydrationMode_Hydrating -> liftIO $ readIORef delayed
1558− HydrationMode_Immediate -> pure $ pure ()
1559683 liftIO $ readIORef unreadyChildren >>= \case
1560684 0 -> writeIORef haveEverBeenReady True
1561685 _ -> modifyIORef' parentUnreadyChildren succ
1562− return (dom, result)
686+ return result
1563687 a'' <- numberOccurrences a'
1564− ((hydrate0, result0), child') <- HydrationDomBuilderT $ lift $ runWithReplace drawInitialChild $ ffor a'' $ \(cohortId, child) -> do
1565− h <- liftIO $ readIORef hydrating
1566− p' <- case h of
1567− HydrationMode_Hydrating -> pure parent
1568− HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
688+ (result0, child') <- ImmediateDomBuilderT $ lift $ runWithReplace drawInitialChild $ ffor a'' $ \(cohortId, child) -> do
689+ df <- createDocumentFragment doc
1569690 unreadyChildren <- liftIO $ newIORef 0
1570691 let commitAction = do
1571692 c <- liftIO $ readIORef currentCohort
1572693 when (c <= cohortId) $ do -- If a newer cohort has already been committed, just ignore this
1573− !before' <- liftIO $ readIORef before
1574− !after' <- liftIO $ readIORef after
1575− deleteBetweenExclusive before' after'
1576− insertBefore p' after'
694+ deleteBetweenExclusive before after
695+ insertBefore df after
1577696 liftIO $ writeIORef currentCohort cohortId
1578697 myCommitAction
1579− delayed <- case h of
1580− HydrationMode_Hydrating -> liftIO $ newIORef $ pure ()
1581− HydrationMode_Immediate -> pure $ _hydrationDomBuilderEnv_delayed initialEnv
1582− result <- runReaderT (unHydrationDomBuilderT child) $ initialEnv
1583− { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
1584− , _hydrationDomBuilderEnv_commitAction = case h of
1585− HydrationMode_Hydrating -> myCommitAction
1586− HydrationMode_Immediate -> commitAction
1587− , _hydrationDomBuilderEnv_parent = Left p'
1588− , _hydrationDomBuilderEnv_delayed = delayed
1589− }
1590− dom <- case h of
1591− HydrationMode_Hydrating -> liftIO $ readIORef delayed
1592− HydrationMode_Immediate -> pure $ pure ()
698+ result <- runReaderT (unImmediateDomBuilderT child) $ initialEnv
699+ { _immediateDomBuilderEnv_parent = toNode df
700+ , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
701+ , _immediateDomBuilderEnv_commitAction = commitAction
702+ }
1593703 uc <- liftIO $ readIORef unreadyChildren
1594704 let commitActionToRunNow = if uc == 0
1595− then Just $ commitAction
705+ then Just commitAction
1596706 else Nothing -- A child will run it when unreadyChildren is decremented to 0
1597− actions = case h of
1598− HydrationMode_Hydrating -> Left dom
1599− HydrationMode_Immediate -> Right commitActionToRunNow
1600− return (actions, result)
1601− let (hydrate', commitAction) = fanEither $ fmap fst child'
1602− addHydrationStepWithSetup (hold hydrate0 hydrate') $ \contents -> do
1603− hydrateStart
1604− join $ sample contents
1605− hydrateEnd
1606− requestDomAction_ $ fmapMaybe id commitAction
707+ return (commitActionToRunNow, result)
708+ requestDomAction_ $ fmapMaybe fst child'
1607709 return (result0, snd <$> child')
1608−
1609710 {-# INLINABLE traverseIntMapWithKeyWithAdjust #-}
1610711 traverseIntMapWithKeyWithAdjust = traverseIntMapWithKeyWithAdjust'
1611712 {-# INLINABLE traverseDMapWithKeyWithAdjust #-}
1612713 traverseDMapWithKeyWithAdjust = traverseDMapWithKeyWithAdjust'
1613714 {-# INLINABLE traverseDMapWithKeyWithAdjustWithMove #-}
1614715 traverseDMapWithKeyWithAdjustWithMove = do
1615− let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) old = do
1616− let new :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> IO (PatchDMapWithMove.NodeInfo k (Constant (IORef (ChildReadyState (Some k)))) a)
716+ let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) old = do
717+ 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)
1617718 new k = PatchDMapWithMove.nodeInfoMapFromM $ \case
1618− PatchDMapWithMove.From_Insert (Compose (TraverseChild (Left _hydration) _)) -> return PatchDMapWithMove.From_Delete
1619− PatchDMapWithMove.From_Insert (Compose (TraverseChild (Right immediate) _)) -> do
1620− readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
719+ PatchDMapWithMove.From_Insert (Compose (_, _, sRef, _)) -> do
720+ readIORef sRef >>= \case
1621721 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
1622722 ChildReadyState_Unready _ -> do
1623− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1624− return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
723+ writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
724+ return $ PatchDMapWithMove.From_Insert $ Constant sRef
1625725 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
1626726 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
1627− deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
727+ deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState k))) (ComposeMaybe k) a -> IO (Constant () a)
1628728 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1629− writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
729+ writeIORef sRef $ ChildReadyState_Unready $ Some.This <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1630730 return $ Constant ()
1631731 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
1632732 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
1633733 return $ applyAlways p' old
1634− hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove updateChildUnreadiness $ \placeholders lastPlaceholder (p_ :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) -> do
734+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove updateChildUnreadiness $ \placeholders lastPlaceholderRef (p_ :: PatchDMapWithMove k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) -> do
1635735 let p = unPatchDMapWithMove p_
1636736 phsBefore <- liftIO $ readIORef placeholders
1637− let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
737+ lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
738+ 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)
1638739 collectIfMoved k e = do
1639− let mThisPlaceholder = Map.lookup (Some k) phsBefore -- Will be Nothing if this element wasn't present before
1640− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsBefore
740+ let mThisPlaceholder = Map.lookup (Some.This k) phsBefore -- Will be Nothing if this element wasn't present before
741+ nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsBefore
1641742 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
1642743 False -> do
1643744 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -1645,22 +746,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1645746 True -> do
1646747 Constant <$> mapM (`collectUpTo` nextPlaceholder) mThisPlaceholder
1647748 collected <- DMap.traverseWithKey collectIfMoved p
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
1657− let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
749+ let !phsAfter = fromMaybe phsBefore $ apply (weakenPatchDMapWithMoveWith (\(Compose (_, ph, _, _)) -> ph) p_) phsBefore --TODO: Don't recompute this
750+ let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> JSM (Constant () a)
1658751 placeFragment k e = do
1659− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
752+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsAfter
1660753 case PatchDMapWithMove._nodeInfo_from e of
1661− PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
1662− Left _ -> pure ()
1663− Right immediate -> _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
754+ PatchDMapWithMove.From_Insert (Compose (df, _, _, _)) -> do
755+ df `insertBefore` nextPlaceholder
1664756 PatchDMapWithMove.From_Delete -> do
1665757 return ()
1666758 PatchDMapWithMove.From_Move fromKey -> do
@@ -1671,166 +763,104 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1671763 liftIO $ writeIORef placeholders $! phsAfter
1672764
1673765{-# 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))
1677− -> DMap k v
1678− -> Event t (PatchDMap k v)
1679− -> HydrationDomBuilderT s t m (DMap k v', Event t (PatchDMap k v'))
766+traverseDMapWithKeyWithAdjust' :: forall t m (k :: * -> *) v v'. (MonadAdjust t m, MonadHold t m, MonadFix m, MonadIO m, MonadJSM m, PrimMonad m, DMap.GCompare k) => (forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> ImmediateDomBuilderT t m (DMap k v', Event t (PatchDMap k v'))
1680767traverseDMapWithKeyWithAdjust' = 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)
768+ let updateChildUnreadiness (p :: PatchDMap k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) old = do
769+ let new :: forall a. k a -> ComposeMaybe (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState k))) a)
1683770 new k (ComposeMaybe m) = ComposeMaybe <$> case m of
1684771 Nothing -> return Nothing
1685− Just (Compose (TraverseChild (Left _hydration) _)) -> pure Nothing
1686− Just (Compose (TraverseChild (Right immediate) _)) -> do
1687− readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
772+ Just (Compose (_, _, sRef, _)) -> do
773+ readIORef sRef >>= \case
1688774 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1689775 ChildReadyState_Unready _ -> do
1690− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1691− return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
776+ writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
777+ return $ Just $ Constant sRef
1692778 delete _ (Constant sRef) = do
1693779 writeIORef sRef $ ChildReadyState_Unready Nothing
1694780 return $ Constant ()
1695781 p' <- fmap PatchDMap $ DMap.traverseWithKey new $ unPatchDMap p
1696782 _ <- DMap.traverseWithKey delete $ PatchDMap.getDeletions p old
1697783 return $ applyAlways p' old
1698− hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
784+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholderRef (PatchDMap p) -> do
1699785 phs <- liftIO $ readIORef placeholders
1700− forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1701− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
1702− -- Delete old node
1703− forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
1704− thisPlaceholder `deleteUpTo` nextPlaceholder
1705− -- Insert new node
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
786+ forM_ (DMap.toList p) $ \(k :=> ComposeMaybe mv) -> do
787+ lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
788+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phs
789+ forM_ (Map.lookup (Some.This k) phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
790+ forM_ mv $ \(Compose (df, _, _, _)) -> df `insertBefore` nextPlaceholder
791+ liftIO $ writeIORef placeholders $! fromMaybe phs $ apply (weakenPatchDMapWith (\(Compose (_, ph, _, _)) -> ph) $ PatchDMap p) phs
1718792
1719793{-# 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')
1723− -> IntMap v
1724− -> Event t (PatchIntMap v)
1725− -> HydrationDomBuilderT s t m (IntMap v', Event t (PatchIntMap v'))
794+traverseIntMapWithKeyWithAdjust' :: forall t m v v'. (MonadAdjust t m, MonadHold t m, MonadFix m, MonadIO m, MonadJSM m, PrimMonad m) => (IntMap.Key -> v -> ImmediateDomBuilderT t m v') -> IntMap v -> Event t (PatchIntMap v) -> ImmediateDomBuilderT t m (IntMap v', Event t (PatchIntMap v'))
1726795traverseIntMapWithKeyWithAdjust' = 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)))
796+ let updateChildUnreadiness (p@(PatchIntMap pInner) :: PatchIntMap (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')) old = do
797+ let new :: IntMap.Key -> Maybe (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v') -> IO (Maybe (IORef ChildReadyStateInt))
1729798 new k m = case m of
1730799 Nothing -> return Nothing
1731− Just (TraverseChild (Left _hydration) _) -> pure Nothing
1732− Just (TraverseChild (Right immediate) _) -> do
1733− let sRef = _traverseChildImmediate_childReadyState immediate
800+ Just (_, _, sRef, _) -> do
1734801 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
802+ ChildReadyStateInt_Ready -> return Nothing -- Delete this child, since it's ready
803+ ChildReadyStateInt_Unready _ -> do
804+ writeIORef sRef $ ChildReadyStateInt_Unready $ Just k
1738805 return $ Just sRef
1739806 delete _ sRef = do
1740− writeIORef sRef $ ChildReadyState_Unready Nothing
807+ writeIORef sRef $ ChildReadyStateInt_Unready Nothing
1741808 return ()
1742− p' <- PatchIntMap <$> IntMap.traverseWithKey new pInner
809+ p' <- fmap PatchIntMap $ IntMap.traverseWithKey new pInner
1743810 _ <- IntMap.traverseWithKey delete $ FastMutableIntMap.getDeletions p old
1744811 return $ applyAlways p' old
1745− hoistTraverseIntMapWithKeyWithAdjust traverseIntMapWithKeyWithAdjust updateChildUnreadiness $ \placeholders lastPlaceholder (PatchIntMap p) -> do
812+ hoistTraverseIntMapWithKeyWithAdjust traverseIntMapWithKeyWithAdjust updateChildUnreadiness $ \placeholders lastPlaceholderRef (PatchIntMap p) -> do
1746813 phs <- liftIO $ readIORef placeholders
1747814 forM_ (IntMap.toList p) $ \(k, mv) -> do
815+ lastPlaceholder <- liftIO $ readIORef lastPlaceholderRef
1748816 let nextPlaceholder = maybe lastPlaceholder snd $ IntMap.lookupGT k phs
1749− -- Delete old node
1750817 forM_ (IntMap.lookup k phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
1751− -- Insert new node
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
1759− Just tc
1760− | Right immediate <- _traverseChild_mode tc -> Just $ Just $ _traverseChildImmediate_placeholder immediate
1761− | otherwise -> Nothing
1762− liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
1763−
1764−{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1765− :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1766− -> IntMap v
1767− -> Event DomTimeline (PatchIntMap v)
1768− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1769− #-}
818+ forM_ mv $ \(df, _, _, _) -> df `insertBefore` nextPlaceholder
819+ liftIO $ writeIORef placeholders $! fromMaybe phs $ apply (fmap (\(_, ph, _, _) -> ph) $ PatchIntMap p) phs
1770820
1771−{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1772− :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1773− -> IntMap v
1774− -> Event DomTimeline (PatchIntMap v)
1775− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1776− #-}
1777−
1778−data ChildReadyState a
821+#if MIN_VERSION_base(4,9,0)
822+data ChildReadyState k
823+#else
824+data ChildReadyState (k :: * -> *)
825+#endif
1779826 = ChildReadyState_Ready
1780− | ChildReadyState_Unready !(Maybe a)
827+ | ChildReadyState_Unready !(Maybe (Some k))
1781828 deriving (Show, Read, Eq, Ord)
1782829
1783−insertAfterPreviousNode :: (Monad m, MonadJSM m) => DOM.IsNode node => node -> HydrationRunnerT t m ()
1784−insertAfterPreviousNode node = do
1785− parent <- askParent
1786− nextNode <- maybe (Node.getFirstChild parent) Node.getNextSibling =<< getPreviousNode
1787− Node.insertBefore_ parent node nextNode
1788− setPreviousNode $ Just $ toNode node
830+data ChildReadyStateInt
831+ = ChildReadyStateInt_Ready
832+ | ChildReadyStateInt_Unready !(Maybe Int)
833+ deriving (Show, Read, Eq, Ord)
1789834
1790−{-# INLINABLE hoistTraverseWithKeyWithAdjust #-}
1791−hoistTraverseWithKeyWithAdjust
1792− ::
1793− ( Adjustable t m
1794− , MonadHold t m
1795− , GCompare k
835+{-# INLINE hoistTraverseIntMapWithKeyWithAdjust #-}
836+hoistTraverseIntMapWithKeyWithAdjust :: forall v v' t m p.
837+ ( MonadAdjust t m
1796838 , MonadIO m
1797839 , MonadJSM m
1798840 , PrimMonad m
1799− , MonadFix m
1800− , Patch (p k v)
1801− , Patch (p k (Constant Int))
1802− , PatchTarget (p k (Constant Int)) ~ DMap k (Constant Int)
1803− , Patch (p k (Compose (TraverseChild t m (Some k)) v'))
1804− , PatchTarget (p k (Compose (TraverseChild t m (Some k)) v')) ~ DMap k (Compose (TraverseChild t m (Some k)) v')
1805− , Monoid (p k (Compose (TraverseChild t m (Some k)) v'))
1806− , RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
841+ , Monoid (p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v'))
842+ , Functor p
1807843 )
1808− => (forall vv vv'.
1809− (forall a. k a -> vv a -> DomRenderHookT t m (vv' a))
1810− -> DMap k vv
1811− -> Event t (p k vv)
1812− -> DomRenderHookT t m (DMap k vv', Event t (p k vv')))
1813− -- ^ The base monad's traversal
1814− -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv')
1815− -- ^ A way of mapping over the patch type
1816− -> (p k (Compose (TraverseChild t m (Some k)) v') -> DMap k (Constant (IORef (ChildReadyState (Some k)))) -> IO (DMap k (Constant (IORef (ChildReadyState (Some k))))))
1817− -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
1818− -> (IORef (Map.Map (Some k) DOM.Text) -> DOM.Text -> p k (Compose (TraverseChild t m (Some k)) v') -> JSM ())
1819− -- ^ Apply a patch to the DOM
1820− -> (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
1821− -> DMap k v
1822− -> Event t (p k v)
1823− -> HydrationDomBuilderT s t m (DMap k v', Event t (p k v'))
1824−hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
1825− doc <- askDocument
1826− initialEnv <- HydrationDomBuilderT ask
1827− let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
1828− pendingChange :: IORef (DMap k (Constant (IORef (ChildReadyState (Some k)))), p k (Compose (TraverseChild t m (Some k)) v')) <- liftIO $ newIORef mempty
844+ => ( (IntMap.Key -> v -> RequesterT t JSM Identity (TriggerEventT t m) (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v'))
845+ -> IntMap v
846+ -> Event t (p v)
847+ -> RequesterT t JSM Identity (TriggerEventT t m) (IntMap (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v'), Event t (p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')))
848+ ) -- ^ The base monad's traversal
849+ -> (p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v') -> IntMap (IORef ChildReadyStateInt) -> IO (IntMap (IORef ChildReadyStateInt))) -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
850+ -> (IORef (IntMap DOM.Text) -> IORef DOM.Text -> p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v') -> JSM ()) -- ^ Apply a patch to the DOM
851+ -> (IntMap.Key -> v -> ImmediateDomBuilderT t m v')
852+ -> IntMap v
853+ -> Event t (p v)
854+ -> ImmediateDomBuilderT t m (IntMap v', Event t (p v'))
855+hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
856+ initialEnv <- ImmediateDomBuilderT ask
857+ let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
858+ pendingChange :: IORef (IntMap (IORef ChildReadyStateInt), p (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')) <- liftIO $ newIORef mempty
1829859 haveEverBeenReady <- liftIO $ newIORef False
1830− placeholders <- liftIO $ newIORef Map.empty
1831− lastPlaceholder <- createTextNode doc ("" :: Text)
860+ placeholders <- liftIO $ newIORef $ error "placeholders not yet initialized"
861+ lastPlaceholderRef <- liftIO $ newIORef $ error "lastPlaceholderRef not yet initialized"
1832862 let applyDomUpdate p = do
1833− applyDomUpdate_ placeholders lastPlaceholder p
863+ applyDomUpdate_ placeholders lastPlaceholderRef p
1834864 markSelfReady
1835865 liftIO $ writeIORef pendingChange $! mempty
1836866 markSelfReady = do
@@ -1841,105 +871,86 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
1841871 old <- liftIO $ readIORef parentUnreadyChildren
1842872 let new = pred old
1843873 liftIO $ writeIORef parentUnreadyChildren $! new
1844− when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
1845− markChildReady :: IORef (ChildReadyState (Some k)) -> JSM ()
874+ when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
875+ markChildReady :: IORef ChildReadyStateInt -> JSM ()
1846876 markChildReady childReadyState = do
1847877 liftIO (readIORef childReadyState) >>= \case
1848− ChildReadyState_Ready -> return ()
1849− ChildReadyState_Unready countedAt -> do
1850− liftIO $ writeIORef childReadyState ChildReadyState_Ready
878+ ChildReadyStateInt_Ready -> return ()
879+ ChildReadyStateInt_Unready countedAt -> do
880+ liftIO $ writeIORef childReadyState ChildReadyStateInt_Ready
1851881 case countedAt of
1852882 Nothing -> return ()
1853− Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
883+ Just k -> do -- This child has been counted as unready, so we need to remove it from the unready set
1854884 (oldUnready, p) <- liftIO $ readIORef pendingChange
1855− when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
1856− let newUnready = DMap.delete k oldUnready
885+ when (not $ IntMap.null oldUnready) $ do -- This shouldn't actually ever be null
886+ let newUnready = IntMap.delete k oldUnready
1857887 liftIO $ writeIORef pendingChange (newUnready, p)
1858− when (DMap.null newUnready) $ do
888+ when (IntMap.null newUnready) $ do
1859889 applyDomUpdate p
1860− (children0 :: DMap k (Compose (TraverseChild t m (Some k)) v'), children' :: Event t (p k (Compose (TraverseChild t m (Some k)) v')))
1861− <- HydrationDomBuilderT $ lift $ base (\k v -> drawChildUpdate initialEnv markChildReady $ f k v) dm0 dm'
1862− let processChild k (Compose (TraverseChild e _)) = case e of
1863− Left _ -> pure $ ComposeMaybe Nothing
1864− Right immediate -> ComposeMaybe <$> do
1865− readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1866− ChildReadyState_Ready -> return Nothing
1867− ChildReadyState_Unready _ -> do
1868− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1869− return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1870− initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
1871− liftIO $ if DMap.null initialUnready
890+ (children0, children') <- ImmediateDomBuilderT $ lift $ base (\k v -> drawChildUpdateInt initialEnv markChildReady $ f k v) dm0 dm'
891+ let processChild k (_, _, sRef, _) = do
892+ readIORef sRef >>= \case
893+ ChildReadyStateInt_Ready -> return Nothing
894+ ChildReadyStateInt_Unready _ -> do
895+ writeIORef sRef $ ChildReadyStateInt_Unready $ Just k
896+ return $ Just sRef
897+ initialUnready <- liftIO $ IntMap.mapMaybe id <$> IntMap.traverseWithKey processChild children0
898+ liftIO $ if IntMap.null initialUnready
1872899 then writeIORef haveEverBeenReady True
1873900 else do
1874901 modifyIORef' parentUnreadyChildren succ
1875902 writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
1876− getHydrationMode >>= \case
1877− HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
1878− dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
1879− phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
1880− liftIO $ writeIORef placeholders $! phs
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
903+ let result0 = IntMap.map (\(_, _, _, v) -> v) children0
904+ placeholders0 = fmap (\(_, ph, _, _) -> ph) children0
905+ result' = ffor children' $ fmap $ \(_, _, _, r) -> r
906+ liftIO $ writeIORef placeholders $! placeholders0
907+ _ <- IntMap.traverseWithKey (\_ (df, _, _, _) -> void $ append df) children0
908+ liftIO . writeIORef lastPlaceholderRef =<< textNodeInternal ("" :: Text)
1889909 requestDomAction_ $ ffor children' $ \p -> do
1890910 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
1891911 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
1892912 let !newP = p <> oldP
1893913 liftIO $ writeIORef pendingChange (newUnready, newP)
1894− when (DMap.null newUnready) $ do
914+ when (IntMap.null newUnready) $ do
1895915 applyDomUpdate newP
1896− let result0 = DMap.map (_traverseChild_result . getCompose) children0
1897− result' = ffor children' $ mapPatch $ _traverseChild_result . getCompose
1898916 return (result0, result')
1899917
1900−{-# INLINE hoistTraverseIntMapWithKeyWithAdjust #-}
1901−hoistTraverseIntMapWithKeyWithAdjust ::
1902− ( Adjustable t m
918+{-# INLINABLE hoistTraverseWithKeyWithAdjust #-}
919+hoistTraverseWithKeyWithAdjust :: forall (k :: * -> *) v v' t m p.
920+ ( MonadAdjust t m
1903921 , MonadHold t m
922+ , DMap.GCompare k
923+ , MonadIO m
1904924 , MonadJSM m
1905− , MonadFix m
1906925 , PrimMonad m
1907− , Monoid (p (TraverseChild t m Int v'))
1908− , Functor p
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
926+ , MonadFix m
927+ , Patch (p k v)
928+ , PatchTarget (p k (Constant Int)) ~ DMap k (Constant Int)
929+ , Monoid (p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v'))
930+ , Patch (p k (Constant Int))
1914931 )
1915− => ((IntMap.Key -> v -> DomRenderHookT t m (TraverseChild t m Int v'))
1916− -> IntMap v
1917− -> Event t (p 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)
1925− -> DOM.Text
1926− -> p (TraverseChild t m Int v')
1927− -> JSM ())
1928− -- ^ Apply a patch to the DOM
1929− -> (IntMap.Key -> v -> HydrationDomBuilderT s t m v')
1930− -> IntMap v
1931− -> Event t (p v)
1932− -> HydrationDomBuilderT s t m (IntMap v', Event t (p v'))
1933−hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
1934− doc <- askDocument
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
932+ => (forall vv vv'.
933+ (forall a. k a -> vv a -> RequesterT t JSM Identity (TriggerEventT t m) (vv' a))
934+ -> DMap k vv
935+ -> Event t (p k vv)
936+ -> RequesterT t JSM Identity (TriggerEventT t m) (DMap k vv', Event t (p k vv'))
937+ ) -- ^ The base monad's traversal
938+ -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv') -- ^ A way of mapping over the patch type
939+ -> (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
940+ -> (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
941+ -> (forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a))
942+ -> DMap k v
943+ -> Event t (p k v)
944+ -> ImmediateDomBuilderT t m (DMap k v', Event t (p k v'))
945+hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpdate_ (f :: forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a)) (dm0 :: DMap k v) dm' = do
946+ initialEnv <- ImmediateDomBuilderT ask
947+ let parentUnreadyChildren = _immediateDomBuilderEnv_unreadyChildren initialEnv
948+ pendingChange :: IORef (DMap k (Constant (IORef (ChildReadyState k))), p k (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v')) <- liftIO $ newIORef mempty
1938949 haveEverBeenReady <- liftIO $ newIORef False
1939− placeholders <- liftIO $ newIORef IntMap.empty
1940− lastPlaceholder <- createTextNode doc ("" :: Text)
950+ placeholders <- liftIO $ newIORef $ error "placeholders not yet initialized"
951+ lastPlaceholderRef <- liftIO $ newIORef $ error "lastPlaceholderRef not yet initialized"
1941952 let applyDomUpdate p = do
1942− applyDomUpdate_ placeholders lastPlaceholder p
953+ applyDomUpdate_ placeholders lastPlaceholderRef p
1943954 markSelfReady
1944955 liftIO $ writeIORef pendingChange $! mempty
1945956 markSelfReady = do
@@ -1950,8 +961,8 @@ hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_
1950961 old <- liftIO $ readIORef parentUnreadyChildren
1951962 let new = pred old
1952963 liftIO $ writeIORef parentUnreadyChildren $! new
1953− when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
1954− markChildReady :: IORef (ChildReadyState Int) -> JSM ()
964+ when (new == 0) $ _immediateDomBuilderEnv_commitAction initialEnv
965+ markChildReady :: IORef (ChildReadyState k) -> JSM ()
1955966 markChildReady childReadyState = do
1956967 liftIO (readIORef childReadyState) >>= \case
1957968 ChildReadyState_Ready -> return ()
@@ -1959,191 +970,82 @@ hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_
1959970 liftIO $ writeIORef childReadyState ChildReadyState_Ready
1960971 case countedAt of
1961972 Nothing -> return ()
1962− Just k -> do -- This child has been counted as unready, so we need to remove it from the unready set
973+ Just (Some.This k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1963974 (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
975+ when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
976+ let newUnready = DMap.delete k oldUnready
1966977 liftIO $ writeIORef pendingChange (newUnready, p)
1967− when (IntMap.null newUnready) $ do
978+ when (DMap.null newUnready) $ do
1968979 applyDomUpdate p
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
980+ (children0, children') <- ImmediateDomBuilderT $ lift $ base (\k v -> drawChildUpdate initialEnv markChildReady $ f k v) dm0 dm'
981+ let processChild k (Compose (_, _, sRef, _)) = ComposeMaybe <$> do
982+ readIORef sRef >>= \case
983+ ChildReadyState_Ready -> return Nothing
984+ ChildReadyState_Unready _ -> do
985+ writeIORef sRef $ ChildReadyState_Unready $ Just $ Some.This k
986+ return $ Just $ Constant sRef
987+ initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
988+ liftIO $ if DMap.null initialUnready
1981989 then writeIORef haveEverBeenReady True
1982990 else do
1983991 modifyIORef' parentUnreadyChildren succ
1984992 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
993+ let result0 = DMap.map (\(Compose (_, _, _, v)) -> v) children0
994+ placeholders0 = weakenDMapWith (\(Compose (_, ph, _, _)) -> ph) children0
995+ result' = ffor children' $ mapPatch $ \(Compose (_, _, _, r)) -> r
996+ liftIO $ writeIORef placeholders $! placeholders0
997+ _ <- DMap.traverseWithKey (\_ (Compose (df, _, _, _)) -> Constant () <$ append df) children0
998+ liftIO . writeIORef lastPlaceholderRef =<< textNodeInternal ("" :: Text)
1998999 requestDomAction_ $ ffor children' $ \p -> do
19991000 (oldUnready, oldP) <- liftIO $ readIORef pendingChange
20001001 newUnready <- liftIO $ updateChildUnreadiness p oldUnready
20011002 let !newP = p <> oldP
20021003 liftIO $ writeIORef pendingChange (newUnready, newP)
2003− when (IntMap.null newUnready) $ do
1004+ when (DMap.null newUnready) $ do
20041005 applyDomUpdate newP
2005− let result0 = IntMap.map _traverseChild_result children0
2006− result' = ffor children' $ fmap $ _traverseChild_result
20071006 return (result0, result')
20081007
2009−{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2010− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
2011− -> IntMap 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)
2018− -> DOM.Text
2019− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2020− -> JSM ())
2021− -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
2022− -> IntMap v
2023− -> Event DomTimeline (PatchIntMap v)
2024− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
2025− #-}
2026−
2027−{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2028− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
2029− -> IntMap 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)
2036− -> DOM.Text
2037− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2038− -> JSM ())
2039− -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
2040− -> IntMap v
2041− -> Event DomTimeline (PatchIntMap v)
2042− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
2043− #-}
2044−
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))
2051− }
2052−
2053−newtype TraverseChildHydration t m = TraverseChildHydration
2054− { _traverseChildHydration_delayed :: HydrationRunnerT t m DOM.Text
2055− -- ^ Action to run at switchover, returns the placeholder
2056− }
2057−
2058−data TraverseChild t m k a = TraverseChild
2059− { _traverseChild_mode :: !(Either (TraverseChildHydration t m) (TraverseChildImmediate k))
2060− , _traverseChild_result :: !a
2061− } deriving Functor
2062−
20631008{-# INLINABLE drawChildUpdate #-}
2064−drawChildUpdate :: (MonadJSM m, Reflex t)
2065− => HydrationDomBuilderEnv t m
1009+drawChildUpdate :: (MonadIO m, MonadJSM m)
1010+ => ImmediateDomBuilderEnv t
20661011 -> (IORef (ChildReadyState k) -> JSM ()) -- This will NOT be called if the child is ready at initialization time; instead, the ChildReadyState return value will be ChildReadyState_Ready
2067− -> HydrationDomBuilderT s t m (f a)
2068− -> DomRenderHookT t m (Compose (TraverseChild t m k) f a)
1012+ -> ImmediateDomBuilderT t m (v' a)
1013+ -> RequesterT t JSM Identity (TriggerEventT t m) (Compose ((,,,) DOM.DocumentFragment DOM.Text (IORef (ChildReadyState k))) v' a)
20691014drawChildUpdate initialEnv markReady child = do
2070− let doc = _hydrationDomBuilderEnv_document initialEnv
1015+ childReadyState <- liftIO $ newIORef $ ChildReadyState_Unready Nothing
20711016 unreadyChildren <- liftIO $ newIORef 0
2072− liftIO (readIORef $ _hydrationDomBuilderEnv_hydrationMode initialEnv) >>= \case
2073− HydrationMode_Hydrating -> do
2074− childDelayedRef <- liftIO $ newIORef $ pure ()
2075− result <- runReaderT (unHydrationDomBuilderT child) initialEnv
2076− { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
2077− , _hydrationDomBuilderEnv_delayed = childDelayedRef
2078− }
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
2086− childDelayed
2087− pure placeholder
2088− }
2089− }
2090− HydrationMode_Immediate -> do
2091− childReadyState <- liftIO $ newIORef $ ChildReadyState_Unready Nothing
2092− df <- createDocumentFragment doc
2093− placeholder <- createTextNode doc ("" :: Text)
2094− Node.appendChild_ df placeholder
2095− result <- runReaderT (unHydrationDomBuilderT child) initialEnv
2096− { _hydrationDomBuilderEnv_parent = Left $ toNode df
2097− , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
2098− , _hydrationDomBuilderEnv_commitAction = markReady childReadyState
2099− }
2100− u <- liftIO $ readIORef unreadyChildren
2101− when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyState_Ready
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
2108− }
2109− }
2110−
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)
2116− #-}
2117−
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)
2123− #-}
1017+ df <- createDocumentFragment $ _immediateDomBuilderEnv_document initialEnv
1018+ (placeholder, result) <- runReaderT (unImmediateDomBuilderT $ (,) <$> textNodeInternal ("" :: Text) <*> child) $ initialEnv
1019+ { _immediateDomBuilderEnv_parent = toNode df
1020+ , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
1021+ , _immediateDomBuilderEnv_commitAction = markReady childReadyState
1022+ }
1023+ u <- liftIO $ readIORef unreadyChildren
1024+ when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyState_Ready
1025+ return $ Compose (df, placeholder, childReadyState, result)
21241026
21251027{-# 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)
2132−
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)
2138− #-}
2139−
2140−{-# INLINE mkHasFocus #-}
2141−mkHasFocus
2142− :: (HasDocument m, MonadJSM m, IsNode (RawElement d), MonadHold t m, Reflex t, DOM.IsDocumentOrShadowRoot (RawDocument (DomBuilderSpace m)))
2143− => Element er d t -> m (Dynamic t Bool)
1028+drawChildUpdateInt :: (MonadIO m, MonadJSM m)
1029+ => ImmediateDomBuilderEnv t
1030+ -> (IORef ChildReadyStateInt -> JSM ()) -- This will NOT be called if the child is ready at initialization time; instead, the ChildReadyState return value will be ChildReadyState_Ready
1031+ -> ImmediateDomBuilderT t m v'
1032+ -> RequesterT t JSM Identity (TriggerEventT t m) (DOM.DocumentFragment, DOM.Text, IORef ChildReadyStateInt, v')
1033+drawChildUpdateInt initialEnv markReady child = do
1034+ childReadyState <- liftIO $ newIORef $ ChildReadyStateInt_Unready Nothing
1035+ unreadyChildren <- liftIO $ newIORef 0
1036+ df <- createDocumentFragment $ _immediateDomBuilderEnv_document initialEnv
1037+ (placeholder, result) <- runReaderT (unImmediateDomBuilderT $ (,) <$> textNodeInternal ("" :: Text) <*> child) $ initialEnv
1038+ { _immediateDomBuilderEnv_parent = toNode df
1039+ , _immediateDomBuilderEnv_unreadyChildren = unreadyChildren
1040+ , _immediateDomBuilderEnv_commitAction = markReady childReadyState
1041+ }
1042+ u <- liftIO $ readIORef unreadyChildren
1043+ when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyStateInt_Ready
1044+ return (df, placeholder, childReadyState, result)
1045+
1046+mkHasFocus :: (MonadHold t m, Reflex t) => Element er d t -> m (Dynamic t Bool)
21441047mkHasFocus e = do
2145− doc <- askDocument
2146− initialFocus <- Node.isSameNode (toNode $ _element_raw e) . fmap toNode =<< Document.getActiveElement doc
1048+ let initialFocus = False --TODO: Actually get the initial focus of the element
21471049 holdDyn initialFocus $ leftmost
21481050 [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
21491051 , True <$ Reflex.select (_element_events e) (WrapArg Focus)
@@ -2152,49 +1054,39 @@ mkHasFocus e = do
21521054insertBefore :: (MonadJSM m, IsNode new, IsNode existing) => new -> existing -> m ()
21531055insertBefore new existing = do
21541056 p <- getParentNodeUnchecked existing
2155− Node.insertBefore_ p new (Just existing) -- If there's no parent, that means we've been removed from the DOM; this should not happen if the we're removing ourselves from the performEvent properly
1057+ DOM.insertBefore_ p new (Just existing) -- If there's no parent, that means we've been removed from the DOM; this should not happen if the we're removing ourselves from the performEvent properly
21561058
2157−type ImmediateDomBuilderT = HydrationDomBuilderT GhcjsDomSpace
2158−
2159−instance PerformEvent t m => PerformEvent t (HydrationDomBuilderT s t m) where
2160− type Performable (HydrationDomBuilderT s t m) = Performable m
1059+instance PerformEvent t m => PerformEvent t (ImmediateDomBuilderT t m) where
1060+ type Performable (ImmediateDomBuilderT t m) = Performable m
21611061 {-# INLINABLE performEvent_ #-}
21621062 performEvent_ e = lift $ performEvent_ e
21631063 {-# INLINABLE performEvent #-}
21641064 performEvent e = lift $ performEvent e
21651065
2166−instance PostBuild t m => PostBuild t (HydrationDomBuilderT s t m) where
1066+instance PostBuild t m => PostBuild t (ImmediateDomBuilderT t m) where
21671067 {-# INLINABLE getPostBuild #-}
21681068 getPostBuild = lift getPostBuild
21691069
2170−instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationDomBuilderT s t m) where
1070+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (ImmediateDomBuilderT t m) where
21711071 {-# INLINABLE newEventWithTrigger #-}
21721072 newEventWithTrigger = lift . newEventWithTrigger
21731073 {-# INLINABLE newFanEventWithTrigger #-}
21741074 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
21751075
2176−instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (HydrationDomBuilderT s t m) where
2177− {-# INLINABLE newTriggerEvent #-}
2178− newTriggerEvent = HydrationDomBuilderT . lift $ newTriggerEvent
2179− {-# INLINABLE newTriggerEventWithOnComplete #-}
2180− newTriggerEventWithOnComplete = HydrationDomBuilderT . lift $ newTriggerEventWithOnComplete
2181− {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
2182− newEventWithLazyTriggerWithOnComplete f = HydrationDomBuilderT . lift $ newEventWithLazyTriggerWithOnComplete f
2183−
2184−instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (DomRenderHookT t m) where
1076+instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (ImmediateDomBuilderT t m) where
21851077 {-# INLINABLE newTriggerEvent #-}
2186− newTriggerEvent = DomRenderHookT . lift $ newTriggerEvent
1078+ newTriggerEvent = ImmediateDomBuilderT . lift . lift $ newTriggerEvent
21871079 {-# INLINABLE newTriggerEventWithOnComplete #-}
2188− newTriggerEventWithOnComplete = DomRenderHookT . lift $ newTriggerEventWithOnComplete
1080+ newTriggerEventWithOnComplete = ImmediateDomBuilderT . lift . lift $ newTriggerEventWithOnComplete
21891081 {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
2190− newEventWithLazyTriggerWithOnComplete f = DomRenderHookT . lift $ newEventWithLazyTriggerWithOnComplete f
1082+ newEventWithLazyTriggerWithOnComplete f = ImmediateDomBuilderT . lift . lift $ newEventWithLazyTriggerWithOnComplete f
21911083
2192−instance HasJSContext m => HasJSContext (HydrationDomBuilderT s t m) where
2193− type JSContextPhantom (HydrationDomBuilderT s t m) = JSContextPhantom m
1084+instance HasJSContext m => HasJSContext (ImmediateDomBuilderT t m) where
1085+ type JSContextPhantom (ImmediateDomBuilderT t m) = JSContextPhantom m
21941086 askJSContext = lift askJSContext
21951087
2196−instance MonadRef m => MonadRef (HydrationDomBuilderT s t m) where
2197− type Ref (HydrationDomBuilderT s t m) = Ref m
1088+instance MonadRef m => MonadRef (ImmediateDomBuilderT t m) where
1089+ type Ref (ImmediateDomBuilderT t m) = Ref m
21981090 {-# INLINABLE newRef #-}
21991091 newRef = lift . newRef
22001092 {-# INLINABLE readRef #-}
@@ -2202,12 +1094,12 @@ instance MonadRef m => MonadRef (HydrationDomBuilderT s t m) where
22021094 {-# INLINABLE writeRef #-}
22031095 writeRef r = lift . writeRef r
22041096
2205−instance MonadAtomicRef m => MonadAtomicRef (HydrationDomBuilderT s t m) where
1097+instance MonadAtomicRef m => MonadAtomicRef (ImmediateDomBuilderT t m) where
22061098 {-# INLINABLE atomicModifyRef #-}
22071099 atomicModifyRef r = lift . atomicModifyRef r
22081100
2209−instance (HasJS x m, ReflexHost t) => HasJS x (HydrationDomBuilderT s t m) where
2210− type JSX (HydrationDomBuilderT s t m) = JSX m
1101+instance (HasJS x m, ReflexHost t) => HasJS x (ImmediateDomBuilderT t m) where
1102+ type JSX (ImmediateDomBuilderT t m) = JSX m
22111103 liftJS = lift . liftJS
22121104
22131105type family EventType en where
@@ -2297,7 +1189,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22971189 Beforecopy -> return ()
22981190 Copy -> return ()
22991191 Beforepaste -> return ()
2300− Paste -> getPasteData
1192+ Paste -> return ()
23011193 Reset -> return ()
23021194 Search -> return ()
23031195 Selectstart -> return ()
@@ -2306,7 +1198,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
23061198 Touchend -> getTouchEvent
23071199 Touchcancel -> getTouchEvent
23081200 Mousewheel -> return ()
2309− Wheel -> getWheelEvent
1201+ Wheel -> return ()
23101202
23111203{-# INLINABLE defaultDomWindowEventHandler #-}
23121204defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2347,7 +1239,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23471239 Beforecopy -> return ()
23481240 Copy -> return ()
23491241 Beforepaste -> return ()
2350− Paste -> getPasteData
1242+ Paste -> return ()
23511243 Reset -> return ()
23521244 Search -> return ()
23531245 Selectstart -> return ()
@@ -2356,7 +1248,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23561248 Touchend -> getTouchEvent
23571249 Touchcancel -> getTouchEvent
23581250 Mousewheel -> return ()
2359− Wheel -> getWheelEvent
1251+ Wheel -> return ()
23601252
23611253{-# INLINABLE withIsEvent #-}
23621254withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2624,15 +1516,6 @@ getMouseEventCoords = do
26241516 e <- event
26251517 bisequence (getClientX e, getClientY e)
26261518
2627−{-# INLINABLE getPasteData #-}
2628−getPasteData :: EventM e ClipboardEvent (Maybe Text)
2629−getPasteData = do
2630− e <- event
2631− mdt <- ClipboardEvent.getClipboardData e
2632− case mdt of
2633− Nothing -> return Nothing
2634− Just dt -> Just <$> DataTransfer.getData dt ("text" :: Text)
2635−
26361519{-# INLINABLE getTouchEvent #-}
26371520getTouchEvent :: EventM e TouchEvent TouchEventResult
26381521getTouchEvent = do
@@ -2674,41 +1557,17 @@ getTouchEvent = do
26741557 , _touchEventResult_touches = touches
26751558 }
26761559
2677−{-# INLINABLE getWheelEvent #-}
2678−getWheelEvent :: EventM e WheelEvent WheelEventResult
2679−getWheelEvent = do
2680− e <- event
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
2690− 0 -> DeltaPixel
2691− 1 -> DeltaLine
2692− 2 -> DeltaPage
2693− -- See https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/deltaMode
2694− _ -> error "getWheelEvent: impossible encoding"
2695− }
2696−
2697−instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
1560+instance MonadSample t m => MonadSample t (ImmediateDomBuilderT t m) where
26981561 {-# INLINABLE sample #-}
26991562 sample = lift . sample
27001563
2701−instance MonadHold t m => MonadHold t (HydrationDomBuilderT s t m) where
1564+instance MonadHold t m => MonadHold t (ImmediateDomBuilderT t m) where
27021565 {-# INLINABLE hold #-}
27031566 hold v0 v' = lift $ hold v0 v'
27041567 {-# INLINABLE holdDyn #-}
27051568 holdDyn v0 v' = lift $ holdDyn v0 v'
27061569 {-# INLINABLE holdIncremental #-}
27071570 holdIncremental v0 v' = lift $ holdIncremental v0 v'
2708− {-# INLINABLE buildDynamic #-}
2709− buildDynamic a0 = lift . buildDynamic a0
2710− {-# INLINABLE headE #-}
2711− headE = lift . headE
27121571
27131572data WindowConfig t = WindowConfig -- No config options yet
27141573
@@ -2720,7 +1579,7 @@ data Window t = Window
27201579 , _window_raw :: DOM.Window
27211580 }
27221581
2723−wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> HydrationDomBuilderT GhcjsDomSpace t m (Window t)
1582+wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> ImmediateDomBuilderT t m (Window t)
27241583wrapWindow wv _ = do
27251584 events <- wrapDomEventsMaybe wv (defaultDomWindowEventHandler wv) windowOnEventName
27261585 return $ Window