mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-01 06:49:32 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'master' into antd-3.0

Browse Source
This commit is contained in:
afc163 2017-09-25 23:10:42 +08:00
commit f9754c8a25
8 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/form/style/index.less
View File

@ -519,7 +519,7 @@ form {
border-color: @error-color; border-color: @error-color;
} }
} }
&.@{ant-prefix}-mention-active .@{ant-prefix}-mention-editor, &.@{ant-prefix}-mention-active:not([disabled]) .@{ant-prefix}-mention-editor,
.@{ant-prefix}-mention-editor:not([disabled]):focus { .@{ant-prefix}-mention-editor:not([disabled]):focus {
.active(@error-color); .active(@error-color);
} }

2
components/mention/demo/async.md
View File

@ -43,7 +43,7 @@ class AsyncMention extends React.Component {
const { suggestions, loading } = this.state; const { suggestions, loading } = this.state;
return ( return (
<Mention <Mention
style={{ width: '100%', height: 100 }} style={{ width: '100%' }}
loading={loading} loading={loading}
suggestions={suggestions} suggestions={suggestions}
onSearchChange={this.onSearchChange} onSearchChange={this.onSearchChange}

2
components/mention/demo/avatar.md
View File

@ -53,7 +53,7 @@ class CustomNavMention extends React.Component {
const { suggestions } = this.state; const { suggestions } = this.state;
return ( return (
<Mention <Mention
style={{ width: '100%', height: 100 }} style={{ width: '100%' }}
suggestions={suggestions} suggestions={suggestions}
onSearchChange={this.onSearchChange} onSearchChange={this.onSearchChange}
/> />

2
components/mention/demo/basic.md
View File

@ -27,7 +27,7 @@ function onSelect(suggestion) {
ReactDOM.render( ReactDOM.render(
<Mention <Mention
style={{ width: '100%', height: 100 }} style={{ width: '100%' }}
onChange={onChange} onChange={onChange}
defaultValue={toContentState('@afc163')} defaultValue={toContentState('@afc163')}
suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']} suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']}

1
components/mention/demo/controlled.md
View File

@ -65,7 +65,6 @@ class App extends React.Component {
})( })(
<Mention <Mention
suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']} suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']}
style={{ height: 60 }}
/> />
)} )}
</FormItem> </FormItem>

2
components/mention/demo/custom-tag.md
View File

@ -55,7 +55,7 @@ class CustomNavMention extends React.Component {
return ( return (
<Mention <Mention
placeholder="@someone" placeholder="@someone"
style={{ width: '100%', height: 100 }} style={{ width: '100%' }}
suggestions={suggestions} suggestions={suggestions}
onSearchChange={this.onSearchChange} onSearchChange={this.onSearchChange}
onSelect={onSelect} onSelect={onSelect}

2
components/mention/demo/multiple-trigger.md
View File

@ -45,7 +45,7 @@ class App extends React.Component {
render() { render() {
return ( return (
<Mention <Mention
style={{ width: '100%', height: 100 }} style={{ width: '100%' }}
onChange={onChange} onChange={onChange}
placeholder="input @ to mention people, # to mention tag" placeholder="input @ to mention people, # to mention tag"
prefix={['@', '#']} prefix={['@', '#']}

2
components/mention/demo/popupContainer.md
View File

@ -32,7 +32,7 @@ class PopoverContainer extends React.Component {
render() { render() {
const mention = ( const mention = (
<Mention <Mention
style={{ width: '100%', height: 100 }} style={{ width: '100%' }}
onChange={onChange} onChange={onChange}
defaultValue={toContentState('@afc163')} defaultValue={toContentState('@afc163')}
suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']} suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']}