From fe849ba821b7632764a6c28ba6bf896f62d3b619 Mon Sep 17 00:00:00 2001
From: Sam Reid <reids@colorado.edu>
Date: Fri, 16 Sep 2022 10:01:33 -0600
Subject: [PATCH] Add phetioVisiblePropertyInstrumented: true, see
 https://github.com/phetsims/scenery/issues/1447

---
 js/common/view/BeakerView.js                     |  3 ++-
 js/energy-forms-and-changes-phet-io-overrides.js | 11 ++++-------
 js/intro/view/BlockNode.js                       |  3 ++-
 js/systems/view/GeneratorNode.js                 |  3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/common/view/BeakerView.js b/js/common/view/BeakerView.js
index 5fb19622..0c496b31 100644
--- a/js/common/view/BeakerView.js
+++ b/js/common/view/BeakerView.js
@@ -188,7 +188,8 @@ class BeakerView extends PhetioObject {
     const labelText = new RichText( options.label, {
       font: LABEL_FONT,
       maxWidth: beakerBounds.width * 0.7, // empirically determined to look nice
-      tandem: options.tandem.createTandem( 'labelText' )
+      tandem: options.tandem.createTandem( 'labelText' ),
+      phetioVisiblePropertyInstrumented: true
     } );
 
     labelText.translation = new Vector2(
diff --git a/js/energy-forms-and-changes-phet-io-overrides.js b/js/energy-forms-and-changes-phet-io-overrides.js
index 625c6750..ba5de71a 100644
--- a/js/energy-forms-and-changes-phet-io-overrides.js
+++ b/js/energy-forms-and-changes-phet-io-overrides.js
@@ -70,16 +70,13 @@ window.phet.preloads.phetio.phetioElementsOverrides =
     "energyFormsAndChanges.introScreen.view.beakerProxyNodeGroup.archetype.labelText.stringProperty": {
       "phetioFeatured": true
     },
-    "energyFormsAndChanges.introScreen.view.beakerProxyNodeGroup.archetype.labelNode.visibleProperty": {
-      "phetioFeatured": true
-    },
-    "energyFormsAndChanges.introScreen.view.blockNodeGroup.archetype.labelNode.textProperty": {
+    "energyFormsAndChanges.introScreen.view.beakerProxyNodeGroup.archetype.labelText.visibleProperty": {
       "phetioFeatured": true
     },
     "energyFormsAndChanges.introScreen.view.blockNodeGroup.archetype.labelText.stringProperty": {
       "phetioFeatured": true
     },
-    "energyFormsAndChanges.introScreen.view.blockNodeGroup.archetype.labelNode.visibleProperty": {
+    "energyFormsAndChanges.introScreen.view.blockNodeGroup.archetype.labelText.visibleProperty": {
       "phetioFeatured": true
     },
     "energyFormsAndChanges.introScreen.view.controlPanel.visibleProperty": {
@@ -163,7 +160,7 @@ window.phet.preloads.phetio.phetioElementsOverrides =
     "energyFormsAndChanges.systemsScreen.view.energyConverters.generatorNode.labelText.stringProperty": {
       "phetioFeatured": true
     },
-    "energyFormsAndChanges.systemsScreen.view.energyConverters.generatorNode.labelNode.visibleProperty": {
+    "energyFormsAndChanges.systemsScreen.view.energyConverters.generatorNode.labelText.visibleProperty": {
       "phetioFeatured": true
     },
     "energyFormsAndChanges.systemsScreen.view.energySourceSelectorPanel.visibleProperty": {
@@ -196,7 +193,7 @@ window.phet.preloads.phetio.phetioElementsOverrides =
     "energyFormsAndChanges.systemsScreen.view.energyUsers.beakerHeaterNode.beakerProxyNode.labelText.stringProperty": {
       "phetioFeatured": true
     },
-    "energyFormsAndChanges.systemsScreen.view.energyUsers.beakerHeaterNode.beakerProxyNode.labelNode.visibleProperty": {
+    "energyFormsAndChanges.systemsScreen.view.energyUsers.beakerHeaterNode.beakerProxyNode.labelText.visibleProperty": {
       "phetioFeatured": true
     }
   };
\ No newline at end of file
diff --git a/js/intro/view/BlockNode.js b/js/intro/view/BlockNode.js
index 78dccb84..36512574 100644
--- a/js/intro/view/BlockNode.js
+++ b/js/intro/view/BlockNode.js
@@ -221,7 +221,8 @@ class BlockNode extends Node {
       maxWidth: modelViewTransform.modelToViewDeltaX( EFACConstants.BLOCK_SURFACE_WIDTH * 0.9 ),
       centerX: ( upperLeftFrontCorner.x + upperRightFrontCorner.x ) / 2,
       centerY: ( upperLeftFrontCorner.y + lowerLeftFrontCorner.y ) / 2,
-      tandem: options.tandem.createTandem( 'labelText' )
+      tandem: options.tandem.createTandem( 'labelText' ),
+      phetioVisiblePropertyInstrumented: true
     } );
     this.addChild( labelText );
 
diff --git a/js/systems/view/GeneratorNode.js b/js/systems/view/GeneratorNode.js
index eaf18b42..67d5421f 100644
--- a/js/systems/view/GeneratorNode.js
+++ b/js/systems/view/GeneratorNode.js
@@ -56,7 +56,8 @@ class GeneratorNode extends MoveFadeModelElementNode {
       centerX: generatorNode.centerX,
       bottom: generatorNode.bottom - 6,
       tandem: options.tandem.createTandem( 'labelText' ),
-      maxWidth: 160 // empirially determined
+      maxWidth: 160, // empirially determined
+      phetioVisiblePropertyInstrumented: true
     } );
     const spokesNode = new Image( generatorWheelSpokes_png, {
       centerX: generatorNode.centerX,