geonetwork-ui 2.4.0-dev.fe59f179 → 2.4.1-dev.4e8752d34

package/src/libs/ui/inputs/src/lib/badge/badge.component.ts

@@ -7,6 +7,12 @@ import {
   Output,
 } from '@angular/core'
 import { ButtonComponent } from '../button/button.component'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { matClose } from '@ng-icons/material-icons/baseline'
 
 @Component({
   selector: 'gn-ui-badge',
@@ -14,7 +20,15 @@ import { ButtonComponent } from '../button/button.component'
   styleUrls: ['./badge.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, ButtonComponent],
+  imports: [CommonModule, ButtonComponent, NgIconComponent],
+  providers: [
+    provideIcons({
+      matClose,
+    }),
+    provideNgIconsConfig({
+      size: '1.2em',
+    }),
+  ],
 })
 export class BadgeComponent {
   @Input() clickable? = false

package/src/libs/ui/inputs/src/lib/button/button.component.ts

@@ -18,7 +18,14 @@ export class ButtonComponent {
   private btnClass = 'gn-ui-btn-default'
 
   @Input() set type(
-    value: 'primary' | 'secondary' | 'default' | 'outline' | 'light'
+    value:
+      | 'primary'
+      | 'secondary'
+      | 'default'
+      | 'outline'
+      | 'light'
+      | 'gray'
+      | 'black'
   ) {
     // btn-classes are written in full to be picked up by tailwind
     switch (value) {
@@ -34,6 +41,13 @@ export class ButtonComponent {
       case 'light':
         this.btnClass = 'gn-ui-btn-light'
         break
+      case 'gray':
+        this.btnClass = 'gn-ui-btn-gray'
+        break
+      case 'black':
+        this.btnClass = 'gn-ui-btn-black'
+        break
+      case 'default':
       default:
         this.btnClass = 'gn-ui-btn-default'
         break

package/src/libs/ui/inputs/src/lib/check-toggle/check-toggle.component.html

@@ -1,4 +1,7 @@
-<label class="inline-flex relative items-start cursor-pointer" [title]="title">
+<label
+  class="inline-flex relative items-start cursor-pointer"
+  [title]="title || label"
+>
   <span class="shrink-0">
     <input
       type="checkbox"

package/src/libs/ui/inputs/src/lib/check-toggle/check-toggle.component.ts

@@ -20,9 +20,9 @@ export class CheckToggleComponent {
   @Input() label: string
   @Input() value: boolean
   @Input() color: 'primary' | 'secondary' = 'primary'
-  @Output() toggled = new EventEmitter()
+  @Output() toggled = new EventEmitter<boolean>()
 
-  toggle(event: Event) {
-    this.toggled.emit(event)
+  toggle(value: boolean) {
+    this.toggled.emit(value)
   }
 }

package/src/libs/ui/inputs/src/lib/chips-input/chips-input.component.ts

@@ -54,7 +54,10 @@ export class ChipsInputComponent implements OnInit, OnDestroy {
     }
   }
 
-  constructor(private http: HttpClient, private translate: TranslateService) {
+  constructor(
+    private http: HttpClient,
+    private translate: TranslateService
+  ) {
     this.rawChange = new Subject<Items[]>()
     this.itemsChange = this.rawChange.pipe(distinctUntilChanged())
     this.subscription = new Subscription()

package/src/libs/ui/inputs/src/lib/copy-text-button/copy-text-button.component.html

@@ -18,15 +18,14 @@
     (click)="copyText($event)"
     [ngClass]="{
       'py-2 px-4 rounded-r-md bg-gray-400 hover:bg-gray-600 focus:bg-gray-800 text-white':
-        displayText
+        displayText,
     }"
-    mat-raised-button
     [matTooltip]="tooltipText"
     matTooltipPosition="above"
   >
-    <mat-icon
-      class="material-symbols-outlined pointer-events-none align-middle card-icon"
-      >content_copy</mat-icon
-    >
+    <ng-icon
+      name="matContentCopy"
+      class="pointer-events-none align-middle card-icon"
+    ></ng-icon>
   </button>
 </div>

package/src/libs/ui/inputs/src/lib/copy-text-button/copy-text-button.component.ts

@@ -1,10 +1,17 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { MatTooltipModule } from '@angular/material/tooltip'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { matContentCopy } from '@ng-icons/material-icons/baseline'
 
 @Component({
   selector: 'gn-ui-copy-text-button',
   templateUrl: './copy-text-button.component.html',
   styleUrls: ['./copy-text-button.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, MatTooltipModule, NgIcon],
+  viewProviders: [provideIcons({ matContentCopy })],
 })
 export class CopyTextButtonComponent {
   @Input() text: string

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.css

@@ -1,3 +1,8 @@
-mat-datepicker-toggle {
-  @apply text-primary;
+:host {
+  --gn-ui-button-rounded: 8px;
+  --gn-ui-button-width: 32px;
+  --gn-ui-button-padding: 0;
+
+  --side-padding: calc(var(--gn-ui-text-input-padding, 0.6em) - 6px);
+  --text-padding: calc(var(--side-padding) + 40px);
 }

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.html

@@ -1,12 +1,18 @@
-<div
-  class="flex items-center justify-between rounded-lg border border-gray-300 bg-white"
->
+<span class="w-full inline-block relative">
   <input
-    class="pl-3"
+    class="gn-ui-text-input pr-[var(--text-padding)]"
     [matDatepicker]="picker"
     [value]="date"
     (dateChange)="dateChange.emit($event.value)"
   />
-  <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
-</div>
+  <gn-ui-button
+    type="light"
+    class="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)] z-10"
+    (buttonClick)="picker.open()"
+    data-cy="date-picker-button"
+    extraClass="h-full"
+  >
+    <ng-icon name="iconoirCalendar" class="text-primary"></ng-icon>
+  </gn-ui-button>
+</span>
 <mat-datepicker #picker></mat-datepicker>

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts

@@ -7,7 +7,13 @@ import {
 } from '@angular/core'
 import { MatNativeDateModule } from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
-import { MatIconModule } from '@angular/material/icon'
+import { ButtonComponent } from '../button/button.component'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { iconoirCalendar } from '@ng-icons/iconoir'
 
 @Component({
   selector: 'gn-ui-date-picker',
@@ -15,7 +21,18 @@ import { MatIconModule } from '@angular/material/icon'
   styleUrls: ['./date-picker.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [MatIconModule, MatNativeDateModule, MatDatepickerModule],
+  imports: [
+    MatNativeDateModule,
+    MatDatepickerModule,
+    ButtonComponent,
+    NgIconComponent,
+  ],
+  providers: [
+    provideIcons({ iconoirCalendar }),
+    provideNgIconsConfig({
+      size: '1.5rem',
+    }),
+  ],
 })
 export class DatePickerComponent {
   @Input() date: Date

package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.css

@@ -0,0 +1,5 @@
+:host {
+  .mat-date-range-input-container {
+    display: none;
+  }
+}

package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.html

@@ -0,0 +1,30 @@
+<gn-ui-button
+  type="outline"
+  extraClass="bg-background w-full !p-[8px] !pl-[16px]"
+  (buttonClick)="picker.open()"
+>
+  <div class="grow flex items-center mr-2 gap-2 overflow-hidden">
+    <div class="text-left font-medium truncate py-1">
+      {{ title }}
+    </div>
+  </div>
+  <ng-icon
+    [name]="isPickerDisplayed ? 'matExpandLess' : 'matExpandMore'"
+    class="shrink-0 opacity-40"
+  >
+  </ng-icon>
+</gn-ui-button>
+<!--date range input is just present for output events and hidden from the DOM-->
+<mat-date-range-input [rangePicker]="picker">
+  <input
+    matStartDate
+    [value]="startDate"
+    (dateInput)="startDateChange.emit($event.value)"
+  />
+  <input
+    matEndDate
+    [value]="endDate"
+    (dateInput)="endDateChange.emit($event.value)"
+  />
+</mat-date-range-input>
+<mat-date-range-picker #picker></mat-date-range-picker>

package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.ts

@@ -0,0 +1,63 @@
+import {
+  AfterViewChecked,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  Output,
+  ViewChild,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { MatNativeDateModule } from '@angular/material/core'
+import { MatDatepickerModule } from '@angular/material/datepicker'
+import { ButtonComponent } from '../button/button.component'
+import { OverlayContainer } from '@angular/cdk/overlay'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import { matExpandLess, matExpandMore } from '@ng-icons/material-icons/baseline'
+
+@Component({
+  selector: 'gn-ui-date-range-dropdown',
+  standalone: true,
+  imports: [
+    CommonModule,
+    NgIconComponent,
+    MatNativeDateModule,
+    MatDatepickerModule,
+    ButtonComponent,
+  ],
+  providers: [
+    provideIcons({
+      matExpandMore,
+      matExpandLess,
+    }),
+  ],
+  templateUrl: './date-range-dropdown.component.html',
+  styleUrls: ['./date-range-dropdown.component.css'],
+})
+export class DateRangeDropdownComponent implements AfterViewChecked {
+  @Input() title: string
+  @Input() startDate: Date
+  @Input() endDate: Date
+  @Output() startDateChange = new EventEmitter<Date>()
+  @Output() endDateChange = new EventEmitter<Date>()
+
+  @ViewChild('picker') picker: ElementRef
+  isPickerDisplayed = false
+
+  constructor(
+    private overlayContainer: OverlayContainer,
+    private cdr: ChangeDetectorRef
+  ) {}
+
+  ngAfterViewChecked() {
+    this.checkPickerOverlay()
+  }
+
+  checkPickerOverlay() {
+    const overlayContainerElement = this.overlayContainer.getContainerElement()
+    this.isPickerDisplayed =
+      overlayContainerElement.querySelector('.mat-datepicker-content') !== null
+    this.cdr.detectChanges()
+  }
+}

package/src/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.css

@@ -1,3 +1,8 @@
-mat-datepicker-toggle {
-  @apply text-primary;
+:host {
+  --gn-ui-button-rounded: 8px;
+  --gn-ui-button-width: 32px;
+  --gn-ui-button-padding: 0;
+
+  --side-padding: calc(var(--gn-ui-text-input-padding, 0.6em) - 6px);
+  --text-padding: calc(var(--side-padding) + 40px);
 }

package/src/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.html

@@ -1,24 +1,27 @@
-<div
-  class="flex items-center justify-between rounded-lg border border-gray-300 bg-white"
->
-  <div class="pl-3 flex justify-center">
-    <mat-date-range-input [rangePicker]="picker" class="w-full">
-      <input
-        matStartDate
-        placeholder="Start date"
-        [value]="startDate"
-        (dateInput)="startDateChange.emit($event.value)"
-      />
-      <input
-        matEndDate
-        placeholder="End date"
-        [value]="endDate"
-        (dateInput)="endDateChange.emit($event.value)"
-      />
-    </mat-date-range-input>
-  </div>
-  <mat-datepicker-toggle matSuffix [for]="picker">
-    <mat-icon>calendar_today</mat-icon>
-  </mat-datepicker-toggle>
-</div>
+<span class="w-full inline-block relative">
+  <mat-date-range-input [rangePicker]="picker" class="gn-ui-text-input">
+    <input
+      matStartDate
+      placeholder="Start date"
+      [value]="startDate"
+      (dateInput)="startDateChange.emit($event.value)"
+    />
+    <input
+      matEndDate
+      placeholder="End date"
+      [value]="endDate"
+      (dateInput)="endDateChange.emit($event.value)"
+    />
+  </mat-date-range-input>
+
+  <gn-ui-button
+    type="light"
+    class="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)] z-10"
+    (buttonClick)="picker.open()"
+    extraClass="h-full"
+    data-cy="date-picker-button"
+  >
+    <ng-icon name="iconoirCalendar" class="text-primary"></ng-icon>
+  </gn-ui-button>
+</span>
 <mat-date-range-picker #picker></mat-date-range-picker>

package/src/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.ts

@@ -7,7 +7,13 @@ import {
 } from '@angular/core'
 import { MatNativeDateModule } from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
-import { MatIconModule } from '@angular/material/icon'
+import { ButtonComponent } from '../button/button.component'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { iconoirCalendar } from '@ng-icons/iconoir'
 
 @Component({
   selector: 'gn-ui-date-range-picker',
@@ -15,7 +21,18 @@ import { MatIconModule } from '@angular/material/icon'
   styleUrls: ['./date-range-picker.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [MatIconModule, MatNativeDateModule, MatDatepickerModule],
+  imports: [
+    MatNativeDateModule,
+    MatDatepickerModule,
+    ButtonComponent,
+    NgIconComponent,
+  ],
+  providers: [
+    provideIcons({ iconoirCalendar }),
+    provideNgIconsConfig({
+      size: '1.5rem',
+    }),
+  ],
 })
 export class DateRangePickerComponent {
   @Input() startDate: Date

package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.html

@@ -14,24 +14,24 @@
     </div>
     <div
       *ngIf="hasSelectedChoices"
-      class="shrink-0 rounded-full text-primary bg-primary-opacity-25 text-white font-bold text-[12px] w-5 h-5 flex items-center justify-center mr-1 selected-count"
+      class="gn-ui-multiselect-counter shrink-0 rounded-full font-bold text-[12px] w-5 h-5 flex items-center justify-center mr-1 selected-count"
     >
       {{ selected.length }}
     </div>
   </div>
   <button class="h-6 w-6" data-cy="clearSelection">
-    <mat-icon
-      class="material-symbols-outlined shrink-0 opacity-40 mr-1.5 hover:opacity-80 transition-colors clear-btn"
+    <ng-icon
+      class="shrink-0 opacity-40 mr-1.5 hover:opacity-80 transition-colors clear-btn"
       *ngIf="hasSelectedChoices && !overlayOpen"
       (click)="clearSelection($event)"
-    >
-      close
-    </mat-icon>
+      name="matClose"
+    ></ng-icon>
   </button>
-  <mat-icon class="material-symbols-outlined shrink-0 opacity-40">
-    <ng-container *ngIf="overlayOpen">expand_less</ng-container>
-    <ng-container *ngIf="!overlayOpen">expand_more</ng-container>
-  </mat-icon>
+  <ng-icon
+    [name]="overlayOpen ? 'matExpandLess' : 'matExpandMore'"
+    class="shrink-0 opacity-40"
+  >
+  </ng-icon>
 </gn-ui-button>
 
 <ng-template
@@ -74,11 +74,10 @@
         <div
           class="flex items-center justify-center rounded-full bg-white text-main h-[13px] w-[13px] pt-px -mt-px shrink-0"
         >
-          <mat-icon
-            class="material-symbols-outlined !h-[12px] !w-[12px] text-[12px]"
-          >
-            close</mat-icon
-          >
+          <ng-icon
+            name="matClose"
+            class="!h-[12px] !w-[11px] text-[12px]"
+          ></ng-icon>
         </div>
       </button>
 
@@ -94,11 +93,8 @@
           class="absolute top-1/2 -translate-y-1/2 right-0 px-[7px] leading-tight clear-search-input mr-2"
           (click)="clearSearchInputValue($event)"
         >
-          <mat-icon
-            class="material-symbols-outlined !h-[10px] !w-[12px] text-[12px]"
-          >
-            close
-          </mat-icon>
+          <ng-icon class="!h-[10px] !w-[12px] text-[12px]" name="matClose">
+          </ng-icon>
         </button>
       </div>
     </div>

package/src/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.html

@@ -9,9 +9,8 @@
   <gn-ui-button
     type="outline"
     class="grow min-w-0"
-    extraClass="bg-background !p-[8px] !pl-[16px] flex flex-row w-full {{
-      extraBtnClass
-    }}"
+    [style.--gn-ui-button-padding]="'8px 8px 8px 16px'"
+    extraClass="bg-background flex flex-row w-full {{ extraBtnClass }}"
     [title]="title"
     [attr.aria-owns]="id"
     (buttonClick)="openOverlay()"
@@ -23,10 +22,11 @@
     <div class="grow font-medium truncate py-1 mr-2 text-left">
       {{ getChoiceLabel() | translate }}
     </div>
-    <mat-icon class="material-symbols-outlined shrink-0 opacity-40">
-      <ng-container *ngIf="overlayOpen">expand_less</ng-container>
-      <ng-container *ngIf="!overlayOpen">expand_more</ng-container>
-    </mat-icon>
+    <ng-icon
+      [name]="overlayOpen ? 'matExpandLess' : 'matExpandMore'"
+      class="shrink-0 opacity-40"
+    >
+    </ng-icon>
   </gn-ui-button>
 </div>
 

package/src/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.ts

@@ -20,8 +20,13 @@ import { firstValueFrom } from 'rxjs'
 import { DropdownChoice } from './dropdown-selector.model'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
-import { MatIconModule } from '@angular/material/icon'
 import { ButtonComponent } from '../button/button.component'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { matExpandLess, matExpandMore } from '@ng-icons/material-icons/baseline'
 
 const DEFAULT_ROW_NUMBERS = 6
 
@@ -35,8 +40,17 @@ const DEFAULT_ROW_NUMBERS = 6
     CommonModule,
     ButtonComponent,
     OverlayModule,
-    MatIconModule,
     TranslateModule,
+    NgIconComponent,
+  ],
+  providers: [
+    provideIcons({
+      matExpandLess,
+      matExpandMore,
+    }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
   ],
 })
 export class DropdownSelectorComponent implements OnInit {

package/src/libs/ui/inputs/src/lib/editable-label/editable-label.directive.ts

@@ -1,48 +1,65 @@
 import {
+  AfterViewInit,
   Directive,
   ElementRef,
-  Renderer2,
-  AfterViewInit,
   EventEmitter,
-  Output,
   Input,
+  OnChanges,
+  Output,
+  Renderer2,
 } from '@angular/core'
 
 @Directive({
   selector: '[gnUiEditableLabel]',
   standalone: true,
 })
-export class EditableLabelDirective implements AfterViewInit {
+export class EditableLabelDirective implements OnChanges, AfterViewInit {
+  @Input() gnUiEditableLabel?: string
   @Output() editableLabelChanged = new EventEmitter<string>()
-  @Input() gnUiEditableLabel?: boolean
 
-  constructor(private el: ElementRef, private renderer: Renderer2) {}
+  appendedInput: HTMLInputElement
+
+  constructor(
+    private el: ElementRef,
+    private renderer: Renderer2
+  ) {}
+
+  ngOnChanges() {
+    if (this.appendedInput) {
+      this.renderer.setProperty(
+        this.appendedInput,
+        'value',
+        this.gnUiEditableLabel
+      )
+    }
+  }
 
   ngAfterViewInit() {
-    if (this.gnUiEditableLabel !== false) {
-      const appendedInput = this.renderer.createElement('input')
-
-      this.renderer.setStyle(appendedInput, 'background', 'inherit')
-      this.renderer.setStyle(appendedInput, 'color', 'inherit')
-      this.renderer.setStyle(appendedInput, 'font', 'inherit')
-      this.renderer.setStyle(appendedInput, 'border', 'inherit')
-      this.renderer.setStyle(appendedInput, 'width', '100%')
-      this.renderer.setStyle(appendedInput, 'padding', 'inherit')
-      this.renderer.setStyle(appendedInput, 'margin', '0')
-      this.renderer.setStyle(appendedInput, 'height', 'inherit')
-      this.renderer.setStyle(appendedInput, 'line-height', 'inherit')
-      this.renderer.setStyle(appendedInput, 'text-decoration', 'inherit')
-
-      const hostContent = this.el.nativeElement.textContent || ''
-      const formattedContent = hostContent.replace(/\s+/g, ' ').trim()
-      this.renderer.setProperty(appendedInput, 'value', formattedContent)
-      this.renderer.setProperty(this.el.nativeElement, 'innerHTML', '')
-
-      this.renderer.listen(appendedInput, 'input', (event) => {
+    if (this.gnUiEditableLabel !== undefined) {
+      this.appendedInput = this.renderer.createElement('input')
+
+      this.renderer.setStyle(this.appendedInput, 'background', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'color', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'font', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'border', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'width', '100%')
+      this.renderer.setStyle(this.appendedInput, 'padding', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'margin', '0')
+      this.renderer.setStyle(this.appendedInput, 'height', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'line-height', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'text-decoration', 'inherit')
+
+      this.renderer.setProperty(
+        this.appendedInput,
+        'value',
+        this.gnUiEditableLabel
+      )
+
+      this.renderer.listen(this.appendedInput, 'input', (event) => {
         this.editableLabelChanged.emit(event.target.value)
       })
 
-      this.renderer.appendChild(this.el.nativeElement, appendedInput)
+      this.renderer.appendChild(this.el.nativeElement, this.appendedInput)
     }
   }
 }

package/src/libs/ui/inputs/src/lib/file-input/file-input.component.css

@@ -0,0 +1,4 @@
+:host {
+  --gn-ui-button-padding: 8px 8px;
+  --gn-ui-button-rounded: 8px;
+}