Skip to content
This repository was archived by the owner on Aug 1, 2022. It is now read-only.

Commit 581f533

Browse files
committed
Merge branch 'release/v1.0.1'
2 parents 0d05ec9 + 63278ce commit 581f533

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

.travis.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
sudo: false
2-
32
language: node_js
43
node_js:
5-
- 8
6-
4+
- 8
75
before_install:
8-
- npm install codecov.io coveralls
9-
6+
- npm install codecov.io coveralls
107
after_success:
11-
- cat ./coverage/lcov.info | ./node_modules/codecov.io/bin/codecov.io.js
12-
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
13-
8+
- cat ./coverage/lcov.info | ./node_modules/codecov.io/bin/codecov.io.js
9+
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
1410
branches:
1511
only:
16-
- master
12+
- master
13+
script:
14+
- yarn test
15+
- yarn build
16+
deploy:
17+
provider: npm
18+
email: mbeierling@gmail.com
19+
api_key:
20+
secure: ZX8j5xi2vhnsWm5BQeLpu9XZ3lwiVK7WH671BhanpwTdHqv1EQdXWXnU5f0qVEL0vNIpqFvSF7fyPby+rtZ36bl8bpvlx8Tqm8iKDI3PuRdp0kt5a3HdaFSedKQE/vx10CRRARs/jAYtv7wW+vVVK6HXE8tvW+OaNFxfsH27lLJvYZbxWSHtnw4cPrZG/U1A8axmkz9q7Yb/U0c50qnRPtU/SK1NlOuVJSaGvHh0KCu2Sv2Vey1J5CTZKrg98Z2viklo3e+5R3UxbTUJz78J4FXs4kabeLAFzNhf2OhD+vyH7xtnJyW5Jt3eT8yMWz40OJQNk5hWOzh1Lucgremyq29/lZtj0fmYwRGRAKpM1HEffCW4TPp+NKlsbkEz6HhbeshSgoGnDetPceIg5AiO3R4bqTpgxj1fcPmuymLne+25RIqF25dcVtrczwu9HmLyr9mGgZMBl5I8MlKTh1IwchT4kTSCMkvNKswxspzve0ncjYTss32zpvPC50cfzXcCNTY3LO0pg5JUPxGVZ7igrCcNmdHHFcXQ15wLM1LPd0W/J8nqBumAAQ2ocdCnG4I5aQ/IpbJmlS7sVJBf1lBX+qlBkJQQvGe/d9FEqelMw2I4CmMOOXPuLwqBoOFqmqH/B50JrFItYzEMee+yzl5LAXvnNCxizvas4A19N29Jl98=
21+
on:
22+
branch: master

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-canvas-draw",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "A simple yet powerful canvas-drawing component for React.",
55
"main": "lib/index.js",
66
"module": "es/index.js",

src/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export default class extends PureComponent {
5151
brushColor: PropTypes.string,
5252
catenaryColor: PropTypes.string,
5353
gridColor: PropTypes.string,
54+
backgroundColor: PropTypes.string,
5455
hideGrid: PropTypes.bool,
5556
canvasWidth: dimensionsPropTypes,
5657
canvasHeight: dimensionsPropTypes,
@@ -67,6 +68,7 @@ export default class extends PureComponent {
6768
brushColor: "#444",
6869
catenaryColor: "#0a0302",
6970
gridColor: "rgba(150,150,150,0.17)",
71+
backgroundColor: "#FFF",
7072
hideGrid: false,
7173
canvasWidth: 400,
7274
canvasHeight: 400,
@@ -528,7 +530,7 @@ export default class extends PureComponent {
528530
className={this.props.className}
529531
style={{
530532
display: "block",
531-
background: "#fff",
533+
background: this.props.backgroundColor,
532534
touchAction: "none",
533535
width: this.props.canvasWidth,
534536
height: this.props.canvasHeight,

0 commit comments

Comments
 (0)