remove form from PicklistBase

salesforce · Oct 9, 2015 · 105eac0 · 105eac0
1 parent f1b5790
commit 105eac0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 50 deletions.
diff --git a/components/SLDSPicklistBase/index.jsx b/components/SLDSPicklistBase/index.jsx
@@ -214,7 +214,6 @@ module.exports = React.createClass( {
 
  <div className={"slds-form-element slds-theme--"+this.props.theme}>
  <div className={"slds-picklist slds-theme--"+this.props.theme}>
- <form>
  <button
  id={this.props.id}
  ref="button"
@@ -231,7 +230,6 @@ module.exports = React.createClass( {
  </button>
 
  {this.props.modal?this.getModalPopover():this.getSimplePopover()}
- </form>
 
  </div>
 

diff --git a/demo/static/bundle.js b/demo/static/bundle.js
diff --git a/lib/SLDSPicklistBase/index.js b/lib/SLDSPicklistBase/index.js
@@ -220,30 +220,26 @@ module.exports = _react2['default'].createClass({
  'div',
  { className: "slds-picklist slds-theme--" + this.props.theme },
  _react2['default'].createElement(
- 'form',
- null,
+ 'button',
+ {
+ id: this.props.id,
+ ref: 'button',
+ className: 'slds-button slds-button--neutral slds-picklist__label ' + this.props.className,
+ 'aria-haspopup': 'true',
+ onBlur: this.handleBlur,
+ onFocus: this.handleFocus,
+ onClick: this.handleClick,
+ onMouseDown: this.handleMouseDown,
+ tabIndex: this.state.isOpen ? -1 : 0,
+ onKeyDown: this.handleKeyDown },
  _react2['default'].createElement(
- 'button',
- {
- id: this.props.id,
- ref: 'button',
- className: 'slds-button slds-button--neutral slds-picklist__label ' + this.props.className,
- 'aria-haspopup': 'true',
- onBlur: this.handleBlur,
- onFocus: this.handleFocus,
- onClick: this.handleClick,
- onMouseDown: this.handleMouseDown,
- tabIndex: this.state.isOpen ? -1 : 0,
- onKeyDown: this.handleKeyDown },
- _react2['default'].createElement(
- 'span',
- { className: 'slds-truncate' },
- this.getPlaceholder()
- ),
- _react2['default'].createElement(_SLDSIcons2.Icon, { name: 'down', category: 'utility' })
+ 'span',
+ { className: 'slds-truncate' },
+ this.getPlaceholder()
  ),
- this.props.modal ? this.getModalPopover() : this.getSimplePopover()
- )
+ _react2['default'].createElement(_SLDSIcons2.Icon, { name: 'down', category: 'utility' })
+ ),
+ this.props.modal ? this.getModalPopover() : this.getSimplePopover()
  )
  );
  },

diff --git a/lib/SLDSPicklistBase/list-item.js b/lib/SLDSPicklistBase/list-item.js
@@ -146,7 +146,7 @@ module.exports = _react2['default'].createClass({
  'aria-checked': this.props.isSelected,
  role: 'menuitemradio',
  tabIndex: -1 },
- this.props.isSelected ? _react2['default'].createElement(_SLDSIcons.Icon, { name: 'task2', size: 'small', position: 'left', category: 'standard' }) : null,
+ this.props.isSelected ? _react2['default'].createElement(_SLDSIcons.Icon, { name: 'check', position: 'left', category: 'utility' }) : null,
  this.props.label
  )
  );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "design-system-react",
- "version": "0.0.12",
+ "version": "0.0.14",
  "description": "Salesforce Lightning Design System React components",
  "scripts": {
  "start": "node server.js",