@@ -37,8 +37,6 @@ import Reflex.PostBuild.Base
3737import Reflex.Query.Base
3838import Reflex.Query.Class
3939import Reflex.Requester.Base
40−import Reflex.Query.Base
41−import Reflex.Query.Class
4240
4341import qualified Control.Category
4442import Control.Lens hiding (element)
@@ -583,25 +581,18 @@ instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive
583581 textNode = liftTextNode
584582 element elementTag cfg (QueryT child) = QueryT $ do
585583 s <- get
586− let cfg' = cfg
587− { _elementConfig_eventSpec = _elementConfig_eventSpec cfg }
588− (e, (a, newS)) <- lift $ element elementTag cfg' $ runStateT child s
584+ (e, (a, newS)) <- lift $ element elementTag cfg $ runStateT child s
589585 put newS
590586 return (e, a)
591−
592− inputElement cfg = lift $ inputElement $ cfg & inputElementConfig_elementConfig %~ liftElementConfig
593− textAreaElement cfg = lift $ textAreaElement $ cfg & textAreaElementConfig_elementConfig %~ liftElementConfig
587+ inputElement = lift . inputElement
588+ textAreaElement = lift . textAreaElement
594589 selectElement cfg (QueryT child) = QueryT $ do
595590 s <- get
596− let cfg' = cfg & selectElementConfig_elementConfig %~ \c ->
597− c { _elementConfig_eventSpec = _elementConfig_eventSpec c }
598− (e, (a, newS)) <- lift $ selectElement cfg' $ runStateT child s
591+ (e, (a, newS)) <- lift $ selectElement cfg $ runStateT child s
599592 put newS
600593 return (e, a)
601594 placeRawElement = lift . placeRawElement
602− wrapRawElement e cfg = lift $ wrapRawElement e $ cfg
603− { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg
604− }
595+ wrapRawElement e = lift . wrapRawElement e
605596
606597-- * Convenience functions
607598
@@ -627,27 +618,6 @@ instance Reflex t => HasDomEvent t (TextAreaElement EventResult d t) en where
627618instance DomBuilder t m => DomBuilder t (ReaderT r m) where
628619 type DomBuilderSpace (ReaderT r m) = DomBuilderSpace m
629620
630−instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q) => DomBuilder t (QueryT t q m) where
631− type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
632− textNode = liftTextNode
633− element elementTag cfg (QueryT child) = QueryT $ do
634− s <- get
635− let cfg' = cfg
636− { _elementConfig_eventSpec = _elementConfig_eventSpec cfg }
637− (e, (a, newS)) <- lift $ element elementTag cfg' $ runStateT child s
638− put newS
639− return (e, a)
640−
641− inputElement = lift . inputElement
642− textAreaElement = lift . textAreaElement
643− selectElement cfg (QueryT child) = QueryT $ do
644− s <- get
645− (e, (a, newS)) <- lift $ selectElement cfg $ runStateT child s
646− put newS
647− return (e, a)
648− placeRawElement = lift . placeRawElement
649− wrapRawElement e = lift . wrapRawElement e
650−
651621type LiftDomBuilder t f m =
652622 ( Reflex t
653623 , MonadTransControlStateless f