Skip to content

Commit

Permalink
Merge pull request #412 from gpbl/fix-test-for-nav-button-with-intera…
Browse files Browse the repository at this point in the history
…ction-disabled

Fix test for nav button with interaction disabled
  • Loading branch information
gpbl authored Jun 16, 2017
2 parents b8184a6 + 5cbd4ac commit 3ec2c01
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 102 deletions.
202 changes: 102 additions & 100 deletions src/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,105 +18,107 @@
margin: 0 1rem;
}

.DayPicker-NavBar {
position: absolute;
left: 0;
right: 0;
padding: 0 .5rem;
top: 1rem;
}

.DayPicker-NavButton {
position: absolute;
width: 1.5rem;
height: 1.5rem;
background-repeat: no-repeat;
background-position: center;
background-size: contain;
cursor: pointer;
}

.DayPicker-NavButton--prev {
left: 1rem;
background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjI2cHgiIGhlaWdodD0iNTBweCIgdmlld0JveD0iMCAwIDI2IDUwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOnNrZXRjaD0iaHR0cDovL3d3dy5ib2hlbWlhbmNvZGluZy5jb20vc2tldGNoL25zIj4KICAgIDwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggMy4zLjIgKDEyMDQzKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5wcmV2PC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc2tldGNoOnR5cGU9Ik1TUGFnZSI+CiAgICAgICAgPGcgaWQ9InByZXYiIHNrZXRjaDp0eXBlPSJNU0xheWVyR3JvdXAiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEzLjM5MzE5MywgMjUuMDAwMDAwKSBzY2FsZSgtMSwgMSkgdHJhbnNsYXRlKC0xMy4zOTMxOTMsIC0yNS4wMDAwMDApIHRyYW5zbGF0ZSgwLjg5MzE5MywgMC4wMDAwMDApIiBmaWxsPSIjNTY1QTVDIj4KICAgICAgICAgICAgPHBhdGggZD0iTTAsNDkuMTIzNzMzMSBMMCw0NS4zNjc0MzQ1IEwyMC4xMzE4NDU5LDI0LjcyMzA2MTIgTDAsNC4yMzEzODMxNCBMMCwwLjQ3NTA4NDQ1OSBMMjUsMjQuNzIzMDYxMiBMMCw0OS4xMjM3MzMxIEwwLDQ5LjEyMzczMzEgWiIgaWQ9InJpZ2h0IiBza2V0Y2g6dHlwZT0iTVNTaGFwZUdyb3VwIj48L3BhdGg+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4K");
}

.DayPicker-NavButton--next {
right: 1rem;
background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjI2cHgiIGhlaWdodD0iNTBweCIgdmlld0JveD0iMCAwIDI2IDUwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOnNrZXRjaD0iaHR0cDovL3d3dy5ib2hlbWlhbmNvZGluZy5jb20vc2tldGNoL25zIj4KICAgIDwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggMy4zLjIgKDEyMDQzKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5uZXh0PC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc2tldGNoOnR5cGU9Ik1TUGFnZSI+CiAgICAgICAgPGcgaWQ9Im5leHQiIHNrZXRjaDp0eXBlPSJNU0xheWVyR3JvdXAiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAuOTUxNDUxLCAwLjAwMDAwMCkiIGZpbGw9IiM1NjVBNUMiPgogICAgICAgICAgICA8cGF0aCBkPSJNMCw0OS4xMjM3MzMxIEwwLDQ1LjM2NzQzNDUgTDIwLjEzMTg0NTksMjQuNzIzMDYxMiBMMCw0LjIzMTM4MzE0IEwwLDAuNDc1MDg0NDU5IEwyNSwyNC43MjMwNjEyIEwwLDQ5LjEyMzczMzEgTDAsNDkuMTIzNzMzMSBaIiBpZD0icmlnaHQiIHNrZXRjaDp0eXBlPSJNU1NoYXBlR3JvdXAiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPgo=");
}

.DayPicker-NavButton--interactionDisabled { display: none; }

.DayPicker-Caption {
display: table-caption;
height: 1.5rem;
text-align: center;
}

.DayPicker-Weekdays {
display: table-header-group;
}

.DayPicker-WeekdaysRow {
display: table-row;
}

.DayPicker-Weekday {
display: table-cell;
padding: .5rem;
font-size: .875em;
text-align: center;
color: #8b9898;
}

.DayPicker-Body {
display: table-row-group;
}

.DayPicker-Week {
display: table-row;
}

.DayPicker-Day {
display: table-cell;
padding: .5rem;
border: 1px solid #eaecec;
text-align: center;
cursor: pointer;
vertical-align: middle;
}

.DayPicker-WeekNumber {
display: table-cell;
padding: .5rem;
text-align: right;
vertical-align: middle;
min-width: 1rem;
font-size: 0.75em;
cursor: pointer;
color: #8b9898;
}

.DayPicker--interactionDisabled .DayPicker-Day {
cursor: default;
}

.DayPicker-Footer {
display: table-caption;
caption-side: bottom;
padding-top: .5rem;
}

.DayPicker-TodayButton {
border:none;
background-image:none;
background-color:transparent;
box-shadow: none;
cursor: pointer;
color: #4A90E2;
font-size: 0.875em;
}
.DayPicker-NavBar {
position: absolute;
left: 0;
right: 0;
padding: 0 .5rem;
top: 1rem;
}

.DayPicker-NavButton {
position: absolute;
width: 1.5rem;
height: 1.5rem;
background-repeat: no-repeat;
background-position: center;
background-size: contain;
cursor: pointer;
}

