mirror of
https://github.com/konvajs/konva.git
synced 2025-08-20 04:18:18 +08:00
change return type of node.toImage(), close #1951
This commit is contained in:
parent
e7eb3e9a3f
commit
b43ff157ce
@ -2080,7 +2080,7 @@ export abstract class Node<Config extends NodeConfig = NodeConfig> {
|
||||
quality?: number;
|
||||
callback?: (img: HTMLImageElement) => void;
|
||||
}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
return new Promise<HTMLImageElement>((resolve, reject) => {
|
||||
try {
|
||||
const callback = config?.callback;
|
||||
if (callback) delete config.callback;
|
||||
|
12
src/Stage.ts
12
src/Stage.ts
@ -592,7 +592,17 @@ export class Stage extends Container<Layer> {
|
||||
if (!events) {
|
||||
return;
|
||||
}
|
||||
if (Konva.isDragging() && DD.node!.preventDefault() && evt.cancelable) {
|
||||
// prevent default only for touch-based interactions to avoid blocking
|
||||
// native mouse wheel scrolling during drag on desktop
|
||||
const isTouchPointer =
|
||||
(evt as any).type.indexOf('touch') >= 0 ||
|
||||
(evt as any).pointerType === 'touch';
|
||||
if (
|
||||
Konva.isDragging() &&
|
||||
DD.node!.preventDefault() &&
|
||||
evt.cancelable &&
|
||||
isTouchPointer
|
||||
) {
|
||||
evt.preventDefault();
|
||||
}
|
||||
this.setPointersPositions(evt);
|
||||
|
Loading…
Reference in New Issue
Block a user