Skip to content

Fix nested Tabs (Issue #54) #61

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Fix nested Tabs (Issue #54) #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions lib/components/Tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ import jss from 'js-stylesheet';
import uuid from '../helpers/uuid';
import childrenPropType from '../helpers/childrenPropType';

// Determine if a node from event.target is a Tab element
function isTabNode(node) {
return node.nodeName === 'LI' && node.getAttribute('role') === 'tab';
}

// Determine if a tab node is disabled
function isTabDisabled(node) {
return node.getAttribute('aria-disabled') === 'true';
Expand Down Expand Up @@ -70,7 +65,7 @@ module.exports = React.createClass({
handleClick(e) {
let node = e.target;
do {
if (isTabNode(node)) {
if (this.isTabNode(node)) {
if (isTabDisabled(node)) {
return;
}
Expand All @@ -83,7 +78,7 @@ module.exports = React.createClass({
},

handleKeyDown(e) {
if (isTabNode(e.target)) {
if (this.isTabNode(e.target)) {
let index = this.state.selectedIndex;
let preventDefault = false;

Expand Down Expand Up @@ -311,6 +306,11 @@ module.exports = React.createClass({
);
},

// Determine if a node from event.target is a Tab element
isTabNode(node) {
return node.nodeName === 'LI' && node.getAttribute('role') === 'tab' && node.parentElement.parentElement === findDOMNode(this);
},

// This is an anti-pattern, so sue me
copyPropsToState(props) {
let selectedIndex = props.selectedIndex;
Expand Down