@@ -398,13 +398,13 @@ function schedule_possible_effect_self_invalidation(signal, effect, root = true)
398398/**
399399 * @template V
400400 * @param {Reaction } reaction
401- * @param {Reaction | null } [previous_reaction]
402401 * @returns {V }
403402 */
404- export function update_reaction ( reaction , previous_reaction = active_reaction ) {
403+ export function update_reaction ( reaction ) {
405404 var previous_deps = new_deps ;
406405 var previous_skipped_deps = skipped_deps ;
407406 var previous_untracked_writes = untracked_writes ;
407+ var previous_reaction = active_reaction ;
408408 var previous_skip_reaction = skip_reaction ;
409409 var previous_reaction_sources = reaction_sources ;
410410 var previous_component_context = component_context ;
@@ -476,7 +476,7 @@ export function update_reaction(reaction, previous_reaction = active_reaction) {
476476 // we need to increment the read version to ensure that
477477 // any dependencies in this reaction aren't marked with
478478 // the same version
479- if ( previous_reaction !== null ) {
479+ if ( previous_reaction !== null && previous_reaction !== reaction ) {
480480 read_version ++ ;
481481
482482 if ( untracked_writes !== null ) {
@@ -493,6 +493,7 @@ export function update_reaction(reaction, previous_reaction = active_reaction) {
493493 new_deps = previous_deps ;
494494 skipped_deps = previous_skipped_deps ;
495495 untracked_writes = previous_untracked_writes ;
496+ console . log ( untracked_writes )
496497 active_reaction = previous_reaction ;
497498 skip_reaction = previous_skip_reaction ;
498499 reaction_sources = previous_reaction_sources ;
@@ -562,10 +563,9 @@ export function remove_reactions(signal, start_index) {
562563
563564/**
564565 * @param {Effect } effect
565- * @param {Reaction | null } [previous_reaction]
566566 * @returns {void }
567567 */
568- export function update_effect ( effect , previous_reaction = active_reaction ) {
568+ export function update_effect ( effect ) {
569569 var flags = effect . f ;
570570
571571 if ( ( flags & DESTROYED ) !== 0 ) {
@@ -594,7 +594,7 @@ export function update_effect(effect, previous_reaction = active_reaction) {
594594 }
595595
596596 execute_effect_teardown ( effect ) ;
597- var teardown = update_reaction ( effect , previous_reaction ) ;
597+ var teardown = update_reaction ( effect ) ;
598598 effect . teardown = typeof teardown === 'function' ? teardown : null ;
599599 effect . wv = write_version ;
600600
0 commit comments