mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Fixed react-bootstrap tabs warnings
We can't use our own "id" values here, since react-bootstrap requires internal consistency between tab containers and tab panes through its own auto-generated identifiers
This commit is contained in:
parent
368d3ee65e
commit
5415afe8bf
@ -17,7 +17,6 @@ class TabItem extends SilverStripeComponent {
|
|||||||
onExiting,
|
onExiting,
|
||||||
onExited,
|
onExited,
|
||||||
animation,
|
animation,
|
||||||
id,
|
|
||||||
unmountOnExit,
|
unmountOnExit,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
@ -33,9 +32,7 @@ class TabItem extends SilverStripeComponent {
|
|||||||
onExiting,
|
onExiting,
|
||||||
onExited,
|
onExited,
|
||||||
animation,
|
animation,
|
||||||
id,
|
|
||||||
unmountOnExit,
|
unmountOnExit,
|
||||||
'aria-labelledby': this.props['aria-labelledby'],
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ class Tabs extends SilverStripeComponent {
|
|||||||
onSelect,
|
onSelect,
|
||||||
className,
|
className,
|
||||||
extraClass,
|
extraClass,
|
||||||
|
id,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
const combinedClassName = `${className} ${extraClass}`;
|
const combinedClassName = `${className} ${extraClass}`;
|
||||||
|
|
||||||
@ -22,6 +23,7 @@ class Tabs extends SilverStripeComponent {
|
|||||||
className: combinedClassName,
|
className: combinedClassName,
|
||||||
defaultActiveKey: this.getDefaultActiveKey(),
|
defaultActiveKey: this.getDefaultActiveKey(),
|
||||||
onSelect,
|
onSelect,
|
||||||
|
id,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user