Skip to content

Commit a4ebd03

Browse files
author
gonzalo-rivas
committed
[ADD] Material
1 parent 70e088a commit a4ebd03

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lib/Select.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ var Select = React.createClass({
891891
value = this.props.placeholder;
892892
}
893893

894-
var animatedBar = classes({
894+
var animatedBar = ClassNames({
895895
"aui-core-form-default-input-bar-animation": true,
896896
"focus": this.state.isFocused,
897897
"aui-core-display-off": !this.props.material
@@ -905,19 +905,19 @@ var Select = React.createClass({
905905
React.createElement(
906906
'div',
907907
{ className: 'Select-control', ref: 'control', onKeyDown: this.handleKeyDown, onMouseDown: this.handleMouseDown, onTouchEnd: this.handleMouseDown },
908-
React.createElement('div', { className: animatedBar }),
908+
React.createElement(
909+
'label',
910+
{ className: focusedLabel },
911+
this.state.initialPlaceholder
912+
),
909913
value,
910914
input,
911915
React.createElement('span', { className: 'Select-arrow-zone', onMouseDown: this.handleMouseDownOnArrow }),
912916
React.createElement('span', { className: 'Select-arrow', onMouseDown: this.handleMouseDownOnArrow }),
913917
loading,
914918
clear
915919
),
916-
React.createElement(
917-
'label',
918-
{ className: focusedLabel },
919-
this.state.initialPlaceholder
920-
),
920+
React.createElement('div', { className: animatedBar }),
921921
menu
922922
);
923923
}

src/Select.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ var Select = React.createClass({
871871
value = this.props.placeholder
872872
}
873873

874-
var animatedBar = classes({
874+
var animatedBar = ClassNames({
875875
"aui-core-form-default-input-bar-animation":true,
876876
"focus": this.state.isFocused,
877877
"aui-core-display-off": !this.props.material
@@ -882,15 +882,15 @@ var Select = React.createClass({
882882
<div ref="wrapper" className={selectClass}>
883883
<input type="hidden" ref="value" name={this.props.name} value={this.state.value} disabled={this.props.disabled} />
884884
<div className="Select-control" ref="control" onKeyDown={this.handleKeyDown} onMouseDown={this.handleMouseDown} onTouchEnd={this.handleMouseDown}>
885-
<div className={animatedBar}></div>
885+
<label className={focusedLabel}>{this.state.initialPlaceholder}</label>
886886
{value}
887887
{input}
888888
<span className="Select-arrow-zone" onMouseDown={this.handleMouseDownOnArrow} />
889889
<span className="Select-arrow" onMouseDown={this.handleMouseDownOnArrow} />
890890
{loading}
891891
{clear}
892892
</div>
893-
<label className={focusedLabel}>{this.state.initialPlaceholder}</label>
893+
<div className={animatedBar}></div>
894894
{menu}
895895
</div>
896896
);

0 commit comments

Comments
 (0)