Limit ten frames through visibility, see: phetsims/number-compare#25

phetsims · Mar 20, 2023 · 7a17fd9 · 7a17fd9
1 parent da87bcf
commit 7a17fd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/js/lab/model/LabModel.ts b/js/lab/model/LabModel.ts
@@ -23,8 +23,8 @@ const HIGHEST_COUNT = 20;
 class LabModel implements TModel {
   public readonly tenFrames: ObservableArray<TenFrame>;
 
-  // Whether the tenFrame icon is pickable by a user or not.
-  public readonly tenFrameIconPickableProperty: Property<boolean>;
+  // Whether the tenFrame icon is visible or not.
+  public readonly tenFrameIconVisibleProperty: Property<boolean>;
   public readonly onesPlayArea: CountingPlayArea;
   public readonly dogPlayArea: CountingPlayArea;
   public readonly applePlayArea: CountingPlayArea;
@@ -35,7 +35,7 @@ class LabModel implements TModel {
   public constructor( tandem: Tandem ) {
 
     this.tenFrames = createObservableArray();
-    this.tenFrameIconPickableProperty = new BooleanProperty( this.tenFrames.length < NumberSuiteCommonConstants.MAX_AMOUNT_OF_TEN_FRAMES );
+    this.tenFrameIconVisibleProperty = new BooleanProperty( this.tenFrames.length < NumberSuiteCommonConstants.MAX_AMOUNT_OF_TEN_FRAMES );
     this.selectedTenFrameProperty = new Property<TenFrame | null>( null );
 
     // create five different kinds of play areas
@@ -73,7 +73,7 @@ class LabModel implements TModel {
     this.tenFrames.lengthProperty.link( length => {
 
       // Limit the amount of tenFrames a user can add to the screen
-      this.tenFrameIconPickableProperty.value = length < NumberSuiteCommonConstants.MAX_AMOUNT_OF_TEN_FRAMES;
+      this.tenFrameIconVisibleProperty.value = length < NumberSuiteCommonConstants.MAX_AMOUNT_OF_TEN_FRAMES;
     } );
 
     this.tenFrames.addItemRemovedListener( tenFrame => {
@@ -98,7 +98,7 @@ class LabModel implements TModel {
     this.ballPlayArea.reset();
     this.onesPlayArea.reset();
     this.tenFrames.clear();
-    this.tenFrameIconPickableProperty.reset();
+    this.tenFrameIconVisibleProperty.reset();
   }
 }
 

diff --git a/js/lab/view/TenFrameCreatorPanel.ts b/js/lab/view/TenFrameCreatorPanel.ts
@@ -52,9 +52,11 @@ class TenFrameCreatorPanel extends NumberSuiteCommonPanel {
       tenFrameNode.dragListener.press( event, tenFrameNode );
     } );
 
-    model.tenFrameIconPickableProperty.link( pickable => {
-      iconNode.cursor = pickable ? 'pointer' : 'auto';
-      iconNode.inputListeners = pickable ? [ dragListener ] : [];
+    iconNode.cursor = 'pointer';
+    iconNode.inputListeners = [ dragListener ];
+
+    model.tenFrameIconVisibleProperty.link( visible => {
+      iconNode.visible = visible;
     } );
 
     super( creatorNodeBackground, {