mirror of
https://github.com/google/blockly.git
synced 2026-01-19 14:57:12 +01:00
4074cee31b
* feat!: Make bubbles, comments, and icons focusable * feat!: Make ISelectable and ICopyable focusable. * feat: Consolidate selection calls. Now everything is based on focus with selection only being used as a proxy. * feat: Invert responsibility for setSelected(). Now setSelected() is only for quasi-external use. * feat: Push up shadow check to getters. Needed new common-level helper. * chore: Lint fixes. * feat!: Allow IFocusableNode to disable focus. * chore: post-merge lint fixes * fix: Fix tests + text bubble focusing. This fixed then regressed a circular dependency causing the node and advanced compilation steps to fail. This investigation is ongoing. * fix: Clean up & fix imports. This ensures the node and advanced compilation test steps now pass. * fix: Lint fixes + revert commented out logic. * chore: Remove unnecessary cast. Addresses reviewer comment. * fix: Some issues and a bunch of clean-ups. This addresses a bunch of review comments, and fixes selecting workspace comments. * chore: Lint fix. * fix: Remove unnecessary shadow consideration. * chore: Revert import. * chore: Some doc updates & added a warn statement.
96 lines
2.7 KiB
TypeScript
96 lines
2.7 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2023 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import {RenderedWorkspaceComment} from '../comments/rendered_workspace_comment.js';
|
|
import {EventType} from '../events/type.js';
|
|
import * as eventUtils from '../events/utils.js';
|
|
import {getFocusManager} from '../focus_manager.js';
|
|
import {ICopyData} from '../interfaces/i_copyable.js';
|
|
import {IPaster} from '../interfaces/i_paster.js';
|
|
import * as commentSerialiation from '../serialization/workspace_comments.js';
|
|
import {Coordinate} from '../utils/coordinate.js';
|
|
import {WorkspaceSvg} from '../workspace_svg.js';
|
|
import * as registry from './registry.js';
|
|
|
|
export class WorkspaceCommentPaster
|
|
implements IPaster<WorkspaceCommentCopyData, RenderedWorkspaceComment>
|
|
{
|
|
static TYPE = 'workspace-comment';
|
|
|
|
paste(
|
|
copyData: WorkspaceCommentCopyData,
|
|
workspace: WorkspaceSvg,
|
|
coordinate?: Coordinate,
|
|
): RenderedWorkspaceComment | null {
|
|
const state = copyData.commentState;
|
|
|
|
if (coordinate) {
|
|
state['x'] = coordinate.x;
|
|
state['y'] = coordinate.y;
|
|
}
|
|
|
|
eventUtils.disable();
|
|
let comment;
|
|
try {
|
|
comment = commentSerialiation.append(
|
|
state,
|
|
workspace,
|
|
) as RenderedWorkspaceComment;
|
|
moveCommentToNotConflict(comment);
|
|
} finally {
|
|
eventUtils.enable();
|
|
}
|
|
|
|
if (!comment) return null;
|
|
|
|
if (eventUtils.isEnabled()) {
|
|
eventUtils.fire(new (eventUtils.get(EventType.COMMENT_CREATE))(comment));
|
|
}
|
|
getFocusManager().focusNode(comment);
|
|
return comment;
|
|
}
|
|
}
|
|
|
|
function moveCommentToNotConflict(comment: RenderedWorkspaceComment) {
|
|
const workspace = comment.workspace;
|
|
const translateDistance = 30;
|
|
const coord = comment.getRelativeToSurfaceXY();
|
|
const offset = new Coordinate(0, 0);
|
|
// getRelativeToSurfaceXY is really expensive, so we want to cache this.
|
|
const otherCoords = workspace
|
|
.getTopComments(false)
|
|
.filter((otherComment) => otherComment.id !== comment.id)
|
|
.map((c) => c.getRelativeToSurfaceXY());
|
|
|
|
while (
|
|
commentOverlapsOtherExactly(Coordinate.sum(coord, offset), otherCoords)
|
|
) {
|
|
offset.translate(
|
|
workspace.RTL ? -translateDistance : translateDistance,
|
|
translateDistance,
|
|
);
|
|
}
|
|
|
|
comment.moveTo(Coordinate.sum(coord, offset));
|
|
}
|
|
|
|
function commentOverlapsOtherExactly(
|
|
coord: Coordinate,
|
|
otherCoords: Coordinate[],
|
|
): boolean {
|
|
return otherCoords.some(
|
|
(otherCoord) =>
|
|
Math.abs(otherCoord.x - coord.x) <= 1 &&
|
|
Math.abs(otherCoord.y - coord.y) <= 1,
|
|
);
|
|
}
|
|
|
|
export interface WorkspaceCommentCopyData extends ICopyData {
|
|
commentState: commentSerialiation.State;
|
|
}
|
|
|
|
registry.register(WorkspaceCommentPaster.TYPE, new WorkspaceCommentPaster());
|