diff --git a/js/ABSwitch.ts b/js/ABSwitch.ts index 351c9b5f..d9fd3505 100644 --- a/js/ABSwitch.ts +++ b/js/ABSwitch.ts @@ -74,6 +74,7 @@ export default class ABSwitch extends HBox { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'Switch', visiblePropertyOptions: { phetioFeatured: true }, phetioEnabledPropertyInstrumented: true // opt into default PhET-iO instrumented enabledProperty }, providedOptions ); diff --git a/js/AccordionBox.ts b/js/AccordionBox.ts index cefcf340..fcac1bcf 100644 --- a/js/AccordionBox.ts +++ b/js/AccordionBox.ts @@ -187,6 +187,7 @@ export default class AccordionBox extends Node { // phet-io support tandem: Tandem.REQUIRED, + tandemSuffix: 'AccordionBox', phetioType: AccordionBox.AccordionBoxIO, phetioEventType: EventType.USER, visiblePropertyOptions: { phetioFeatured: true } diff --git a/js/AquaRadioButton.ts b/js/AquaRadioButton.ts index adacc9db..b1c0c3d7 100644 --- a/js/AquaRadioButton.ts +++ b/js/AquaRadioButton.ts @@ -85,6 +85,7 @@ export default class AquaRadioButton extends Voicing( Node ) { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'RadioButton', visiblePropertyOptions: { phetioFeatured: true }, phetioEnabledPropertyInstrumented: true, // opt into default PhET-iO instrumented enabledProperty diff --git a/js/AquaRadioButtonGroup.ts b/js/AquaRadioButtonGroup.ts index ec12912a..dab765f0 100644 --- a/js/AquaRadioButtonGroup.ts +++ b/js/AquaRadioButtonGroup.ts @@ -77,6 +77,7 @@ export default class AquaRadioButtonGroup extends FlowBox { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'RadioButtonGroup', visiblePropertyOptions: { phetioFeatured: true }, phetioEnabledPropertyInstrumented: true, // opt into default PhET-iO instrumented enabledProperty diff --git a/js/Checkbox.ts b/js/Checkbox.ts index bd5e7153..8bc17059 100644 --- a/js/Checkbox.ts +++ b/js/Checkbox.ts @@ -103,6 +103,7 @@ export default class Checkbox extends WidthSizable( Voicing( Node ) ) { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'Checkbox', phetioEventType: EventType.USER, visiblePropertyOptions: { phetioFeatured: true }, phetioEnabledPropertyInstrumented: true, // opt into default PhET-iO instrumented enabledProperty diff --git a/js/ComboBox.ts b/js/ComboBox.ts index c5c896b3..13494f3f 100644 --- a/js/ComboBox.ts +++ b/js/ComboBox.ts @@ -233,6 +233,7 @@ export default class ComboBox extends WidthSizable( Node ) { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'ComboBox', phetioType: ComboBox.ComboBoxIO, phetioEventType: EventType.USER, visiblePropertyOptions: { phetioFeatured: true }, diff --git a/js/ComboBoxListItemNode.ts b/js/ComboBoxListItemNode.ts index b1bd119a..6bce41da 100644 --- a/js/ComboBoxListItemNode.ts +++ b/js/ComboBoxListItemNode.ts @@ -69,6 +69,7 @@ export default class ComboBoxListItemNode extends Voicing( Node ) { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'Item', // Together, these options make it possible to reorder the combo box items in studio, and save a customized // simulation with the new order. diff --git a/js/ExpandCollapseButton.ts b/js/ExpandCollapseButton.ts index 572929cf..56eec40a 100644 --- a/js/ExpandCollapseButton.ts +++ b/js/ExpandCollapseButton.ts @@ -46,7 +46,8 @@ export default class ExpandCollapseButton extends BooleanRectangularToggleButton touchAreaYDilation: 5, // phet-io - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // BooleanRectangularToggleButtonOptions that are controlled by ExpandCollapseButton diff --git a/js/NumberPicker.ts b/js/NumberPicker.ts index caa4000e..894677b0 100644 --- a/js/NumberPicker.ts +++ b/js/NumberPicker.ts @@ -177,6 +177,7 @@ export default class NumberPicker extends AccessibleNumberSpinner( Node, 0 ) { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'Picker', phetioReadOnly: PhetioObject.DEFAULT_OPTIONS.phetioReadOnly, visiblePropertyOptions: { phetioFeatured: true }, phetioEnabledPropertyInstrumented: true diff --git a/js/NumberSpinner.ts b/js/NumberSpinner.ts index 49543a55..4da12a9c 100644 --- a/js/NumberSpinner.ts +++ b/js/NumberSpinner.ts @@ -109,6 +109,7 @@ export default class NumberSpinner extends AccessibleNumberSpinner( Node, 0 ) { // PhET-iO tandem: Tandem.REQUIRED, + tandemSuffix: 'Spinner', phetioEnabledPropertyInstrumented: true // opt into default PhET-iO instrumented enabledProperty }, providedOptions ); diff --git a/js/PageControl.ts b/js/PageControl.ts index ff066fbd..c0eb4b0d 100644 --- a/js/PageControl.ts +++ b/js/PageControl.ts @@ -65,6 +65,7 @@ export default class PageControl extends Node { // NodeOptions tandem: Tandem.REQUIRED, + tandemSuffix: 'PageControl', visiblePropertyOptions: { phetioFeatured: true } diff --git a/js/Slider.ts b/js/Slider.ts index a6355a43..fbc86a99 100644 --- a/js/Slider.ts +++ b/js/Slider.ts @@ -219,6 +219,7 @@ export default class Slider extends AccessibleSlider( Node, 0 ) { // Supertype options tandem: Tandem.REQUIRED, + tandemSuffix: 'Slider', phetioType: Slider.SliderIO, visiblePropertyOptions: { phetioFeatured: true }, phetioEnabledPropertyInstrumented: true // opt into default PhET-iO instrumented enabledProperty diff --git a/js/SliderThumb.ts b/js/SliderThumb.ts index 25c745f9..40fd7cfb 100644 --- a/js/SliderThumb.ts +++ b/js/SliderThumb.ts @@ -38,7 +38,8 @@ export default class SliderThumb extends Rectangle { fill: 'rgb( 50, 145, 184 )', stroke: 'black', lineWidth: 1, - tandem: Tandem.REQUIRED // Slider.js adds to this tandem to nest its dragListener under the thumb. + tandem: Tandem.REQUIRED, // Slider.js adds to this tandem to nest its dragListener under the thumb. + tandemSuffix: 'ThumbNode' }, providedOptions ); // Set a default corner radius diff --git a/js/SliderTrack.ts b/js/SliderTrack.ts index 2c822dd1..99f945c6 100644 --- a/js/SliderTrack.ts +++ b/js/SliderTrack.ts @@ -76,7 +76,8 @@ export default class SliderTrack extends Node { valueChangeSoundGeneratorOptions: {}, // phet-io - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'TrackNode' }, providedOptions ); // If no sound generator was provided, create the default. diff --git a/js/ToggleSwitch.ts b/js/ToggleSwitch.ts index 6f0cfc27..be648553 100644 --- a/js/ToggleSwitch.ts +++ b/js/ToggleSwitch.ts @@ -110,6 +110,7 @@ export default class ToggleSwitch extends Voicing( Node ) { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'Switch', phetioEventType: EventType.USER, phetioReadOnly: PhetioObject.DEFAULT_OPTIONS.phetioReadOnly, visiblePropertyOptions: { phetioFeatured: true }, diff --git a/js/buttons/BooleanRectangularToggleButton.ts b/js/buttons/BooleanRectangularToggleButton.ts index 8a3146fa..bbcfd4e6 100644 --- a/js/buttons/BooleanRectangularToggleButton.ts +++ b/js/buttons/BooleanRectangularToggleButton.ts @@ -34,7 +34,8 @@ export default class BooleanRectangularToggleButton extends RectangularToggleBut const options = optionize()( { content: content, - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); super( booleanProperty, false, true, options ); diff --git a/js/buttons/BooleanRoundToggleButton.ts b/js/buttons/BooleanRoundToggleButton.ts index 6e6fa649..d0817709 100644 --- a/js/buttons/BooleanRoundToggleButton.ts +++ b/js/buttons/BooleanRoundToggleButton.ts @@ -32,7 +32,8 @@ class BooleanRoundToggleButton extends RoundToggleButton { const options = optionize()( { content: null, - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); const content = new BooleanToggleNode( booleanProperty, trueNode, falseNode, { diff --git a/js/buttons/RectangularMomentaryButton.ts b/js/buttons/RectangularMomentaryButton.ts index 9daca010..1018cfd2 100644 --- a/js/buttons/RectangularMomentaryButton.ts +++ b/js/buttons/RectangularMomentaryButton.ts @@ -36,7 +36,8 @@ export default class RectangularMomentaryButton extends RectangularButton { public constructor( property: TProperty, valueOff: T, valueOn: T, providedOptions?: RectangularMomentaryButtonOptions ) { const options = optionize()( { - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button diff --git a/js/buttons/RectangularPushButton.ts b/js/buttons/RectangularPushButton.ts index 76bc1179..31d28044 100644 --- a/js/buttons/RectangularPushButton.ts +++ b/js/buttons/RectangularPushButton.ts @@ -36,7 +36,8 @@ export default class RectangularPushButton extends RectangularButton { const options = optionize()( { soundPlayer: pushButtonSoundPlayer, - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // Save the listener and add it after creating the button model. This is done so that diff --git a/js/buttons/RectangularRadioButton.ts b/js/buttons/RectangularRadioButton.ts index 0c6e24d0..0eb714e3 100644 --- a/js/buttons/RectangularRadioButton.ts +++ b/js/buttons/RectangularRadioButton.ts @@ -94,6 +94,7 @@ export default class RectangularRadioButton extends RectangularButton { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'Button', phetioReadOnly: PhetioObject.DEFAULT_OPTIONS.phetioReadOnly // to support properly passing this to children, see https://github.com/phetsims/tandem/issues/60 }, providedOptions ); diff --git a/js/buttons/RectangularRadioButtonGroup.ts b/js/buttons/RectangularRadioButtonGroup.ts index 5c19adf2..d26f6001 100644 --- a/js/buttons/RectangularRadioButtonGroup.ts +++ b/js/buttons/RectangularRadioButtonGroup.ts @@ -151,6 +151,7 @@ export default class RectangularRadioButtonGroup extends FlowBox { // phet-io tandem: Tandem.REQUIRED, + tandemSuffix: 'ButtonGroup', visiblePropertyOptions: { phetioFeatured: true }, phetioEnabledPropertyInstrumented: true, // opt into default PhET-iO instrumented enabledProperty diff --git a/js/buttons/RectangularToggleButton.ts b/js/buttons/RectangularToggleButton.ts index df63a3a3..8c893c08 100644 --- a/js/buttons/RectangularToggleButton.ts +++ b/js/buttons/RectangularToggleButton.ts @@ -47,7 +47,8 @@ export default class RectangularToggleButton extends RectangularButton { valueOnSoundPlayer: toggleOnSoundPlayer, // phet-io support - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button diff --git a/js/buttons/RoundMomentaryButton.ts b/js/buttons/RoundMomentaryButton.ts index dbb48322..3c8afe9a 100644 --- a/js/buttons/RoundMomentaryButton.ts +++ b/js/buttons/RoundMomentaryButton.ts @@ -35,7 +35,8 @@ export default class RoundMomentaryButton extends RoundButton { public constructor( property: TProperty, valueOff: T, valueOn: T, providedOptions?: RoundMomentaryButtonOptions ) { const options = optionize()( { - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button diff --git a/js/buttons/RoundPushButton.ts b/js/buttons/RoundPushButton.ts index 897bcc27..d699a11a 100644 --- a/js/buttons/RoundPushButton.ts +++ b/js/buttons/RoundPushButton.ts @@ -37,7 +37,8 @@ export default class RoundPushButton extends RoundButton { const options = optionize()( { soundPlayer: pushButtonSoundPlayer, - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // Save the listener and add it after creating the button model. This is done so that diff --git a/js/buttons/RoundStickyToggleButton.ts b/js/buttons/RoundStickyToggleButton.ts index d5c23f4f..e29c9591 100644 --- a/js/buttons/RoundStickyToggleButton.ts +++ b/js/buttons/RoundStickyToggleButton.ts @@ -42,7 +42,8 @@ export default class RoundStickyToggleButton extends RoundButton { soundPlayer: pushButtonSoundPlayer, // RoundButtonOptions - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button diff --git a/js/buttons/RoundToggleButton.ts b/js/buttons/RoundToggleButton.ts index 661b08f8..2314c9de 100644 --- a/js/buttons/RoundToggleButton.ts +++ b/js/buttons/RoundToggleButton.ts @@ -47,7 +47,8 @@ export default class RoundToggleButton extends RoundButton { valueOnSoundPlayer: toggleOnSoundPlayer, // phet-io support - tandem: Tandem.REQUIRED + tandem: Tandem.REQUIRED, + tandemSuffix: 'Button' }, providedOptions ); // Note it shares a tandem with this, so the emitter will be instrumented as a child of the button diff --git a/js/buttons/TextPushButton.ts b/js/buttons/TextPushButton.ts index d8a66274..c7cda308 100644 --- a/js/buttons/TextPushButton.ts +++ b/js/buttons/TextPushButton.ts @@ -36,6 +36,7 @@ export default class TextPushButton extends RectangularPushButton { // RectangularPushButtonOptions tandem: Tandem.REQUIRED, + tandemSuffix: 'Button', innerContent: text }, providedOptions );