From 93adb345f38216bab98ed03b726540ed18b50882 Mon Sep 17 00:00:00 2001 From: s100 Date: Wed, 22 Apr 2020 22:17:02 +0100 Subject: [PATCH] fix(react): stop passing selectionMode through as a prop (#5908) Co-authored-by: Josh Black --- .../src/components/ContentSwitcher/ContentSwitcher-test.js | 4 ++++ .../react/src/components/ContentSwitcher/ContentSwitcher.js | 1 + packages/react/src/components/Tabs/Tabs-test.js | 6 ++++++ packages/react/src/components/Tabs/Tabs.js | 1 + 4 files changed, 12 insertions(+) diff --git a/packages/react/src/components/ContentSwitcher/ContentSwitcher-test.js b/packages/react/src/components/ContentSwitcher/ContentSwitcher-test.js index a9ffda23398f..824ecced3565 100644 --- a/packages/react/src/components/ContentSwitcher/ContentSwitcher-test.js +++ b/packages/react/src/components/ContentSwitcher/ContentSwitcher-test.js @@ -40,6 +40,10 @@ describe('ContentSwitcher', () => { it('should apply extra classes passed to it', () => { expect(wrapper.hasClass('extra-class')).toEqual(true); }); + + it('should not have a selectionMode prop', () => { + expect('selectionMode' in wrapper.props()).toEqual(false); + }); }); describe('Allow initial state to draw from props', () => { diff --git a/packages/react/src/components/ContentSwitcher/ContentSwitcher.js b/packages/react/src/components/ContentSwitcher/ContentSwitcher.js index 4faea42eeacc..83ade3af3930 100644 --- a/packages/react/src/components/ContentSwitcher/ContentSwitcher.js +++ b/packages/react/src/components/ContentSwitcher/ContentSwitcher.js @@ -112,6 +112,7 @@ export default class ContentSwitcher extends React.Component { children, className, selectedIndex, // eslint-disable-line no-unused-vars + selectionMode, // eslint-disable-line no-unused-vars ...other } = this.props; diff --git a/packages/react/src/components/Tabs/Tabs-test.js b/packages/react/src/components/Tabs/Tabs-test.js index 185732433f93..1a6e5efdb935 100644 --- a/packages/react/src/components/Tabs/Tabs-test.js +++ b/packages/react/src/components/Tabs/Tabs-test.js @@ -74,6 +74,12 @@ describe('Tabs', () => { .hasClass(`${prefix}--tabs--container`) ).toBe(true); }); + + it('has no selectionMode prop', () => { + expect( + 'selectionMode' in wrapper.find(`.${prefix}--tabs`).props() + ).toBe(false); + }); }); describe('Trigger (
)', () => { diff --git a/packages/react/src/components/Tabs/Tabs.js b/packages/react/src/components/Tabs/Tabs.js index c1ec3f30f962..70442ac3843b 100644 --- a/packages/react/src/components/Tabs/Tabs.js +++ b/packages/react/src/components/Tabs/Tabs.js @@ -227,6 +227,7 @@ export default class Tabs extends React.Component { role, type, onSelectionChange, + selectionMode, // eslint-disable-line no-unused-vars tabContentClassName, ...other } = this.props;