@@ -134,6 +134,7 @@ module Reflex.Class
134 , unsafeBuildDynamic
134 , unsafeBuildDynamic
135 , unsafeBuildIncremental
135 , unsafeBuildIncremental
136 , mergeIncremental
136 , mergeIncremental
137+ , mergeIncrementalWithMove
137 , currentIncremental
138 , currentIncremental
138 , updatedIncremental
139 , updatedIncremental
139 , incrementalToDynamic
140 , incrementalToDynamic
@@ -314,6 +315,7 @@ updated :: Reflex t => Dynamic t a -> Event t a
314unsafeBuildDynamic :: Reflex t => PullM t a -> Event t a -> Dynamic t a
315unsafeBuildDynamic :: Reflex t => PullM t a -> Event t a -> Dynamic t a
315unsafeBuildIncremental :: (Reflex t, Patch p) => PullM t (PatchTarget p) -> Event t p -> Incremental t p
316unsafeBuildIncremental :: (Reflex t, Patch p) => PullM t (PatchTarget p) -> Event t p -> Incremental t p
316mergeIncremental :: (Reflex t, GCompare k) => Incremental t (PatchDMap k (Event t)) -> Event t (DMap k Identity)
317mergeIncremental :: (Reflex t, GCompare k) => Incremental t (PatchDMap k (Event t)) -> Event t (DMap k Identity)
318+mergeIncrementalWithMove :: (Reflex t, GCompare k) => Incremental t (PatchDMapWithMove k (Event t)) -> Event t (DMap k Identity)
317currentIncremental :: (Reflex t, Patch p) => Incremental t p -> Behavior t (PatchTarget p)
319currentIncremental :: (Reflex t, Patch p) => Incremental t p -> Behavior t (PatchTarget p)
318updatedIncremental :: (Reflex t, Patch p) => Incremental t p -> Event t p
320updatedIncremental :: (Reflex t, Patch p) => Incremental t p -> Event t p
319incrementalToDynamic :: (Reflex t, Patch p) => Incremental t p -> Dynamic t (PatchTarget p)
321incrementalToDynamic :: (Reflex t, Patch p) => Incremental t p -> Dynamic t (PatchTarget p)
@@ -348,6 +350,8 @@ unsafeBuildDynamic readV0 v' = SpiderDynamic $ dynamicDynIdentity $ unsafeDyn (c
348unsafeBuildIncremental readV0 dv = SpiderIncremental $ S.dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
350unsafeBuildIncremental readV0 dv = SpiderIncremental $ S.dynamicDyn $ unsafeDyn (coerce readV0) $ unSpiderEvent dv
349{-# INLINE mergeIncremental #-}
351{-# INLINE mergeIncremental #-}
350mergeIncremental = SpiderEvent . S.merge . (unsafeCoerce :: S.Dynamic x (PatchDMap k (Event (SpiderTimeline x))) -> S.Dynamic x (PatchDMap k (S.Event x))) . unSpiderIncremental
352mergeIncremental = SpiderEvent . S.merge . (unsafeCoerce :: S.Dynamic x (PatchDMap k (Event (SpiderTimeline x))) -> S.Dynamic x (PatchDMap k (S.Event x))) . unSpiderIncremental
353+{-# INLINE mergeIncrementalWithMove #-}
354+mergeIncrementalWithMove = SpiderEvent . S.mergeWithMove . (unsafeCoerce :: S.Dynamic x (PatchDMapWithMove k (Event (SpiderTimeline x))) -> S.Dynamic x (PatchDMapWithMove k (S.Event x))) . unSpiderIncremental
351{-# INLINE currentIncremental #-}
355{-# INLINE currentIncremental #-}
352currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
356currentIncremental = SpiderBehavior . dynamicCurrent . unSpiderIncremental
353{-# INLINE updatedIncremental #-}
357{-# INLINE updatedIncremental #-}