feat: override method with default interception behavior #663
This commit is contained in:
@@ -6,7 +6,14 @@
|
|||||||
import Editor from "@hufe921/canvas-editor"
|
import Editor from "@hufe921/canvas-editor"
|
||||||
|
|
||||||
const instance = new Editor(container, <IElement[]>data, options)
|
const instance = new Editor(container, <IElement[]>data, options)
|
||||||
instance.override.overrideFunction = ()=>{}
|
|
||||||
|
instance.override.overrideFunction = () => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
|
```
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
interface IOverrideResult {
|
||||||
|
preventDefault?: boolean // Prevent the execution of internal default method. Default prevent
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## paste
|
## paste
|
||||||
@@ -16,7 +23,7 @@ Feature: Override internal paste function
|
|||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
instance.override.paste = (evt?: ClipboardEvent) => void
|
instance.override.paste = (evt?: ClipboardEvent) => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
```
|
```
|
||||||
|
|
||||||
## copy
|
## copy
|
||||||
@@ -26,7 +33,7 @@ Feature: Override internal copy function
|
|||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
instance.override.copy = () => void
|
instance.override.copy = () => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
```
|
```
|
||||||
|
|
||||||
## drop
|
## drop
|
||||||
@@ -36,5 +43,5 @@ Feature: Override internal drop function
|
|||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
instance.override.drop = (evt: DragEvent) => void
|
instance.override.drop = (evt: DragEvent) => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
```
|
```
|
||||||
|
|||||||
+11
-4
@@ -6,7 +6,14 @@
|
|||||||
import Editor from "@hufe921/canvas-editor"
|
import Editor from "@hufe921/canvas-editor"
|
||||||
|
|
||||||
const instance = new Editor(container, <IElement[]>data, options)
|
const instance = new Editor(container, <IElement[]>data, options)
|
||||||
instance.override.overrideFunction = ()=>{}
|
|
||||||
|
instance.override.overrideFunction = () => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
|
```
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
interface IOverrideResult {
|
||||||
|
preventDefault?: boolean // 阻止执行内部默认方法。默认阻止
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## paste
|
## paste
|
||||||
@@ -16,7 +23,7 @@ instance.override.overrideFunction = ()=>{}
|
|||||||
用法:
|
用法:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
instance.override.paste = (evt?: ClipboardEvent) => void
|
instance.override.paste = (evt?: ClipboardEvent) => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
```
|
```
|
||||||
|
|
||||||
## copy
|
## copy
|
||||||
@@ -26,7 +33,7 @@ instance.override.paste = (evt?: ClipboardEvent) => void
|
|||||||
用法:
|
用法:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
instance.override.copy = () => void
|
instance.override.copy = () => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
```
|
```
|
||||||
|
|
||||||
## drop
|
## drop
|
||||||
@@ -36,5 +43,5 @@ instance.override.copy = () => void
|
|||||||
用法:
|
用法:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
instance.override.drop = (evt: DragEvent) => void
|
instance.override.drop = (evt: DragEvent) => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -1,17 +1,20 @@
|
|||||||
import { ElementType } from '../../../dataset/enum/Element'
|
import { ElementType } from '../../../dataset/enum/Element'
|
||||||
import { IElement } from '../../../interface/Element'
|
import { IElement } from '../../../interface/Element'
|
||||||
import { ITr } from '../../../interface/table/Tr'
|
import { ITr } from '../../../interface/table/Tr'
|
||||||
|
import { isPromiseFunction } from '../../../utils'
|
||||||
import { writeElementList } from '../../../utils/clipboard'
|
import { writeElementList } from '../../../utils/clipboard'
|
||||||
import { zipElementList } from '../../../utils/element'
|
import { zipElementList } from '../../../utils/element'
|
||||||
|
import { IOverrideResult } from '../../override/Override'
|
||||||
import { CanvasEvent } from '../CanvasEvent'
|
import { CanvasEvent } from '../CanvasEvent'
|
||||||
|
|
||||||
export function copy(host: CanvasEvent) {
|
export async function copy(host: CanvasEvent) {
|
||||||
const draw = host.getDraw()
|
const draw = host.getDraw()
|
||||||
// 自定义粘贴事件
|
// 自定义粘贴事件
|
||||||
const { copy } = draw.getOverride()
|
const { copy } = draw.getOverride()
|
||||||
if (copy) {
|
if (copy) {
|
||||||
copy()
|
const overrideResult = isPromiseFunction(copy) ? await copy() : copy()
|
||||||
return
|
// 默认阻止默认事件
|
||||||
|
if ((<IOverrideResult>overrideResult)?.preventDefault !== false) return
|
||||||
}
|
}
|
||||||
const rangeManager = draw.getRange()
|
const rangeManager = draw.getRange()
|
||||||
// 光标闭合时复制整行
|
// 光标闭合时复制整行
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
|
import { isPromiseFunction } from '../../../utils'
|
||||||
|
import { IOverrideResult } from '../../override/Override'
|
||||||
import { CanvasEvent } from '../CanvasEvent'
|
import { CanvasEvent } from '../CanvasEvent'
|
||||||
import { pasteImage } from './paste'
|
import { pasteImage } from './paste'
|
||||||
|
|
||||||
export function drop(evt: DragEvent, host: CanvasEvent) {
|
export async function drop(evt: DragEvent, host: CanvasEvent) {
|
||||||
const draw = host.getDraw()
|
const draw = host.getDraw()
|
||||||
// 自定义拖放事件
|
// 自定义拖放事件
|
||||||
const { drop } = draw.getOverride()
|
const { drop } = draw.getOverride()
|
||||||
if (drop) {
|
if (drop) {
|
||||||
drop(evt)
|
const overrideResult = isPromiseFunction(drop) ? await drop(evt) : drop(evt)
|
||||||
return
|
// 默认阻止默认事件
|
||||||
|
if ((<IOverrideResult>overrideResult)?.preventDefault !== false) return
|
||||||
}
|
}
|
||||||
evt.preventDefault()
|
evt.preventDefault()
|
||||||
const data = evt.dataTransfer?.getData('text')
|
const data = evt.dataTransfer?.getData('text')
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ import {
|
|||||||
getElementListByHTML
|
getElementListByHTML
|
||||||
} from '../../../utils/element'
|
} from '../../../utils/element'
|
||||||
import { CanvasEvent } from '../CanvasEvent'
|
import { CanvasEvent } from '../CanvasEvent'
|
||||||
|
import { isPromiseFunction } from '../../../utils'
|
||||||
|
import { IOverrideResult } from '../../override/Override'
|
||||||
|
|
||||||
export function pasteElement(host: CanvasEvent, elementList: IElement[]) {
|
export function pasteElement(host: CanvasEvent, elementList: IElement[]) {
|
||||||
const draw = host.getDraw()
|
const draw = host.getDraw()
|
||||||
@@ -96,7 +98,7 @@ export function pasteImage(host: CanvasEvent, file: File | Blob) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function pasteByEvent(host: CanvasEvent, evt: ClipboardEvent) {
|
export async function pasteByEvent(host: CanvasEvent, evt: ClipboardEvent) {
|
||||||
const draw = host.getDraw()
|
const draw = host.getDraw()
|
||||||
const isReadonly = draw.isReadonly()
|
const isReadonly = draw.isReadonly()
|
||||||
if (isReadonly) return
|
if (isReadonly) return
|
||||||
@@ -105,8 +107,11 @@ export function pasteByEvent(host: CanvasEvent, evt: ClipboardEvent) {
|
|||||||
// 自定义粘贴事件
|
// 自定义粘贴事件
|
||||||
const { paste } = draw.getOverride()
|
const { paste } = draw.getOverride()
|
||||||
if (paste) {
|
if (paste) {
|
||||||
paste(evt)
|
const overrideResult = isPromiseFunction(paste)
|
||||||
return
|
? await paste(evt)
|
||||||
|
: paste(evt)
|
||||||
|
// 默认阻止默认事件
|
||||||
|
if ((<IOverrideResult>overrideResult)?.preventDefault !== false) return
|
||||||
}
|
}
|
||||||
// 优先读取编辑器内部粘贴板数据(粘贴板不包含文件时)
|
// 优先读取编辑器内部粘贴板数据(粘贴板不包含文件时)
|
||||||
if (!getIsClipboardContainFile(clipboardData)) {
|
if (!getIsClipboardContainFile(clipboardData)) {
|
||||||
@@ -160,8 +165,9 @@ export async function pasteByApi(host: CanvasEvent, options?: IPasteOption) {
|
|||||||
// 自定义粘贴事件
|
// 自定义粘贴事件
|
||||||
const { paste } = draw.getOverride()
|
const { paste } = draw.getOverride()
|
||||||
if (paste) {
|
if (paste) {
|
||||||
paste()
|
const overrideResult = isPromiseFunction(paste) ? await paste() : paste()
|
||||||
return
|
// 默认阻止默认事件
|
||||||
|
if ((<IOverrideResult>overrideResult)?.preventDefault !== false) return
|
||||||
}
|
}
|
||||||
// 优先读取编辑器内部粘贴板数据
|
// 优先读取编辑器内部粘贴板数据
|
||||||
const clipboardText = await navigator.clipboard.readText()
|
const clipboardText = await navigator.clipboard.readText()
|
||||||
|
|||||||
@@ -1,5 +1,19 @@
|
|||||||
export class Override {
|
export interface IOverrideResult {
|
||||||
public paste: ((evt?: ClipboardEvent) => void) | undefined
|
preventDefault?: boolean
|
||||||
public copy: (() => void) | undefined
|
}
|
||||||
public drop: ((evt: DragEvent) => void) | undefined
|
|
||||||
|
export class Override {
|
||||||
|
public paste:
|
||||||
|
| ((
|
||||||
|
evt?: ClipboardEvent
|
||||||
|
) => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>)
|
||||||
|
| undefined
|
||||||
|
public copy:
|
||||||
|
| (() => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>)
|
||||||
|
| undefined
|
||||||
|
public drop:
|
||||||
|
| ((
|
||||||
|
evt: DragEvent
|
||||||
|
) => void | Promise<void> | IOverrideResult | Promise<IOverrideResult>)
|
||||||
|
| undefined
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -326,3 +326,7 @@ export function isObjectEqual(obj1: unknown, obj2: unknown): boolean {
|
|||||||
}
|
}
|
||||||
return !obj1Keys.some(key => obj2[key] !== obj1[key])
|
return !obj1Keys.some(key => obj2[key] !== obj1[key])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function isPromiseFunction(fn: Function): boolean {
|
||||||
|
return fn?.constructor?.name === 'AsyncFunction'
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user