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>
292 lines
9.3 KiB
TypeScript
292 lines
9.3 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2021 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Browser event handling.
|
|
*/
|
|
|
|
/**
|
|
* Browser event handling.
|
|
* @namespace Blockly.browserEvents
|
|
*/
|
|
import * as goog from '../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.browserEvents');
|
|
|
|
import * as Touch from './touch.js';
|
|
import * as userAgent from './utils/useragent.js';
|
|
|
|
|
|
/**
|
|
* Blockly opaque event data used to unbind events when using
|
|
* `bind` and `conditionalBind`.
|
|
* @alias Blockly.browserEvents.Data
|
|
*/
|
|
export type Data = AnyDuringMigration[][];
|
|
|
|
/**
|
|
* The multiplier for scroll wheel deltas using the line delta mode.
|
|
* See https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/deltaMode
|
|
* for more information on deltaMode.
|
|
*/
|
|
const LINE_MODE_MULTIPLIER = 40;
|
|
|
|
/**
|
|
* The multiplier for scroll wheel deltas using the page delta mode.
|
|
* See https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/deltaMode
|
|
* for more information on deltaMode.
|
|
*/
|
|
const PAGE_MODE_MULTIPLIER = 125;
|
|
|
|
/**
|
|
* Bind an event handler that can be ignored if it is not part of the active
|
|
* touch stream.
|
|
* Use this for events that either start or continue a multi-part gesture (e.g.
|
|
* mousedown or mousemove, which may be part of a drag or click).
|
|
* @param node Node upon which to listen.
|
|
* @param name Event name to listen to (e.g. 'mousedown').
|
|
* @param thisObject The value of 'this' in the function.
|
|
* @param func Function to call when event is triggered.
|
|
* @param opt_noCaptureIdentifier True if triggering on this event should not
|
|
* block execution of other event handlers on this touch or other
|
|
* simultaneous touches. False by default.
|
|
* @param opt_noPreventDefault True if triggering on this event should prevent
|
|
* the default handler. False by default. If opt_noPreventDefault is
|
|
* provided, opt_noCaptureIdentifier must also be provided.
|
|
* @return Opaque data that can be passed to unbindEvent_.
|
|
* @alias Blockly.browserEvents.conditionalBind
|
|
*/
|
|
export function conditionalBind(
|
|
node: EventTarget, name: string, thisObject: AnyDuringMigration|null,
|
|
func: Function, opt_noCaptureIdentifier?: boolean,
|
|
opt_noPreventDefault?: boolean): Data {
|
|
let handled = false;
|
|
function wrapFunc(e: AnyDuringMigration) {
|
|
const captureIdentifier = !opt_noCaptureIdentifier;
|
|
// Handle each touch point separately. If the event was a mouse event, this
|
|
// will hand back an array with one element, which we're fine handling.
|
|
const events = Touch.splitEventByTouches(e);
|
|
for (let i = 0; i < events.length; i++) {
|
|
const event = events[i];
|
|
if (captureIdentifier && !Touch.shouldHandleEvent(event)) {
|
|
continue;
|
|
}
|
|
Touch.setClientFromTouch(event);
|
|
if (thisObject) {
|
|
func.call(thisObject, event);
|
|
} else {
|
|
func(event);
|
|
}
|
|
handled = true;
|
|
}
|
|
}
|
|
|
|
const bindData = [];
|
|
if (globalThis['PointerEvent'] && name in Touch.TOUCH_MAP) {
|
|
for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
|
|
const type = Touch.TOUCH_MAP[name][i];
|
|
node.addEventListener(type, wrapFunc, false);
|
|
bindData.push([node, type, wrapFunc]);
|
|
}
|
|
} else {
|
|
node.addEventListener(name, wrapFunc, false);
|
|
bindData.push([node, name, wrapFunc]);
|
|
|
|
// Add equivalent touch event.
|
|
if (name in Touch.TOUCH_MAP) {
|
|
const touchWrapFunc = (e: AnyDuringMigration) => {
|
|
wrapFunc(e);
|
|
// Calling preventDefault stops the browser from scrolling/zooming the
|
|
// page.
|
|
const preventDef = !opt_noPreventDefault;
|
|
if (handled && preventDef) {
|
|
e.preventDefault();
|
|
}
|
|
};
|
|
for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
|
|
const type = Touch.TOUCH_MAP[name][i];
|
|
node.addEventListener(type, touchWrapFunc, false);
|
|
bindData.push([node, type, touchWrapFunc]);
|
|
}
|
|
}
|
|
}
|
|
return bindData;
|
|
}
|
|
|
|
/**
|
|
* Bind an event handler that should be called regardless of whether it is part
|
|
* of the active touch stream.
|
|
* Use this for events that are not part of a multi-part gesture (e.g.
|
|
* mouseover for tooltips).
|
|
* @param node Node upon which to listen.
|
|
* @param name Event name to listen to (e.g. 'mousedown').
|
|
* @param thisObject The value of 'this' in the function.
|
|
* @param func Function to call when event is triggered.
|
|
* @return Opaque data that can be passed to unbindEvent_.
|
|
* @alias Blockly.browserEvents.bind
|
|
*/
|
|
export function bind(
|
|
node: EventTarget, name: string, thisObject: AnyDuringMigration|null,
|
|
func: Function): Data {
|
|
function wrapFunc(e: AnyDuringMigration) {
|
|
if (thisObject) {
|
|
func.call(thisObject, e);
|
|
} else {
|
|
func(e);
|
|
}
|
|
}
|
|
|
|
const bindData = [];
|
|
if (globalThis['PointerEvent'] && name in Touch.TOUCH_MAP) {
|
|
for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
|
|
const type = Touch.TOUCH_MAP[name][i];
|
|
node.addEventListener(type, wrapFunc, false);
|
|
bindData.push([node, type, wrapFunc]);
|
|
}
|
|
} else {
|
|
node.addEventListener(name, wrapFunc, false);
|
|
bindData.push([node, name, wrapFunc]);
|
|
|
|
// Add equivalent touch event.
|
|
if (name in Touch.TOUCH_MAP) {
|
|
const touchWrapFunc = (e: AnyDuringMigration) => {
|
|
// Punt on multitouch events.
|
|
if (e.changedTouches && e.changedTouches.length === 1) {
|
|
// Map the touch event's properties to the event.
|
|
const touchPoint = e.changedTouches[0];
|
|
e.clientX = touchPoint.clientX;
|
|
e.clientY = touchPoint.clientY;
|
|
}
|
|
wrapFunc(e);
|
|
|
|
// Stop the browser from scrolling/zooming the page.
|
|
e.preventDefault();
|
|
};
|
|
for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
|
|
const type = Touch.TOUCH_MAP[name][i];
|
|
node.addEventListener(type, touchWrapFunc, false);
|
|
bindData.push([node, type, touchWrapFunc]);
|
|
}
|
|
}
|
|
}
|
|
return bindData;
|
|
}
|
|
|
|
/**
|
|
* Unbind one or more events event from a function call.
|
|
* @param bindData Opaque data from bindEvent_.
|
|
* This list is emptied during the course of calling this function.
|
|
* @return The function call.
|
|
* @alias Blockly.browserEvents.unbind
|
|
*/
|
|
export function unbind(bindData: Data): Function {
|
|
let func;
|
|
while (bindData.length) {
|
|
const bindDatum = bindData.pop();
|
|
const node = bindDatum![0];
|
|
const name = bindDatum![1];
|
|
func = bindDatum![2];
|
|
node.removeEventListener(name, func, false);
|
|
}
|
|
return func;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this event is targeting a text input widget?
|
|
* @param e An event.
|
|
* @return True if text input.
|
|
* @alias Blockly.browserEvents.isTargetInput
|
|
*/
|
|
export function isTargetInput(e: Event): boolean {
|
|
if (e.target instanceof HTMLElement) {
|
|
if (e.target.isContentEditable ||
|
|
e.target.getAttribute('data-is-text-input') === 'true') {
|
|
return true;
|
|
}
|
|
|
|
if (e.target instanceof HTMLInputElement) {
|
|
const target = e.target;
|
|
return target.type === 'text' || target.type === 'number' ||
|
|
target.type === 'email' || target.type === 'password' ||
|
|
target.type === 'search' || target.type === 'tel' ||
|
|
target.type === 'url';
|
|
}
|
|
|
|
if (e.target instanceof HTMLTextAreaElement) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns true this event is a right-click.
|
|
* @param e Mouse event.
|
|
* @return True if right-click.
|
|
* @alias Blockly.browserEvents.isRightButton
|
|
*/
|
|
export function isRightButton(e: Event): boolean {
|
|
// AnyDuringMigration because: Property 'ctrlKey' does not exist on type
|
|
// 'Event'.
|
|
if ((e as AnyDuringMigration).ctrlKey && userAgent.MAC) {
|
|
// Control-clicking on Mac OS X is treated as a right-click.
|
|
// WebKit on Mac OS X fails to change button to 2 (but Gecko does).
|
|
return true;
|
|
}
|
|
// AnyDuringMigration because: Property 'button' does not exist on type
|
|
// 'Event'.
|
|
return (e as AnyDuringMigration).button === 2;
|
|
}
|
|
|
|
/**
|
|
* Returns the converted coordinates of the given mouse event.
|
|
* The origin (0,0) is the top-left corner of the Blockly SVG.
|
|
* @param e Mouse event.
|
|
* @param svg SVG element.
|
|
* @param matrix Inverted screen CTM to use.
|
|
* @return Object with .x and .y properties.
|
|
* @alias Blockly.browserEvents.mouseToSvg
|
|
*/
|
|
export function mouseToSvg(
|
|
e: Event, svg: SVGSVGElement, matrix: SVGMatrix|null): SVGPoint {
|
|
const svgPoint = svg.createSVGPoint();
|
|
// AnyDuringMigration because: Property 'clientX' does not exist on type
|
|
// 'Event'.
|
|
svgPoint.x = (e as AnyDuringMigration).clientX;
|
|
// AnyDuringMigration because: Property 'clientY' does not exist on type
|
|
// 'Event'.
|
|
svgPoint.y = (e as AnyDuringMigration).clientY;
|
|
|
|
if (!matrix) {
|
|
matrix = svg.getScreenCTM()!.inverse();
|
|
}
|
|
return svgPoint.matrixTransform(matrix);
|
|
}
|
|
|
|
/**
|
|
* Returns the scroll delta of a mouse event in pixel units.
|
|
* @param e Mouse event.
|
|
* @return Scroll delta object with .x and .y properties.
|
|
* @alias Blockly.browserEvents.getScrollDeltaPixels
|
|
*/
|
|
export function getScrollDeltaPixels(e: WheelEvent): {x: number, y: number} {
|
|
switch (e.deltaMode) {
|
|
case 0x00: // Pixel mode.
|
|
default:
|
|
return {x: e.deltaX, y: e.deltaY};
|
|
case 0x01: // Line mode.
|
|
return {
|
|
x: e.deltaX * LINE_MODE_MULTIPLIER,
|
|
y: e.deltaY * LINE_MODE_MULTIPLIER,
|
|
};
|
|
case 0x02: // Page mode.
|
|
return {
|
|
x: e.deltaX * PAGE_MODE_MULTIPLIER,
|
|
y: e.deltaY * PAGE_MODE_MULTIPLIER,
|
|
};
|
|
}
|
|
}
|