From a454ec5f431200a7c5a6376e214a56b92ed9ca0d Mon Sep 17 00:00:00 2001 From: Simeon Simeonoff Date: Mon, 30 Sep 2024 16:54:09 +0300 Subject: [PATCH 1/3] fix(navdrawer): border and transitions --- .../components/navdrawer/_navdrawer-theme.scss | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss index 305cb7393fe..96ca11cfbbf 100644 --- a/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss +++ b/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss @@ -202,7 +202,7 @@ } %navdrawer-display-mini-pinned { - flex-basis: var(--igx-mini-nav-drawer-size, #{$item-mini-size}); + flex-basis: calc(var(--igx-mini-nav-drawer-size, #{$item-mini-size}) + rem(1px)); } %aside { @@ -213,11 +213,11 @@ background: var-get($theme, 'background'); top: 0; bottom: 0; - min-width: var(--igx-nav-drawer-size); + width: var(--igx-nav-drawer-size); inset-inline-start: 0; z-index: 999; transition: width, padding, transform; - transition-timing-function: $in-out-quad, $in-out-quad; + transition-timing-function: $in-out-quad; box-shadow: var-get($theme, 'shadow'); padding: $aside-padding; @@ -279,11 +279,13 @@ } %aside--mini { - transition-duration: .2s, .2s; - min-width: var(--igx-nav-drawer-size--mini); + transition-duration: .3s; + width: var(--igx-nav-drawer-size--mini); + min-width: fit-content; %item { justify-content: center; + min-width: fit-content; @if $variant == 'bootstrap' { width: rem(56px); @@ -303,7 +305,7 @@ } %aside--normal { - transition-duration: .3s, .3s; + transition-duration: .3s; width: var(--igx-nav-drawer-size); } @@ -311,7 +313,7 @@ opacity: 1; background: color(null, 'gray', 500, .54); transition: opacity, visibility; - transition-duration: .25s, .25s; + transition-duration: .3s, .3s; transition-timing-function: ease-in, step-start; transition-delay: 0s, 0s; position: absolute; From 7ccc1ba7589fcd425f0db21f29aea20198378561 Mon Sep 17 00:00:00 2001 From: Simeon Simeonoff Date: Tue, 1 Oct 2024 09:49:12 +0300 Subject: [PATCH 2/3] spec(navigation-drawer): fix failing test --- .../lib/navigation-drawer/navigation-drawer.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts b/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts index 67af25c1b6f..71039eedc57 100644 --- a/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts +++ b/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts @@ -15,7 +15,7 @@ import { IgxNavbarComponent } from '../navbar/navbar.component'; declare let Simulator: any; // const oldTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL; -describe('Navigation Drawer', () => { +fdescribe('Navigation Drawer', () => { let widthSpyOverride: jasmine.Spy; // configureTestSuite(); beforeEach(waitForAsync(() => { @@ -626,7 +626,7 @@ describe('Navigation Drawer', () => { let flexBasis = getComputedStyle(drawerEl).getPropertyValue('flex-basis'); // Mini variant pinned by default - expect(flexBasis).toEqual('56px');; + expect(flexBasis).toEqual('57px');; expect(navbarEl.offsetLeft).toEqual(parseInt(flexBasis)); fix.componentInstance.navDrawer.toggle(); From 3a9835ab7848ec32966b3992316b05246718b292 Mon Sep 17 00:00:00 2001 From: Simeon Simeonoff Date: Tue, 1 Oct 2024 10:30:37 +0300 Subject: [PATCH 3/3] spec(navigation-drawer): remove fdesrcribe --- .../lib/navigation-drawer/navigation-drawer.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts b/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts index 71039eedc57..f17308683db 100644 --- a/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts +++ b/projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts @@ -15,7 +15,7 @@ import { IgxNavbarComponent } from '../navbar/navbar.component'; declare let Simulator: any; // const oldTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL; -fdescribe('Navigation Drawer', () => { +describe('Navigation Drawer', () => { let widthSpyOverride: jasmine.Spy; // configureTestSuite(); beforeEach(waitForAsync(() => {