fix(tabs): address issues from comments

- Update the sample for nested tabs
IgniteUI · Nov 19, 2024 · 074d059 · 074d059
1 parent 29e81b1
commit 074d059
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/src/components/tabs/themes/tab.base.scss b/src/components/tabs/themes/tab.base.scss
@@ -4,7 +4,7 @@
 @use 'sass:map';
 
 [part~='tab-header'] {
-    $transition: .3s cubic-bezier(.35, 0, .25, 1);
+    $transition: .3s $tabs-animation-function;
 
     display: flex;
     scroll-snap-align: var(--_ig-tab-snap);
@@ -15,8 +15,8 @@
     justify-content: center;
     pointer-events: all;
     height: 100%;
-    max-width: var(--tab-max-width--justify, var(--tab-max-width));
-    min-width: var(--tab-min-width);
+    max-width: var(--tab-max-width--justify, $tab-max-width);
+    min-width: $tab-min-width;
     cursor: pointer;
     position: relative;
     z-index: map.get($tabs-z-index, 'header');
@@ -74,6 +74,8 @@
     height: 100%;
     grid-row: 3;
     grid-column: 1 / -1;
+
+    // The value of --_ig-tabs-width is calculated in TypeScript and represents the width of the ig-tabs component
     max-width: var(--_ig-tabs-width);
     transition: transform 250ms ease-in-out;
 }

diff --git a/src/components/tabs/themes/tabs.base.scss b/src/components/tabs/themes/tabs.base.scss
@@ -5,8 +5,6 @@
 
 :host {
     --scroll-btn-size: #{rem(48px)};
-    --tab-max-width: #{rem(360px)};
-    --tab-min-width: #{rem(90px)};
     --_border-size: #{rem(1px)};
 
     display: block;
@@ -53,14 +51,13 @@
 }
 
 [part~='scrollable'] {
-    /* stylelint-disable */
+    /* stylelint-disable-next-line max-line-length */
     grid-template-columns: var(--scroll-btn-size) repeat(var(--_tabs-count), minmax(max-content, auto)) var(--scroll-btn-size);
-    /* stylelint-enable */
 }
 
 [part~='inner']:not([part~='scrollable']) {
     grid-template-columns: repeat(var(--_tabs-count), minmax(auto, min-content));
-    min-width: var(--tab-min-width);
+    min-width: $tab-min-width;
 }
 
 :host([alignment='start']) {
@@ -99,12 +96,12 @@
 
     [part~='scrollable'] {
         /* stylelint-disable */
-        grid-template-columns: var(--scroll-btn-size) repeat(var(--_tabs-count), minmax(var(--tab-min-width), 1fr)) var(--scroll-btn-size);
+        grid-template-columns: var(--scroll-btn-size) repeat(var(--_tabs-count), minmax($tab-min-width, 1fr)) var(--scroll-btn-size);
         /* stylelint-enable */
     }
 
     [part~='inner']:not([part~='scrollable']) {
-        grid-template-columns: repeat(var(--_tabs-count), minmax(var(--tab-min-width), auto));
+        grid-template-columns: repeat(var(--_tabs-count), minmax($tab-min-width, auto));
     }
 }
 
@@ -138,16 +135,14 @@ igc-icon-button::part(base) {
 }
 
 [part='selected-indicator'] {
-    $indicator-bezier: cubic-bezier(.35, 0, .25, 1);
-
     position: relative;
     grid-row: 2;
     grid-column: 1 / -1;
 
     span {
         position: absolute;
         display: inline-block;
-        transition: transform .3s $indicator-bezier, width .2s $indicator-bezier;
+        transition: transform .3s $tabs-animation-function, width .2s $tabs-animation-function;
         z-index: map.get($tabs-z-index, 'selected-indicator');
     }
 }
diff --git a/src/components/tabs/themes/tabs.common.scss b/src/components/tabs/themes/tabs.common.scss
@@ -1,5 +1,10 @@
+@use 'styles/utilities' as *;
+
 $tabs-z-index: (
     scroll-button: 2,
     selected-indicator: 1,
     header: 1,
 );
+$tab-min-width: rem(90px);
+$tab-max-width: rem(360px);
+$tabs-animation-function: cubic-bezier(.35, 0, .25, 1);
diff --git a/stories/tabs.stories.ts b/stories/tabs.stories.ts
@@ -288,8 +288,8 @@ export const NestedTabs: Story = {
         margin: 0 auto;
       }
       .nested {
-        padding-inline-start: 1rem;
-        padding-block-start: 1rem;
+        padding: 1rem;
+        background: var(--ig-gray-50);
       }
     </style>
     <igc-tabs