mirror of
https://github.com/google/blockly.git
synced 2026-01-04 23:50:12 +01:00
* fix: convert files to typescript * fix: add alias for AnyDuringMigration so that tsc will run * chore: format * chore: enable ts for the clang-format workflow (#6233) * chore: Restore @fileoverview comment locations (#6237) * chore: add declareModuleId (#6238) * fix: Revert comment change to app_controller.js (#6241) * fix: Add missing import goog statements (#6240) I've added the import statement immediately before the goog.declareModuleId calls that depend on it. There is an argument to be made that we should put the import statement in their normal place amongst any other imports, and move the declareModuleId statement to below the double blank line below the imports, but as these are so tightly coupled, replace the previous goog.module calls, and will both be deleted at the same time once the transition to TypeScript is fully complete I think it's fine (and certainly much easier) to do it this way. * chore: Fix whitespace (#6243) * fix: Remove spurious blank lines Remove extraneous blank lines introduced by deletion of 'use strict'; pragmas. Also fix the location of the goog.declareModuleId call in core/utils/array.ts. * fix: Add missing double-blank-line before body of modules Our convention is to have two blank lines between the imports (or module ID, if there are no imports) and the beginning of the body of the module. Enforce this. * fix: one addition format error for PR #6243 * fix(build): Skip npm prepare when running in CI (#6244) Have npm prepare do nothing when running in CI. We don't need to do any building, because npm test will build everything needed in the workflows in which it is run, and we don't want to build anything in other workflows because a tsc error would prevent those workflows from completing. * fix: re-add `@package` annotations as `@internal` annotations (#6232) * fix: add ~70% of internal attributes * fix: work on manually adding more @internal annotations * fix: add more manual internal annotations * fix: rename package typos to internal * fix: final manual fixes for internal annotations * chore: format * chore: make unnecessary multiline jsdoc a single line * fix: fix internal tags in serialization exceptions * fix: tsc errors picked up from develop (#6224) * fix: relative path for deprecation utils * fix: checking if properties exist in svg_math * fix: set all timeout PIDs to AnyDuringMigration * fix: make nullability errors explicity in block drag surface * fix: make null check in events_block_change explicit * fix: make getEventWorkspace_ internal so we can access it from CommentCreateDeleteHelper * fix: rename DIV -> containerDiv in tooltip * fix: ignore backwards compat check in category * fix: set block styles to AnyDuringMigration * fix: type typo in KeyboardShortcut * fix: constants name in row measurables * fix: typecast in mutator * fix: populateProcedures type of flattened array * fix: ignore errors related to workspace comment deserialization * chore: format files * fix: renaming imports missing file extensions * fix: remove check for sound.play * fix: temporarily remove bad requireType. All `export type` statements are stripped when tsc is run. This means that when we attempt to require BlockDefinition from the block files, we get an error because it does not exist. We decided to temporarily remove the require, because this will no longer be a problem when we conver the blocks to typescript, and everything gets compiled together. * fix: bad jsdoc in array * fix: silence missing property errors Closure was complaining about inexistant properties, but they actually do exist, they're just not being transpiled by tsc in a way that closure understands. I.E. if things are initialized in a function called by the constructor, rather than in a class field or in the custructor itself, closure would error. It would also error on enums, because they are transpiled to a weird IIFE. * fix: context menu action handler not knowing the type of this. this: TypeX information gets stripped when tsc is run, so closure could not know that this was not global. Fixed this by reorganizing to use the option object directly instead of passing it to onAction to be bound to this. * fix: readd getDeveloperVars checks (should not be part of migration) This was found because ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE was no longer being accessed. * fix: silence closure errors about overriding supertype props We propertly define the overrides in typescript, but these get removed from the compiled output, so closure doesn't know they exist. * fix: silence globalThis errors this: TypeX annotations get stripped from the compiled output, so closure can't know that we're accessing the correct things. However, typescript makes sure that this always has the correct properties, so silencing this should be fine. * fix: bad jsdoc name * chore: attempt compiling with blockly.js * fix: attempt moving the import statement above the namespace line * chore: add todo comments to block def files * chore: remove todo from context menu * chore: add comments abotu disabled errors * chore: move comments back to their correct positions (#6249) * fix: work on fixing comments * chore: finish moving all comments * chore: format * chore: move some other messed up comments * chore: format * fix: Correct enum formatting, use merged `namespace`s for types that are class static members (#6246) * fix: formatting of enum KeyCodes * fix: Use merged namespace for ContextMenuRegistry static types - Create a namespace to be merged with the ContextMenuRegistry class containing the types that were formerly declared as static properties on that class. - Use type aliases to export them individually as well, for compatibility with the changes made by MigranTS (and/or @gonfunko) to how other modules in core/ now import these types. - Update renamings.json5 to reflect the availability of the direct exports for modules that import this module directly (though they are not available to, and will not be used by, code that imports only via blockly.js/blockly.ts.) * fix: Use merged namespace for Input.Align - Create a merged namespace for the Input.Align enum. - Use type/const aliases to export it as Input too. - Update renamings.json5 to reflect the availability of the direct export. * fix: Use merged namespace for Names.NameType - Create a merged namespace for the Names.NameType enum. - Use type/const aliases to export it as NameType too. - Update renamings.json5 to reflect the availability of the direct export. (This ought to have happened in an earlier version as it was already available by both routes.) * chore: Fix minor issues for PR #6246 - Use `Align` instead of `Input.Align` where possible. * fix(build): Suppress irrelevant JSC_UNUSED_LOCAL_ASSIGNMENT errors tsc generates code for merged namespaces that looks like: (function (ClassName) { let EnumName; (function (EnumName) { EnumName[EnumNameAlign["v1"] = 0] = "v1"; // etc. })(EnumName = ClassName.EnumName || (ClassName.EnumName = {})); })(ClassName || (ClassName = {})); and Closure Compiler complains about the fact that the EnumName let binding is initialised but never used. (It exists so that any other code that was in the namespace could see the enum.) Suppress this message, since it is not actionable and lint and/or tsc should tell us if we have actual unused variables in our .ts files. * chore(build): Suppress spurious warnings from closure-make-deps (#6253) A little bit of an ugly hack, but it works: pipe stderr through grep -v to suppress error output starting with "WARNING in". * fix: remaining enums that weren't properly exported (#6251) * fix: remaining enums that weren't properly exported * chore: format * fix: add enum value exports * chore: format * fix: properly export interfaces that were typedefs (#6250) * fix: properly export interfaces that were typedefs * fix: allowCollsion -> allowCollision * fix: convert unconverted enums * fix: enums that were/are instance properties * fix: revert changes to property enums * fix: renamed protected parameter properties (#6252) * fix: bad protected parameter properties * chore:format * fix: gesture constructor * fix: overridden properties that were renamed * refactor: Migrate `blockly.js` to TypeScript (#6261) * chore: Apply changes to blockly.js to blockly.ts * fix: Build using core/blockly.ts instead of .js Compiles and runs in compressed mode correctly! * fix(build): Don't depend on execSync running bash (#6262) For some reason on Github CI servers execSync uses /bin/sh, which is (on Ubuntu) dash rather than bash, and does not understand the pipefail option. So remove the grep pipe on stderr and just discard all error output at all. This is not ideal as errors in test deps will go unreported AND not even cause test failure, but it's not clear that it's worth investing more time to fix this at the moment. * chore: use `import type` where possible (#6279) * chore: automatically change imports to import types * chore: revert changes that actually need to be imports * chore: format * chore: add more import type statements based on importsNotUsedAsValues * chore: fix tsconfig * chore: add link to compiler issue * fix: add type information to blockly options (#6283) * fix: add type information to blockly options * chore: format * chore: remove erroneous comment * fix: bugs revealed by getting the built output working (#6282) * fix: types of compose and decompose in block * fix: workspace naming in toolbox * chore: add jsdoc * chore: restore registry comments to better positions * chore: pr comments' * fix(variables): Revert inadvertent change to allDeveloperVariables (#6290) It appears that a function call got modified incorrectly (probably in an effort to fix a typing issue). This fix trivially reverts the line in question to match the original JS version from develop. This causes the generator tests to pass. * fix: circular dependencies (#6281) * chore: fix circular dependencies w/ static workspace funcs * remove preserved imports that aren't currently necessary (probably) * fix circular dependency with workspaces and block using stub * fix dependency between variables and xml by moving function to utils * add stub for trashcan as well * fix line endings from rebase * fix goog/base order * add trashcan patch * fix: types of compose and decompose in block * fix: workspace naming in toolbox * chore: add jsdoc * chore: restore registry comments to better positions * chore: remove implementations in goog.js * chore: fix types of stubs * chore: remove added AnyDuringMigration casts * chore: remove modifications to xml and variables * chore: format * chore: remove event requirements in workspace comments * chore: fix circular dependency with xml and workspace comments * fixup remove ContextMenu import * chore: fix dependency between mutator and workspace * chore: break circular dependency between names and procedures * chore: get tests to run? * chore: pr comments' * chore: fix stubbing field registry fromJson * chore: fix spying on fire * chore: fix stubbing parts of connection checker * chore: fix stubbing dialog * chore: fix stubbing style * chore: fix spying on duplicate * chore: fix stubbing variables * chore: fix stubbing copy * chore: fix stubbing in workspace * chore: remove unnecessary stubs * chore: fix formatting * chore: fix other formatting * chore: add backwards compatible static properties to workspace * chore: move static type properties * chore: move and comment stubs * chore: add newlines at EOF * chore: improve errors for monkey patched functions * chore: update comment with a pointer to the doc * chore: update comment with a pointer to the doc * chore: format * chore: revert changes to playground used for testing (#6292) * chore: get mocha tests to pass. (#6291) * chore: fix undo and empty code blocks * chore: skip IE test * chore: fix gesture test * chore: fix replace message references test * chore: fix string table interpolation * chore: skip getById tests * chore: fix field tests * chore: fix console errors by making workspace nullable * chore: format * chore: fix definition overwrite warning * chore: update metadata * chore: temporarily modify the the advanced compile test * chore: fix gestures by fixing test instead Co-authored-by: Neil Fraser <fraser@google.com> Co-authored-by: Christopher Allen <cpcallen+git@google.com>
442 lines
15 KiB
TypeScript
442 lines
15 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2015 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Object representing a zoom icons.
|
|
*/
|
|
|
|
/**
|
|
* Object representing a zoom icons.
|
|
* @class
|
|
*/
|
|
import * as goog from '../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.ZoomControls');
|
|
|
|
/* eslint-disable-next-line no-unused-vars */
|
|
// Unused import preserved for side-effects. Remove if unneeded.
|
|
// import './metrics_manager.js';
|
|
// Unused import preserved for side-effects. Remove if unneeded.
|
|
import './events/events_click.js';
|
|
|
|
import * as browserEvents from './browser_events.js';
|
|
import {ComponentManager} from './component_manager.js';
|
|
import * as Css from './css.js';
|
|
import * as eventUtils from './events/utils.js';
|
|
import type {IPositionable} from './interfaces/i_positionable.js';
|
|
import type {UiMetrics} from './metrics_manager.js';
|
|
import * as uiPosition from './positionable_helpers.js';
|
|
import {SPRITE} from './sprites.js';
|
|
import * as Touch from './touch.js';
|
|
import * as dom from './utils/dom.js';
|
|
import {Rect} from './utils/rect.js';
|
|
import {Size} from './utils/size.js';
|
|
import {Svg} from './utils/svg.js';
|
|
import type {WorkspaceSvg} from './workspace_svg.js';
|
|
|
|
|
|
/**
|
|
* Class for a zoom controls.
|
|
* @alias Blockly.ZoomControls
|
|
*/
|
|
export class ZoomControls implements IPositionable {
|
|
/**
|
|
* The unique id for this component that is used to register with the
|
|
* ComponentManager.
|
|
*/
|
|
id = 'zoomControls';
|
|
|
|
/**
|
|
* A handle to use to unbind the mouse down event handler for zoom reset
|
|
* button. Opaque data returned from browserEvents.conditionalBind.
|
|
*/
|
|
private onZoomResetWrapper_: browserEvents.Data|null = null;
|
|
|
|
/**
|
|
* A handle to use to unbind the mouse down event handler for zoom in
|
|
* button. Opaque data returned from browserEvents.conditionalBind.
|
|
*/
|
|
private onZoomInWrapper_: browserEvents.Data|null = null;
|
|
|
|
/**
|
|
* A handle to use to unbind the mouse down event handler for zoom out
|
|
* button. Opaque data returned from browserEvents.conditionalBind.
|
|
*/
|
|
private onZoomOutWrapper_: browserEvents.Data|null = null;
|
|
|
|
/** The zoom in svg <g> element. */
|
|
// AnyDuringMigration because: Type 'null' is not assignable to type
|
|
// 'SVGGElement'.
|
|
private zoomInGroup_: SVGGElement = null as AnyDuringMigration;
|
|
|
|
/** The zoom out svg <g> element. */
|
|
// AnyDuringMigration because: Type 'null' is not assignable to type
|
|
// 'SVGGElement'.
|
|
private zoomOutGroup_: SVGGElement = null as AnyDuringMigration;
|
|
|
|
/** The zoom reset svg <g> element. */
|
|
// AnyDuringMigration because: Type 'null' is not assignable to type
|
|
// 'SVGGElement'.
|
|
private zoomResetGroup_: SVGGElement = null as AnyDuringMigration;
|
|
|
|
/** Width of the zoom controls. */
|
|
private readonly WIDTH_ = 32;
|
|
|
|
/** Height of each zoom control. */
|
|
private readonly HEIGHT_ = 32;
|
|
|
|
/** Small spacing used between the zoom in and out control, in pixels. */
|
|
private readonly SMALL_SPACING_ = 2;
|
|
|
|
/**
|
|
* Large spacing used between the zoom in and reset control, in pixels.
|
|
*/
|
|
private readonly LARGE_SPACING_ = 11;
|
|
|
|
/** Distance between zoom controls and bottom or top edge of workspace. */
|
|
private readonly MARGIN_VERTICAL_ = 20;
|
|
|
|
/** Distance between zoom controls and right or left edge of workspace. */
|
|
private readonly MARGIN_HORIZONTAL_ = 20;
|
|
|
|
/** The SVG group containing the zoom controls. */
|
|
// AnyDuringMigration because: Type 'null' is not assignable to type
|
|
// 'SVGElement'.
|
|
private svgGroup_: SVGElement = null as AnyDuringMigration;
|
|
|
|
/** Left coordinate of the zoom controls. */
|
|
private left_ = 0;
|
|
|
|
/** Top coordinate of the zoom controls. */
|
|
private top_ = 0;
|
|
|
|
/** Whether this has been initialized. */
|
|
private initialized_ = false;
|
|
|
|
/** @param workspace The workspace to sit in. */
|
|
constructor(private readonly workspace: WorkspaceSvg) {}
|
|
|
|
/**
|
|
* Create the zoom controls.
|
|
* @return The zoom controls SVG group.
|
|
*/
|
|
createDom(): SVGElement {
|
|
this.svgGroup_ = dom.createSvgElement(Svg.G, {});
|
|
|
|
// Each filter/pattern needs a unique ID for the case of multiple Blockly
|
|
// instances on a page. Browser behaviour becomes undefined otherwise.
|
|
// https://neil.fraser.name/news/2015/11/01/
|
|
const rnd = String(Math.random()).substring(2);
|
|
this.createZoomOutSvg_(rnd);
|
|
this.createZoomInSvg_(rnd);
|
|
if (this.workspace.isMovable()) {
|
|
// If we zoom to the center and the workspace isn't movable we could
|
|
// loose blocks at the edges of the workspace.
|
|
this.createZoomResetSvg_(rnd);
|
|
}
|
|
return this.svgGroup_;
|
|
}
|
|
|
|
/** Initializes the zoom controls. */
|
|
init() {
|
|
this.workspace.getComponentManager().addComponent({
|
|
component: this,
|
|
weight: 2,
|
|
capabilities: [ComponentManager.Capability.POSITIONABLE],
|
|
});
|
|
this.initialized_ = true;
|
|
}
|
|
|
|
/**
|
|
* Disposes of this zoom controls.
|
|
* Unlink from all DOM elements to prevent memory leaks.
|
|
*/
|
|
dispose() {
|
|
this.workspace.getComponentManager().removeComponent('zoomControls');
|
|
if (this.svgGroup_) {
|
|
dom.removeNode(this.svgGroup_);
|
|
}
|
|
if (this.onZoomResetWrapper_) {
|
|
browserEvents.unbind(this.onZoomResetWrapper_);
|
|
}
|
|
if (this.onZoomInWrapper_) {
|
|
browserEvents.unbind(this.onZoomInWrapper_);
|
|
}
|
|
if (this.onZoomOutWrapper_) {
|
|
browserEvents.unbind(this.onZoomOutWrapper_);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the bounding rectangle of the UI element in pixel units relative to
|
|
* the Blockly injection div.
|
|
* @return The UI elements's bounding box. Null if bounding box should be
|
|
* ignored by other UI elements.
|
|
*/
|
|
getBoundingRectangle(): Rect|null {
|
|
let height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
|
|
if (this.zoomResetGroup_) {
|
|
height += this.LARGE_SPACING_ + this.HEIGHT_;
|
|
}
|
|
const bottom = this.top_ + height;
|
|
const right = this.left_ + this.WIDTH_;
|
|
return new Rect(this.top_, bottom, this.left_, right);
|
|
}
|
|
|
|
/**
|
|
* Positions the zoom controls.
|
|
* It is positioned in the opposite corner to the corner the
|
|
* categories/toolbox starts at.
|
|
* @param metrics The workspace metrics.
|
|
* @param savedPositions List of rectangles that are already on the workspace.
|
|
*/
|
|
position(metrics: UiMetrics, savedPositions: Rect[]) {
|
|
// Not yet initialized.
|
|
if (!this.initialized_) {
|
|
return;
|
|
}
|
|
|
|
const cornerPosition =
|
|
uiPosition.getCornerOppositeToolbox(this.workspace, metrics);
|
|
let height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
|
|
if (this.zoomResetGroup_) {
|
|
height += this.LARGE_SPACING_ + this.HEIGHT_;
|
|
}
|
|
const startRect = uiPosition.getStartPositionRect(
|
|
cornerPosition, new Size(this.WIDTH_, height), this.MARGIN_HORIZONTAL_,
|
|
this.MARGIN_VERTICAL_, metrics, this.workspace);
|
|
|
|
const verticalPosition = cornerPosition.vertical;
|
|
const bumpDirection = verticalPosition === uiPosition.verticalPosition.TOP ?
|
|
uiPosition.bumpDirection.DOWN :
|
|
uiPosition.bumpDirection.UP;
|
|
const positionRect = uiPosition.bumpPositionRect(
|
|
startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
|
|
|
|
if (verticalPosition === uiPosition.verticalPosition.TOP) {
|
|
const zoomInTranslateY = this.SMALL_SPACING_ + this.HEIGHT_;
|
|
this.zoomInGroup_.setAttribute(
|
|
'transform', 'translate(0, ' + zoomInTranslateY + ')');
|
|
if (this.zoomResetGroup_) {
|
|
const zoomResetTranslateY =
|
|
zoomInTranslateY + this.LARGE_SPACING_ + this.HEIGHT_;
|
|
this.zoomResetGroup_.setAttribute(
|
|
'transform', 'translate(0, ' + zoomResetTranslateY + ')');
|
|
}
|
|
} else {
|
|
const zoomInTranslateY =
|
|
this.zoomResetGroup_ ? this.LARGE_SPACING_ + this.HEIGHT_ : 0;
|
|
this.zoomInGroup_.setAttribute(
|
|
'transform', 'translate(0, ' + zoomInTranslateY + ')');
|
|
const zoomOutTranslateY =
|
|
zoomInTranslateY + this.SMALL_SPACING_ + this.HEIGHT_;
|
|
this.zoomOutGroup_.setAttribute(
|
|
'transform', 'translate(0, ' + zoomOutTranslateY + ')');
|
|
}
|
|
|
|
this.top_ = positionRect.top;
|
|
this.left_ = positionRect.left;
|
|
this.svgGroup_.setAttribute(
|
|
'transform', 'translate(' + this.left_ + ',' + this.top_ + ')');
|
|
}
|
|
|
|
/**
|
|
* Create the zoom in icon and its event handler.
|
|
* @param rnd The random string to use as a suffix in the clip path's ID.
|
|
* These IDs must be unique in case there are multiple Blockly instances
|
|
* on the same page.
|
|
*/
|
|
private createZoomOutSvg_(rnd: string) {
|
|
/* This markup will be generated and added to the .svgGroup_:
|
|
<g class="blocklyZoom">
|
|
<clipPath id="blocklyZoomoutClipPath837493">
|
|
<rect width="32" height="32></rect>
|
|
</clipPath>
|
|
<image width="96" height="124" x="-64" y="-92"
|
|
xlink:href="media/sprites.png"
|
|
clip-path="url(#blocklyZoomoutClipPath837493)"></image>
|
|
</g>
|
|
*/
|
|
this.zoomOutGroup_ =
|
|
dom.createSvgElement(Svg.G, {'class': 'blocklyZoom'}, this.svgGroup_);
|
|
const clip = dom.createSvgElement(
|
|
Svg.CLIPPATH, {'id': 'blocklyZoomoutClipPath' + rnd},
|
|
this.zoomOutGroup_);
|
|
dom.createSvgElement(
|
|
Svg.RECT, {
|
|
'width': 32,
|
|
'height': 32,
|
|
},
|
|
clip);
|
|
const zoomoutSvg = dom.createSvgElement(
|
|
Svg.IMAGE, {
|
|
'width': SPRITE.width,
|
|
'height': SPRITE.height,
|
|
'x': -64,
|
|
'y': -92,
|
|
'clip-path': 'url(#blocklyZoomoutClipPath' + rnd + ')',
|
|
},
|
|
this.zoomOutGroup_);
|
|
zoomoutSvg.setAttributeNS(
|
|
dom.XLINK_NS, 'xlink:href',
|
|
this.workspace.options.pathToMedia + SPRITE.url);
|
|
|
|
// Attach listener.
|
|
this.onZoomOutWrapper_ = browserEvents.conditionalBind(
|
|
this.zoomOutGroup_, 'mousedown', null, this.zoom_.bind(this, -1));
|
|
}
|
|
|
|
/**
|
|
* Create the zoom out icon and its event handler.
|
|
* @param rnd The random string to use as a suffix in the clip path's ID.
|
|
* These IDs must be unique in case there are multiple Blockly instances
|
|
* on the same page.
|
|
*/
|
|
private createZoomInSvg_(rnd: string) {
|
|
/* This markup will be generated and added to the .svgGroup_:
|
|
<g class="blocklyZoom">
|
|
<clipPath id="blocklyZoominClipPath837493">
|
|
<rect width="32" height="32"></rect>
|
|
</clipPath>
|
|
<image width="96" height="124" x="-32" y="-92"
|
|
xlink:href="media/sprites.png"
|
|
clip-path="url(#blocklyZoominClipPath837493)"></image>
|
|
</g>
|
|
*/
|
|
this.zoomInGroup_ =
|
|
dom.createSvgElement(Svg.G, {'class': 'blocklyZoom'}, this.svgGroup_);
|
|
const clip = dom.createSvgElement(
|
|
Svg.CLIPPATH, {'id': 'blocklyZoominClipPath' + rnd}, this.zoomInGroup_);
|
|
dom.createSvgElement(
|
|
Svg.RECT, {
|
|
'width': 32,
|
|
'height': 32,
|
|
},
|
|
clip);
|
|
const zoominSvg = dom.createSvgElement(
|
|
Svg.IMAGE, {
|
|
'width': SPRITE.width,
|
|
'height': SPRITE.height,
|
|
'x': -32,
|
|
'y': -92,
|
|
'clip-path': 'url(#blocklyZoominClipPath' + rnd + ')',
|
|
},
|
|
this.zoomInGroup_);
|
|
zoominSvg.setAttributeNS(
|
|
dom.XLINK_NS, 'xlink:href',
|
|
this.workspace.options.pathToMedia + SPRITE.url);
|
|
|
|
// Attach listener.
|
|
this.onZoomInWrapper_ = browserEvents.conditionalBind(
|
|
this.zoomInGroup_, 'mousedown', null, this.zoom_.bind(this, 1));
|
|
}
|
|
|
|
/**
|
|
* Handles a mouse down event on the zoom in or zoom out buttons on the
|
|
* workspace.
|
|
* @param amount Amount of zooming. Negative amount values zoom out, and
|
|
* positive amount values zoom in.
|
|
* @param e A mouse down event.
|
|
*/
|
|
private zoom_(amount: number, e: Event) {
|
|
this.workspace.markFocused();
|
|
this.workspace.zoomCenter(amount);
|
|
this.fireZoomEvent_();
|
|
Touch.clearTouchIdentifier(); // Don't block future drags.
|
|
e.stopPropagation(); // Don't start a workspace scroll.
|
|
e.preventDefault(); // Stop double-clicking from selecting text.
|
|
}
|
|
|
|
/**
|
|
* Create the zoom reset icon and its event handler.
|
|
* @param rnd The random string to use as a suffix in the clip path's ID.
|
|
* These IDs must be unique in case there are multiple Blockly instances
|
|
* on the same page.
|
|
*/
|
|
private createZoomResetSvg_(rnd: string) {
|
|
/* This markup will be generated and added to the .svgGroup_:
|
|
<g class="blocklyZoom">
|
|
<clipPath id="blocklyZoomresetClipPath837493">
|
|
<rect width="32" height="32"></rect>
|
|
</clipPath>
|
|
<image width="96" height="124" x="-32" y="-92"
|
|
xlink:href="media/sprites.png"
|
|
clip-path="url(#blocklyZoomresetClipPath837493)"></image>
|
|
</g>
|
|
*/
|
|
this.zoomResetGroup_ =
|
|
dom.createSvgElement(Svg.G, {'class': 'blocklyZoom'}, this.svgGroup_);
|
|
const clip = dom.createSvgElement(
|
|
Svg.CLIPPATH, {'id': 'blocklyZoomresetClipPath' + rnd},
|
|
this.zoomResetGroup_);
|
|
dom.createSvgElement(Svg.RECT, {'width': 32, 'height': 32}, clip);
|
|
const zoomresetSvg = dom.createSvgElement(
|
|
Svg.IMAGE, {
|
|
'width': SPRITE.width,
|
|
'height': SPRITE.height,
|
|
'y': -92,
|
|
'clip-path': 'url(#blocklyZoomresetClipPath' + rnd + ')',
|
|
},
|
|
this.zoomResetGroup_);
|
|
zoomresetSvg.setAttributeNS(
|
|
dom.XLINK_NS, 'xlink:href',
|
|
this.workspace.options.pathToMedia + SPRITE.url);
|
|
|
|
// Attach event listeners.
|
|
this.onZoomResetWrapper_ = browserEvents.conditionalBind(
|
|
this.zoomResetGroup_, 'mousedown', null, this.resetZoom_.bind(this));
|
|
}
|
|
|
|
/**
|
|
* Handles a mouse down event on the reset zoom button on the workspace.
|
|
* @param e A mouse down event.
|
|
*/
|
|
private resetZoom_(e: Event) {
|
|
this.workspace.markFocused();
|
|
|
|
// zoom is passed amount and computes the new scale using the formula:
|
|
// targetScale = currentScale * Math.pow(speed, amount)
|
|
const targetScale = this.workspace.options.zoomOptions.startScale;
|
|
const currentScale = this.workspace.scale;
|
|
const speed = this.workspace.options.zoomOptions.scaleSpeed;
|
|
// To compute amount:
|
|
// amount = log(speed, (targetScale / currentScale))
|
|
// Math.log computes natural logarithm (ln), to change the base, use
|
|
// formula: log(base, value) = ln(value) / ln(base)
|
|
const amount = Math.log(targetScale / currentScale) / Math.log(speed);
|
|
this.workspace.beginCanvasTransition();
|
|
this.workspace.zoomCenter(amount);
|
|
this.workspace.scrollCenter();
|
|
|
|
setTimeout(this.workspace.endCanvasTransition.bind(this.workspace), 500);
|
|
this.fireZoomEvent_();
|
|
Touch.clearTouchIdentifier(); // Don't block future drags.
|
|
e.stopPropagation(); // Don't start a workspace scroll.
|
|
e.preventDefault(); // Stop double-clicking from selecting text.
|
|
}
|
|
|
|
/** Fires a zoom control UI event. */
|
|
private fireZoomEvent_() {
|
|
const uiEvent = new (eventUtils.get(eventUtils.CLICK))!
|
|
(null, this.workspace.id, 'zoom_controls');
|
|
eventUtils.fire(uiEvent);
|
|
}
|
|
}
|
|
|
|
/** CSS for zoom controls. See css.js for use. */
|
|
Css.register(`
|
|
.blocklyZoom>image, .blocklyZoom>svg>image {
|
|
opacity: .4;
|
|
}
|
|
|
|
.blocklyZoom>image:hover, .blocklyZoom>svg>image:hover {
|
|
opacity: .6;
|
|
}
|
|
|
|
.blocklyZoom>image:active, .blocklyZoom>svg>image:active {
|
|
opacity: .8;
|
|
}
|
|
`);
|