refactor: Make the RecyclableBlockFlyoutInflater inert for non-contin…

…uous flyouts.
google · Nov 8, 2024 · a538e7e · a538e7e
1 parent 7c0a08c
commit a538e7e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/plugins/continuous-toolbox/src/ContinuousFlyout.ts b/plugins/continuous-toolbox/src/ContinuousFlyout.ts
@@ -56,6 +56,8 @@ export class ContinuousFlyout extends Blockly.VerticalFlyout {
         this.selectCategoryByScrollPosition(-this.getWorkspace().scrollY);
       }
     });
+
+    this.setRecyclingEnabled(true);
   }
 
   /**
@@ -234,10 +236,7 @@ export class ContinuousFlyout extends Blockly.VerticalFlyout {
     if (!this.getParentToolbox().getSelectedItem()) {
       this.selectCategoryByScrollPosition(0);
     }
-    const inflater = this.getInflaterForType('block');
-    if (inflater instanceof RecyclableBlockFlyoutInflater) {
-      inflater.emptyRecycledBlocks();
-    }
+    this.getRecyclableInflater().emptyRecycledBlocks();
   }
 
   /**
@@ -246,10 +245,7 @@ export class ContinuousFlyout extends Blockly.VerticalFlyout {
    * @param func The function used to determine if a block is recyclable.
    */
   setBlockIsRecyclable(func: (block: Blockly.Block) => boolean) {
-    const inflater = this.getInflaterForType('block');
-    if (inflater instanceof RecyclableBlockFlyoutInflater) {
-      inflater.setRecyclingEligibilityChecker(func);
-    }
+    this.getRecyclableInflater().setRecyclingEligibilityChecker(func);
   }
 
   /**
@@ -258,9 +254,20 @@ export class ContinuousFlyout extends Blockly.VerticalFlyout {
    * @param isEnabled True to allow blocks to be recycled, false otherwise.
    */
   setRecyclingEnabled(isEnabled: boolean) {
+    this.getRecyclableInflater().setRecyclingEnabled(isEnabled);
+  }
+
+  /**
+   * Returns the recyclable block flyout inflater.
+   *
+   * @returns The recyclable inflater.
+   */
+  protected getRecyclableInflater(): RecyclableBlockFlyoutInflater {
     const inflater = this.getInflaterForType('block');
-    if (inflater instanceof RecyclableBlockFlyoutInflater) {
-      inflater.setRecyclingEnabled(isEnabled);
+    if (!(inflater instanceof RecyclableBlockFlyoutInflater)) {
+      throw new Error('The RecyclableBlockFlyoutInflater is not registered.');
     }
+
+    return inflater;
   }
 }
diff --git a/plugins/continuous-toolbox/src/RecyclableBlockFlyoutInflater.ts b/plugins/continuous-toolbox/src/RecyclableBlockFlyoutInflater.ts
@@ -13,7 +13,7 @@ export class RecyclableBlockFlyoutInflater extends Blockly.BlockFlyoutInflater {
   /**
    * Whether or not block recycling is enabled.
    */
-  private recyclingEnabled = true;
+  private recyclingEnabled = false;
 
   /**
    * Map from block type to block instance.