feat(CardDeck): set flex as only option (#316)

TheSharpieOne · eddywashere · commit feb9a701ade6 · 2017-01-30T21:47:39.000-08:00
diff --git a/docs/lib/Components/CardPage.js b/docs/lib/Components/CardPage.js
@@ -71,9 +71,7 @@ CardColumns.propTypes = {
 CardDeck.propTypes = {
   // Pass in a Component to override default element
   tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
-  className: PropTypes.string,
-  // enable flexbox version of component (removes extra classes)
-  flex: PropTypes.bool
+  className: PropTypes.string
 };
 
 CardFooter.propTypes = {
diff --git a/src/CardDeck.js b/src/CardDeck.js
@@ -6,37 +6,26 @@ const propTypes = {
   tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
   className: PropTypes.string,
   cssModule: PropTypes.object,
-  flex: PropTypes.bool,
 };
 
 const defaultProps = {
   tag: 'div',
-  flex: false
 };
 
 const CardDeck = (props) => {
   const {
     className,
     cssModule,
     tag: Tag,
-    flex,
     ...attributes
   } = props;
   const classes = mapToCssModules(classNames(
     className,
     'card-deck'
   ), cssModule);
 
-  if (flex) {
-    return (
-      <Tag {...attributes} className={classes} />
-    );
-  }
-
   return (
-    <div className="card-deck-wrapper">
-      <Tag {...attributes} className={classes} />
-    </div>
+    <Tag {...attributes} className={classes} />
   );
 };
 
diff --git a/src/__tests__/CardDeck.spec.js b/src/__tests__/CardDeck.spec.js
@@ -7,32 +7,21 @@ describe('CardDeck', () => {
     const wrapper = shallow(<CardDeck>Yo!</CardDeck>);
 
     expect(wrapper.text()).toBe('Yo!');
-    expect(wrapper.hasClass('card-deck-wrapper')).toBe(true);
     expect(wrapper.find('.card-deck').length).toBe(1);
   });
 
   it('should render additional classes', () => {
     const wrapper = shallow(<CardDeck className="other">Yo!</CardDeck>);
 
     expect(wrapper.find('.card-deck').hasClass('other')).toBe(true);
-    expect(wrapper.hasClass('card-deck-wrapper')).toBe(true);
     expect(wrapper.find('.card-deck').length).toBe(1);
   });
 
   it('should render custom tag', () => {
     const wrapper = shallow(<CardDeck tag="main">Yo!</CardDeck>);
 
     expect(wrapper.text()).toBe('Yo!');
-    expect(wrapper.hasClass('card-deck-wrapper')).toBe(true);
     expect(wrapper.find('.card-deck').length).toBe(1);
     expect(wrapper.find('main').length).toBe(1);
   });
-
-  it('should render without wrapper class when flexbox is enabled', () => {
-    const wrapper = shallow(<CardDeck flex>Yo!</CardDeck>);
-
-    expect(wrapper.hasClass('card-deck-wrapper')).toBe(false);
-    expect(wrapper.hasClass('card-deck')).toBe(true);
-    expect(wrapper.text()).toBe('Yo!');
-  });
 });
