Skip to content

Commit 074d059

Browse files
committed
fix(tabs): address issues from comments
- Update the sample for nested tabs
1 parent 29e81b1 commit 074d059

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

src/components/tabs/themes/tab.base.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@use 'sass:map';
55

66
[part~='tab-header'] {
7-
$transition: .3s cubic-bezier(.35, 0, .25, 1);
7+
$transition: .3s $tabs-animation-function;
88

99
display: flex;
1010
scroll-snap-align: var(--_ig-tab-snap);
@@ -15,8 +15,8 @@
1515
justify-content: center;
1616
pointer-events: all;
1717
height: 100%;
18-
max-width: var(--tab-max-width--justify, var(--tab-max-width));
19-
min-width: var(--tab-min-width);
18+
max-width: var(--tab-max-width--justify, $tab-max-width);
19+
min-width: $tab-min-width;
2020
cursor: pointer;
2121
position: relative;
2222
z-index: map.get($tabs-z-index, 'header');
@@ -74,6 +74,8 @@
7474
height: 100%;
7575
grid-row: 3;
7676
grid-column: 1 / -1;
77+
78+
// The value of --_ig-tabs-width is calculated in TypeScript and represents the width of the ig-tabs component
7779
max-width: var(--_ig-tabs-width);
7880
transition: transform 250ms ease-in-out;
7981
}

src/components/tabs/themes/tabs.base.scss

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
:host {
77
--scroll-btn-size: #{rem(48px)};
8-
--tab-max-width: #{rem(360px)};
9-
--tab-min-width: #{rem(90px)};
108
--_border-size: #{rem(1px)};
119

1210
display: block;
@@ -53,14 +51,13 @@
5351
}
5452

5553
[part~='scrollable'] {
56-
/* stylelint-disable */
54+
/* stylelint-disable-next-line max-line-length */
5755
grid-template-columns: var(--scroll-btn-size) repeat(var(--_tabs-count), minmax(max-content, auto)) var(--scroll-btn-size);
58-
/* stylelint-enable */
5956
}
6057

6158
[part~='inner']:not([part~='scrollable']) {
6259
grid-template-columns: repeat(var(--_tabs-count), minmax(auto, min-content));
63-
min-width: var(--tab-min-width);
60+
min-width: $tab-min-width;
6461
}
6562

6663
:host([alignment='start']) {
@@ -99,12 +96,12 @@
9996

10097
[part~='scrollable'] {
10198
/* stylelint-disable */
102-
grid-template-columns: var(--scroll-btn-size) repeat(var(--_tabs-count), minmax(var(--tab-min-width), 1fr)) var(--scroll-btn-size);
99+
grid-template-columns: var(--scroll-btn-size) repeat(var(--_tabs-count), minmax($tab-min-width, 1fr)) var(--scroll-btn-size);
103100
/* stylelint-enable */
104101
}
105102

106103
[part~='inner']:not([part~='scrollable']) {
107-
grid-template-columns: repeat(var(--_tabs-count), minmax(var(--tab-min-width), auto));
104+
grid-template-columns: repeat(var(--_tabs-count), minmax($tab-min-width, auto));
108105
}
109106
}
110107

@@ -138,16 +135,14 @@ igc-icon-button::part(base) {
138135
}
139136

140137
[part='selected-indicator'] {
141-
$indicator-bezier: cubic-bezier(.35, 0, .25, 1);
142-
143138
position: relative;
144139
grid-row: 2;
145140
grid-column: 1 / -1;
146141

147142
span {
148143
position: absolute;
149144
display: inline-block;
150-
transition: transform .3s $indicator-bezier, width .2s $indicator-bezier;
145+
transition: transform .3s $tabs-animation-function, width .2s $tabs-animation-function;
151146
z-index: map.get($tabs-z-index, 'selected-indicator');
152147
}
153148
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
@use 'styles/utilities' as *;
2+
13
$tabs-z-index: (
24
scroll-button: 2,
35
selected-indicator: 1,
46
header: 1,
57
);
8+
$tab-min-width: rem(90px);
9+
$tab-max-width: rem(360px);
10+
$tabs-animation-function: cubic-bezier(.35, 0, .25, 1);

stories/tabs.stories.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ export const NestedTabs: Story = {
288288
margin: 0 auto;
289289
}
290290
.nested {
291-
padding-inline-start: 1rem;
292-
padding-block-start: 1rem;
291+
padding: 1rem;
292+
background: var(--ig-gray-50);
293293
}
294294
</style>
295295
<igc-tabs

0 commit comments

Comments
 (0)