From e77c92858a1a5fc11a2277cb2339e034bd27023c Mon Sep 17 00:00:00 2001 From: Alexey Umanskiy Date: Mon, 21 Oct 2024 11:47:33 +0300 Subject: [PATCH 1/2] v18.1.2 RC (#6690) * fix(Typeahead) Typeahead highlight displays tag when empty spaces added at the end of query and does not escape html tags (#6434) Co-authored-by: udayk Co-authored-by: Alexey Umanskiy * 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 Co-authored-by: Alexey Umanskiy * 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 Co-authored-by: udayk Co-authored-by: vrbaaa <44699684+vrbaaa@users.noreply.github.com> Co-authored-by: Dmitriy Shekhovtsov --- apps/ngx-bootstrap-docs/src/app/app.module.ts | 5 ++--- src/chronos/i18n/hr.ts | 2 +- src/chronos/testing/locale/hr.spec.ts | 4 ++-- src/datepicker/bs-datepicker-input.directive.ts | 1 - src/datepicker/bs-daterangepicker-input.directive.ts | 1 - src/dropdown/bs-dropdown-container.component.ts | 1 - src/typeahead/typeahead-container.component.ts | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/ngx-bootstrap-docs/src/app/app.module.ts b/apps/ngx-bootstrap-docs/src/app/app.module.ts index fcc97e640f..09cf7ab7b9 100644 --- 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 index 8fdc6ca019..ae38a672e2 100644 --- 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 index ff1f7c0159..679898f3ec 100644 --- 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 index 98d9d4b87f..9186cccade 100644 --- 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 index 7c5750ce6f..72c20badcb 100644 --- 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 index ea8e5749a8..981cd0e6ff 100644 --- 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"> `, - 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 index 6cc0a6e7c5..032fe11a72 100644 --- 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)}${itemStr.substring(startIdx, startIdx + tokenLen)}` + `${itemStr.substring(startIdx + tokenLen)}`; itemStrHelper = - `${itemStrHelper.substring(0, startIdx)} ${' '.repeat(tokenLen)} ` + + `${itemStrHelper.substring(0, startIdx)}????????${'??'.repeat(tokenLen)}??????????` + `${itemStrHelper.substring(startIdx + tokenLen)}`; } } From b56863dad3f81a45ae289202426d82cac159d30a Mon Sep 17 00:00:00 2001 From: Alexey Umanskiy Date: Mon, 21 Oct 2024 13:29:30 +0300 Subject: [PATCH 2/2] Alex bump to 18 1 2 (#6694) * fix(Typeahead) Typeahead highlight displays tag when empty spaces added at the end of query and does not escape html tags (#6434) Co-authored-by: udayk Co-authored-by: Alexey Umanskiy * 18.1.2 * chore(version): version bump * chore(version): version bump * chore(version): version bump --------- Co-authored-by: UdayAppam Co-authored-by: udayk --- apps/ngx-bootstrap-docs/src/assets/json/current-version.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/accordion/package.json | 2 +- src/alert/package.json | 2 +- src/buttons/package.json | 2 +- src/carousel/package.json | 2 +- src/chronos/package.json | 2 +- src/collapse/package.json | 2 +- src/component-loader/package.json | 2 +- src/datepicker/package.json | 2 +- src/dropdown/package.json | 2 +- src/focus-trap/package.json | 2 +- src/locale/package.json | 2 +- src/mini-ngrx/package.json | 2 +- src/modal/package.json | 2 +- src/pagination/package.json | 2 +- src/popover/package.json | 2 +- src/positioning/package.json | 2 +- src/progressbar/package.json | 2 +- src/rating/package.json | 2 +- src/root/package.json | 2 +- src/schematics/package.json | 2 +- src/schematics/src/utils/current_dependency_versions.json | 2 +- src/sortable/package.json | 2 +- src/tabs/package.json | 2 +- src/timepicker/package.json | 2 +- src/tooltip/package.json | 2 +- src/typeahead/package.json | 2 +- src/utils/package.json | 2 +- 30 files changed, 31 insertions(+), 31 deletions(-) diff --git a/apps/ngx-bootstrap-docs/src/assets/json/current-version.json b/apps/ngx-bootstrap-docs/src/assets/json/current-version.json index 068131925c..7f9a58507d 100644 --- a/apps/ngx-bootstrap-docs/src/assets/json/current-version.json +++ b/apps/ngx-bootstrap-docs/src/assets/json/current-version.json @@ -1,3 +1,3 @@ { - "version": "18.1.1" + "version": "18.1.2" } diff --git a/package-lock.json b/package-lock.json index ed712ed5d5..ffb88e7452 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ngx-bootstrap-base", - "version": "18.1.1", + "version": "18.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ngx-bootstrap-base", - "version": "18.1.1", + "version": "18.1.2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c1c0252f27..ed0b68be09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap-base", - "version": "18.1.1", + "version": "18.1.2", "license": "MIT", "author": "Dmitriy Shekhovtsov ", "schematics": "./schematics/src/collection.json", diff --git a/src/accordion/package.json b/src/accordion/package.json index 0dd7738830..e79f72b000 100644 --- a/src/accordion/package.json +++ b/src/accordion/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/accordion", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/alert/package.json b/src/alert/package.json index 6a35a023b9..7d8c90b81c 100644 --- a/src/alert/package.json +++ b/src/alert/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/alert", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/buttons/package.json b/src/buttons/package.json index c7d4807fc7..a7c2292e0a 100644 --- a/src/buttons/package.json +++ b/src/buttons/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/buttons", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/carousel/package.json b/src/carousel/package.json index 0cd2f05f2d..fd6ea5c7bf 100644 --- a/src/carousel/package.json +++ b/src/carousel/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/carousel", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/chronos/package.json b/src/chronos/package.json index cdf2cf8eca..55d2a31046 100644 --- a/src/chronos/package.json +++ b/src/chronos/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/chronos", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/collapse/package.json b/src/collapse/package.json index 6bb0c979f9..c13c7966f1 100644 --- a/src/collapse/package.json +++ b/src/collapse/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/collapse", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/component-loader/package.json b/src/component-loader/package.json index 5024032b46..62943895dc 100644 --- a/src/component-loader/package.json +++ b/src/component-loader/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/component-loader", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/datepicker/package.json b/src/datepicker/package.json index f50a853cd6..d6f9896fd7 100644 --- a/src/datepicker/package.json +++ b/src/datepicker/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/datepicker", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/dropdown/package.json b/src/dropdown/package.json index 08048953bf..8242ab9142 100644 --- a/src/dropdown/package.json +++ b/src/dropdown/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/dropdown", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/focus-trap/package.json b/src/focus-trap/package.json index 82b05ef148..4b2264a1b0 100644 --- a/src/focus-trap/package.json +++ b/src/focus-trap/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/focus-trap", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/locale/package.json b/src/locale/package.json index 5eb51ee06d..0addb735c1 100644 --- a/src/locale/package.json +++ b/src/locale/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/locale", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/mini-ngrx/package.json b/src/mini-ngrx/package.json index 9112c1fe30..ec51e945d2 100644 --- a/src/mini-ngrx/package.json +++ b/src/mini-ngrx/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/mini-ngrx", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/modal/package.json b/src/modal/package.json index 0a303c5f24..135b931931 100644 --- a/src/modal/package.json +++ b/src/modal/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/modal", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/pagination/package.json b/src/pagination/package.json index df20f24377..965757b409 100644 --- a/src/pagination/package.json +++ b/src/pagination/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/pagination", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/popover/package.json b/src/popover/package.json index 462b00b143..5b18c017de 100644 --- a/src/popover/package.json +++ b/src/popover/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/popover", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/positioning/package.json b/src/positioning/package.json index 17d421294f..e8407dfc6c 100644 --- a/src/positioning/package.json +++ b/src/positioning/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/positioning", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/progressbar/package.json b/src/progressbar/package.json index c3c9f44ae8..d1ec324032 100644 --- a/src/progressbar/package.json +++ b/src/progressbar/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/progressbar", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/rating/package.json b/src/rating/package.json index 7680095734..2c2049d0d0 100644 --- a/src/rating/package.json +++ b/src/rating/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/rating", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/root/package.json b/src/root/package.json index 7b6f69ccdf..4cd5008c30 100644 --- a/src/root/package.json +++ b/src/root/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap", - "version": "18.1.1", + "version": "18.1.2", "description": "Angular Bootstrap", "author": "Dmitriy Shekhovtsov ", "license": "MIT", diff --git a/src/schematics/package.json b/src/schematics/package.json index 1bcc1fdd4a..2fb67140af 100644 --- a/src/schematics/package.json +++ b/src/schematics/package.json @@ -1,6 +1,6 @@ { "name": "schematics", - "version": "18.1.1", + "version": "18.1.2", "schematics": "./collection.json", "author": "Dmitriy Shekhovtsov ", "license": "MIT" diff --git a/src/schematics/src/utils/current_dependency_versions.json b/src/schematics/src/utils/current_dependency_versions.json index 092ceceb24..47c322c2d5 100644 --- a/src/schematics/src/utils/current_dependency_versions.json +++ b/src/schematics/src/utils/current_dependency_versions.json @@ -1,4 +1,4 @@ { - "NGX_BOOTSTRAP_VERSION": "18.1.1", + "NGX_BOOTSTRAP_VERSION": "18.1.2", "BOOTSTRAP_VERSION": "^5.2.3" } diff --git a/src/sortable/package.json b/src/sortable/package.json index 7595c8a7cd..7bd5818b93 100644 --- a/src/sortable/package.json +++ b/src/sortable/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/sortable", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/tabs/package.json b/src/tabs/package.json index c15d73143f..74e986575b 100644 --- a/src/tabs/package.json +++ b/src/tabs/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/tabs", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/timepicker/package.json b/src/timepicker/package.json index cc2c357e5c..908a5e4554 100644 --- a/src/timepicker/package.json +++ b/src/timepicker/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/timepicker", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/tooltip/package.json b/src/tooltip/package.json index cfec702241..06f4e714b4 100644 --- a/src/tooltip/package.json +++ b/src/tooltip/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/tooltip", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/typeahead/package.json b/src/typeahead/package.json index deb804e7fb..f352e05e24 100644 --- a/src/typeahead/package.json +++ b/src/typeahead/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/typeahead", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" } diff --git a/src/utils/package.json b/src/utils/package.json index 442f87287b..9f1924a89c 100644 --- a/src/utils/package.json +++ b/src/utils/package.json @@ -1,6 +1,6 @@ { "name": "ngx-bootstrap/utils", - "version": "18.1.1", + "version": "18.1.2", "author": "Dmitriy Shekhovtsov ", "license": "MIT" }