Revert "fix(structured-list): remove unused prop (carbon-design-syste…

…m#5592)" This reverts commit 49112d9.
renmaddox · Mar 20, 2020 · 3c3bbf8 · 3c3bbf8
1 parent 88b0480
commit 3c3bbf8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -4456,13 +4456,16 @@ Map {
   "StructuredListWrapper" => Object {
     "defaultProps": Object {
       "ariaLabel": "Structured list section",
+      "border": false,
       "selection": false,
     },
     "propTypes": Object {
       "ariaLabel": Object {
         "type": "string",
       },
-      "border": [Function],
+      "border": Object {
+        "type": "bool",
+      },
       "children": Object {
         "type": "node",
       },

diff --git a/packages/react/src/components/StructuredList/StructuredList-story.js b/packages/react/src/components/StructuredList/StructuredList-story.js
@@ -97,7 +97,7 @@ storiesOf('StructuredList', module)
         ));
       };
       return (
-        <StructuredListWrapper selection>
+        <StructuredListWrapper selection border>
           <StructuredListHead>
             <StructuredListRow head>
               <StructuredListCell head>ColumnA</StructuredListCell>
@@ -125,7 +125,7 @@ storiesOf('StructuredList', module)
     () => (
       <div style={{ width: '800px' }}>
         <StructuredListSkeleton />
-        <StructuredListSkeleton />
+        <StructuredListSkeleton border />
       </div>
     ),
     {

diff --git a/packages/react/src/components/StructuredList/StructuredList-test.js b/packages/react/src/components/StructuredList/StructuredList-test.js
@@ -33,12 +33,27 @@ describe('StructuredListWrapper', () => {
       expect(wrapper.hasClass('extra-class')).toEqual(true);
     });
 
+    it('By default, border prop is false', () => {
+      wrapper.setProps({ border: false });
+      expect(wrapper.hasClass(`${prefix}--structured-list--border`)).toEqual(
+        false
+      );
+    });
+
     it('By default, selection prop is false', () => {
+      wrapper.setProps({ border: false });
       expect(wrapper.hasClass(`${prefix}--structured-list--selection`)).toEqual(
         false
       );
     });
 
+    it('Should add the modifier class for border when border prop is true', () => {
+      wrapper.setProps({ border: true });
+      expect(wrapper.hasClass(`${prefix}--structured-list--border`)).toEqual(
+        true
+      );
+    });
+
     it('Should add the modifier class for selection when selection prop is true', () => {
       wrapper.setProps({ selection: true });
       expect(wrapper.hasClass(`${prefix}--structured-list--selection`)).toEqual(

diff --git a/packages/react/src/components/StructuredList/StructuredList.js b/packages/react/src/components/StructuredList/StructuredList.js
@@ -10,7 +10,6 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { settings } from 'carbon-components';
 import setupGetInstanceId from '../../tools/setupGetInstanceId';
-import deprecate from '../../prop-types/deprecate';
 
 const { prefix } = settings;
 
@@ -29,10 +28,7 @@ export class StructuredListWrapper extends Component {
     /**
      * Specify whether a border should be added to your StructuredListWrapper
      */
-    border: deprecate(
-      PropTypes.bool,
-      `\nThe prop \`border\` will be removed in the next major version of Carbon.`
-    ),
+    border: PropTypes.bool,
 
     /**
      * Specify whether your StructuredListWrapper should have selections
@@ -46,6 +42,7 @@ export class StructuredListWrapper extends Component {
   };
 
   static defaultProps = {
+    border: false,
     selection: false,
     ariaLabel: 'Structured list section',
   };
@@ -55,12 +52,13 @@ export class StructuredListWrapper extends Component {
       children,
       selection,
       className,
+      border,
       ariaLabel,
-      border: _border,
       ...other
     } = this.props;
 
     const classes = classNames(`${prefix}--structured-list`, className, {
+      [`${prefix}--structured-list--border`]: border,
       [`${prefix}--structured-list--selection`]: selection,
     });