blockly 9.0.0-beta.0 → 9.0.0-beta.2

package/core/flyout_metrics_manager.ts

@@ -1,94 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Calculates and reports flyout workspace metrics.
- */
-
-/**
- * Calculates and reports flyout workspace metrics.
- * @class
- */
-import * as goog from '../closure/goog/goog.js';
-goog.declareModuleId('Blockly.FlyoutMetricsManager');
-
-import type {IFlyout} from './interfaces/i_flyout.js';
-import {ContainerRegion, MetricsManager} from './metrics_manager.js';
-import type {WorkspaceSvg} from './workspace_svg.js';
-
-
-/**
- * Calculates metrics for a flyout's workspace.
- * The metrics are mainly used to size scrollbars for the flyout.
- * @alias Blockly.FlyoutMetricsManager
- */
-export class FlyoutMetricsManager extends MetricsManager {
-  /** The flyout that owns the workspace to calculate metrics for. */
-  protected flyout_: IFlyout;
-
-  /**
-   * @param workspace The flyout's workspace.
-   * @param flyout The flyout.
-   */
-  constructor(workspace: WorkspaceSvg, flyout: IFlyout) {
-    super(workspace);
-    this.flyout_ = flyout;
-  }
-
-  /**
-   * Gets the bounding box of the blocks on the flyout's workspace.
-   * This is in workspace coordinates.
-   * @return The bounding box of the blocks on the workspace.
-   */
-  private getBoundingBox_(): SVGRect|
-      {height: number, y: number, width: number, x: number} {
-    let blockBoundingBox;
-    try {
-      blockBoundingBox = this.workspace_.getCanvas().getBBox();
-    } catch (e) {
-      // Firefox has trouble with hidden elements (Bug 528969).
-      // 2021 Update: It looks like this was fixed around Firefox 77 released in
-      // 2020.
-      blockBoundingBox = {height: 0, y: 0, width: 0, x: 0};
-    }
-    return blockBoundingBox;
-  }
-
-  override getContentMetrics(opt_getWorkspaceCoordinates: boolean) {
-    // The bounding box is in workspace coordinates.
-    const blockBoundingBox = this.getBoundingBox_();
-    const scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
-
-    return {
-      height: blockBoundingBox.height * scale,
-      width: blockBoundingBox.width * scale,
-      top: blockBoundingBox.y * scale,
-      left: blockBoundingBox.x * scale,
-    };
-  }
-
-  override getScrollMetrics(
-      opt_getWorkspaceCoordinates: boolean, opt_viewMetrics: ContainerRegion,
-      opt_contentMetrics: ContainerRegion) {
-    // AnyDuringMigration because:  Expected 1 arguments, but got 0.
-    const contentMetrics =
-        opt_contentMetrics || (this.getContentMetrics as AnyDuringMigration)();
-    const margin = this.flyout_.MARGIN * this.workspace_.scale;
-    const scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
-
-    // The left padding isn't just the margin. Some blocks are also offset by
-    // tabWidth so that value and statement blocks line up.
-    // The contentMetrics.left value is equivalent to the variable left padding.
-    const leftPadding = contentMetrics.left;
-
-    return {
-      height: (contentMetrics.height + 2 * margin) / scale,
-      width: (contentMetrics.width + leftPadding + margin) / scale,
-      top: 0,
-      left: 0,
-    };
-  }
-}

package/core/flyout_vertical.ts

