@onemrvapublic/design-system 22.0.0-develop.22 → 22.0.0-develop.24

package/fesm2022/onemrvapublic-design-system-shared.mjs

@@ -22,6 +22,14 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 import { OverlayContainer } from '@angular/cdk/overlay';
 
+/**
+ * Icon button that copies adjacent text to the clipboard.
+ *
+ * This component exposes no configurable inputs or outputs.
+ *
+ * @MatKeywords clipboard, copy, icon, copy-to-clipboard
+ * @MatGroup Misc
+ */
 class ClipboardIconComponent {
     constructor() {
         this._elementRef = inject(ElementRef);
@@ -1173,23 +1181,23 @@ class OnemrvaTranslateHttpLoader {
         this.modules = modules;
     }
     /**
-     * Gets the translations from the server
+     * Gets the translations from the server.
+     * Design-system module translations load first; the project's own
+     * translation file is merged last so it overrides on key collisions.
      */
     getTranslation(lang) {
-        const observables = [
-            this.http
-                .get(`${this.prefix}${lang}${this.suffix}`)
-                .pipe(catchError$1(() => of(null))),
-            ...this.modules.map(m => {
-                this.http
-                    .get(`${this.prefix}${m}/${lang}${this.suffix}`)
-                    .pipe(catchError$1(() => of(null)));
-                //console.log(`${this.prefix}${m}/${lang}${this.suffix}`);
-            }),
-        ];
-        return forkJoin(observables).pipe(map(all => {
-            return all.filter(v => !!v).reduce((s, c) => ({ ...s, ...c }), {});
-        }));
+        const dsRequest = this.http
+            .get(`/assets/design-system/i18n/${lang.toLocaleLowerCase()}.json`)
+            .pipe(catchError$1(() => of(null)));
+        const moduleRequests = this.modules.map(m => this.http
+            .get(`${this.prefix}${m}/${lang}${this.suffix}`)
+            .pipe(catchError$1(() => of(null))));
+        const projectRequest = this.http
+            .get(`${this.prefix}${lang}${this.suffix}`)
+            .pipe(catchError$1(() => of(null)));
+        return forkJoin([dsRequest, ...moduleRequests, projectRequest]).pipe(map(all => all
+            .filter((v) => !!v)
+            .reduce((merged, current) => ({ ...merged, ...current }), {})));
     }
 }
 
@@ -2086,7 +2094,7 @@ function onemrvaDateLuxonYearMonthProvider() {
 }
 
 // Auto-generated — do not edit
-const VERSION = '22.0.0-develop.22';
+const VERSION = '22.0.0-develop.24';
 
 function onemrvaThemeProvider() {
     return makeEnvironmentProviders([