Skip to content

Commit 5c0af5c

Browse files
authored
Merge pull request #1 from media-net/fix/timeConstraints-on-rerender
Fix Time Constraints failure on re-render
2 parents d40f6d8 + a1bee31 commit 5c0af5c

File tree

1 file changed

+31
-2
lines changed

1 file changed

+31
-2
lines changed

src/TimeView.js

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ var DateTimePickerTime = onClickOutside( createClass({
9595
counters.push(
9696
React.createElement('div', { className: 'rdtCounter rdtMilli', key: 'm' },
9797
React.createElement('input', { value: this.state.milliseconds, type: 'text', onChange: this.updateMilli } )
98-
)
99-
);
98+
)
99+
);
100100
}
101101

102102
return React.createElement('div', { className: 'rdtTime' },
@@ -140,6 +140,35 @@ var DateTimePickerTime = onClickOutside( createClass({
140140
},
141141

142142
componentWillReceiveProps: function( nextProps ) {
143+
var me = this;
144+
if (nextProps.timeConstraints) {
145+
['hours', 'minutes', 'seconds', 'milliseconds'].forEach( function( type ) {
146+
assign(me.timeConstraints[ type ], nextProps.timeConstraints[ type ]);
147+
});
148+
} else {
149+
me.timeConstraints = {
150+
hours: {
151+
min: 0,
152+
max: 23,
153+
step: 1
154+
},
155+
minutes: {
156+
min: 0,
157+
max: 59,
158+
step: 1
159+
},
160+
seconds: {
161+
min: 0,
162+
max: 59,
163+
step: 1
164+
},
165+
milliseconds: {
166+
min: 0,
167+
max: 999,
168+
step: 1
169+
}
170+
};
171+
}
143172
this.setState( this.calculateState( nextProps ) );
144173
},
145174

0 commit comments

Comments
 (0)