From 2868ebe5062c385405ee287b436c647acb7b2204 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 17 May 2023 13:36:16 +0300 Subject: [PATCH] RED-5875: migrate menus --- src/assets/styles/common-menu.scss | 10 +++++----- src/lib/filtering/filters.module.ts | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/assets/styles/common-menu.scss b/src/assets/styles/common-menu.scss index edf323f..dd26816 100644 --- a/src/assets/styles/common-menu.scss +++ b/src/assets/styles/common-menu.scss @@ -1,6 +1,6 @@ @use 'common-mixins'; -.mat-menu-panel { +.mat-mdc-menu-panel { border-radius: var(--iqser-menu-border-radius) !important; max-width: none !important; min-width: 180px !important; @@ -10,20 +10,20 @@ @include common-mixins.scroll-bar; @include common-mixins.drop-shadow; - .mat-menu-content:not(:empty) { + .mat-mdc-menu-content:not(:empty) { padding-top: var(--iqser-menu-padding-top); padding-bottom: var(--iqser-menu-padding-bottom); } - &.padding-bottom-0 .mat-menu-content:not(:empty) { + &.padding-bottom-0 .mat-mdc-menu-content:not(:empty) { padding-bottom: 0; } - &.padding-bottom-8 .mat-menu-content:not(:empty) { + &.padding-bottom-8 .mat-mdc-menu-content:not(:empty) { padding-bottom: 8px; } - .mat-menu-item { + .mat-mdc-menu-item { font-size: var(--iqser-font-size); color: var(--iqser-text); padding: 0 26px 0 8px; diff --git a/src/lib/filtering/filters.module.ts b/src/lib/filtering/filters.module.ts index 37b11e0..7554ec8 100644 --- a/src/lib/filtering/filters.module.ts +++ b/src/lib/filtering/filters.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatMenuModule } from '@angular/material/menu'; import { TranslateModule } from '@ngx-translate/core'; import { ChevronButtonComponent, IconButtonComponent } from '../buttons'; import { PopupFilterComponent } from './popup-filter/popup-filter.component'; @@ -13,7 +13,6 @@ import { MatIconModule } from '@angular/material/icon'; import { PreventDefaultDirective, StopPropagationDirective } from '../directives'; import { InputWithActionComponent } from '../inputs'; -const matModules = [MatCheckboxModule, MatMenuModule]; const components = [QuickFiltersComponent, PopupFilterComponent, SingleFilterComponent, FilterCardComponent]; @NgModule({ @@ -21,7 +20,8 @@ const components = [QuickFiltersComponent, PopupFilterComponent, SingleFilterCom exports: [...components], imports: [ CommonModule, - ...matModules, + MatCheckboxModule, + MatMenuModule, TranslateModule, IqserHelpModeModule, IconButtonComponent,