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

FOUR-14221 the button to navigate between pages does not appear #1547

Merged
merged 2 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
75 changes: 49 additions & 26 deletions src/components/TabsBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@
@input="tabOpened"
>
<template #tabs-start>
<div>
<slot name="tabs-start" />
<div class="tabs-sticky d-flex flex-row tabs-start">
<div class="tabs-sticky d-flex flex-row tabs-start">
<div
v-show="tabsListOverflow"
class="position-relative overflow-visible"
>
<div
v-show="tabsListOverflow && showLeftScroll"
class="position-relative overflow-visible"
role="link"
class="nav-scroll nav-scroll-left"
data-test="scroll-left"
@click="scrollTabsLeft"
>
<div
role="link"
class="nav-scroll nav-scroll-left"
data-test="scroll-left"
@click="scrollTabsLeft"
>
<i class="fas fa-chevron-left" />
</div>
<i class="fas fa-chevron-left" />
</div>
</div>
</div>

<div :class="{'dd-ml': tabsListOverflow}">
<slot name="tabs-start" />
</div>
</template>
<b-tab
v-for="(index, n) in localOpenedPages"
Expand Down Expand Up @@ -58,7 +59,7 @@
</b-tab>
<template #tabs-end>
<div
v-show="tabsListOverflow && showRightScroll"
v-if="tabsListOverflow"
class="tabs-sticky overflow-visible"
>
<div
Expand Down Expand Up @@ -127,15 +128,19 @@ export default {
}
},
mounted() {
// check resize of tabs list
window.addEventListener("resize", this.checkTabsOverflow);
setTimeout(() => {
this.checkTabsOverflow();
this.checkScrollPosition();
}, 0);
// listen to scroll event
const tablist = this.$refs.tabs.$el.querySelector(".nav-tabs");
tablist.addEventListener("scroll", () => this.checkScrollPosition());
this.$nextTick(() => {
// check resize of tabs list
window.addEventListener("resize", this.checkTabsOverflow);
// listen to scroll event
const tablist = this.$refs.tabs.$el.querySelector(".nav-tabs");
tablist.addEventListener("scroll", this.checkScrollPosition);

Promise.resolve().then(() => {
this.checkTabsOverflow();
this.checkScrollPosition();
});
});

},
beforeDestroy() {
window.removeEventListener("resize", this.checkTabsOverflow);
Expand Down Expand Up @@ -226,6 +231,12 @@ export default {
flex-wrap: nowrap !important;
overflow: hidden !important;
}

.nav-tabs .nav-item .nav-link {
display: flex;
align-items: center;
}

/* Style for individual tabs */
.nav-tabs .nav-item.show .nav-link,
.nav-tabs .nav-link.active {
Expand All @@ -250,6 +261,16 @@ export default {
flex-wrap: nowrap !important;
}

.nav-tabs .nav-item .nav-link:not(.active) {
.badge {
background-color: #6A7888 !important;
}

span:not(.badge, .close-tab) {
color: #556271 !important;
}
}

/* Style for the hover effect */
.nav-tabs .nav-link:hover {
border: none;
Expand All @@ -261,7 +282,6 @@ export default {
/* Adding the 'x' button to the tab */
.nav-tabs .nav-link .close-tab {
font-size: 0.8rem;
margin-top: 0.4rem;
color: var(--tabs-light);
margin-left: 0.5rem;
display: inline !important;
Expand Down Expand Up @@ -289,10 +309,10 @@ export default {
z-index: 1;
}
.nav-tabs .nav-scroll-right {
right: 0;
right: 5px;
}
.nav-tabs .nav-scroll-left {
left: 0;
margin-left: 5px;
}
.nav-tabs .tabs-sticky {
position: sticky;
Expand All @@ -311,4 +331,7 @@ export default {
.flat-tabs .h-tab {
height: calc(100% - 42px) !important;
}
.dd-ml {
margin-left: 2rem;
}
</style>
4 changes: 2 additions & 2 deletions src/stories/PageTabs.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export const ALotOfPagesOpen = {
const scrollRight = canvas.getByTestId("scroll-right");

await waitFor(() => expect(scrollRight).toBeVisible());
await waitFor(() => expect(scrollLeft).not.toBeVisible());
await waitFor(() => expect(scrollLeft).toBeVisible());

// Scroll to the right
await step("Scroll to the right", async () => {
Expand All @@ -215,7 +215,7 @@ export const ALotOfPagesOpen = {
// Scroll to the left
await step("Scroll to the left", async () => {
scrollLeft.click();
await waitFor(() => expect(scrollLeft).not.toBeVisible());
await waitFor(() => expect(scrollLeft).toBeVisible());
});
}
};
Expand Down
Loading