.DayPicker-NavButton--prev {
left: 1rem;
background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjI2cHgiIGhlaWdodD0iNTBweCIgdmlld0JveD0iMCAwIDI2IDUwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOnNrZXRjaD0iaHR0cDovL3d3dy5ib2hlbWlhbmNvZGluZy5jb20vc2tldGNoL25zIj4KICAgIDwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggMy4zLjIgKDEyMDQzKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5wcmV2PC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc2tldGNoOnR5cGU9Ik1TUGFnZSI+CiAgICAgICAgPGcgaWQ9InByZXYiIHNrZXRjaDp0eXBlPSJNU0xheWVyR3JvdXAiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEzLjM5MzE5MywgMjUuMDAwMDAwKSBzY2FsZSgtMSwgMSkgdHJhbnNsYXRlKC0xMy4zOTMxOTMsIC0yNS4wMDAwMDApIHRyYW5zbGF0ZSgwLjg5MzE5MywgMC4wMDAwMDApIiBmaWxsPSIjNTY1QTVDIj4KICAgICAgICAgICAgPHBhdGggZD0iTTAsNDkuMTIzNzMzMSBMMCw0NS4zNjc0MzQ1IEwyMC4xMzE4NDU5LDI0LjcyMzA2MTIgTDAsNC4yMzEzODMxNCBMMCwwLjQ3NTA4NDQ1OSBMMjUsMjQuNzIzMDYxMiBMMCw0OS4xMjM3MzMxIEwwLDQ5LjEyMzczMzEgWiIgaWQ9InJpZ2h0IiBza2V0Y2g6dHlwZT0iTVNTaGFwZUdyb3VwIj48L3BhdGg+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4K");
}

.DayPicker-NavButton--next {
right: 1rem;
background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjI2cHgiIGhlaWdodD0iNTBweCIgdmlld0JveD0iMCAwIDI2IDUwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOnNrZXRjaD0iaHR0cDovL3d3dy5ib2hlbWlhbmNvZGluZy5jb20vc2tldGNoL25zIj4KICAgIDwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggMy4zLjIgKDEyMDQzKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5uZXh0PC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc2tldGNoOnR5cGU9Ik1TUGFnZSI+CiAgICAgICAgPGcgaWQ9Im5leHQiIHNrZXRjaDp0eXBlPSJNU0xheWVyR3JvdXAiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAuOTUxNDUxLCAwLjAwMDAwMCkiIGZpbGw9IiM1NjVBNUMiPgogICAgICAgICAgICA8cGF0aCBkPSJNMCw0OS4xMjM3MzMxIEwwLDQ1LjM2NzQzNDUgTDIwLjEzMTg0NTksMjQuNzIzMDYxMiBMMCw0LjIzMTM4MzE0IEwwLDAuNDc1MDg0NDU5IEwyNSwyNC43MjMwNjEyIEwwLDQ5LjEyMzczMzEgTDAsNDkuMTIzNzMzMSBaIiBpZD0icmlnaHQiIHNrZXRjaDp0eXBlPSJNU1NoYXBlR3JvdXAiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPgo=");
}

.DayPicker-NavButton--interactionDisabled {
display: none;
}

.DayPicker-Caption {
display: table-caption;
height: 1.5rem;
text-align: center;
}

.DayPicker-Weekdays {
display: table-header-group;
}

.DayPicker-WeekdaysRow {
display: table-row;
}

.DayPicker-Weekday {
display: table-cell;
padding: .5rem;
font-size: .875em;
text-align: center;
color: #8b9898;
}

.DayPicker-Body {
display: table-row-group;
}

.DayPicker-Week {
display: table-row;
}

.DayPicker-Day {
display: table-cell;
padding: .5rem;
border: 1px solid #eaecec;
text-align: center;
cursor: pointer;
vertical-align: middle;
}

.DayPicker-WeekNumber {
display: table-cell;
padding: .5rem;
text-align: right;
vertical-align: middle;
min-width: 1rem;
font-size: 0.75em;
cursor: pointer;
color: #8b9898;
}

.DayPicker--interactionDisabled .DayPicker-Day {
cursor: default;
}

.DayPicker-Footer {
display: table-caption;
caption-side: bottom;
padding-top: .5rem;
}

.DayPicker-TodayButton {
border: none;
background-image: none;
background-color: transparent;
box-shadow: none;
cursor: pointer;
color: #4A90E2;
font-size: 0.875em;
}

/* Default modifiers */

Expand Down Expand Up @@ -166,4 +168,4 @@
position: absolute;
background: white;
box-shadow: 0 2px 5px rgba(0, 0, 0, .15);
}
}
8 changes: 6 additions & 2 deletions test/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,15 @@ describe('<Navbar />', () => {
});
it('should disable interaction with the previous button', () => {
const wrapper = shallow(<Navbar showPreviousButton={false} />);
expect(wrapper.find('.DayPicker-NavButton--prev')).toHaveLength(1);
expect(wrapper.find('.DayPicker-NavButton--prev')).toHaveClassName(
'.DayPicker-NavButton--interactionDisabled'
);
});
it('should disable interaction with the next button', () => {
const wrapper = shallow(<Navbar showNextButton={false} />);
expect(wrapper.find('.DayPicker-NavButton--next')).toHaveLength(1);
expect(wrapper.find('.DayPicker-NavButton--next')).toHaveClassName(
'.DayPicker-NavButton--interactionDisabled'
);
});
it('should call `onNextClick` when clicking the next button', () => {
const handleNextClick = jest.fn();
Expand Down

0 comments on commit 3ec2c01

Please sign in to comment.