blockly 7.20211209.4 → 8.0.1

package/core/delete_area.js

@@ -18,7 +18,6 @@
  */
 goog.module('Blockly.DeleteArea');
 
-const object = goog.require('Blockly.utils.object');
 const {BlockSvg} = goog.require('Blockly.BlockSvg');
 const {DragTarget} = goog.require('Blockly.DragTarget');
 /* eslint-disable-next-line no-unused-vars */
@@ -32,53 +31,57 @@ const {IDraggable} = goog.requireType('Blockly.IDraggable');
  * dropped on top of it.
  * @extends {DragTarget}
  * @implements {IDeleteArea}
- * @constructor
  * @alias Blockly.DeleteArea
  */
-const DeleteArea = function() {
-  DeleteArea.superClass_.constructor.call(this);
-
+class DeleteArea extends DragTarget {
   /**
-   * Whether the last block or bubble dragged over this delete area would be
-   * deleted if dropped on this component.
-   * This property is not updated after the block or bubble is deleted.
-   * @type {boolean}
-   * @protected
+   * Constructor for DeleteArea. Should not be called directly, only by a
+   * subclass.
    */
-  this.wouldDelete_ = false;
-};
-object.inherits(DeleteArea, DragTarget);
+  constructor() {
+    super();
 
-/**
- * Returns whether the provided block or bubble would be deleted if dropped on
- * this area.
- * This method should check if the element is deletable and is always called
- * before onDragEnter/onDragOver/onDragExit.
- * @param {!IDraggable} element The block or bubble currently being
- *   dragged.
- * @param {boolean} couldConnect Whether the element could could connect to
- *     another.
- * @return {boolean} Whether the element provided would be deleted if dropped on
- *     this area.
- */
-DeleteArea.prototype.wouldDelete = function(element, couldConnect) {
-  if (element instanceof BlockSvg) {
-    const block = /** @type {BlockSvg} */ (element);
-    const couldDeleteBlock = !block.getParent() && block.isDeletable();
-    this.updateWouldDelete_(couldDeleteBlock && !couldConnect);
-  } else {
-    this.updateWouldDelete_(element.isDeletable());
+    /**
+     * Whether the last block or bubble dragged over this delete area would be
+     * deleted if dropped on this component.
+     * This property is not updated after the block or bubble is deleted.
+     * @type {boolean}
+     * @protected
+     */
+    this.wouldDelete_ = false;
   }
-  return this.wouldDelete_;
-};
 
-/**
- * Updates the internal wouldDelete_ state.
- * @param {boolean} wouldDelete The new value for the wouldDelete state.
- * @protected
- */
-DeleteArea.prototype.updateWouldDelete_ = function(wouldDelete) {
-  this.wouldDelete_ = wouldDelete;
-};
+  /**
+   * Returns whether the provided block or bubble would be deleted if dropped on
+   * this area.
+   * This method should check if the element is deletable and is always called
+   * before onDragEnter/onDragOver/onDragExit.
+   * @param {!IDraggable} element The block or bubble currently being
+   *   dragged.
+   * @param {boolean} couldConnect Whether the element could could connect to
+   *     another.
+   * @return {boolean} Whether the element provided would be deleted if dropped
+   *     on this area.
+   */
+  wouldDelete(element, couldConnect) {
+    if (element instanceof BlockSvg) {
+      const block = /** @type {BlockSvg} */ (element);
+      const couldDeleteBlock = !block.getParent() && block.isDeletable();
+      this.updateWouldDelete_(couldDeleteBlock && !couldConnect);
+    } else {
+      this.updateWouldDelete_(element.isDeletable());
+    }
+    return this.wouldDelete_;
+  }
+
+  /**
+   * Updates the internal wouldDelete_ state.
+   * @param {boolean} wouldDelete The new value for the wouldDelete state.
+   * @protected
+   */
+  updateWouldDelete_(wouldDelete) {
+    this.wouldDelete_ = wouldDelete;
+  }
+}
 
 exports.DeleteArea = DeleteArea;

package/core/drag_target.js

@@ -30,68 +30,69 @@ const {Rect} = goog.requireType('Blockly.utils.Rect');
  * Abstract class for a component with custom behaviour when a block or bubble
  * is dragged over or dropped on top of it.
  * @implements {IDragTarget}
- * @constructor
  * @alias Blockly.DragTarget
  */
-const DragTarget = function() {};
+class DragTarget {
+  /**
+   * Handles when a cursor with a block or bubble enters this drag target.
+   * @param {!IDraggable} _dragElement The block or bubble currently being
+   *   dragged.
+   */
+  onDragEnter(_dragElement) {
+    // no-op
+  }
 
-/**
- * Returns the bounding rectangle of the drag target area in pixel units
- * relative to the Blockly injection div.
- * @return {?Rect} The component's bounding box. Null if drag
- *   target area should be ignored.
- */
-DragTarget.prototype.getClientRect;
+  /**
+   * Handles when a cursor with a block or bubble is dragged over this drag
+   * target.
+   * @param {!IDraggable} _dragElement The block or bubble currently being
+   *   dragged.
+   */
+  onDragOver(_dragElement) {
+    // no-op
+  }
 
-/**
- * Handles when a cursor with a block or bubble enters this drag target.
- * @param {!IDraggable} _dragElement The block or bubble currently being
- *   dragged.
- */
-DragTarget.prototype.onDragEnter = function(_dragElement) {
-  // no-op
-};
+  /**
+   * Handles when a cursor with a block or bubble exits this drag target.
+   * @param {!IDraggable} _dragElement The block or bubble currently being
+   *   dragged.
+   */
+  onDragExit(_dragElement) {
+    // no-op
+  }
 
-/**
- * Handles when a cursor with a block or bubble is dragged over this drag
- * target.
- * @param {!IDraggable} _dragElement The block or bubble currently being
- *   dragged.
- */
-DragTarget.prototype.onDragOver = function(_dragElement) {
-  // no-op
-};
+  /**
+   * Handles when a block or bubble is dropped on this component.
+   * Should not handle delete here.
+   * @param {!IDraggable} _dragElement The block or bubble currently being
+   *   dragged.
+   */
+  onDrop(_dragElement) {
+    // no-op
+  }
 
-/**
- * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!IDraggable} _dragElement The block or bubble currently being
- *   dragged.
- */
-DragTarget.prototype.onDragExit = function(_dragElement) {
-  // no-op
-};
-
-/**
- * Handles when a block or bubble is dropped on this component.
- * Should not handle delete here.
- * @param {!IDraggable} _dragElement The block or bubble currently being
- *   dragged.
- */
-DragTarget.prototype.onDrop = function(_dragElement) {
-  // no-op
-};
+  /**
+   * Returns the bounding rectangle of the drag target area in pixel units
+   * relative to the Blockly injection div.
+   * @return {?Rect} The component's bounding box. Null if drag
+   *   target area should be ignored.
+   */
+  getClientRect() {
+    return null;
+  }
 
-/**
- * Returns whether the provided block or bubble should not be moved after being
- * dropped on this component. If true, the element will return to where it was
- * when the drag started.
- * @param {!IDraggable} _dragElement The block or bubble currently being
- *   dragged.
- * @return {boolean} Whether the block or bubble provided should be returned to
- *     drag start.
- */
-DragTarget.prototype.shouldPreventMove = function(_dragElement) {
-  return false;
-};
+  /**
+   * Returns whether the provided block or bubble should not be moved after
+   * being dropped on this component. If true, the element will return to where
+   * it was when the drag started.
+   * @param {!IDraggable} _dragElement The block or bubble currently being
+   *   dragged.
+   * @return {boolean} Whether the block or bubble provided should be returned
+   *     to drag start.
+   */
+  shouldPreventMove(_dragElement) {
+    return false;
+  }
+}
 
 exports.DragTarget = DragTarget;