Skip to content

Commit 105eac0

Browse files
committed
remove form from PicklistBase
1 parent f1b5790 commit 105eac0

File tree

5 files changed

+44
-50
lines changed

5 files changed

+44
-50
lines changed

components/SLDSPicklistBase/index.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ module.exports = React.createClass( {
214214

215215
<div className={"slds-form-element slds-theme--"+this.props.theme}>
216216
<div className={"slds-picklist slds-theme--"+this.props.theme}>
217-
<form>
218217
<button
219218
id={this.props.id}
220219
ref="button"
@@ -231,7 +230,6 @@ module.exports = React.createClass( {
231230
</button>
232231

233232
{this.props.modal?this.getModalPopover():this.getSimplePopover()}
234-
</form>
235233

236234
</div>
237235

demo/static/bundle.js

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/SLDSPicklistBase/index.js

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -220,30 +220,26 @@ module.exports = _react2['default'].createClass({
220220
'div',
221221
{ className: "slds-picklist slds-theme--" + this.props.theme },
222222
_react2['default'].createElement(
223-
'form',
224-
null,
223+
'button',
224+
{
225+
id: this.props.id,
226+
ref: 'button',
227+
className: 'slds-button slds-button--neutral slds-picklist__label ' + this.props.className,
228+
'aria-haspopup': 'true',
229+
onBlur: this.handleBlur,
230+
onFocus: this.handleFocus,
231+
onClick: this.handleClick,
232+
onMouseDown: this.handleMouseDown,
233+
tabIndex: this.state.isOpen ? -1 : 0,
234+
onKeyDown: this.handleKeyDown },
225235
_react2['default'].createElement(
226-
'button',
227-
{
228-
id: this.props.id,
229-
ref: 'button',
230-
className: 'slds-button slds-button--neutral slds-picklist__label ' + this.props.className,
231-
'aria-haspopup': 'true',
232-
onBlur: this.handleBlur,
233-
onFocus: this.handleFocus,
234-
onClick: this.handleClick,
235-
onMouseDown: this.handleMouseDown,
236-
tabIndex: this.state.isOpen ? -1 : 0,
237-
onKeyDown: this.handleKeyDown },
238-
_react2['default'].createElement(
239-
'span',
240-
{ className: 'slds-truncate' },
241-
this.getPlaceholder()
242-
),
243-
_react2['default'].createElement(_SLDSIcons2.Icon, { name: 'down', category: 'utility' })
236+
'span',
237+
{ className: 'slds-truncate' },
238+
this.getPlaceholder()
244239
),
245-
this.props.modal ? this.getModalPopover() : this.getSimplePopover()
246-
)
240+
_react2['default'].createElement(_SLDSIcons2.Icon, { name: 'down', category: 'utility' })
241+
),
242+
this.props.modal ? this.getModalPopover() : this.getSimplePopover()
247243
)
248244
);
249245
},

lib/SLDSPicklistBase/list-item.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ module.exports = _react2['default'].createClass({
146146
'aria-checked': this.props.isSelected,
147147
role: 'menuitemradio',
148148
tabIndex: -1 },
149-
this.props.isSelected ? _react2['default'].createElement(_SLDSIcons.Icon, { name: 'task2', size: 'small', position: 'left', category: 'standard' }) : null,
149+
this.props.isSelected ? _react2['default'].createElement(_SLDSIcons.Icon, { name: 'check', position: 'left', category: 'utility' }) : null,
150150
this.props.label
151151
)
152152
);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "design-system-react",
3-
"version": "0.0.12",
3+
"version": "0.0.14",
44
"description": "Salesforce Lightning Design System React components",
55
"scripts": {
66
"start": "node server.js",

0 commit comments

Comments
 (0)