Skip to content

Commit 824f946

Browse files
committed
changed 'onTooltip' element
1 parent 57ce76b commit 824f946

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-design-editor",
3-
"version": "0.0.42",
3+
"version": "0.0.43",
44
"description": "Design Editor Tools with React.js + ant.design + fabric.js",
55
"main": "dist/react-design-editor.min.js",
66
"typings": "lib/index.d.ts",

src/canvas/handlers/Handler.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,22 +1538,21 @@ class Handler implements HandlerOptions {
15381538
let prevLeft = 0;
15391539
let prevTop = 0;
15401540
this.canvas.setBackgroundColor(this.canvasOption.backgroundColor, this.canvas.renderAll.bind(this.canvas));
1541-
const workareaExist = json.filter((obj: FabricObjectOption) => obj.id === 'workarea');
1541+
const workarea = json.find((obj: FabricObjectOption) => obj.id === 'workarea');
15421542
if (!this.workarea) {
15431543
this.workareaHandler.initialize();
15441544
}
1545-
if (!workareaExist.length) {
1546-
this.canvas.centerObject(this.workarea);
1547-
this.workarea.setCoords();
1548-
prevLeft = this.workarea.left;
1549-
prevTop = this.workarea.top;
1550-
} else {
1551-
const workarea = workareaExist[0];
1545+
if (workarea) {
15521546
prevLeft = workarea.left;
15531547
prevTop = workarea.top;
15541548
this.workarea.set(workarea);
15551549
await this.workareaHandler.setImage(workarea.src, true);
15561550
this.workarea.setCoords();
1551+
} else {
1552+
this.canvas.centerObject(this.workarea);
1553+
this.workarea.setCoords();
1554+
prevLeft = this.workarea.left;
1555+
prevTop = this.workarea.top;
15571556
}
15581557
json.forEach((obj: FabricObjectOption) => {
15591558
if (obj.id === 'workarea') {

src/canvas/handlers/TooltipHandler.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import ReactDOM from 'react-dom';
21
import debounce from 'lodash/debounce';
3-
4-
import Handler from './Handler';
2+
import ReactDOM from 'react-dom';
53
import { FabricObject } from '../utils';
4+
import Handler from './Handler';
5+
66

77
class TooltipHandler {
88
handler: Handler;
@@ -54,7 +54,7 @@ class TooltipHandler {
5454
let element = target.name as any;
5555
const { onTooltip } = this.handler;
5656
if (onTooltip) {
57-
element = await onTooltip(this.tooltipEl, target);
57+
element = await onTooltip(tooltip, target);
5858
if (!element) {
5959
return;
6060
}

0 commit comments

Comments
 (0)