Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(search): prevent browser shortcuts when input is focused

johavena1ef31ca71f0
diff --git a/frontend/src/app/layout/navbar/components/navbar-search.component.html b/frontend/src/app/applications/search/navbar/navbar-search.component.html
similarity index 100%
rename from frontend/src/app/layout/navbar/components/navbar-search.component.html
rename to frontend/src/app/applications/search/navbar/navbar-search.component.html
diff --git a/frontend/src/app/layout/navbar/components/navbar-search.component.ts b/frontend/src/app/applications/search/navbar/navbar-search.component.ts
similarity index 95%
rename from frontend/src/app/layout/navbar/components/navbar-search.component.ts
rename to frontend/src/app/applications/search/navbar/navbar-search.component.ts
index 74f7922c..e94ac08d 100644
--- a/frontend/src/app/layout/navbar/components/navbar-search.component.ts
+++ b/frontend/src/app/applications/search/navbar/navbar-search.component.ts
@@ -6,8 +6,8 @@ import { LucideChevronDown, LucideDynamicIcon, LucideFunnel, LucideLoader, Lucid
import { L10N_LOCALE, L10nLocale, L10nTranslatePipe } from 'angular-l10n'
import { BsDropdownModule } from 'ngx-bootstrap/dropdown'
import { filter } from 'rxjs'
-import { isNavbarGlobalSearchMode, NAVBAR_SEARCH_MODE, type NavbarSearchOption } from '../interfaces/navbar-search.interface'
-import { NavbarSearchService } from '../services/navbar-search.service'
+import { isNavbarGlobalSearchMode, NAVBAR_SEARCH_MODE, type NavbarSearchOption } from '../../../layout/navbar/interfaces/navbar-search.interface'
+import { NavbarSearchService } from '../../../layout/navbar/services/navbar-search.service'
@Component({
selector: 'app-navbar-search',
@@ -92,7 +92,7 @@ export class NavbarSearchComponent {
(!event.ctrlKey && !event.metaKey) ||
event.altKey ||
event.shiftKey ||
- this.isEditableTarget(event.target) ||
+ (this.isEditableTarget(event.target) && event.target !== this.searchInput.nativeElement) ||
document.querySelector('.modal.show')
) {
return
diff --git a/frontend/src/app/layout/navbar/navbar.component.ts b/frontend/src/app/layout/navbar/navbar.component.ts
index bad84fb5..598da698 100644
--- a/frontend/src/app/layout/navbar/navbar.component.ts
+++ b/frontend/src/app/layout/navbar/navbar.component.ts
@@ -6,7 +6,7 @@ import { StoreService } from '../../store/store.service'
import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component'
import { TAB_MENU } from '../layout.interfaces'
import { LayoutService } from '../layout.service'
-import { NavbarSearchComponent } from './components/navbar-search.component'
+import { NavbarSearchComponent } from '../../applications/search/navbar/navbar-search.component'
import { NavbarSearchService } from './services/navbar-search.service'
@Component({
diff --git a/frontend/src/styles/components/_header.scss b/frontend/src/styles/components/_header.scss
index cd5a3237..a5f002f6 100644
--- a/frontend/src/styles/components/_header.scss
+++ b/frontend/src/styles/components/_header.scss
@@ -138,9 +138,10 @@
width: 100%;
min-width: 0;
height: 32px;
- border: 1px solid rgba($white, .34);
+ border: 1px solid mix($sidebar-light-icons-menu-hover-bg, $primary, 50%);
border-radius: $border-radius-base;
background: rgba($black, .12);
+ transition: border-color .15s ease;
}
.navbar-search-mode {
@@ -157,7 +158,7 @@
height: 100%;
padding: 0 .25rem;
border: 0;
- border-right: 1px solid rgba($white, .26);
+ border-right: 1px solid mix($sidebar-light-icons-menu-hover-bg, $primary, 50%);
background: transparent;
color: $white;
@@ -294,7 +295,7 @@
.navbar-search-submit {
right: 0;
- border-left: 1px solid rgba($white, .2);
+ border-left: 1px solid mix($sidebar-light-icons-menu-hover-bg, $primary, 50%);
&:disabled {
opacity: .4;
@@ -370,7 +371,7 @@
width: 100%;
height: 32px;
margin: 0;
- border-color: rgba($white, .34);
+ border-color: mix($sidebar-light-icons-menu-hover-bg, $primary, 50%);
background: rgba($black, .12);
box-shadow: none;
}
@@ -394,7 +395,7 @@
width: auto;
height: 42px;
margin: .4rem;
- border-color: rgba($white, .5);
+ border-color: mix($sidebar-light-icons-menu-hover-bg, $primary, 50%);
background: $primary;
box-shadow: 0 .35rem 1rem rgba($black, .28);
}
@@ -403,6 +404,10 @@
display: flex;
}
}
+
+ .navbar-search-panel:focus-within {
+ border-color: mix($sidebar-light-icons-menu-hover-bg, $primary, 75%);
+ }
}