@@ -74,11 +74,11 @@ incrementalExtractFunctorDMap = unsafeMapIncremental mapWithFunctorToDMap $ \(Pa
74mergeIncrementalMap :: (Reflex t, Ord k) => Incremental t PatchMap (Map k (Event t v)) -> Event t (Map k v)
74mergeIncrementalMap :: (Reflex t, Ord k) => Incremental t PatchMap (Map k (Event t v)) -> Event t (Map k v)
75mergeIncrementalMap = fmap dmapToMap . mergeIncremental . incrementalExtractFunctorDMap
75mergeIncrementalMap = fmap dmapToMap . mergeIncremental . incrementalExtractFunctorDMap
77−incrementalReplaceableMap :: (Reflex t, MonadHold t m, MonadFix m, Ord k) => Map k (Replaceable t v) -> Event t (PatchMap (Map k (Replaceable t v))) -> m (Incremental t PatchMap (Map k v))
77+incrementalReplaceableMap :: (Reflex t, Ord k) => Incremental t PatchMap (Map k (Replaceable t v)) -> Incremental t PatchMap (Map k v)
78−incrementalReplaceableMap v0 e = do
78+incrementalReplaceableMap m =
79− rec vals <- holdIncremental v0 $ e <> valChanges
79+ let vals = unsafeBuildIncremental (sample $ currentIncremental m) $ updatedIncremental m <> valChanges
80− let valChanges = fmap PatchMap $ mergeIncrementalMap $ mapIncrementalMapValues _replaceable_modify vals
80+ valChanges = fmap PatchMap $ mergeIncrementalMap $ mapIncrementalMapValues _replaceable_modify vals
81− return $ mapIncrementalMapValues _replaceable_value vals
81+ in mapIncrementalMapValues _replaceable_value vals
83mergeDynIncremental :: (Reflex t, Ord k) => Incremental t PatchMap (Map k (Dynamic t v)) -> Incremental t PatchMap (Map k v)
83mergeDynIncremental :: (Reflex t, Ord k) => Incremental t PatchMap (Map k (Dynamic t v)) -> Incremental t PatchMap (Map k v)
84mergeDynIncremental a = unsafeBuildIncremental (mapM (sample . current) =<< sample (currentIncremental a)) $ addedAndRemovedValues <> changedValues
84mergeDynIncremental a = unsafeBuildIncremental (mapM (sample . current) =<< sample (currentIncremental a)) $ addedAndRemovedValues <> changedValues
@@ -114,13 +114,13 @@ instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (DynamicWrit
114runDynamicWriterTInternal :: DynamicWriterT t w m a -> m (a, DynamicWriterAccumulator t w)
114runDynamicWriterTInternal :: DynamicWriterT t w m a -> m (a, DynamicWriterAccumulator t w)
115runDynamicWriterTInternal (DynamicWriterT a) = runStateT a []
115runDynamicWriterTInternal (DynamicWriterT a) = runStateT a []
117−mconcatIncrementalReplaceableDynMap :: (Reflex t, Monoid v, Ord k) => Incremental t PatchMap (Map k (Dynamic t v)) -> Dynamic t v
117+mconcatIncrementalReplaceableDynMap :: (Reflex t, Monoid v, Ord k) => Incremental t PatchMap (Map k (Replaceable t (Dynamic t v))) -> Dynamic t v
118−mconcatIncrementalReplaceableDynMap = fmap (mconcat . Map.elems) . incrementalToDynamic . mergeDynIncremental
118+mconcatIncrementalReplaceableDynMap = fmap (mconcat . Map.elems) . incrementalToDynamic . mergeDynIncremental . incrementalReplaceableMap
120−runDynamicWriterT :: (Reflex t, MonadHold t m, Monoid w, MonadFix m) => DynamicWriterT t w m a -> m (a, Dynamic t w)
120+runDynamicWriterT :: (Reflex t, MonadHold t m, Monoid w) => DynamicWriterT t w m a -> m (a, Dynamic t w)
121runDynamicWriterT (DynamicWriterT a) = do
121runDynamicWriterT (DynamicWriterT a) = do
122 (result, ws) <- runStateT a []
122 (result, ws) <- runStateT a []
123− i <- incrementalReplaceableMap (Map.fromList $ zip [1 :: Int ..] $ reverse ws) never
123+ i <- holdIncremental (Map.fromList $ zip [1 :: Int ..] $ reverse ws) never
124 let w = mconcatIncrementalReplaceableDynMap i
124 let w = mconcatIncrementalReplaceableDynMap i
125 return (result, w)
125 return (result, w)
@@ -177,12 +177,13 @@ instance (DomBuilder t m, Monoid w, MonadHold t m, MonadFix m) => DomBuilder t (
177 let (myNextId, numbered) = mapAccumL (\n v -> (succ n, (n, Just v))) myFirstId cs
177 let (myNextId, numbered) = mapAccumL (\n v -> (succ n, (n, Just v))) myFirstId cs
178 return (myNextId, PatchMap $ Map.fromList numbered)
178 return (myNextId, PatchMap $ Map.fromList numbered)
179 newNextId = fst <$> numberedNewChildren
179 newNextId = fst <$> numberedNewChildren
180− replaceableMap <- incrementalReplaceableMap Map.empty $ snd <$> numberedNewChildren
180+ replaceableMap <- holdIncremental Map.empty $ snd <$> numberedNewChildren
181 noMoreAdditions <- holdDyn False $ True <$ additionsCeased
181 noMoreAdditions <- holdDyn False $ True <$ additionsCeased
182 let replaceSelf nma i = do
182 let replaceSelf nma i = do
183 guard nma
183 guard nma
184 case Map.toList i of
184 case Map.toList i of
185 [] -> return Nothing -- Delete self
185 [] -> return Nothing -- Delete self
186+ [(_, n)] -> return $ Just n
186 _ -> mzero
187 _ -> mzero
187 return $ Replaceable (mconcatIncrementalReplaceableDynMap replaceableMap) $ fmapMaybe id $ updated $ zipDynWith replaceSelf noMoreAdditions $ incrementalToDynamic replaceableMap
188 return $ Replaceable (mconcatIncrementalReplaceableDynMap replaceableMap) $ fmapMaybe id $ updated $ zipDynWith replaceSelf noMoreAdditions $ incrementalToDynamic replaceableMap
188 rec children <- lift $ manageChildren childOutputs $ cfg ^. deleteSelf
189 rec children <- lift $ manageChildren childOutputs $ cfg ^. deleteSelf