@@ -23,6 +23,7 @@ module Reflex.Dom.Builder.Class
2323import Reflex.Class as Reflex
2424import Reflex.Dom.Builder.Class.Events
2525import Reflex.DynamicWriter
26+import Reflex.EventWriter
2627import Reflex.PerformEvent.Class
2728import Reflex.PostBuild.Base
2829import Reflex.Requester.Base
@@ -430,19 +431,17 @@ instance (DomBuilder t m, MonadHold t m, MonadFix m) => DomBuilder t (RequesterT
430431 textNode = liftTextNode
431432 element elementTag cfg (RequesterT child) = RequesterT $ do
432433 r <- ask
433− s <- get
434434 let cfg' = liftElementConfig cfg
435− (el, (a, newS)) <- lift $ lift $ element elementTag cfg' $ runReaderT (runStateT child s) r
436− put newS
435+ (el, (a, e)) <- lift $ lift $ element elementTag cfg' $ runReaderT (runEventWriterT child) r
436+ tellEvent e
437437 return (el, a)
438438 inputElement cfg = lift $ inputElement $ cfg & inputElementConfig_elementConfig %~ liftElementConfig
439439 textAreaElement cfg = lift $ textAreaElement $ cfg & textAreaElementConfig_elementConfig %~ liftElementConfig
440440 selectElement cfg (RequesterT child) = RequesterT $ do
441441 r <- ask
442− s <- get
443442 let cfg' = cfg & selectElementConfig_elementConfig %~ liftElementConfig
444− (el, (a, newS)) <- lift $ lift $ selectElement cfg' $ runReaderT (runStateT child s) r
445− put newS
443+ (el, (a, e)) <- lift $ lift $ selectElement cfg' $ runReaderT (runEventWriterT child) r
444+ tellEvent e
446445 return (el, a)
447446 placeRawElement = lift . placeRawElement
448447 wrapRawElement e cfg = lift $ wrapRawElement e $ cfg