| undefined {
return this.layoutToolbarExternal ?? this.layoutToolbarContent;
}
@@ -80,15 +78,6 @@ export class NgxLayoutComponent {
return value;
}
- @Input()
- public set withEditorToolbar(value: BooleanInput) {
- this._withEditorToolbar = coerceBooleanProperty(value);
- }
-
- public get withEditorToolbar(): BooleanInput {
- return this._withEditorToolbar;
- }
-
private _withSidenav = false;
@Input()
@@ -101,6 +90,7 @@ export class NgxLayoutComponent {
}
private _keepFilterButtonDisplayed = true;
+
@Input()
public set keepFilterButtonDisplayed(value: BooleanInput) {
this._keepFilterButtonDisplayed = coerceBooleanProperty(value);
@@ -111,6 +101,7 @@ export class NgxLayoutComponent {
}
private _withCloseButton = false;
+
@Input()
public set withCloseButton(value: BooleanInput) {
this._withCloseButton = coerceBooleanProperty(value);
@@ -131,17 +122,6 @@ export class NgxLayoutComponent {
return this._withBackButton;
}
- private _displayEditorToolbar = true;
-
- @Input()
- public set displayEditorToolbar(value: BooleanInput) {
- this._displayEditorToolbar = coerceBooleanProperty(value);
- }
-
- public get displayEditorToolbar(): BooleanInput {
- return this._displayEditorToolbar;
- }
-
public closeSideFilter(): void {
void this.sideFilter?.close();
}
diff --git a/projects/search-container/CHANGELOG.md b/projects/search-container/CHANGELOG.md
index 5ed28920..7eecf78a 100644
--- a/projects/search-container/CHANGELOG.md
+++ b/projects/search-container/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.1.11 (2024-07-26)
+
+
+### 🐛 Fixes
+
+- error message ([e174fe9](https://github.com/DSI-HUG/ngx-components/commit/e174fe9))
+
+- **ngx-search-container:** add NgTemplateOutlet import + add tooltip and style to icons ([46ae279](https://github.com/DSI-HUG/ngx-components/commit/46ae279))
+
+
+### ❤️ Thank You
+
+- damien-guillermet
+- Serge
+
## 1.1.10 (2024-07-25)
diff --git a/projects/search-container/package.json b/projects/search-container/package.json
index 102430d7..3537da95 100644
--- a/projects/search-container/package.json
+++ b/projects/search-container/package.json
@@ -1,6 +1,6 @@
{
"name": "@hug/ngx-search-container",
- "version": "1.1.10",
+ "version": "1.1.11",
"description": "HUG Angular - search-container component",
"homepage": "https://github.com/dsi-hug/ngx-components",
"license": "GPL-3.0-only",
diff --git a/projects/search-container/src/search-container.component.html b/projects/search-container/src/search-container.component.html
index b798eabb..b7db22d9 100644
--- a/projects/search-container/src/search-container.component.html
+++ b/projects/search-container/src/search-container.component.html
@@ -1,10 +1,10 @@
- arrow_back
+ arrow_back
- search
+ search
diff --git a/projects/search-container/src/search-container.component.scss b/projects/search-container/src/search-container.component.scss
index b50f9fdb..07fc120b 100644
--- a/projects/search-container/src/search-container.component.scss
+++ b/projects/search-container/src/search-container.component.scss
@@ -50,7 +50,7 @@ ngx-search-container {
&.active {
display: flex;
align-items: center;
- position: fixed;
+ position: absolute;
top: 0;
left: 0;
width: 100vw;
@@ -61,5 +61,10 @@ ngx-search-container {
.mat-icon {
padding: 0.5rem;
}
+
+ .icon-close-search,
+ .icon-open-search {
+ cursor: pointer;
+ }
}
}
diff --git a/projects/search-container/src/search-container.component.ts b/projects/search-container/src/search-container.component.ts
index 1d71bea6..c2a306db 100644
--- a/projects/search-container/src/search-container.component.ts
+++ b/projects/search-container/src/search-container.component.ts
@@ -1,4 +1,4 @@
-import { AsyncPipe, NgIf } from '@angular/common';
+import { AsyncPipe, NgIf, NgTemplateOutlet } from '@angular/common';
import { AfterContentInit, ChangeDetectionStrategy, Component, ContentChild, Directive, ElementRef, EventEmitter, inject, Input, NgZone, Output, TemplateRef, ViewEncapsulation } from '@angular/core';
import { NgControl } from '@angular/forms';
import { MatIconModule } from '@angular/material/icon';
@@ -34,6 +34,7 @@ export class NgxSearchInputDirective {
imports: [
AsyncPipe,
NgIf,
+ NgTemplateOutlet,
MatIconModule,
MatTooltipModule
]
@@ -46,6 +47,12 @@ export class NgxSearchContainerComponent extends NgxDestroy implements AfterCont
@Input()
public clearTooltip = 'Effacer la recherche';
+ @Input()
+ public openSearchTooltip = 'Ouvrir la recherche';
+
+ @Input()
+ public closeSearchTooltip = 'Quitter la recherche';
+
@ContentChild('mobileSearch')
public mobileSearch: TemplateRef | undefined;
@@ -58,10 +65,10 @@ export class NgxSearchContainerComponent extends NgxDestroy implements AfterCont
@ContentChild(NgxSearchInputDirective)
public set searchInput(searchInput: NgxSearchInputDirective) {
if (!searchInput) {
- throw new Error('You need to add the attribute ngx-search-input to the SearchContainerComponent');
+ throw new Error('You need to add the attribute ngx-search-input to the NgxSearchContainerComponent');
}
if (!searchInput.ngControl) {
- throw new Error('You need to add the attribute ngModel to the SearchContainerComponent');
+ throw new Error('You need to add the attribute ngModel to the NgxSearchContainerComponent');
}
this._searchInput = searchInput;
}