Skip to content

Commit 3841e42

Browse files
committed
Merge branch 'develop' of https://github.com/curlywurlycraig/react-canvas-draw into curlywurlycraig-develop
2 parents 6d14f27 + ab06f60 commit 3841e42

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

src/index.js

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,7 @@ const canvasStyle = {
2222
position: "absolute"
2323
};
2424

25-
const canvasTypes = [
26-
{
27-
name: "interface",
28-
zIndex: 15
29-
},
30-
{
31-
name: "drawing",
32-
zIndex: 11
33-
},
34-
{
35-
name: "temp",
36-
zIndex: 12
37-
},
38-
{
39-
name: "grid",
40-
zIndex: 10
41-
}
42-
];
25+
const canvasTypes = ["grid", "drawing", "temp", "interface"];
4326

4427
const dimensionsPropTypes = PropTypes.oneOfType([
4528
PropTypes.number,

tests/index.test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
import expect from "expect";
2-
import Enzyme from "enzyme";
3-
import Adapter from "enzyme-adapter-react-16";
42
import React from "react";
53
import { render, unmountComponentAtNode } from "react-dom";
64

75
import CanvasDraw from "src/";
86

9-
describe("CanvasDraw", () => {
10-
before(() => {
11-
Enzyme.configure({ adapter: new Adapter() });
12-
});
13-
7+
describe("DrawCanvas", () => {
148
let node;
159

1610
beforeEach(() => {

0 commit comments

Comments
 (0)