diff --git a/js/PhetButton.js b/js/PhetButton.js index d3bbf83a..68502791 100644 --- a/js/PhetButton.js +++ b/js/PhetButton.js @@ -11,14 +11,15 @@ import Property from '../../axon/js/Property.js'; import inherit from '../../phet-core/js/inherit.js'; import Image from '../../scenery/js/nodes/Image.js'; import Node from '../../scenery/js/nodes/Node.js'; -import joist from './joist.js'; -import joistStrings from './joistStrings.js'; +import Tandem from '../../tandem/js/Tandem.js'; import JoistButton from './JoistButton.js'; import KebabMenuIcon from './KebabMenuIcon.js'; import PhetButtonIO from './PhetButtonIO.js'; import PhetMenu from './PhetMenu.js'; -import updateCheck from './updateCheck.js'; import UpdateState from './UpdateState.js'; +import joist from './joist.js'; +import joistStrings from './joistStrings.js'; +import updateCheck from './updateCheck.js'; // Accommodate logos of any height by scaling them down proportionately. // The primary logo is 108px high and we have been scaling it at 0.28 to make it look good even on higher resolution @@ -95,6 +96,12 @@ function PhetButton( sim, backgroundFillProperty, tandem ) { phetioFeatured: true }, + visiblePropertyOptions: { + // TODO: Shouldn't it be read-only instead of uninstrumented? See https://github.com/phetsims/scenery/issues/1046 + tandem: Tandem.OPT_OUT, + phetioReadOnly: true + }, + // pdom tagName: 'button', innerContent: joistStrings.a11y.phetMenu diff --git a/js/PhetMenu.js b/js/PhetMenu.js index 61420ad7..48dd6709 100644 --- a/js/PhetMenu.js +++ b/js/PhetMenu.js @@ -15,8 +15,8 @@ import openPopup from '../../phet-core/js/openPopup.js'; import platform from '../../phet-core/js/platform.js'; import stripEmbeddingMarks from '../../phet-core/js/stripEmbeddingMarks.js'; import PhetFont from '../../scenery-phet/js/PhetFont.js'; -import PDOMUtils from '../../scenery/js/accessibility/pdom/PDOMUtils.js'; import KeyboardUtils from '../../scenery/js/accessibility/KeyboardUtils.js'; +import PDOMUtils from '../../scenery/js/accessibility/pdom/PDOMUtils.js'; import Display from '../../scenery/js/display/Display.js'; import Node from '../../scenery/js/nodes/Node.js'; import Path from '../../scenery/js/nodes/Path.js'; @@ -28,15 +28,16 @@ import MenuItem from '../../sun/js/MenuItem.js'; import soundManager from '../../tambo/js/soundManager.js'; import PhetioCapsule from '../../tandem/js/PhetioCapsule.js'; import PhetioCapsuleIO from '../../tandem/js/PhetioCapsuleIO.js'; +import Tandem from '../../tandem/js/Tandem.js'; import AboutDialog from './AboutDialog.js'; -import joistStrings from './joistStrings.js'; -import joist from './joist.js'; import OptionsDialog from './OptionsDialog.js'; import PhetMenuIO from './PhetMenuIO.js'; import ScreenshotGenerator from './ScreenshotGenerator.js'; -import updateCheck from './updateCheck.js'; import UpdateDialog from './UpdateDialog.js'; import UpdateState from './UpdateState.js'; +import joist from './joist.js'; +import joistStrings from './joistStrings.js'; +import updateCheck from './updateCheck.js'; const menuItemAboutString = joistStrings.menuItem.about; const menuItemEnhancedSoundString = joistStrings.menuItem.enhancedSound; @@ -106,6 +107,12 @@ function PhetMenu( sim, phetButton, tandem, options ) { phetioState: false, phetioDocumentation: 'This menu is displayed when the PhET button is pressed.', + visiblePropertyOptions: { + // TODO: Shouldn't it be read-only instead of uninstrumented? See https://github.com/phetsims/scenery/issues/1046 + tandem: Tandem.OPT_OUT, + phetioReadOnly: true + }, + // pdom, tagname and role for content in the menu tagName: 'ul', ariaRole: 'menu'