@@ -1,384 +0,0 @@
-/**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Layout code for a vertical variant of the flyout.
- */
-
-/**
- * Layout code for a vertical variant of the flyout.
- * @class
- */
-import * as goog from '../closure/goog/goog.js';
-goog.declareModuleId('Blockly.VerticalFlyout');
-
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './block.js';
-// Unused import preserved for side-effects. Remove if unneeded.
-// import './constants.js';
-
-import * as browserEvents from './browser_events.js';
-import * as dropDownDiv from './dropdowndiv.js';
-import {Flyout, FlyoutItem} from './flyout_base.js';
-import type {FlyoutButton} from './flyout_button.js';
-import type {Options} from './options.js';
-import * as registry from './registry.js';
-import {Scrollbar} from './scrollbar.js';
-import type {Coordinate} from './utils/coordinate.js';
-import {Rect} from './utils/rect.js';
-import * as toolbox from './utils/toolbox.js';
-import * as WidgetDiv from './widgetdiv.js';
-
-
-/**
- * Class for a flyout.
- * @alias Blockly.VerticalFlyout
- */
-export class VerticalFlyout extends Flyout {
-  /** The name of the vertical flyout in the registry. */
-  static registryName = 'verticalFlyout';
-
-  // Record the height for workspace metrics.
-  override height_: AnyDuringMigration;
-
-  // Record the width for workspace metrics and .position.
-  override width_: AnyDuringMigration;
-
-  /** @param workspaceOptions Dictionary of options for the workspace. */
-  constructor(workspaceOptions: Options) {
-    super(workspaceOptions);
-  }
-
-  /**
-   * Sets the translation of the flyout to match the scrollbars.
-   * @param xyRatio Contains a y property which is a float between 0 and 1
-   *     specifying the degree of scrolling and a similar x property.
-   */
-  protected override setMetrics_(xyRatio: {x: number, y: number}) {
-    if (!this.isVisible()) {
-      return;
-    }
-    const metricsManager = this.workspace_.getMetricsManager();
-    const scrollMetrics = metricsManager.getScrollMetrics();
-    const viewMetrics = metricsManager.getViewMetrics();
-    const absoluteMetrics = metricsManager.getAbsoluteMetrics();
-
-    if (typeof xyRatio.y === 'number') {
-      this.workspace_.scrollY =
-          -(scrollMetrics.top +
-            (scrollMetrics.height - viewMetrics.height) * xyRatio.y);
-    }
-    this.workspace_.translate(
-        this.workspace_.scrollX + absoluteMetrics.left,
-        this.workspace_.scrollY + absoluteMetrics.top);
-  }
-
-  /**
-   * Calculates the x coordinate for the flyout position.
-   * @return X coordinate.
-   */
-  override getX(): number {
-    if (!this.isVisible()) {
-      return 0;
-    }
-    const metricsManager = this.targetWorkspace!.getMetricsManager();
-    const absoluteMetrics = metricsManager.getAbsoluteMetrics();
-    const viewMetrics = metricsManager.getViewMetrics();
-    const toolboxMetrics = metricsManager.getToolboxMetrics();
-    let x = 0;
-
-    // If this flyout is not the trashcan flyout (e.g. toolbox or mutator).
-    // Trashcan flyout is opposite the main flyout.
-    if (this.targetWorkspace!.toolboxPosition === this.toolboxPosition_) {
-      // If there is a category toolbox.
-      // Simple (flyout-only) toolbox.
-      if (this.targetWorkspace!.getToolbox()) {
-        if (this.toolboxPosition_ === toolbox.Position.LEFT) {
-          x = toolboxMetrics.width;
-        } else {
-          x = viewMetrics.width - this.width_;
-        }
-      } else {
-        if (this.toolboxPosition_ === toolbox.Position.LEFT) {
-          x = 0;
-        } else {
-          // The simple flyout does not cover the workspace.
-          x = viewMetrics.width;
-        }
-      }
-    } else {
-      if (this.toolboxPosition_ === toolbox.Position.LEFT) {
-        x = 0;
-      } else {
-        // Because the anchor point of the flyout is on the left, but we want
-        // to align the right edge of the flyout with the right edge of the
-        // blocklyDiv, we calculate the full width of the div minus the width
-        // of the flyout.
-        x = viewMetrics.width + absoluteMetrics.left - this.width_;
-      }
-    }
-
-    return x;
-  }
-
-  /**
-   * Calculates the y coordinate for the flyout position.
-   * @return Y coordinate.
-   */
-  override getY(): number {
-    // Y is always 0 since this is a vertical flyout.
-    return 0;
-  }
-
-  /** Move the flyout to the edge of the workspace. */
-  override position() {
-    if (!this.isVisible() || !this.targetWorkspace!.isVisible()) {
-      return;
-    }
-    const metricsManager = this.targetWorkspace!.getMetricsManager();
-    const targetWorkspaceViewMetrics = metricsManager.getViewMetrics();
-    this.height_ = targetWorkspaceViewMetrics.height;
-
-    const edgeWidth = this.width_ - this.CORNER_RADIUS;
-    const edgeHeight =
-        targetWorkspaceViewMetrics.height - 2 * this.CORNER_RADIUS;
-    this.setBackgroundPath_(edgeWidth, edgeHeight);
-
-    const x = this.getX();
-    const y = this.getY();
-
-    this.positionAt_(this.width_, this.height_, x, y);
-  }
-
-  /**
-   * Create and set the path for the visible boundaries of the flyout.
-   * @param width The width of the flyout, not including the rounded corners.
-   * @param height The height of the flyout, not including rounded corners.
-   */
-  private setBackgroundPath_(width: number, height: number) {
-    const atRight = this.toolboxPosition_ === toolbox.Position.RIGHT;
-    const totalWidth = width + this.CORNER_RADIUS;
-
-    // Decide whether to start on the left or right.
-    const path: Array<string|number> =
-        ['M ' + (atRight ? totalWidth : 0) + ',0'];
-    // Top.
-    path.push('h', (atRight ? -width : width));
-    // Rounded corner.
-    path.push(
-        'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, atRight ? 0 : 1,
-        atRight ? -this.CORNER_RADIUS : this.CORNER_RADIUS, this.CORNER_RADIUS);
-    // Side closest to workspace.
-    path.push('v', Math.max(0, height));
-    // Rounded corner.
-    path.push(
-        'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, atRight ? 0 : 1,
-        atRight ? this.CORNER_RADIUS : -this.CORNER_RADIUS, this.CORNER_RADIUS);
-    // Bottom.
-    path.push('h', (atRight ? width : -width));
-    path.push('z');
-    this.svgBackground_!.setAttribute('d', path.join(' '));
-  }
-
-  /** Scroll the flyout to the top. */
-  override scrollToStart() {
-    this.workspace_.scrollbar.setY(0);
-  }
-
-  /**
-   * Scroll the flyout.
-   * @param e Mouse wheel scroll event.
-   */
-  protected override wheel_(e: WheelEvent) {
-    const scrollDelta = browserEvents.getScrollDeltaPixels(e);
-
-    if (scrollDelta.y) {
-      const metricsManager = this.workspace_.getMetricsManager();
-      const scrollMetrics = metricsManager.getScrollMetrics();
-      const viewMetrics = metricsManager.getViewMetrics();
-      const pos = viewMetrics.top - scrollMetrics.top + scrollDelta.y;
-
-      this.workspace_.scrollbar.setY(pos);
-      // When the flyout moves from a wheel event, hide WidgetDiv and
-      // dropDownDiv.
-      WidgetDiv.hide();
-      dropDownDiv.hideWithoutAnimation();
-    }
-    // Don't scroll the page.
-    e.preventDefault();
-    // Don't propagate mousewheel event (zooming).
-    e.stopPropagation();
-  }
-
-  /**
-   * Lay out the blocks in the flyout.
-   * @param contents The blocks and buttons to lay out.
-   * @param gaps The visible gaps between blocks.
-   */
-  protected override layout_(contents: FlyoutItem[], gaps: number[]) {
-    this.workspace_.scale = this.targetWorkspace!.scale;
-    const margin = this.MARGIN;
-    const cursorX = this.RTL ? margin : margin + this.tabWidth_;
-    let cursorY = margin;
-
-    for (let i = 0, item; item = contents[i]; i++) {
-      if (item.type === 'block') {
-        const block = item.block;
-        const allBlocks = block!.getDescendants(false);
-        for (let j = 0, child; child = allBlocks[j]; j++) {
-          // Mark blocks as being inside a flyout.  This is used to detect and
-          // prevent the closure of the flyout if the user right-clicks on such
-          // a block.
-          child.isInFlyout = true;
-        }
-        block!.render();
-        const root = block!.getSvgRoot();
-        const blockHW = block!.getHeightWidth();
-        const moveX =
-            block!.outputConnection ? cursorX - this.tabWidth_ : cursorX;
-        block!.moveBy(moveX, cursorY);
-
-        // AnyDuringMigration because:  Argument of type 'BlockSvg | undefined'
-        // is not assignable to parameter of type 'BlockSvg'.
-        const rect = this.createRect_(
-            block as AnyDuringMigration,
-            this.RTL ? moveX - blockHW.width : moveX, cursorY, blockHW, i);
-
-        // AnyDuringMigration because:  Argument of type 'BlockSvg | undefined'
-        // is not assignable to parameter of type 'BlockSvg'.
-        this.addBlockListeners_(root, block as AnyDuringMigration, rect);
-
-        cursorY += blockHW.height + gaps[i];
-      } else if (item.type === 'button') {
-        const button = item.button as FlyoutButton;
-        this.initFlyoutButton_(button, cursorX, cursorY);
-        cursorY += button.height + gaps[i];
-      }
-    }
-  }
-
-  /**
-   * Determine if a drag delta is toward the workspace, based on the position
-   * and orientation of the flyout. This is used in determineDragIntention_ to
-   * determine if a new block should be created or if the flyout should scroll.
-   * @param currentDragDeltaXY How far the pointer has moved from the position
-   *     at mouse down, in pixel units.
-   * @return True if the drag is toward the workspace.
-   * @internal
-   */
-  override isDragTowardWorkspace(currentDragDeltaXY: Coordinate): boolean {
-    const dx = currentDragDeltaXY.x;
-    const dy = currentDragDeltaXY.y;
-    // Direction goes from -180 to 180, with 0 toward the right and 90 on top.
-    const dragDirection = Math.atan2(dy, dx) / Math.PI * 180;
-
-    const range = this.dragAngleRange_;
-    // Check for left or right dragging.
-    if (dragDirection < range && dragDirection > -range ||
-        (dragDirection < -180 + range || dragDirection > 180 - range)) {
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Returns the bounding rectangle of the drag target area in pixel units
-   * relative to viewport.
-   * @return The component's bounding box. Null if drag target area should be
-   *     ignored.
-   */
-  override getClientRect(): Rect|null {
-    if (!this.svgGroup_ || this.autoClose || !this.isVisible()) {
-      // The bounding rectangle won't compute correctly if the flyout is closed
-      // and auto-close flyouts aren't valid drag targets (or delete areas).
-      return null;
-    }
-
-    const flyoutRect = this.svgGroup_.getBoundingClientRect();
-    // BIG_NUM is offscreen padding so that blocks dragged beyond the shown
-    // flyout area are still deleted.  Must be larger than the largest screen
-    // size, but be smaller than half Number.MAX_SAFE_INTEGER (not available on
-    // IE).
-    const BIG_NUM = 1000000000;
-    const left = flyoutRect.left;
-
-    if (this.toolboxPosition_ === toolbox.Position.LEFT) {
-      const width = flyoutRect.width;
-      return new Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, left + width);
-    } else {  // Right
-      return new Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
-    }
-  }
-
-  /**
-   * Compute width of flyout.  toolbox.Position mat under each block.
-   * For RTL: Lay out the blocks and buttons to be right-aligned.
-   */
-  protected override reflowInternal_() {
-    this.workspace_.scale = this.getFlyoutScale();
-    let flyoutWidth = 0;
-    const blocks = this.workspace_.getTopBlocks(false);
-    for (let i = 0, block; block = blocks[i]; i++) {
-      let width = block.getHeightWidth().width;
-      if (block.outputConnection) {
-        width -= this.tabWidth_;
-      }
-      flyoutWidth = Math.max(flyoutWidth, width);
-    }
-    for (let i = 0, button; button = this.buttons_[i]; i++) {
-      flyoutWidth = Math.max(flyoutWidth, button.width);
-    }
-    flyoutWidth += this.MARGIN * 1.5 + this.tabWidth_;
-    flyoutWidth *= this.workspace_.scale;
-    flyoutWidth += Scrollbar.scrollbarThickness;
-
-    if (this.width_ !== flyoutWidth) {
-      for (let i = 0, block; block = blocks[i]; i++) {
-        if (this.RTL) {
-          // With the flyoutWidth known, right-align the blocks.
-          const oldX = block.getRelativeToSurfaceXY().x;
-          let newX = flyoutWidth / this.workspace_.scale - this.MARGIN;
-          if (!block.outputConnection) {
-            newX -= this.tabWidth_;
-          }
-          block.moveBy(newX - oldX, 0);
-        }
-        if (this.rectMap_.has(block)) {
-          // AnyDuringMigration because:  Argument of type 'SVGElement |
-          // undefined' is not assignable to parameter of type 'SVGElement'.
-          this.moveRectToBlock_(
-              this.rectMap_.get(block) as AnyDuringMigration, block);
-        }
-      }
-      if (this.RTL) {
-        // With the flyoutWidth known, right-align the buttons.
-        for (let i = 0, button; button = this.buttons_[i]; i++) {
-          const y = button.getPosition().y;
-          const x = flyoutWidth / this.workspace_.scale - button.width -
-              this.MARGIN - this.tabWidth_;
-          button.moveTo(x, y);
-        }
-      }
-
-      if (this.targetWorkspace!.toolboxPosition === this.toolboxPosition_ &&
-          this.toolboxPosition_ === toolbox.Position.LEFT &&
-          !this.targetWorkspace!.getToolbox()) {
-        // This flyout is a simple toolbox. Reposition the workspace so that
-        // (0,0) is in the correct position relative to the new absolute edge
-        // (ie toolbox edge).
-        this.targetWorkspace!.translate(
-            this.targetWorkspace!.scrollX + flyoutWidth,
-            this.targetWorkspace!.scrollY);
-      }
-      this.width_ = flyoutWidth;
-      this.position();
-      this.targetWorkspace!.recordDragTargets();
-    }
-  }
-}
-
-registry.register(
-    registry.Type.FLYOUTS_VERTICAL_TOOLBOX, registry.DEFAULT, VerticalFlyout);