Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#59, patched searchBar, add iconSize for toast #62 #63

Merged
merged 1 commit into from
Apr 11, 2016
Merged

#59, patched searchBar, add iconSize for toast #62 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/toast.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
属性 | 类型 | 默认值 | 可选值 | 备注
-----|------|--------|-------|------|
icon|string|toast|所有icon|
iconSize|string|'small'|small, large| icon size
show|bool|false|| 是否显示

示例：
Expand Down
18 changes: 17 additions & 1 deletion example/pages/toast/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ export default class ToastDemo extends React.Component {
state = {
showToast: false,
showLoading: false,
showCustom: false,
toastTimer: null,
loadingTimer: null
loadingTimer: null,
customTimer: null
};

componentWillUnmount() {
Expand All @@ -26,7 +28,13 @@ export default class ToastDemo extends React.Component {
return (
<Page className="toast" title="Toast" spacing>
<Button onClick={this.showToast.bind(this)}>Toast</Button>
<Button onClick={this.showCustom.bind(this)}>Custom Toast</Button>
<Button onClick={this.showLoading.bind(this)}>Loading</Button>
<Toast
show={this.state.showCustom}
icon="waiting_circle"
iconSize="large"
>waiting...</Toast>
<Toast show={this.state.showToast}>完成</Toast>
<Toast icon="loading" show={this.state.showLoading}>正在加载中...</Toast>
</Page>
Expand All @@ -48,4 +56,12 @@ export default class ToastDemo extends React.Component {
this.setState({showLoading: false});
}, 2000);
}

showCustom() {
this.setState({showCustom: true});

this.state.customTimer = setTimeout(()=> {
this.setState({showCustom: false});
}, 2000);
}
};
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@
"url-loader": "^0.5.7",
"webpack": "^1.12.2",
"webpack-dev-server": "^1.12.1",
"weui": "^0.4.0"
"weui": "^0.4.1"
}
}
7 changes: 6 additions & 1 deletion src/components/searchbar/searchbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,12 @@ class SearchBar extends React.Component {
onChange={this.changeHandle.bind(this)}
value={this.state.text}
/>
<a className='weui_icon_clear' onMouseDown={this.clearHandle.bind(this)}/>
{/*React will not trigger onMouseDown when not onClick presented*/}
<a
className='weui_icon_clear'
onClick={e=>e/*issues #59*/}
onMouseDown={this.clearHandle.bind(this)}
/>
</div>
<label
className='weui_search_text'
Expand Down
7 changes: 4 additions & 3 deletions src/components/toast/toast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,23 @@ import Icon from '../icon/index';
class Toast extends React.Component {
static propTypes = {
icon: React.PropTypes.string,
iconSize: React.PropTypes.string,
show: React.PropTypes.bool
};

static defaultProps = {
icon: 'toast',
show: false
show: false,
};

render() {
const {icon, show, children} = this.props;
const {icon, show, children, iconSize} = this.props;

return (
<div className={icon === 'loading' ? 'weui_loading_toast' : ''} style={{display: show ? 'block' : 'none'}}>
<Mask transparent={true}/>
<div className="weui_toast">
<Icon value={icon}/>
<Icon value={icon} size={iconSize}/>
<p className="weui_toast_content">{children}</p>
</div>
</div>
Expand Down
98 changes: 59 additions & 39 deletions test/toast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,51 +12,71 @@ import WeUI from '../src/index';
const {Toast, Mask, Icon} = WeUI;

describe('<Toast></Toast>', ()=> {
[undefined, null, false, true].map((show) => {
['toast', 'loading'].map((icon) => {
describe(`<Toast icon="${icon}" show="${show}"></Toast>`, ()=> {
const body = '加载中...';
const wrapper = shallow(
<Toast show={show} icon={icon}>
{body}
</Toast>
);
['small', 'large'].map((iconSize) => {
[undefined, null, false, true].map((show) => {
['toast', 'loading'].map((icon) => {
describe(`<Toast icon="${icon}" iconSize="${iconSize}" show="${show}"></Toast>`, ()=> {
const body = '加载中...';
const wrapper = shallow(
<Toast show={show} icon={icon} iconSize={iconSize}>
{body}
</Toast>
);

it(`should render <Toast></Toast> component`, () => {
assert(wrapper.instance() instanceof Toast);
assert(wrapper.find('.weui_toast'));
});
it(`should render <Toast></Toast> component`, () => {
assert(wrapper.instance() instanceof Toast);
assert(wrapper.find('.weui_toast'));
});

it(`should be hidden when 'show' attribute is false`, ()=> {
if (show) {
assert(wrapper.prop('style').display === 'block');
}
else {
assert(wrapper.prop('style').display === 'none');
}
});
it(`should be hidden when 'show' attribute is false`, ()=> {
if (show) {
assert(wrapper.prop('style').display === 'block');
}
else {
assert(wrapper.prop('style').display === 'none');
}
});

it(`should have a transparent mask`, ()=> {
const mask = wrapper.find(Mask).shallow();
assert(mask.instance() instanceof Mask);
assert(!mask.hasClass('weui_mask'));
assert(mask.hasClass('weui_mask_transparent'));
});
it(`should have a transparent mask`, ()=> {
const mask = wrapper.find(Mask).shallow();
assert(mask.instance() instanceof Mask);
assert(!mask.hasClass('weui_mask'));
assert(mask.hasClass('weui_mask_transparent'));
});

it(`should have a icon`, ()=> {
const icon = wrapper.find(Icon).shallow();
assert(icon.instance() instanceof Icon);
});
it(`should have a icon`, ()=> {
const icon = wrapper.find(Icon).shallow();
assert(icon.instance() instanceof Icon);
});

it(`should have 'weui_loading_toast' class name when icon is 'loading'`, ()=> {
if (icon === 'loading') {
assert(wrapper.hasClass('weui_loading_toast'));
}
});
it(`should have a icon with appropriate size`, ()=> {
const icon = wrapper.find(Icon).shallow();
assert(icon.instance() instanceof Icon);
});

it(`should have a icon with appropriate size: ${iconSize}`, ()=> {
const iconWrapper = wrapper.find(Icon).shallow();
//exclude loading case
if(icon != 'loading'){
if (iconSize === 'large') {
assert(iconWrapper.hasClass('weui_icon_msg'));
}
else {
assert(!iconWrapper.hasClass('weui_icon_msg'));
}
}
});

it(`should have 'weui_loading_toast' class name when icon is 'loading'`, ()=> {
if (icon === 'loading') {
assert(wrapper.hasClass('weui_loading_toast'));
}
});

it(`should have body`, ()=> {
const $body = wrapper.find('.weui_toast_content');
assert($body.text() === body);
it(`should have body`, ()=> {
const $body = wrapper.find('.weui_toast_content');
assert($body.text() === body);
});
});
});
});
Expand Down