Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
wangzuo committed May 24, 2019
1 parent 1f14a6b commit 8c9d0b3
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 200 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-input-color",
"version": "2.0.13",
"version": "2.0.16",
"description": "React input color component with hsv color picker",
"main": "dist/index.cjs.js",
"module": "dist/index.esm.js",
Expand Down Expand Up @@ -28,23 +28,23 @@
"license": "MIT",
"devDependencies": {
"babel-jest": "^24.8.0",
"babel-preset-swiftcarrot": "^0.6.2",
"babel-preset-swiftcarrot": "^0.7.0",
"jest": "^24.8.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-test-renderer": "^16.8.6",
"rollup": "^1.11.3",
"rollup": "^1.12.3",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-node-resolve": "^4.2.3"
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.0"
},
"dependencies": {
"@babel/runtime": "^7.4.4",
"@babel/runtime": "^7.4.5",
"@emotion/core": "^10.0.10",
"@xkit/popover": "^0.1.10",
"color-functions": "^3.0.1",
"react-input-number": "^5.0.14",
"react-input-slider": "^5.0.14"
"@swiftcarrot/color-fns": "^3.0.2",
"@xkit/popover": "^0.1.11",
"react-input-number": "^5.0.16",
"react-input-slider": "^5.0.15"
},
"peerDependencies": {
"react": "^16.8.4",
Expand Down
2 changes: 1 addition & 1 deletion src/color-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
hex2rgb,
rgba,
hsv2rgb
} from 'color-functions';
} from '@swiftcarrot/color-fns';

const KEY_ENTER = 13;

Expand Down
4 changes: 2 additions & 2 deletions src/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { hex2rgb, rgb2hsv } from 'color-functions';
import { hex2rgb, rgb2hsv } from '@swiftcarrot/color-fns';

export function parseColor(hexColor) {
const rgb = hex2rgb(hexColor);
Expand All @@ -15,4 +15,4 @@ export {
hex2rgb,
rgba,
hsv2rgb
} from 'color-functions';
} from '@swiftcarrot/color-fns';
Loading

0 comments on commit 8c9d0b3

Please sign in to comment.