diff --git a/src/assets/styles/common-layout.scss b/src/assets/styles/common-layout.scss index 0db257f..1d054a1 100644 --- a/src/assets/styles/common-layout.scss +++ b/src/assets/styles/common-layout.scss @@ -31,7 +31,6 @@ redaction-root { section.settings { display: flex; - .page-header, .content-inner { width: calc(100vw - 200px); } @@ -43,7 +42,7 @@ section.settings { align-items: center; padding: 0 24px; height: 50px; - width: 100vw; + width: 100%; box-sizing: border-box; background-color: var(--iqser-background); border-bottom: 1px solid var(--iqser-separator); @@ -104,7 +103,6 @@ section.settings { .content-inner { display: flex; flex-direction: row; - position: absolute; right: 0; bottom: 0; width: 100%; diff --git a/src/lib/listing/page-header/models/search-positions.type.ts b/src/lib/listing/page-header/models/search-positions.type.ts index c0d336d..f18015b 100644 --- a/src/lib/listing/page-header/models/search-positions.type.ts +++ b/src/lib/listing/page-header/models/search-positions.type.ts @@ -1,6 +1,7 @@ export const SearchPositions = { beforeFilters: 'beforeFilters', afterFilters: 'afterFilters', + withActions: 'withActions', } as const; export type SearchPosition = keyof typeof SearchPositions; diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html index c59c4ed..b0a336b 100644 --- a/src/lib/listing/page-header/page-header.component.html +++ b/src/lib/listing/page-header/page-header.component.html @@ -28,7 +28,7 @@
+ + diff --git a/src/lib/listing/page-header/page-header.component.scss b/src/lib/listing/page-header/page-header.component.scss index e69de29..be3ac28 100644 --- a/src/lib/listing/page-header/page-header.component.scss +++ b/src/lib/listing/page-header/page-header.component.scss @@ -0,0 +1,3 @@ +.actions iqser-input-with-action { + margin-right: 16px +} diff --git a/src/lib/listing/page-header/page-header.component.ts b/src/lib/listing/page-header/page-header.component.ts index e2e63ec..1801d3d 100644 --- a/src/lib/listing/page-header/page-header.component.ts +++ b/src/lib/listing/page-header/page-header.component.ts @@ -20,6 +20,7 @@ export class PageHeaderComponent { @Input() pageLabel?: string; @Input() showCloseButton = false; + @Input() hideResetButton = false; @Input() actionConfigs?: readonly ActionConfig[]; @Input() buttonConfigs?: readonly ButtonConfig[]; @Input() viewModeSelection?: TemplateRef; @@ -30,11 +31,15 @@ export class PageHeaderComponent { @Output() readonly closeAction = new EventEmitter(); readonly filters$ = this.filterService?.filterGroups$.pipe(filterEach(f => !!f.icon)); - readonly showResetFilters$ = this._showResetFilters$; + readonly showResetFilters$ = this.#showResetFilters$; constructor(@Optional() readonly filterService: FilterService, @Optional() readonly searchService: SearchService) {} - get _showResetFilters$(): Observable { + get filterHelpModeKey() { + return this.helpModeKey ? `filter_${this.helpModeKey}_list` : ''; + } + + get #showResetFilters$(): Observable { if (!this.filterService) { return of(false); } @@ -45,10 +50,6 @@ export class PageHeaderComponent { ); } - get filterHelpModeKey() { - return this.helpModeKey ? `filter_${this.helpModeKey}_list` : ''; - } - resetFilters(): void { this.filterService.reset(); this.searchService.reset();