@colijnit/corecomponents_v12 12.0.53 → 12.0.56

package/fesm2015/colijnit-corecomponents_v12.js

@@ -5923,7 +5923,6 @@ InputDatePickerComponent.decorators = [
                     [format]="dateFormat"
                     [placeholder]="placeholder"
                     [ngModel]="model"
-                    [readonly]="readonly"
                     (ngModelChange)="modelChange.emit($event)"
     ></ejs-datepicker>
     <div class="required-indicator"></div>
@@ -6009,13 +6008,12 @@ InputDateRangePickerComponent.decorators = [
       [format]="dateFormat"
       [placeholder]="placeholder"
       [ngModel]="model"
-      [(startDate)]="startDate"
-      [(endDate)]="endDate"
-      [readonly]="readonly"
       (ngModelChange)="rangeChange()"
       (close)="close.next($event)"
       (select)="select.next($event)"
       (cleared)="cleared.next($event)"
+      [(startDate)]="startDate"
+      [(endDate)]="endDate"
     ></ejs-daterangepicker>
     <div class="required-indicator"></div>
     <ng-template #validationError></ng-template>
@@ -9182,9 +9180,14 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         }
         this._detectChanges();
     }
-    pageChange(page) {
+    goToPreviousPage() {
+        this.currentPage -= 1;
+    }
+    goToNextPage() {
+        this.currentPage += 1;
+    }
+    setCurrentPage(page) {
         this.currentPage = page;
-        //this.gridBody.nativeElement.scrollTop = 0;
     }
     _detectChanges() {
         this._changeDetection.detectChanges();
@@ -9269,7 +9272,15 @@ SimpleGridComponent.decorators = [
         </tr>
       </tbody>
     </table>
-    <co-pagination *ngIf="data?.length > rowsPerPage" [autoHide]="true" (pageChange)="pageChange($event)"></co-pagination>
+    <co-pagination-bar *ngIf="data?.length > rowsPerPage"
+                       [itemsPerPage]="rowsPerPage"
+                       [currentPage]="currentPage"
+                       [totalItems]="data.length"
+                       [autoHide]="true"
+                       (previousClick)="goToPreviousPage()"
+                       (nextClick)="goToNextPage()"
+                       (pageClick)="setCurrentPage($event)"
+                        ></co-pagination-bar>
   `,
                 providers: [
                     FormMasterService
@@ -9301,6 +9312,7 @@ class PaginationBarComponent {
         this.itemsPerPage = 20;
         this.totalItems = 1;
         this.paginationRange = 8;
+        this.autoHide = false;
         this.previousClick = new EventEmitter();
         this.nextClick = new EventEmitter();
         this.pageClick = new EventEmitter();
@@ -9314,9 +9326,7 @@ class PaginationBarComponent {
         this.pages = this._createPageArray();
     }
     ngOnChanges(changes) {
-        if (changes['currentPage'].currentValue !== changes['currentPage'].previousValue) {
-            this.pages = this._createPageArray();
-        }
+        this.pages = this._createPageArray();
     }
     isOnFirstPage() {
         return this.currentPage === 1;
@@ -9325,15 +9335,27 @@ class PaginationBarComponent {
         return this.pages.length === this.currentPage;
     }
     onPreviousClick() {
-        this.previousClick.emit();
+        if (!this.isOnFirstPage()) {
+            this.previousClick.emit();
+        }
     }
     onNextClick() {
-        this.nextClick.emit();
+        if (!this.isOnLastPage()) {
+            this.nextClick.emit();
+        }
     }
     onPageClick(value) {
         this.currentPage = value;
         this.pageClick.emit(value);
     }
+    shouldBeHidden() {
+        if (!this.autoHide) {
+            return false;
+        }
+        else {
+            return (this.totalItems <= this.itemsPerPage);
+        }
+    }
     // Returns an array of IPage objects to use in the pagination controls.
     _createPageArray() {
         // paginationRange could be a string if passed from attribute, so cast to number.
@@ -9393,14 +9415,14 @@ PaginationBarComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-pagination-bar",
                 template: `
-    <ul class="pagination">
-      <li *ngIf="directionLinks" class="pagination-previous">
+    <ul class="pagination" *ngIf="!shouldBeHidden()">
+      <li *ngIf="directionLinks" class="pagination-previous" [class.disabled]="isOnFirstPage()">
         <a (click)="onPreviousClick()" [class.disabled]="isOnFirstPage()">{{ previousLabel }}</a>
       </li>
       <li *ngFor="let page of pages" [class.current]="currentPage === page.value" (click)="onPageClick(page.value)">
         <span>{{page.label}}</span>
       </li>
-      <li *ngIf="directionLinks" class="pagination-next">
+      <li *ngIf="directionLinks" class="pagination-next" [class.disabled]="isOnLastPage()">
         <a (click)="onNextClick()" [class.disabled]="isOnLastPage()">{{ nextLabel }}</a>
       </li>
     </ul>
@@ -9416,6 +9438,7 @@ PaginationBarComponent.propDecorators = {
     itemsPerPage: [{ type: Input }],
     totalItems: [{ type: Input }],
     paginationRange: [{ type: Input }],
+    autoHide: [{ type: Input }],
     previousClick: [{ type: Output }],
     nextClick: [{ type: Output }],
     pageClick: [{ type: Output }],
@@ -9659,29 +9682,17 @@ class PaginationComponent {
         this.changeSub.unsubscribe();
     }
     goToFirstPage() {
-        if (!this.isOnFirstPage()) {
-            this.setCurrentPage(1);
-        }
+        this.setCurrentPage(1);
     }
     goToPreviousPage() {
-        if (!this.isOnFirstPage()) {
-            this.setCurrentPage(this.getCurrentPage() - 1);
-        }
+        this.setCurrentPage(this.getCurrentPage() - 1);
     }
     goToNextPage() {
-        if (!this.isOnLastPage()) {
-            this.setCurrentPage(this.getCurrentPage() + 1);
-        }
+        this.setCurrentPage(this.getCurrentPage() + 1);
     }
     setCurrentPage(page) {
         this.pageChange.emit(page);
     }
-    isOnFirstPage() {
-        return this.getCurrentPage() === 1;
-    }
-    isOnLastPage() {
-        return this.getLastPage() === this.getCurrentPage();
-    }
     shouldBeHidden() {
         if (!this.autoHide) {
             return false;
@@ -9708,10 +9719,6 @@ class PaginationComponent {
     getCurrentPage() {
         return this._paginationService.getCurrentPage(this.id);
     }
-    getLastPage() {
-        let instance = this._paginationService.getInstance(this.id);
-        return Math.ceil(instance.totalItems / instance.itemsPerPage);
-    }
     /**
      * Checks that the instance.currentPage property is within bounds for the current page range.
      * If not, return a correct value for currentPage, or the current value if OK.
@@ -10048,7 +10055,8 @@ SimpleGridModule.decorators = [
                     InputTextModule,
                     FormModule,
                     ObserveVisibilityModule,
-                    PaginationModule
+                    PaginationModule,
+                    PaginationBarModule
                 ],
                 declarations: [
                     SimpleGridComponent,