keyboard help for Micro screen, #249

phetsims · Oct 4, 2022 · fcb2f19 · fcb2f19
1 parent 417ef75
commit fcb2f19
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/js/macro/view/MacroKeyboardHelpContent.ts b/js/macro/view/MacroKeyboardHelpContent.ts
@@ -14,12 +14,13 @@ import PhScaleStrings from '../../PhScaleStrings.js';
 import MoveKeyboardHelpContent from '../../common/view/MoveKeyboardHelpContent.js';
 
 export default class MacroKeyboardHelpContent extends TwoColumnKeyboardHelpContent {
+
   public constructor() {
 
     const leftColumn = [
 
       // Move the Dropper
-      new MoveKeyboardHelpContent( PhScaleStrings.keyboardHelpDialog.moveTheDropperStringProperty ),
+      new MoveKeyboardHelpContent( PhScaleStrings.keyboardHelpDialog.moveTheDropperOrPHProbeStringProperty ),
 
       // Choose a Solute
       new ComboBoxKeyboardHelpSection( {

diff --git a/js/micro/view/MicroKeyboardHelpContent.ts b/js/micro/view/MicroKeyboardHelpContent.ts
@@ -1,19 +1,45 @@
 // Copyright 2022, University of Colorado Boulder
 
+//TODO https://github.com/phetsims/ph-scale/issues/249 same as MacroKeyboardHelpContent, except for moveTheDropperStringProperty
 /**
  * MicroKeyboardHelpContent is the keyboard-help content for the 'Micro' screen.
  *
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import { Node, Text } from '../../../../scenery/js/imports.js';
+import TwoColumnKeyboardHelpContent from '../../../../scenery-phet/js/keyboard/help/TwoColumnKeyboardHelpContent.js';
 import phScale from '../../phScale.js';
+import MoveKeyboardHelpContent from '../../common/view/MoveKeyboardHelpContent.js';
+import PhScaleStrings from '../../PhScaleStrings.js';
+import ComboBoxKeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/ComboBoxKeyboardHelpSection.js';
+import BasicActionsKeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/BasicActionsKeyboardHelpSection.js';
+
+export default class MicroKeyboardHelpContent extends TwoColumnKeyboardHelpContent {
 
-export default class MicroKeyboardHelpContent extends Node {
   public constructor() {
-    super( {
-      children: [ new Text( 'Under Construction' ) ]
-    } );
+
+    const leftColumn = [
+
+      // Move the Dropper
+      new MoveKeyboardHelpContent( PhScaleStrings.keyboardHelpDialog.moveTheDropperStringProperty ),
+
+      // Choose a Solute
+      new ComboBoxKeyboardHelpSection( {
+        headingString: PhScaleStrings.keyboardHelpDialog.chooseASoluteStringProperty,
+        thingAsLowerCaseSingular: PhScaleStrings.keyboardHelpDialog.soluteStringProperty,
+        thingAsLowerCasePlural: PhScaleStrings.keyboardHelpDialog.solutesStringProperty
+      } )
+    ];
+
+    const rightColumn = [
+
+      // Basic Actions
+      new BasicActionsKeyboardHelpSection( {
+        withCheckboxContent: true
+      } )
+    ];
+
+    super( leftColumn, rightColumn );
   }
 }