Skip to content

Commit 27269ec

Browse files
committed
Refactoring tools to concrete package per tool
1 parent 3cc8914 commit 27269ec

File tree

15 files changed

+45
-22
lines changed

15 files changed

+45
-22
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# Linux trash folder which might appear on any partition or disk
88
.Trash-*
9-
9+
dist/
1010

1111
### JetBrains template
1212
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio

src/SketchField.jsx

+2-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,9 @@ import React, {PureComponent} from 'react';
44
import PropTypes from 'prop-types';
55
import History from './history';
66
import {uuid4} from './utils';
7-
import Select from './select';
8-
import Pencil from './pencil';
9-
import Line from './line';
10-
import Arrow from './arrow';
11-
import Rectangle from './rectangle';
12-
import Circle from './circle';
13-
import Pan from './pan';
7+
import { Arrow, Circle, Line,Select ,Pencil,Rectangle,Pan,Highlighter, RectangleLabel} from './tools';
148
import Tool from './tools';
15-
import Highlighter from './highlighter';
16-
import RectangleLabel from './rectangle-label';
17-
import DefaultTool from './defaul-tool';
9+
import DefaultTool from './tools/defaul-tool';
1810

1911
const fabric = require('fabric').fabric;
2012

src/arrow.js renamed to src/tools/Arrow/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*eslint no-unused-vars: 0*/
22

3-
import FabricCanvasTool from './fabrictool'
3+
import FabricCanvasTool from '../fabrictool'
44

55
const fabric = require('fabric').fabric;
66

7-
class Arrow extends FabricCanvasTool {
7+
class Index extends FabricCanvasTool {
88

99
configureCanvas(props) {
1010
let canvas = this._canvas;
@@ -80,4 +80,4 @@ class Arrow extends FabricCanvasTool {
8080
}
8181
}
8282

83-
export default Arrow;
83+
export default Index;

src/circle.js renamed to src/tools/Circle/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*eslint no-unused-vars: 0*/
22

3-
import FabricCanvasTool from './fabrictool'
4-
import {linearDistance} from './utils';
3+
import FabricCanvasTool from '../fabrictool'
4+
import {linearDistance} from '../../utils';
55

66
const fabric = require('fabric').fabric;
77

File renamed without changes.

src/line.js renamed to src/tools/Line/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*eslint no-unused-vars: 0*/
22

3-
import FabricCanvasTool from './fabrictool'
3+
import FabricCanvasTool from '../fabrictool'
44

55
const fabric = require('fabric').fabric;
66

src/pan.js renamed to src/tools/Pan/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*eslint no-unused-vars: 0*/
22

3-
import FabricCanvasTool from './fabrictool'
3+
import FabricCanvasTool from '../fabrictool'
44

55
const fabric = require('fabric').fabric;
66

src/pencil.js renamed to src/tools/Pencil/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import FabricCanvasTool from './fabrictool'
2+
import FabricCanvasTool from '../fabrictool'
33

44
class Pencil extends FabricCanvasTool {
55

src/rectangle.js renamed to src/tools/Rectangle/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*eslint no-unused-vars: 0*/
22

3-
import FabricCanvasTool from './fabrictool'
3+
import FabricCanvasTool from '../fabrictool'
44

55
const fabric = require('fabric').fabric;
66

src/rectangle-label.js renamed to src/tools/Rectangle/rectangle-label.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*eslint no-unused-vars: 0*/
22

3-
import FabricCanvasTool from './fabrictool'
3+
import FabricCanvasTool from '../fabrictool'
44
import RectangleLabelObject from './rectangle-label-object';
55

66
class RectangleLabel extends FabricCanvasTool {

src/select.js renamed to src/tools/Select/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*eslint no-unused-vars: 0*/
22

3-
import FabricCanvasTool from './fabrictool'
3+
import FabricCanvasTool from '../fabrictool'
44

55
class Select extends FabricCanvasTool {
66

File renamed without changes.
File renamed without changes.

src/tools/index.js

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import Arrow from './Arrow'
2+
import Circle from './Circle'
3+
import Highlighter from './Highlighter'
4+
import Line from './Line'
5+
import Pan from './Pan'
6+
import Pencil from './Pencil'
7+
import Rectangle from './Rectangle'
8+
import RectangleLabel from './Rectangle/rectangle-label'
9+
import Select from './Select'
10+
11+
export {Arrow}
12+
export {Circle}
13+
export {Highlighter}
14+
export {Line}
15+
export {Pan}
16+
export {Pencil}
17+
export {Rectangle}
18+
export {RectangleLabel}
19+
export {Select}
20+
21+
export default {
22+
Arrow,
23+
Circle,
24+
Highlighter,
25+
Line,
26+
Pan,
27+
Pencil,
28+
Rectangle,
29+
RectangleLabel,
30+
Select
31+
}

0 commit comments

Comments
 (0)