Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(react): update Tabs API and delete next/Tab #10225

Merged
merged 22 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a84090f
chore: check in progress
abbeyhrt Nov 18, 2021
81c4c78
chore: check in progress
abbeyhrt Nov 18, 2021
307e1bd
chore: check in progress
abbeyhrt Nov 29, 2021
d630596
refactor(styles): remove unused tabs styles
abbeyhrt Nov 29, 2021
7040df6
fix(styles): remove tabs scrollable class and replace with tabs
abbeyhrt Nov 30, 2021
164245d
chore(styles): merge in main
abbeyhrt Nov 30, 2021
84446a4
chore(react): remove outdated comments
abbeyhrt Nov 30, 2021
e52b58a
chore(react): remove outdated comments
abbeyhrt Nov 30, 2021
c86f8cc
chore(react): remove outdated comments
abbeyhrt Nov 30, 2021
4b6572f
Merge branch 'main' into fix/remove-scrollable-class
abbeyhrt Nov 30, 2021
923f71e
Merge branch 'main' into fix/remove-scrollable-class
abbeyhrt Dec 1, 2021
d5d3199
chore(react): merge in main
abbeyhrt Dec 1, 2021
2b31b72
chore: check in progress
abbeyhrt Dec 3, 2021
966b897
feat(react): update tabs api and delete tab next
abbeyhrt Dec 3, 2021
554ea5c
fix(react): resolve merge conflicts
abbeyhrt Dec 3, 2021
0bb3dca
fix(react): remove unnecessary ContainedTab export
abbeyhrt Dec 3, 2021
00a5994
fix(react): remove contained tab export
abbeyhrt Dec 6, 2021
5513f2b
fix(react): update snapshots and add tests to new Tabs
abbeyhrt Dec 6, 2021
2fcf9a0
fix(react): resolve merge conflicts
abbeyhrt Dec 7, 2021
8153113
feat(react): remove unstable containedTabs
abbeyhrt Dec 7, 2021
008e655
Merge branch 'main' into feat/update-tabs-api
abbeyhrt Dec 7, 2021
28fc7e6
Merge branch 'main' into feat/update-tabs-api
abbeyhrt Dec 7, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 51 additions & 45 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5941,51 +5941,6 @@ Map {
},
},
},
"unstable_ContainedTab" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
"className": Object {
"type": "string",
},
"disabled": Object {
"type": "bool",
},
"handleTabClick": Object {
"type": "func",
},
"handleTabKeyDown": Object {
"type": "func",
},
"id": Object {
"type": "string",
},
"index": Object {
"type": "number",
},
"label": Object {
"type": "node",
},
"onClick": Object {
"type": "func",
},
"onKeyDown": Object {
"type": "func",
},
"renderButton": Object {
"type": "func",
},
"renderContent": Object {
"type": "func",
},
"selected": Object {
"type": "bool",
},
"tabIndex": Object {
"type": "number",
},
},
"render": [Function],
},
"TabContent" => Object {
"defaultProps": Object {
"selected": false,
Expand Down Expand Up @@ -6133,6 +6088,57 @@ Map {
},
"render": [Function],
},
"unstable_TabPanel" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
"children": Object {
"type": "node",
},
"className": Object {
"type": "string",
},
},
"render": [Function],
},
"unstable_TabPanels" => Object {
"propTypes": Object {
"children": Object {
"type": "node",
},
},
},
"unstable_TabList" => Object {
"propTypes": Object {
"activation": Object {
"args": Array [
Array [
"automatic",
"manual",
],
],
"type": "oneOf",
},
"aria-label": Object {
"isRequired": true,
"type": "string",
},
"children": Object {
"type": "node",
},
"className": Object {
"type": "string",
},
"contained": Object {
"type": "bool",
},
"light": Object {
"type": "bool",
},
"scrollIntoView": Object {
"type": "bool",
},
},
},
"Tag" => Object {
"propTypes": Object {
"children": Object {
Expand Down
4 changes: 3 additions & 1 deletion packages/react/src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ Array [
"TooltipDefinition",
"TooltipIcon",
"UnorderedList",
"unstable_ContainedTab",
"unstable_ContainedTabs",
"unstable_FeatureFlags",
"unstable_HStack",
Expand All @@ -219,6 +218,9 @@ Array [
"unstable_ProgressBar",
"unstable_Section",
"unstable_Stack",
"unstable_TabList",
"unstable_TabPanel",
"unstable_TabPanels",
"unstable_Theme",
"unstable_Tooltip",
"unstable_TreeNode",
Expand Down
5 changes: 1 addition & 4 deletions packages/react/src/components/Tab/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
*/

import * as FeatureFlags from '@carbon/feature-flags';
import { default as TabNext } from './next/Tab';
import { Tab as TabNext } from '../Tabs/next/Tabs';
import { default as TabClassic } from './Tab';
import ContainedTab from './next/ContainedTab';

const Tab = FeatureFlags.enabled('enable-v11-release') ? TabNext : TabClassic;

export { ContainedTab };

export default Tab;
155 changes: 0 additions & 155 deletions packages/react/src/components/Tab/next/ContainedTab.js

This file was deleted.

Loading