diff --git a/js/common/view/RaysRadioButtonGroup.ts b/js/common/view/RaysRadioButtonGroup.ts index 865c31c4..e7a81f6c 100644 --- a/js/common/view/RaysRadioButtonGroup.ts +++ b/js/common/view/RaysRadioButtonGroup.ts @@ -18,6 +18,7 @@ import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize. import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; type SelfOptions = EmptySelfOptions; @@ -39,10 +40,10 @@ export default class RaysRadioButtonGroup extends VerticalAquaRadioButtonGroup { +function createItem( value: RaysType, + labelStringProperty: TReadOnlyProperty, + groupTandem: Tandem, + itemTandemName: string ): AquaRadioButtonGroupItem { return { value: value, - node: new Text( text, { + node: new Text( labelStringProperty, { font: GOConstants.CONTROL_FONT, maxWidth: 65, tandem: groupTandem.createTandem( itemTandemName ).createTandem( 'labelText' ), diff --git a/js/geometric-optics-phet-io-overrides.js b/js/geometric-optics-phet-io-overrides.js index e714e96c..33ac77b5 100644 --- a/js/geometric-optics-phet-io-overrides.js +++ b/js/geometric-optics-phet-io-overrides.js @@ -226,18 +226,6 @@ window.phet.preloads.phetio.phetioElementsOverrides = "geometricOptics.lensScreen.view.controls.controlPanel.opticSubpanel.visibleProperty": { "phetioFeatured": true }, - "geometricOptics.lensScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.manyRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, - "geometricOptics.lensScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.marginalRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, - "geometricOptics.lensScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.noneRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, - "geometricOptics.lensScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.principalRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, "geometricOptics.lensScreen.view.controls.controlPanel.raysSubpanel.visibleProperty": { "phetioFeatured": true }, @@ -508,18 +496,6 @@ window.phet.preloads.phetio.phetioElementsOverrides = "geometricOptics.mirrorScreen.view.controls.controlPanel.opticSubpanel.visibleProperty": { "phetioFeatured": true }, - "geometricOptics.mirrorScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.manyRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, - "geometricOptics.mirrorScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.marginalRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, - "geometricOptics.mirrorScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.noneRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, - "geometricOptics.mirrorScreen.view.controls.controlPanel.raysSubpanel.raysRadioButtonGroup.principalRadioButton.labelText.textProperty": { - "phetioFeatured": true - }, "geometricOptics.mirrorScreen.view.controls.controlPanel.raysSubpanel.visibleProperty": { "phetioFeatured": true },