v18.1.2 RC (#6690)

* fix(Typeahead) Typeahead highlight displays <strong> tag when empty spaces added at the end of query and does not escape html tags (#6434) Co-authored-by: udayk <uday.appam@wavemaker.com> Co-authored-by: Alexey Umanskiy <sharkakatsukie@gmail.com> * fix(typeahead): rolled back changes from UdayAppam and introduced another solution * update hr.ts (#6447) change date separation from slashes (/) to dots (.) Co-authored-by: Dmitriy Shekhovtsov <valorkin@gmail.com> Co-authored-by: Alexey Umanskiy <sharkakatsukie@gmail.com> * fix(chronos): fixed chronos test for updated croatian locale * fix(bs-dropdown): state provided issue * fix(daterange-picker): locale change fix --------- Co-authored-by: UdayAppam <appam.uday@gmail.com> Co-authored-by: udayk <uday.appam@wavemaker.com> Co-authored-by: vrbaaa <44699684+vrbaaa@users.noreply.github.com> Co-authored-by: Dmitriy Shekhovtsov <valorkin@gmail.com>
valor-software · Oct 21, 2024 · e77c928 · e77c928
1 parent 5b0fc2e
commit e77c928
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/apps/ngx-bootstrap-docs/src/app/app.module.ts b/apps/ngx-bootstrap-docs/src/app/app.module.ts
@@ -1,7 +1,6 @@
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { environment } from '../environments/environment';
@@ -15,8 +14,8 @@ import { routes } from './app.routing';
     ],
     bootstrap: [AppComponent], imports: [BrowserAnimationsModule,
         DocsModule,
-        RouterModule.forRoot(routes, { useHash: environment.useHash }),
-        BsDropdownModule], providers: [
+        RouterModule.forRoot(routes, { useHash: environment.useHash })
+        ], providers: [
         { provide: NgApiDoc, useValue: ngdoc },
         { provide: DOCS_TOKENS, useValue: routes },
         { provide: SIDEBAR_ROUTES, useValue: SidebarRoutesStructure },

diff --git a/src/chronos/i18n/hr.ts b/src/chronos/i18n/hr.ts
@@ -14,7 +14,7 @@ export const hrLocale: LocaleData = {
   longDateFormat: {
     LT: 'HH:mm',
     LTS: 'HH:mm:ss',
-    L: 'DD/MM/YYYY',
+    L: 'DD.MM.YYYY.',
     LL: 'D MMMM YYYY',
     LLL: 'D MMMM YYYY HH:mm',
     LLLL: 'dddd, D MMMM YYYY HH:mm'

diff --git a/src/chronos/testing/locale/hr.spec.ts b/src/chronos/testing/locale/hr.spec.ts
@@ -56,11 +56,11 @@ describe('locale: hr', () => {
         ['a A', 'pm PM'],
         ['[the] DDDo [day of the year]', 'the 45. day of the year'],
         ['LTS', '15:25:50'],
-        ['L', '14/02/2010'],
+        ['L', '14.02.2010.'],
         ['LL', '14 Veljača 2010'],
         ['LLL', '14 Veljača 2010 15:25'],
         ['LLLL', 'Nedjelja, 14 Veljača 2010 15:25'],
-        ['l', '14/2/2010'],
+        ['l', '14.2.2010.'],
         ['ll', '14 Velj 2010'],
         ['lll', '14 Velj 2010 15:25'],
         ['llll', 'Ned, 14 Velj 2010 15:25']

diff --git a/src/datepicker/bs-datepicker-input.directive.ts b/src/datepicker/bs-datepicker-input.directive.ts
@@ -51,7 +51,6 @@ const BS_DATEPICKER_VALIDATOR: Provider = {
 @Directive({
     selector: `input[bsDatepicker]`,
     providers: [
-      BsLocaleService,
       BS_DATEPICKER_VALUE_ACCESSOR,
       BS_DATEPICKER_VALIDATOR
     ],

diff --git a/src/datepicker/bs-daterangepicker-input.directive.ts b/src/datepicker/bs-daterangepicker-input.directive.ts
@@ -58,7 +58,6 @@ const BS_DATERANGEPICKER_VALIDATOR: Provider = {
         '(blur)': 'onBlur()'
     },
     providers: [
-      BsLocaleService,
       BS_DATERANGEPICKER_VALUE_ACCESSOR,
       BS_DATERANGEPICKER_VALIDATOR
     ],

diff --git a/src/dropdown/bs-dropdown-container.component.ts b/src/dropdown/bs-dropdown-container.component.ts
@@ -32,7 +32,6 @@ import { NgClass } from '@angular/common';
          [class.open]="isOpen"><ng-content></ng-content>
     </div>
   `,
-  providers: [BsDropdownState]
 })
 export class BsDropdownContainerComponent implements OnDestroy {
   isOpen = false;

diff --git a/src/typeahead/typeahead-container.component.ts b/src/typeahead/typeahead-container.component.ts
@@ -276,7 +276,7 @@ export class TypeaheadContainerComponent implements OnDestroy {
             `${itemStr.substring(0, startIdx)}<strong>${itemStr.substring(startIdx, startIdx + tokenLen)}</strong>` +
             `${itemStr.substring(startIdx + tokenLen)}`;
           itemStrHelper =
-            `${itemStrHelper.substring(0, startIdx)}        ${' '.repeat(tokenLen)}         ` +
+            `${itemStrHelper.substring(0, startIdx)}????????${'??'.repeat(tokenLen)}??????????` +
             `${itemStrHelper.substring(startIdx + tokenLen)}`;
         }
       }