Merge branch 'master' into tooltip

Author: donnieberg

components/SLDSButton/SLDSButtonStateful/index.jsx

@@ -0,0 +1,106 @@
+/*
+Copyright (c) 2015, salesforce.com, inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+import React from "react";
+import {ButtonIcon} from '../../SLDSIcons';
+const classNames = require("classnames");
+
+const displayName = "SLDSButtonStateful";
+const propTypes = {
+  assistiveText: React.PropTypes.string,
+  disabled: React.PropTypes.bool,
+  iconName: React.PropTypes.string,
+  iconSize: React.PropTypes.string,
+  type: React.PropTypes.string,
+  variant: React.PropTypes.oneOf(["base", "neutral", "brand", "destructive", "icon", "inverse", "icon-inverse"]),
+};
+const defaultProps = {};
+
+class SLDSButtonStateful extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {active: false};
+  }
+
+  handleClick() {
+    this.setState({ active: !this.state.active });
+  }
+
+  getClassName() {
+    return classNames(this.props.className, "slds-button", {
+      ["slds-button--neutral"]: this.props.type !== "icon",
+      ["slds-button--inverse"]: this.props.variant === "inverse",
+      ["slds-not-selected"]: !this.state.active,
+      ["slds-is-selected"]: this.state.active,
+      ["slds-button--icon-border"]: this.props.type === "icon",
+    });
+  }
+
+  render() {
+    if(this.props.type === "follow") {
+      return (
+        <button className={this.getClassName()} aria-live="assertive" onClick={this.handleClick.bind(this)}>
+          <span className="slds-text-not-selected">
+            <ButtonIcon disabled={this.props.disabled} name="add" size="small" position="left" className="slds-button__icon--stateful" />
+            Follow
+          </span>
+          <span className="slds-text-selected">
+            <ButtonIcon disabled={this.props.disabled} name="check" size="small" position="left" className="slds-button__icon--stateful"  />
+            Following
+          </span>
+          <span className="slds-text-selected-focus">
+            <ButtonIcon disabled={this.props.disabled} name="close" size="small" position="left" className="slds-button__icon--stateful"  />
+            Unfollow
+          </span>
+        </button>
+      )
+    }
+    else if(this.props.type === "join") {
+      return (
+        <button className={this.getClassName()} aria-live="assertive" onClick={this.handleClick.bind(this)}>
+          <span className="slds-text-not-selected">
+            <ButtonIcon disabled={this.props.disabled} name="add" size="small" position="left" className="slds-button__icon--stateful" />
+            Join
+          </span>
+          <span className="slds-text-selected">
+            <ButtonIcon disabled={this.props.disabled} name="check" size="small" position="left" className="slds-button__icon--stateful"  />
+            Member
+          </span>
+          <span className="slds-text-selected-focus">
+            <ButtonIcon disabled={this.props.disabled} name="close" size="small" position="left" className="slds-button__icon--stateful"  />
+            Leave
+          </span>
+        </button>
+      )
+    }
+    else if(this.props.type === "icon") {
+      return (
+        <button className={this.getClassName()} onClick={this.handleClick.bind(this)}>
+          <ButtonIcon disabled={this.props.disabled} name={this.props.iconName} size={this.props.iconSize} assistiveText={this.props.assistiveText} className="slds-button__icon--stateful"  />
+        </button>
+      )
+    }
+    else {
+      return (
+        <div className="">SLDS Stateful Button needs proper type prop: follow, join, or icon.</div>
+      )
+    }
+
+  }
+}
+
+SLDSButtonStateful.displayName = displayName;
+SLDSButtonStateful.propTypes = propTypes;
+SLDSButtonStateful.defaultProps = defaultProps;
+
+module.exports = SLDSButtonStateful;
+

components/SLDSButton/index.js renamed to components/SLDSButton/index.jsx

@@ -12,57 +12,57 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 import React from "react";
 const classNames = require("classnames");
 import createChainedFunction from "../utils/create-chained-function";
-import {ButtonIcon} from "../SLDSIcons.js";
+import {ButtonIcon} from "../SLDSIcons";
 import omit from "lodash.omit";
 
-class Button extends React.Component {
+const displayName = 'SLDSButton';
+const propTypes = {
+  assistiveText: React.PropTypes.string,
+  buttonSize: React.PropTypes.oneOf(["small"]),
+  disabled: React.PropTypes.bool,
+  hint: React.PropTypes.bool,
+  iconName: React.PropTypes.string,
+  iconPosition: React.PropTypes.oneOf(["left", "right"]),
+  iconSize: React.PropTypes.oneOf(["x-small", "small", "medium", "large"]),
+  iconVariant: React.PropTypes.oneOf(["bare", "container", "border", "border-filled", "small", "more"]),
+  label: React.PropTypes.string,
+  onClick: React.PropTypes.func,
+  responsive: React.PropTypes.bool,
+  tabindex: React.PropTypes.string,
+  variant: React.PropTypes.oneOf(["base", "neutral", "brand", "destructive", "icon", "inverse", "icon-inverse"]),
+};
+const defaultProps = {};
+
+
+class SLDSButton extends React.Component {
 
   constructor(props) {
     super(props);
-    this.displayName = "SLDSButton";
     this.state = { active: false };
   }
 
-  componentWillMount(){
-    /*===============================
-    TODO: refactor so that React doesn"t throw warnings in console
-    for (var key in this.props) {
-      if(this.props.hasOwnProperty(key) && typeof(this.props[key]) === "string" && key !== "label"){
-        this.props[key] = this.props[key].toLowerCase();
-      }
-    }
-    ===============================*/
-  }
-
   onClick() {
     this.setState({ active: !this.state.active });
   }
 
   getClassName() {
-    let isSelected = this.props.stateful && this.state.active ? true : false;
-    let notSelected = this.props.stateful && !this.state.active ? true : false;
+    const iconOnly = this.props.variant === 'icon' ? true : false;
     return classNames(this.props.className, "slds-button", {
-      [`slds-button--${this.props.variant}`]: this.props.variant,
+      [`slds-button--${this.props.variant}`]: !iconOnly,
       [`slds-button--icon-${this.props.iconVariant}`]: this.props.iconVariant,
       ["slds-max-small-button--stretch"]: this.props.responsive,
-      ["slds-not-selected"]: notSelected,
-      ["slds-is-selected"]: isSelected,
-      ["slds-button--icon-inverse"]: this.props.inverse,
+      ["slds-button--small"]: this.props.buttonSize,
     });
   }
 
   renderIcon(name){
-    if(this.props.iconName || this.props.notSelectedIcon || this.props.selectedIcon || this.props.selectedFocusIcon){
+    if(this.props.iconName){
       return (
         <ButtonIcon
-          variant={this.props.variant}
-          disabled={this.props.disabled}
-          inverse={this.props.inverse}
-          stateful={this.props.stateful}
           hint={this.props.hint}
           name={name}
-          size={this.props.iconSize}
           position={this.props.iconPosition}
+          size={this.props.iconSize}
           />
       );
     }
@@ -72,68 +72,43 @@ class Button extends React.Component {
     if(this.props.iconVariant === "more"){
       return(
         <ButtonIcon
-          variant={this.props.variant}
-          disabled={this.props.disabled}
-          inverse={this.props.inverse}
           name="down"
           size="x-small"
           />
       );
     }
   }
 
+  renderLabel() {
+    const iconOnly = this.props.variant === "icon" || this.props.variant === "icon-inverse";
+    return iconOnly && this.props.assistiveText ? <span className="slds-assistive-text">{this.props.assistiveText}</span> : <span>{this.props.label}</span>;
+  }
+
 
   render() {
     const props = omit(this.props, "className");
     const click = createChainedFunction(this.props.onClick, this.onClick.bind(this));
-    const labelClasses = this.props.variant === "icon" ? "slds-assistive-text": "";
-    if (this.props.disabled) { props["disabled"] = "disabled" };
 
-    if(this.props.stateful){
-      return (
-        <button tabIndex={this.props.tabindex} className={this.getClassName()} {...props} onClick={click}>
-          <span className="slds-text-not-selected">
-            {this.renderIcon(this.props.notSelectedIcon)}
-            {this.props.notSelectedLabel}
-          </span>
-          <span className="slds-text-selected">
-            {this.renderIcon(this.props.selectedIcon)}
-            {this.props.selectedLabel}
-          </span>
-          <span className="slds-text-selected-focus">
-            {this.renderIcon(this.props.selectedFocusIcon)}
-            {this.props.selectedFocusLabel}
-          </span>
-        </button>
-      )
-    }else{
-      return (
-        <button tabIndex={this.props.tabindex} className={this.getClassName()} {...props} onClick={click}>
-          {this.props.iconPosition === "right" ? <span className={labelClasses}>{this.props.label}</span>: null}
-          {this.renderIcon(this.props.iconName)}
-          {this.renderIconMore()}
-          {(this.props.iconPosition === "left" || !this.props.iconPosition) ? <span className={labelClasses}>{this.props.label}</span>: null}
-          {this.props.children}
-        </button>
-      );
+    if (this.props.disabled) {
+      props["disabled"] = "disabled"
     }
+
+    return (
+      <button tabIndex={this.props.tabindex} className={this.getClassName()} {...props} onClick={click}>
+        {this.props.iconPosition === "right" ? this.renderLabel(): null}
+
+        {this.renderIcon(this.props.iconName)}
+        {this.renderIconMore()}
+
+        {(this.props.iconPosition !== "right")? this.renderLabel(): null}
+        {this.props.children}
+      </button>
+    )
   }
 }
 
-Button.propTypes = {
-  label: React.PropTypes.string.isRequired,
-  variant: React.PropTypes.oneOf(["base", "neutral", "brand", "destructive", "icon"]),
-  tabindex: React.PropTypes.string,
-  disabled: React.PropTypes.bool,
-  inverse: React.PropTypes.bool,
-  hint: React.PropTypes.bool,
-  stateful: React.PropTypes.bool,
-  responsive: React.PropTypes.bool,
-  iconName: React.PropTypes.string,
-  iconVariant: React.PropTypes.oneOf(["bare", "container", "border", "border-filled", "small", "more"]),
-  iconSize: React.PropTypes.oneOf(["x-small", "small", "medium", "large"]),
-  iconPosition: React.PropTypes.oneOf(["left", "right"]),
-  onClick: React.PropTypes.func,
-}
+SLDSButton.displayName = displayName;
+SLDSButton.propTypes = propTypes;
+SLDSButton.defaultProps = defaultProps;
 
-module.exports = Button;
+module.exports = SLDSButton;

components/SLDSButtonGroup/index.js renamed to components/SLDSButtonGroup/index.jsx

@@ -11,19 +11,30 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 import React from "react";
 
-class ButtonGroup extends React.Component {
+const displayName = "SLDSButtonGroup";
+const propTypes = {
+  children: React.PropTypes.node.isRequired
+};
+const defaultProps = {};
+
+class SLDSButtonGroup extends React.Component {
   constructor(props) {
     super(props);
     this.state = {};
   }
+
   render() {
     return (
       <div className="slds-button-group" role="group">
         {this.props.children}
       </div>
-    );
+    )
   }
 }
 
-module.exports = ButtonGroup;
+SLDSButtonGroup.displayName = displayName;
+SLDSButtonGroup.propTypes = propTypes;
+SLDSButtonGroup.defaultProps = defaultProps;
+
+module.exports = SLDSButtonGroup;