mirror of
https://github.com/google/blockly.git
synced 2026-01-04 15:40:08 +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>
307 lines
11 KiB
TypeScript
307 lines
11 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2016 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Touch handling for Blockly.
|
|
*/
|
|
|
|
/**
|
|
* Touch handling for Blockly.
|
|
* @namespace Blockly.Touch
|
|
*/
|
|
import * as goog from '../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.Touch');
|
|
|
|
import type {Gesture} from './gesture.js';
|
|
|
|
|
|
/**
|
|
* A mock event, created from either a mouse or touch event,
|
|
* with no more than one entry in the changedTouches array.
|
|
*/
|
|
interface PseudoEvent {
|
|
type: string;
|
|
changedTouches: Touch[];
|
|
target: Element;
|
|
stopPropagation: () => void;
|
|
preventDefault: () => void;
|
|
}
|
|
|
|
/** Length in ms for a touch to become a long press. */
|
|
const LONGPRESS = 750;
|
|
|
|
/**
|
|
* Whether touch is enabled in the browser.
|
|
* Copied from Closure's goog.events.BrowserFeature.TOUCH_ENABLED
|
|
*/
|
|
export const TOUCH_ENABLED = 'ontouchstart' in globalThis ||
|
|
!!(globalThis['document'] && document.documentElement &&
|
|
'ontouchstart' in
|
|
document.documentElement) || // IE10 uses non-standard touch events,
|
|
// so it has a different check.
|
|
!!(globalThis['navigator'] &&
|
|
(globalThis['navigator']['maxTouchPoints'] ||
|
|
(globalThis['navigator'] as any)['msMaxTouchPoints']));
|
|
|
|
/** Which touch events are we currently paying attention to? */
|
|
let touchIdentifier_: string|null = null;
|
|
|
|
/**
|
|
* The TOUCH_MAP lookup dictionary specifies additional touch events to fire,
|
|
* in conjunction with mouse events.
|
|
* @alias Blockly.Touch.TOUCH_MAP
|
|
*/
|
|
export const TOUCH_MAP: {[key: string]: string[]} = globalThis['PointerEvent'] ?
|
|
{
|
|
'mousedown': ['pointerdown'],
|
|
'mouseenter': ['pointerenter'],
|
|
'mouseleave': ['pointerleave'],
|
|
'mousemove': ['pointermove'],
|
|
'mouseout': ['pointerout'],
|
|
'mouseover': ['pointerover'],
|
|
'mouseup': ['pointerup', 'pointercancel'],
|
|
'touchend': ['pointerup'],
|
|
'touchcancel': ['pointercancel'],
|
|
} :
|
|
{
|
|
'mousedown': ['touchstart'],
|
|
'mousemove': ['touchmove'],
|
|
'mouseup': ['touchend', 'touchcancel'],
|
|
};
|
|
|
|
/** PID of queued long-press task. */
|
|
let longPid_: AnyDuringMigration = 0;
|
|
|
|
/**
|
|
* Context menus on touch devices are activated using a long-press.
|
|
* Unfortunately the contextmenu touch event is currently (2015) only supported
|
|
* by Chrome. This function is fired on any touchstart event, queues a task,
|
|
* which after about a second opens the context menu. The tasks is killed
|
|
* if the touch event terminates early.
|
|
* @param e Touch start event.
|
|
* @param gesture The gesture that triggered this longStart.
|
|
* @alias Blockly.Touch.longStart
|
|
* @internal
|
|
*/
|
|
export function longStart(e: Event, gesture: Gesture) {
|
|
longStop();
|
|
// Punt on multitouch events.
|
|
if (e instanceof TouchEvent && e.changedTouches &&
|
|
e.changedTouches.length !== 1) {
|
|
return;
|
|
}
|
|
longPid_ = setTimeout(function() {
|
|
// TODO(#6097): Make types accurate, possibly by refactoring touch handling.
|
|
const typelessEvent = e as AnyDuringMigration;
|
|
// Additional check to distinguish between touch events and pointer events
|
|
if (typelessEvent.changedTouches) {
|
|
// TouchEvent
|
|
typelessEvent.button = 2; // Simulate a right button click.
|
|
// e was a touch event. It needs to pretend to be a mouse event.
|
|
typelessEvent.clientX = typelessEvent.changedTouches[0].clientX;
|
|
typelessEvent.clientY = typelessEvent.changedTouches[0].clientY;
|
|
}
|
|
|
|
// Let the gesture route the right-click correctly.
|
|
if (gesture) {
|
|
gesture.handleRightClick(e);
|
|
}
|
|
}, LONGPRESS);
|
|
}
|
|
|
|
/**
|
|
* Nope, that's not a long-press. Either touchend or touchcancel was fired,
|
|
* or a drag hath begun. Kill the queued long-press task.
|
|
* @alias Blockly.Touch.longStop
|
|
* @internal
|
|
*/
|
|
export function longStop() {
|
|
if (longPid_) {
|
|
clearTimeout(longPid_);
|
|
longPid_ = 0;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Clear the touch identifier that tracks which touch stream to pay attention
|
|
* to. This ends the current drag/gesture and allows other pointers to be
|
|
* captured.
|
|
* @alias Blockly.Touch.clearTouchIdentifier
|
|
*/
|
|
export function clearTouchIdentifier() {
|
|
touchIdentifier_ = null;
|
|
}
|
|
|
|
/**
|
|
* Decide whether Blockly should handle or ignore this event.
|
|
* Mouse and touch events require special checks because we only want to deal
|
|
* with one touch stream at a time. All other events should always be handled.
|
|
* @param e The event to check.
|
|
* @return True if this event should be passed through to the registered
|
|
* handler; false if it should be blocked.
|
|
* @alias Blockly.Touch.shouldHandleEvent
|
|
*/
|
|
export function shouldHandleEvent(e: Event|PseudoEvent): boolean {
|
|
return !isMouseOrTouchEvent(e) || checkTouchIdentifier(e);
|
|
}
|
|
|
|
/**
|
|
* Get the touch identifier from the given event. If it was a mouse event, the
|
|
* identifier is the string 'mouse'.
|
|
* @param e Mouse event or touch event.
|
|
* @return The touch identifier from the first changed touch, if defined.
|
|
* Otherwise 'mouse'.
|
|
* @alias Blockly.Touch.getTouchIdentifierFromEvent
|
|
*/
|
|
export function getTouchIdentifierFromEvent(e: Event|PseudoEvent): string {
|
|
if (e instanceof MouseEvent) {
|
|
return 'mouse';
|
|
}
|
|
|
|
if (e instanceof PointerEvent) {
|
|
return String(e.pointerId);
|
|
}
|
|
|
|
/**
|
|
* TODO(#6097): Fix types. This is a catch-all for everything but mouse
|
|
* and pointer events.
|
|
*/
|
|
const pseudoEvent = /** {!PseudoEvent} */ e;
|
|
|
|
// AnyDuringMigration because: Property 'changedTouches' does not exist on
|
|
// type 'PseudoEvent | Event'. AnyDuringMigration because: Property
|
|
// 'changedTouches' does not exist on type 'PseudoEvent | Event'.
|
|
// AnyDuringMigration because: Property 'changedTouches' does not exist on
|
|
// type 'PseudoEvent | Event'. AnyDuringMigration because: Property
|
|
// 'changedTouches' does not exist on type 'PseudoEvent | Event'.
|
|
// AnyDuringMigration because: Property 'changedTouches' does not exist on
|
|
// type 'PseudoEvent | Event'.
|
|
return (pseudoEvent as AnyDuringMigration).changedTouches &&
|
|
(pseudoEvent as AnyDuringMigration).changedTouches[0] &&
|
|
(pseudoEvent as AnyDuringMigration).changedTouches[0].identifier !==
|
|
undefined &&
|
|
(pseudoEvent as AnyDuringMigration).changedTouches[0].identifier !==
|
|
null ?
|
|
String((pseudoEvent as AnyDuringMigration).changedTouches[0].identifier) :
|
|
'mouse';
|
|
}
|
|
|
|
/**
|
|
* Check whether the touch identifier on the event matches the current saved
|
|
* identifier. If there is no identifier, that means it's a mouse event and
|
|
* we'll use the identifier "mouse". This means we won't deal well with
|
|
* multiple mice being used at the same time. That seems okay.
|
|
* If the current identifier was unset, save the identifier from the
|
|
* event. This starts a drag/gesture, during which touch events with other
|
|
* identifiers will be silently ignored.
|
|
* @param e Mouse event or touch event.
|
|
* @return Whether the identifier on the event matches the current saved
|
|
* identifier.
|
|
* @alias Blockly.Touch.checkTouchIdentifier
|
|
*/
|
|
export function checkTouchIdentifier(e: Event|PseudoEvent): boolean {
|
|
const identifier = getTouchIdentifierFromEvent(e);
|
|
|
|
// if (touchIdentifier_) is insufficient because Android touch
|
|
// identifiers may be zero.
|
|
if (touchIdentifier_ !== undefined && touchIdentifier_ !== null) {
|
|
// We're already tracking some touch/mouse event. Is this from the same
|
|
// source?
|
|
return touchIdentifier_ === identifier;
|
|
}
|
|
if (e.type === 'mousedown' || e.type === 'touchstart' ||
|
|
e.type === 'pointerdown') {
|
|
// No identifier set yet, and this is the start of a drag. Set it and
|
|
// return.
|
|
touchIdentifier_ = identifier;
|
|
return true;
|
|
}
|
|
// There was no identifier yet, but this wasn't a start event so we're going
|
|
// to ignore it. This probably means that another drag finished while this
|
|
// pointer was down.
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Set an event's clientX and clientY from its first changed touch. Use this to
|
|
* make a touch event work in a mouse event handler.
|
|
* @param e A touch event.
|
|
* @alias Blockly.Touch.setClientFromTouch
|
|
*/
|
|
export function setClientFromTouch(e: Event|PseudoEvent) {
|
|
// AnyDuringMigration because: Property 'changedTouches' does not exist on
|
|
// type 'PseudoEvent | Event'.
|
|
if (e.type.startsWith('touch') && (e as AnyDuringMigration).changedTouches) {
|
|
// Map the touch event's properties to the event.
|
|
// AnyDuringMigration because: Property 'changedTouches' does not exist on
|
|
// type 'PseudoEvent | Event'.
|
|
const touchPoint = (e as AnyDuringMigration).changedTouches[0];
|
|
// AnyDuringMigration because: Property 'clientX' does not exist on type
|
|
// 'PseudoEvent | Event'.
|
|
(e as AnyDuringMigration).clientX = touchPoint.clientX;
|
|
// AnyDuringMigration because: Property 'clientY' does not exist on type
|
|
// 'PseudoEvent | Event'.
|
|
(e as AnyDuringMigration).clientY = touchPoint.clientY;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Check whether a given event is a mouse, touch, or pointer event.
|
|
* @param e An event.
|
|
* @return True if it is a mouse, touch, or pointer event; false otherwise.
|
|
* @alias Blockly.Touch.isMouseOrTouchEvent
|
|
*/
|
|
export function isMouseOrTouchEvent(e: Event|PseudoEvent): boolean {
|
|
return e.type.startsWith('touch') || e.type.startsWith('mouse') ||
|
|
e.type.startsWith('pointer');
|
|
}
|
|
|
|
/**
|
|
* Check whether a given event is a touch event or a pointer event.
|
|
* @param e An event.
|
|
* @return True if it is a touch or pointer event; false otherwise.
|
|
* @alias Blockly.Touch.isTouchEvent
|
|
*/
|
|
export function isTouchEvent(e: Event|PseudoEvent): boolean {
|
|
return e.type.startsWith('touch') || e.type.startsWith('pointer');
|
|
}
|
|
|
|
/**
|
|
* Split an event into an array of events, one per changed touch or mouse
|
|
* point.
|
|
* @param e A mouse event or a touch event with one or more changed touches.
|
|
* @return An array of events or pseudo events.
|
|
* Each pseudo-touch event will have exactly one changed touch and there
|
|
* will be no real touch events.
|
|
* @alias Blockly.Touch.splitEventByTouches
|
|
*/
|
|
export function splitEventByTouches(e: Event): Array<Event|PseudoEvent> {
|
|
const events = [];
|
|
if (e instanceof TouchEvent) {
|
|
for (let i = 0; i < e.changedTouches.length; i++) {
|
|
const newEvent = {
|
|
type: e.type,
|
|
changedTouches: [e.changedTouches[i]],
|
|
target: e.target,
|
|
stopPropagation() {
|
|
e.stopPropagation();
|
|
},
|
|
preventDefault() {
|
|
e.preventDefault();
|
|
},
|
|
};
|
|
events[i] = newEvent;
|
|
}
|
|
} else {
|
|
events.push(e);
|
|
}
|
|
// AnyDuringMigration because: Type '(Event | { type: string; changedTouches:
|
|
// Touch[]; target: EventTarget | null; stopPropagation(): void;
|
|
// preventDefault(): void; })[]' is not assignable to type '(PseudoEvent |
|
|
// Event)[]'.
|
|
return events as AnyDuringMigration;
|
|
}
|