updateElementName should not support layout, #90

phetsims · Jul 31, 2023 · 03104f2 · 03104f2
1 parent a8badaf
commit 03104f2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/js/chart-intro/view/ChartIntroScreenView.ts b/js/chart-intro/view/ChartIntroScreenView.ts
@@ -115,16 +115,17 @@ class ChartIntroScreenView extends BANScreenView<ChartIntroModel> {
     this.periodicTableAndIsotopeSymbol.right = this.resetAllButton.right;
     this.addChild( this.periodicTableAndIsotopeSymbol );
 
-    this.elementName.centerX = this.doubleArrowButtons.centerX;
-    this.elementName.top = this.nucleonCountPanel.top;
+    this.elementName.boundsProperty.link( () => {
+      this.elementName.centerX = this.doubleArrowButtons.centerX;
+      this.elementName.top = this.nucleonCountPanel.top;
+    } );
 
     this.nucleonCountPanel.left = this.layoutBounds.left + 20;
 
     // Hook up update listeners.
     Multilink.multilink( [ model.particleAtom.protonCountProperty, model.particleAtom.neutronCountProperty, model.doesNuclideExistBooleanProperty ],
       ( protonCount: number, neutronCount: number, doesNuclideExist: boolean ) =>
-        BANScreenView.updateElementName( this.elementName, protonCount, neutronCount, doesNuclideExist,
-          this.doubleArrowButtons.centerX )
+        BANScreenView.updateElementName( this.elementName, protonCount, neutronCount, doesNuclideExist )
     );
 
     // create and add the 'Nuclear Shell Model' title

diff --git a/js/common/view/BANScreenView.ts b/js/common/view/BANScreenView.ts
@@ -751,8 +751,7 @@ abstract class BANScreenView<M extends BANModel<ParticleAtom | ParticleNucleus>>
    * TODO: support dynamic locale for this whole function, https://github.com/phetsims/build-a-nucleus/issues/90
    *
    */
-  public static updateElementName( elementNameText: Text, protonCount: number, neutronCount: number,
-                                   doesNuclideExist: boolean, centerX: number, centerY?: number ): void {
+  public static updateElementName( elementNameText: Text, protonCount: number, neutronCount: number, doesNuclideExist: boolean ): void {
     let name = AtomIdentifier.getName( protonCount );
     const massNumber = protonCount + neutronCount;
 
@@ -793,10 +792,6 @@ abstract class BANScreenView<M extends BANModel<ParticleAtom | ParticleNucleus>>
       name += ' - ' + massNumber.toString();
     }
     elementNameText.string = name;
-    elementNameText.centerX = centerX;
-    if ( centerY ) {
-      elementNameText.centerY = centerY;
-    }
   }
 
   /**

diff --git a/js/decay/view/DecayScreenView.ts b/js/decay/view/DecayScreenView.ts
@@ -242,15 +242,15 @@ class DecayScreenView extends BANScreenView<DecayModel> {
     };
     model.doesNuclideExistBooleanProperty.link( updateStabilityIndicatorVisibility );
 
-    // TODO: move elementName to BANScreenView bc text node the same, just positioning different https://github.com/phetsims/build-a-nucleus/issues/93
-
-    this.elementName.center = this.stabilityIndicator.center.plusXY( 0, 60 );
+    this.elementName.boundsProperty.link( () => {
+      this.elementName.center = this.stabilityIndicator.center.plusXY( 0, 60 );
+    } );
     this.nucleonCountPanel.left = availableDecaysPanel.left;
 
     // Hook up update listeners.
     Multilink.multilink( [ model.particleAtom.protonCountProperty, model.particleAtom.neutronCountProperty, model.doesNuclideExistBooleanProperty ],
       ( protonCount: number, neutronCount: number, doesNuclideExist: boolean ) =>
-        BANScreenView.updateElementName( this.elementName, protonCount, neutronCount, doesNuclideExist, this.stabilityIndicator.centerX )
+        BANScreenView.updateElementName( this.elementName, protonCount, neutronCount, doesNuclideExist )
     );
 
     // only show the emptyAtomCircle if less than 2 particles are in the atom. We still want to show it when there's

diff --git a/js/decay/view/HalfLifeNumberLineNode.ts b/js/decay/view/HalfLifeNumberLineNode.ts
@@ -225,6 +225,10 @@ class HalfLifeNumberLineNode extends Node {
         maxWidth: BANConstants.ELEMENT_NAME_MAX_WIDTH
       } );
       this.halfLifeDisplayNode.insertChild( 0, elementName );
+      const desiredCenterX = this.halfLifeDisplayNode.centerX;
+      this.halfLifeDisplayNode.boundsProperty.link( () => {
+        this.halfLifeDisplayNode.centerX = desiredCenterX;
+      } );
 
       // Hook up update listeners.
       Multilink.multilink( [
@@ -233,7 +237,7 @@ class HalfLifeNumberLineNode extends Node {
           options.doesNuclideExistBooleanProperty
         ],
         ( protonCount, neutronCount, doesNuclideExist ) => BANScreenView.updateElementName( elementName,
-          protonCount, neutronCount, doesNuclideExist, this.halfLifeDisplayNode.centerX )
+          protonCount, neutronCount, doesNuclideExist )
       );
     }