mirror of
https://github.com/google/blockly.git
synced 2026-01-07 17:10:11 +01:00
* fix(build): Restore erroneously-deleted filter function This was deleted in PR #7406 as it was mainly being used to filter core/ vs. test/mocha/ deps into separate deps files - but it turns out also to be used for filtering error messages too. Oops. * refactor(tests): Migrate advanced compilation test to ES Modules * refactor(build): Migrate main.js to TypeScript This turns out to be pretty straight forward, even if it would cause crashing if one actually tried to import this module instead of just feeding it to Closure Compiler. * chore(build): Remove goog.declareModuleId calls Replace goog.declareModuleId calls with a comment recording the former module ID for posterity (or at least until we decide how to reformat the renamings file. * chore(tests): Delete closure/goog/* For the moment we still need something to serve as base.js for the benefit of closure-make-deps, so we keep a vestigial base.js around, containing only the @provideGoog declaration. * refactor(build): Remove vestigial base.js By changing slightly the command line arguments to closure-make-deps and closure-calculate-chunks the need to have any base.js is eliminated. * chore: Typo fix for PR #7415
187 lines
5.3 KiB
TypeScript
187 lines
5.3 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2018 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* Class for comment move event.
|
|
*
|
|
* @class
|
|
*/
|
|
// Former goog.module ID: Blockly.Events.CommentMove
|
|
|
|
import * as registry from '../registry.js';
|
|
import {Coordinate} from '../utils/coordinate.js';
|
|
import type {WorkspaceComment} from '../workspace_comment.js';
|
|
|
|
import {CommentBase, CommentBaseJson} from './events_comment_base.js';
|
|
import * as eventUtils from './utils.js';
|
|
import type {Workspace} from '../workspace.js';
|
|
|
|
/**
|
|
* Notifies listeners that a workspace comment has moved.
|
|
*/
|
|
export class CommentMove extends CommentBase {
|
|
override type = eventUtils.COMMENT_MOVE;
|
|
|
|
/** The comment that is being moved. */
|
|
comment_?: WorkspaceComment;
|
|
|
|
// TODO(#6774): We should remove underscores.
|
|
/** The location of the comment before the move, in workspace coordinates. */
|
|
oldCoordinate_?: Coordinate;
|
|
|
|
/** The location of the comment after the move, in workspace coordinates. */
|
|
newCoordinate_?: Coordinate;
|
|
|
|
/**
|
|
* @param opt_comment The comment that is being moved. Undefined for a blank
|
|
* event.
|
|
*/
|
|
constructor(opt_comment?: WorkspaceComment) {
|
|
super(opt_comment);
|
|
|
|
if (!opt_comment) {
|
|
return; // Blank event to be populated by fromJson.
|
|
}
|
|
|
|
this.comment_ = opt_comment;
|
|
this.oldCoordinate_ = opt_comment.getRelativeToSurfaceXY();
|
|
}
|
|
|
|
/**
|
|
* Record the comment's new location. Called after the move. Can only be
|
|
* called once.
|
|
*/
|
|
recordNew() {
|
|
if (this.newCoordinate_) {
|
|
throw Error(
|
|
'Tried to record the new position of a comment on the ' +
|
|
'same event twice.',
|
|
);
|
|
}
|
|
if (!this.comment_) {
|
|
throw new Error(
|
|
'The comment is undefined. Pass a comment to ' +
|
|
'the constructor if you want to use the record functionality',
|
|
);
|
|
}
|
|
this.newCoordinate_ = this.comment_.getRelativeToSurfaceXY();
|
|
}
|
|
|
|
/**
|
|
* Override the location before the move. Use this if you don't create the
|
|
* event until the end of the move, but you know the original location.
|
|
*
|
|
* @param xy The location before the move, in workspace coordinates.
|
|
*/
|
|
setOldCoordinate(xy: Coordinate) {
|
|
this.oldCoordinate_ = xy;
|
|
}
|
|
|
|
// TODO (#1266): "Full" and "minimal" serialization.
|
|
/**
|
|
* Encode the event as JSON.
|
|
*
|
|
* @returns JSON representation.
|
|
*/
|
|
override toJson(): CommentMoveJson {
|
|
const json = super.toJson() as CommentMoveJson;
|
|
if (!this.oldCoordinate_) {
|
|
throw new Error(
|
|
'The old comment position is undefined. Either pass a comment to ' +
|
|
'the constructor, or call fromJson',
|
|
);
|
|
}
|
|
if (!this.newCoordinate_) {
|
|
throw new Error(
|
|
'The new comment position is undefined. Either call recordNew, or ' +
|
|
'call fromJson',
|
|
);
|
|
}
|
|
json['oldCoordinate'] =
|
|
`${Math.round(this.oldCoordinate_.x)}, ` +
|
|
`${Math.round(this.oldCoordinate_.y)}`;
|
|
json['newCoordinate'] =
|
|
Math.round(this.newCoordinate_.x) +
|
|
',' +
|
|
Math.round(this.newCoordinate_.y);
|
|
return json;
|
|
}
|
|
|
|
/**
|
|
* Deserializes the JSON event.
|
|
*
|
|
* @param event The event to append new properties to. Should be a subclass
|
|
* of CommentMove, but we can't specify that due to the fact that
|
|
* parameters to static methods in subclasses must be supertypes of
|
|
* parameters to static methods in superclasses.
|
|
* @internal
|
|
*/
|
|
static fromJson(
|
|
json: CommentMoveJson,
|
|
workspace: Workspace,
|
|
event?: any,
|
|
): CommentMove {
|
|
const newEvent = super.fromJson(
|
|
json,
|
|
workspace,
|
|
event ?? new CommentMove(),
|
|
) as CommentMove;
|
|
let xy = json['oldCoordinate'].split(',');
|
|
newEvent.oldCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
|
|
xy = json['newCoordinate'].split(',');
|
|
newEvent.newCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
|
|
return newEvent;
|
|
}
|
|
|
|
/**
|
|
* Does this event record any change of state?
|
|
*
|
|
* @returns False if something changed.
|
|
*/
|
|
override isNull(): boolean {
|
|
return Coordinate.equals(this.oldCoordinate_, this.newCoordinate_);
|
|
}
|
|
|
|
/**
|
|
* Run a move event.
|
|
*
|
|
* @param forward True if run forward, false if run backward (undo).
|
|
*/
|
|
override run(forward: boolean) {
|
|
const workspace = this.getEventWorkspace_();
|
|
if (!this.commentId) {
|
|
throw new Error(
|
|
'The comment ID is undefined. Either pass a comment to ' +
|
|
'the constructor, or call fromJson',
|
|
);
|
|
}
|
|
const comment = workspace.getCommentById(this.commentId);
|
|
if (!comment) {
|
|
console.warn("Can't move non-existent comment: " + this.commentId);
|
|
return;
|
|
}
|
|
|
|
const target = forward ? this.newCoordinate_ : this.oldCoordinate_;
|
|
if (!target) {
|
|
throw new Error(
|
|
'Either oldCoordinate_ or newCoordinate_ is undefined. ' +
|
|
'Either pass a comment to the constructor and call recordNew, ' +
|
|
'or call fromJson',
|
|
);
|
|
}
|
|
// TODO: Check if the comment is being dragged, and give up if so.
|
|
const current = comment.getRelativeToSurfaceXY();
|
|
comment.moveBy(target.x - current.x, target.y - current.y);
|
|
}
|
|
}
|
|
|
|
export interface CommentMoveJson extends CommentBaseJson {
|
|
oldCoordinate: string;
|
|
newCoordinate: string;
|
|
}
|
|
|
|
registry.register(registry.Type.EVENT, eventUtils.COMMENT_MOVE, CommentMove);
|