Merge branch 'master' into feature

* master:
  Correct doc
  🆙 ant-design-palettes => @ant-design/colors
This commit is contained in:
afc163 2018-12-24 13:38:46 +08:00
commit 360f8cb7dc
No known key found for this signature in database
GPG Key ID: 738F973FCE5C6B48
3 changed files with 3 additions and 3 deletions

View File

@ -48,7 +48,7 @@ When need to mention someone or something.
| value | core state of mention | ContentState | null |
| onBlur | Callback function called when mention component blur | function(e) | null |
| onChange | Callback function called when content of input changes | function(contentState: ContentState) | null |
| onFocus | Callback function called when mention component get focus | functione) | null |
| onFocus | Callback function called when mention component get focus | function | null |
| onSearchChange | Callback function called when search content changes | function(value:string, trigger: string) | \[] |
| onSelect | Callback function called when select from suggestions | function(suggestion: string, data?: any) | null |

View File

@ -99,7 +99,7 @@
"@types/react-slick": "^0.23.2",
"@yesmeck/offline-plugin": "^5.0.5",
"ansi-styles": "^3.2.1",
"ant-design-palettes": "^1.1.3",
"@ant-design/colors": "^2.0.0",
"antd-theme-generator": "^1.1.4",
"antd-tools": "^6.4.3",
"babel-eslint": "^10.0.1",

View File

@ -1,5 +1,5 @@
import React from 'react';
import { generate } from 'ant-design-palettes';
import { generate } from '@ant-design/colors';
import ColorBlock from './ColorBlock';
export default function ColorPatterns({ color }) {