Merge branch 'master' into arbitrary-component-button

carbon-design-system · Feb 20, 2019 · f6b925b · f6b925b
2 parents 9fbfcbf + 9905920
commit f6b925b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/components/DropdownV2/DropdownV2.js b/src/components/DropdownV2/DropdownV2.js
@@ -187,9 +187,7 @@ export default class DropdownV2 extends React.Component {
                     key={itemToString(item)}
                     isActive={selectedItem === item}
                     isHighlighted={
-                      highlightedIndex === index ||
-                      (selectedItem && selectedItem.id === item.id) ||
-                      false
+                      highlightedIndex === index || selectedItem === item
                     }
                     {...getItemProps({ item, index })}>
                     {itemToElement ? (

diff --git a/src/components/ToggleSmall/ToggleSmall-story.js b/src/components/ToggleSmall/ToggleSmall-story.js
@@ -15,8 +15,6 @@ import ToggleSmallSkeleton from '../ToggleSmall/ToggleSmall.Skeleton';
 const toggleProps = () => ({
   className: 'some-class',
   ariaLabel: text('ARIA label (ariaLabel)', 'Label Name'),
-  labelA: text('Label for untoggled state (labelA)', 'Off'),
-  labelB: text('Label for toggled state (labelB)', 'On'),
   onChange: action('onChange'),
   onToggle: action('onToggle'),
 });

diff --git a/src/components/ToggleSmall/ToggleSmall.js b/src/components/ToggleSmall/ToggleSmall.js
@@ -67,7 +67,7 @@ const ToggleSmall = ({
             </svg>
           )}
         </span>
-        <span class={`${prefix}--assistive-text`}>{ariaLabel}</span>
+        <span className={`${prefix}--assistive-text`}>{ariaLabel}</span>
       </label>
     </div>
   );