Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

[terra-tabs] Fixed issue to prefer customDisplay over label #1864

Merged
merged 6 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
1 change: 1 addition & 0 deletions packages/terra-framework-docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

* Added
* Updated customDisplay examples for tabs.
* Added `aria-label` and `ariaDescribedBy` examples for `terra-collapsible-menu-view`.
* Added examples and test to `terra-table` for row selection mode.
* Added initial setup for `terra-compact-interactive-list` documentation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const ClosableTab = () => {

tabsExample.push(
{
label: 'Customized Tab',
label: 'Cutomised Test Tab',
saket2403 marked this conversation as resolved.
Show resolved Hide resolved
customDisplay: <div className={cx('custom-display')}>Customized Tab</div>,
key: 'CloseCustomTab',
content: 'Custom display',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@
.content-container-vertical {
height: 240px;
}

.custom-display {
color: #f00;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ const VerticalTab = () => {
const customTab = (
<Tabs.Pane
customDisplay={(
<div className={cx('custom-display')}>
<span className={cx('custom-display', 'custom-vertical')}>
Custom display
</div>
</span>
)}
label="Custom display"
key="tCustomTab"
Expand Down
3 changes: 3 additions & 0 deletions packages/terra-tabs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Fixed
* Fixed issue to prefer `customDisplay` prop over `label` prop.

## 7.11.1 - (October 25, 2023)

* Fixed
Expand Down
1 change: 1 addition & 0 deletions packages/terra-tabs/src/Tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ class Tabs extends React.Component {
isDisabled={child.props.isDisabled}
isClosable={isClosable}
variant="framework"
customDisplay={child.props.customDisplay}
/>,
);
});
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading