Skip to content
This repository has been archived by the owner on Nov 10, 2017. It is now read-only.

Remove setting selected in options #47

Merged
merged 1 commit into from
Sep 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions dist/components/types/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,11 @@ var SelectType = function (_React$Component) {

(0, _createClass3.default)(SelectType, [{
key: '_makeOpt',
value: function _makeOpt(key, val, selected) {
value: function _makeOpt(key, val) {
var opts = {
key: key,
selected: 'selected',
value: key
};
if (selected !== key) {
delete opts.selected;
}

return _react2.default.createElement(
'option',
Expand All @@ -79,16 +75,14 @@ var SelectType = function (_React$Component) {
value: function _options(values) {
var _this2 = this;

var selected = arguments.length <= 1 || arguments[1] === undefined ? '' : arguments[1];

var data = [];
if (Array.isArray(values)) {
data = values.map(function (val) {
return _this2._makeOpt(val, val, selected);
return _this2._makeOpt(val, val);
});
} else {
data = (0, _keys2.default)(values).map(function (key) {
return _this2._makeOpt(key, values[key], selected);
return _this2._makeOpt(key, values[key]);
});
}

Expand Down
12 changes: 4 additions & 8 deletions src/components/types/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,20 @@ const styles = {
};

class SelectType extends React.Component {
_makeOpt(key, val, selected) {
_makeOpt(key, val) {
const opts = {
key,
selected: 'selected',
value: key,
};
if (selected !== key) {
delete(opts.selected);
}

return <option {...opts}>{val}</option>;
}
_options(values, selected = '') {
_options(values) {
let data = [];
if (Array.isArray(values)) {
data = values.map(val => this._makeOpt(val, val, selected));
data = values.map(val => this._makeOpt(val, val));
} else {
data = Object.keys(values).map(key => this._makeOpt(key, values[key], selected));
data = Object.keys(values).map(key => this._makeOpt(key, values[key]));
}

return data;
Expand Down