18-1-3-release-candidate (#6695)

* fix(datepicker): fixed infinite cycle behavior

* fix(modal): fix for issue-6683 body is scrollable if you close just one modal

* fix(modal): fix for issue-6683 body is scrollable if you close just one modal

* fix(modal): issue-6675 animation and issue-6547

* fix(modal): nested modals backdrop added

* 18.1.3

* chore(versions): version bump

* fix(datepicker): quick ranges button is not selected with maxDate (#6670) (#6698)

Co-authored-by: Dmytro Danylov <[email protected]>

* fix(docs): fixed typo in import

---------

Co-authored-by: Dmytro Danylov <[email protected]>

apps/ngx-bootstrap-docs/src/assets/css/style.scss

@@ -994,6 +994,10 @@ footer {
   border-radius: 4px;
 }
 
+.modal-backdrop ~ .modal + .modal {
+  background-color: rgba(0,0,0,0.5);
+}
+
 /*Imported adaptive styles*/
 @import "adaptive";
 

apps/ngx-bootstrap-docs/src/assets/json/current-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "18.1.2"
+  "version": "18.1.3"
 }

libs/doc-pages/dropdown/src/lib/docs/usage.md

@@ -1,7 +1,7 @@
 ### Standalone component usage
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
-import { BsDropdownModule } from 'ngx-bootstrap/datepicker';
+import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 
 @Components({
   standalone: true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap-base",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "license": "MIT",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "schematics": "./schematics/src/collection.json",

src/accordion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/accordion",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/alert/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/alert",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/buttons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/buttons",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/carousel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/carousel",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/chronos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/chronos",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/collapse/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/collapse",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/component-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/component-loader",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/datepicker/bs-datepicker-input.directive.ts

@@ -158,13 +158,13 @@ export class BsDatepickerInputDirective implements ControlValueAccessor, Validat
       if (this._picker && this._picker.minDate && isBefore(_value, this._picker.minDate, 'date')) {
         this.writeValue(this._picker.minDate);
 
-        return { bsDate: { minDate: this._picker.minDate } };
+        return this._picker.ignoreMinMaxErrors ? null : { bsDate: { minDate: this._picker.minDate } };
       }
 
       if (this._picker && this._picker.maxDate && isAfter(_value, this._picker.maxDate, 'date')) {
         this.writeValue(this._picker.maxDate);
 
-        return { bsDate: { maxDate: this._picker.maxDate } };
+        return this._picker.ignoreMinMaxErrors ? null : { bsDate: { maxDate: this._picker.maxDate } };
       }
     }
 
@@ -194,7 +194,6 @@ export class BsDatepickerInputDirective implements ControlValueAccessor, Validat
     }
 
     this._picker.bsValue = this._value;
-    this._onChange(this._value);
   }
 
   setDisabledState(isDisabled: boolean): void {

src/datepicker/bs-datepicker.component.ts

@@ -72,6 +72,10 @@ export class BsDatepickerDirective implements OnInit, OnDestroy, OnChanges, Afte
    * Maximum date which is available for selection
    */
   @Input() maxDate?: Date;
+  /**
+   * Ignore validation errors when you reset to minDate or maxDate
+   */
+  @Input() ignoreMinMaxErrors?: boolean;
   /**
    * Minimum view mode : day, month, or year
    */

src/datepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/datepicker",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/dropdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/dropdown",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/focus-trap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/focus-trap",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/locale/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/locale",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/mini-ngrx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/mini-ngrx",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/modal/bs-modal.service.ts

@@ -42,7 +42,7 @@ export class BsModalService {
   protected backdropRef?: ComponentRef<ModalBackdropComponent>;
   private _backdropLoader: ComponentLoader<ModalBackdropComponent>;
   private modalsCount = 0;
-  private lastHiddenId: number | string | undefined = 0;
+  private lastHiddenId: number | string | null | undefined = null;
   private lastDismissReason?: string;
 
   private loaders: ComponentLoader<ModalContainerComponent>[] = [];
@@ -69,6 +69,7 @@ export class BsModalService {
   ): BsModalRef<T> {
     this._focusEl = document.activeElement;
     this.modalsCount++;
+    this.lastHiddenId = null;
     this._createLoaders();
 
     // must be different per every show() call
@@ -146,7 +147,7 @@ export class BsModalService {
       .provide({ provide: BsModalRef, useValue: bsModalRef })
       .attach(ModalContainerComponent)
       .to('body');
-    bsModalRef.hide = () => this.hide(bsModalRef.id);
+    bsModalRef.hide = () => modalContainerRef.instance?.hide();
     bsModalRef.setClass = (newClass: string) => {
       if (modalContainerRef.instance) {
         modalContainerRef.instance.config.class = newClass;

src/modal/modal-container.component.ts

@@ -165,10 +165,11 @@ export class ModalContainerComponent implements OnInit, OnDestroy {
     );
     setTimeout(() => {
       this.isShown = false;
+      this.bsModalService?.hide(this.config.id);
       if (
         document &&
         document.body &&
-        this.bsModalService?.getModalsCount() === 1
+        this.bsModalService?.getModalsCount() === 0
       ) {
         this._renderer.removeClass(document.body, CLASS_NAME.OPEN);
         this._renderer.setStyle(document.body, 'overflow-y', '');

src/modal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/modal",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/pagination/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/pagination",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/popover/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/popover",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/positioning/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/positioning",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/progressbar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/progressbar",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/rating/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/rating",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/root/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "description": "Angular Bootstrap",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT",

src/schematics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "schematics",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "schematics": "./collection.json",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"

src/schematics/src/utils/current_dependency_versions.json

@@ -1,4 +1,4 @@
 {
-  "NGX_BOOTSTRAP_VERSION": "18.1.2",
+  "NGX_BOOTSTRAP_VERSION": "18.1.3",
   "BOOTSTRAP_VERSION": "^5.2.3"
 }

src/sortable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/sortable",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/tabs",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/timepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/timepicker",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/tooltip/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/tooltip",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/typeahead/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/typeahead",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }

src/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/utils",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT"
 }