Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/sprotty/src/base/di.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { SetModelCommand } from "./features/set-model";
import { UIExtensionRegistry, SetUIExtensionVisibilityCommand } from "./ui-extensions/ui-extension-registry";
import { DefaultDiagramLocker } from "./actions/diagram-locker";
import { TouchTool } from "./views/touch-tool";
import { PointerTool } from "./views/pointer-tool";

const defaultContainerModule = new ContainerModule((bind, _unbind, isBound) => {
// Logging ---------------------------------------------
Expand Down Expand Up @@ -135,6 +136,8 @@ const defaultContainerModule = new ContainerModule((bind, _unbind, isBound) => {
bind(TYPES.HiddenVNodePostprocessor).toService(CssClassPostprocessor);
bind(MouseTool).toSelf().inSingletonScope();
bind(TYPES.IVNodePostprocessor).toService(MouseTool);
bind(PointerTool).toSelf().inSingletonScope();
bind(TYPES.IVNodePostprocessor).toService(PointerTool);
bind(TouchTool).toSelf().inSingletonScope();
bind(TYPES.IVNodePostprocessor).toService(TouchTool);
bind(KeyTool).toSelf().inSingletonScope();
Expand Down
1 change: 1 addition & 0 deletions packages/sprotty/src/base/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export const TYPES = {
ModelViewer: Symbol('ModelViewer'),
MouseListener: Symbol('MouseListener'),
PatcherProvider: Symbol('PatcherProvider'),
IPointerListener: Symbol('IPointerListener'),
IPopupModelProvider: Symbol('IPopupModelProvider'),
PopupModelViewer: Symbol('PopupModelViewer'),
PopupMouseListener: Symbol('PopupMouseListener'),
Expand Down
182 changes: 182 additions & 0 deletions packages/sprotty/src/base/views/pointer-tool.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
/********************************************************************************
* Copyright (c) 2025 TypeFox and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the Eclipse
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
* with the GNU Classpath Exception which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
********************************************************************************/

import { inject, injectable, multiInject, optional } from "inversify";
import { VNode } from "snabbdom";
import { Action, isAction } from "sprotty-protocol/lib/actions";
import { IActionDispatcher } from "../actions/action-dispatcher";
import { SModelElementImpl, SModelRootImpl } from "../model/smodel";
import { TYPES } from "../types";
import { DOMHelper } from "./dom-helper";
import { IVNodePostprocessor } from "./vnode-postprocessor";
import { on } from "./vnode-utils";

@injectable()
export class PointerTool implements IVNodePostprocessor {
@inject(TYPES.IActionDispatcher) protected actionDispatcher!: IActionDispatcher;
@inject(TYPES.DOMHelper) protected domHelper!: DOMHelper;

constructor(@multiInject(TYPES.IPointerListener) @optional() protected pointerListeners: IPointerListener[] = []) {}

register(pointerListener: IPointerListener) {
this.pointerListeners.push(pointerListener);
}

deregister(pointerListener: IPointerListener) {
const index = this.pointerListeners.indexOf(pointerListener);
if (index >= 0) this.pointerListeners.splice(index, 1);
}

protected getTargetElement(model: SModelRootImpl, event: PointerEvent): SModelElementImpl | undefined {
let target = event.target as Element;
const index = model.index;
while (target) {
if (target.id) {
const element = index.getById(this.domHelper.findSModelIdByDOMElement(target));
if (element !== undefined) return element;
}
target = target.parentNode as Element;
}
return undefined;
}

protected handleEvent(methodName: PointerEventKind, model: SModelRootImpl, event: PointerEvent) {
const element = this.getTargetElement(model, event);
if (!element) return;
const actions = this.pointerListeners
.map((listener) => listener[methodName](element, event))
.reduce((a, b) => a.concat(b), []);
if (actions.length > 0) {
event.preventDefault();
for (const actionOrPromise of actions) {
if (isAction(actionOrPromise)) {
this.actionDispatcher.dispatch(actionOrPromise);
} else {
actionOrPromise.then((action: Action) => {
this.actionDispatcher.dispatch(action);
});
}
}
}
}

decorate(vnode: VNode, element: SModelElementImpl): VNode {
if (element instanceof SModelRootImpl) {
on(vnode, "pointerover", this.handleEvent.bind(this, "pointerOver", element) as (e: Event) => void);
on(vnode, "pointerenter", this.handleEvent.bind(this, "pointerEnter", element) as (e: Event) => void);
on(vnode, "pointerdown", this.handleEvent.bind(this, "pointerDown", element) as (e: Event) => void);
on(vnode, "pointermove", this.handleEvent.bind(this, "pointerMove", element) as (e: Event) => void);
on(vnode, "pointerup", this.handleEvent.bind(this, "pointerUp", element) as (e: Event) => void);
on(vnode, "pointercancel", this.handleEvent.bind(this, "pointerCancel", element) as (e: Event) => void);
on(vnode, "pointerout", this.handleEvent.bind(this, "pointerOut", element) as (e: Event) => void);
on(vnode, "pointerleave", this.handleEvent.bind(this, "pointerLeave", element) as (e: Event) => void);
on(
vnode,
"gotpointercapture",
this.handleEvent.bind(this, "gotPointerCapture", element) as (e: Event) => void
);
on(
vnode,
"lostpointercapture",
this.handleEvent.bind(this, "lostPointerCapture", element) as (e: Event) => void
);
}
return vnode;
}

postUpdate() {
}
}

export type PointerEventKind =
| "pointerOver"
| "pointerEnter"
| "pointerDown"
| "pointerMove"
| "pointerUp"
| "pointerCancel"
| "pointerOut"
| "pointerLeave"
| "gotPointerCapture"
| "lostPointerCapture";

export interface IPointerListener {

pointerOver(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

pointerEnter(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

pointerDown(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

pointerMove(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

pointerUp(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

pointerCancel(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

pointerOut(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

pointerLeave(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

gotPointerCapture(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];

lostPointerCapture(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[];
}

@injectable()
export class PointerListener implements IPointerListener {

pointerOver(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

pointerEnter(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

pointerDown(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

pointerMove(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

pointerUp(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

pointerCancel(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

pointerOut(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

pointerLeave(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

gotPointerCapture(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

lostPointerCapture(target: SModelElementImpl, event: PointerEvent): (Action | Promise<Action>)[] {
return [];
}

}
8 changes: 4 additions & 4 deletions packages/sprotty/src/base/views/touch-tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ export class TouchTool implements IVNodePostprocessor {

constructor(@multiInject(TYPES.ITouchListener) @optional() protected touchListeners: ITouchListener[] = []) { }

register(mouseListener: ITouchListener) {
this.touchListeners.push(mouseListener);
register(touchListener: ITouchListener) {
this.touchListeners.push(touchListener);
}

deregister(mouseListener: ITouchListener) {
const index = this.touchListeners.indexOf(mouseListener);
deregister(touchListener: ITouchListener) {
const index = this.touchListeners.indexOf(touchListener);
if (index >= 0)
this.touchListeners.splice(index, 1);
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sprotty/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ export * from './base/ui-extensions/ui-extension';

export * from './base/views/key-tool';
export * from './base/views/mouse-tool';
export * from './base/views/pointer-tool';
export * from './base/views/thunk-view';
export * from './base/views/touch-tool';
export * from './base/views/view';
export * from './base/views/viewer-cache';
export * from './base/views/viewer-options';
Expand Down