move user control logic into the model, fixes #133

phetsims · Aug 18, 2023 · ea664b6 · ea664b6
1 parent fb9418f
commit ea664b6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/js/common/model/BANModel.ts b/js/common/model/BANModel.ts
@@ -105,6 +105,29 @@ class BANModel<T extends ParticleAtom> {
       ( protonNumber: number, neutronNumber: number ) => AtomIdentifier.doesExist( protonNumber, neutronNumber )
     );
 
+    const userControlledListener = ( isUserControlled: boolean, particle: Particle ) => {
+      if ( isUserControlled && this.particleAtom.containsParticle( particle ) ) {
+        this.particleAtom.removeParticle( particle );
+      }
+
+      if ( isUserControlled && particle.type === ParticleType.PROTON.particleTypeString && !this.userControlledProtons.includes( particle ) ) {
+        this.userControlledProtons.add( particle );
+      }
+      else if ( !isUserControlled && particle.type === ParticleType.PROTON.particleTypeString && this.userControlledProtons.includes( particle ) ) {
+        this.userControlledProtons.remove( particle );
+      }
+      else if ( isUserControlled && particle.type === ParticleType.NEUTRON.particleTypeString && !this.userControlledNeutrons.includes( particle ) ) {
+        this.userControlledNeutrons.add( particle );
+      }
+      else if ( !isUserControlled && particle.type === ParticleType.NEUTRON.particleTypeString && this.userControlledNeutrons.includes( particle ) ) {
+        this.userControlledNeutrons.remove( particle );
+      }
+    };
+
+    this.particles.addItemAddedListener( particle => {
+      particle.userControlledProperty.link( isUserControlled => userControlledListener( isUserControlled, particle ) );
+    } );
+
     // reconfigure the nucleus when the massNumber changes
     this.particleAtom.massNumberProperty.link( () => this.particleAtom.reconfigureNucleus() );
   }

diff --git a/js/common/view/BANScreenView.ts b/js/common/view/BANScreenView.ts
@@ -454,24 +454,6 @@ abstract class BANScreenView<M extends BANModel<ParticleAtom | ParticleNucleus>>
     } );
     this.addChild( this.resetAllButton );
 
-    const userControlledListener = ( isUserControlled: boolean, particle: Particle ) => {
-      if ( isUserControlled && this.model.particleAtom.containsParticle( particle ) ) {
-        this.model.particleAtom.removeParticle( particle );
-      }
-
-      if ( isUserControlled && particle.type === ParticleType.PROTON.particleTypeString && !this.model.userControlledProtons.includes( particle ) ) {
-        this.model.userControlledProtons.add( particle );
-      }
-      else if ( !isUserControlled && particle.type === ParticleType.PROTON.particleTypeString && this.model.userControlledProtons.includes( particle ) ) {
-        this.model.userControlledProtons.remove( particle );
-      }
-      else if ( isUserControlled && particle.type === ParticleType.NEUTRON.particleTypeString && !this.model.userControlledNeutrons.includes( particle ) ) {
-        this.model.userControlledNeutrons.add( particle );
-      }
-      else if ( !isUserControlled && particle.type === ParticleType.NEUTRON.particleTypeString && this.model.userControlledNeutrons.includes( particle ) ) {
-        this.model.userControlledNeutrons.remove( particle );
-      }
-    };
 
     // add ParticleView's to match the model
     this.model.particles.addItemAddedListener( ( particle: Particle ) => {
@@ -488,8 +470,6 @@ abstract class BANScreenView<M extends BANModel<ParticleAtom | ParticleNucleus>>
         this.checkIfCreatorNodeShouldBeInvisible( particleType );
       }
 
-      particle.userControlledProperty.link( isUserControlled => userControlledListener( isUserControlled, particle ) );
-
       particle.disposeEmitter.addListener( () => {
         delete this.particleViewMap[ particle.id ];