@colijnit/corecomponents_v12 260.1.15 → 260.1.17

package/fesm2015/colijnit-corecomponents_v12.js

@@ -1835,7 +1835,7 @@ CommitButtonsComponent.decorators = [
                 <svg class="checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52" *ngIf="firstShow || commitFinished">
                     <path class="checkmark-check" [class.first-show]="firstShow" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8"/></svg>
             </div>
-            <div class="commit-buttons-button cancel" (click)="cancelClick.emit($event)">
+            <div class="commit-buttons-button cancel" (mousedown)="$event.preventDefault()" (click)="cancelClick.emit($event)">
                 <div class="cancel-button"></div>
             </div>
         </div>
@@ -1907,8 +1907,8 @@ class BaseInputComponent {
         this.excludeUserModelChange = false;
         this.noFormGroupControl = false;
         this.keepFocus = false;
-        this.canceled = false;
         this.validationError = '';
+        this.shouldCommit = true;
         this._markedAsUserTouched = false;
         this._destroyed = false;
         this._hasOnPushCdStrategy = false;
@@ -2207,8 +2207,7 @@ class BaseInputComponent {
         this.input = undefined;
     }
     cancelClick(event) {
-        this.canceled = true;
-        this.conditionResolver(this.canceled);
+        this.shouldCommit = false;
         this.keepFocus = true;
         if (this._initialModelSet) {
             this.model = this._initialModel;
@@ -2262,20 +2261,9 @@ class BaseInputComponent {
         }
         this.focus.next();
     }
-    waitForCancelCondition() {
-        return new Promise((resolve) => {
-            this.conditionResolver = resolve; // Save the resolver to be called later
-        });
-    }
     doBlur(event, handleCommit = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cancelTimeout = new Promise(resolve => setTimeout(resolve, 300));
-            const result = yield Promise.race([this.waitForCancelCondition(), cancelTimeout]);
-            // If canceled
-            if (result) {
-                return;
-            }
-            if (this.showSaveCancel && handleCommit && this._modelDirtyForCommit) {
+            if (this.showSaveCancel && handleCommit && this._modelDirtyForCommit && this.shouldCommit) {
                 yield this._handleCommit(event, false);
             }
             setTimeout(() => {
@@ -2411,6 +2399,7 @@ class BaseInputComponent {
                 return true;
             }
             this.keepFocus = true;
+            this.shouldCommit = true;
             if (this._commitButtonsComponentRef) {
                 this._commitButtonsComponentRef.instance.commitFinished = false;
                 this._commitButtonsComponentRef.instance.committing = true;
@@ -5253,12 +5242,18 @@ var FilterItemMode;
     // It's value will be passed along directly as a boolean.
     FilterItemMode["Checkbox"] = "checkbox";
     //This mode makes the Filter display a simple checkBox.
-    // It's value will be passed along as either a 'T' or and 'F'.
+    // It's value will be passed along as either a 'J' or and 'N'.
     FilterItemMode["CheckboxToSimpleText"] = "checkboxToSimpleText";
     //This mode makes the Filter display a simple checkBox.
-    // It's value will be passed along as either a "?='T'" or and "?='F'".
+    // It's value will be passed along as either a "?='J'" or and "?='N'".
     FilterItemMode["CheckboxToText"] = "checkboxToText";
     //This mode makes the Filter display a simple checkBox.
+    // It's value will be passed along as either a 'T' or and 'F'.
+    FilterItemMode["CheckboxToTFSimpleText"] = "checkboxToTFSimpleText";
+    //This mode makes the Filter display a simple checkBox.
+    // It's value will be passed along as either a "?='T'" or and "?='F'".
+    FilterItemMode["CheckboxToTFText"] = "checkboxToTFText";
+    //This mode makes the Filter display a simple checkBox.
     // It's value will be passed along as either a 1 or and 0.
     FilterItemMode["CheckboxToBinary"] = "checkboxToBinary";
 })(FilterItemMode || (FilterItemMode = {}));
@@ -5909,6 +5904,8 @@ class InputTextComponent extends BaseInputComponent {
     }
     clearInput(event) {
         this.setModel(null);
+        this.keepFocus = true;
+        this.shouldCommit = false;
         this.clearIconClick.emit(event);
     }
     handleKeyDownInput(event) {
@@ -11755,58 +11752,58 @@ class ListOfValuesComponent extends BaseInputComponent {
 ListOfValuesComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-list-of-values',
-                template: `
-      <co-input-text
-              *ngIf="!largeCollection"
-              aria-haspopup="listbox"
-              [attr.aria-expanded]="isSelectOpen"
-              aria-controls="lov-popup"
-              role="combobox"
-              class="no-focus-line"
-              overlayParent
-              #parentForOverlay="overlayParent"
-              type="text"
-              [id]="label"
-              [model]="multiselect ? selectedModels : selectedModel"
-              [placeholder]="label"
-              [myFormInputInstance]="this"
-              [readonly]="readonly"
-              [disabled]="disabled"
-              [required]="required"
-              [noClickFocus]="false"
-              [leftIconData]=" model && model[optionIcon] ? iconCacheService.getIcon(model[optionIcon]) : leftIconData"
-              [rightIcon]="isSelectOpen ? icons.ChevronUpRegular : icons.ChevronDownRegular"
-              [showClearButton]="true"
-              [useContent]="multiselect"
-              [customHeight]="multiselect"
-              [keepFocussed]="keepFocussed"
-              (modelChange)="handleInputModelChange($event)"
-              (click)="openPopup()"
-              (rightIconClick)="toggleSelect()"
-              (keydown)="handleInputKeyDown($event)"
-              (clearIconClick)="clearModel($event)"
-              (blur)="checkModel()">
-          <ng-container *ngIf="multiselect && showChips">
-              <div class="multiselect-chips-wrapper">
-                  <div class="chips" *ngFor="let chip of model">
-                      <span class="chips-description" [textContent]="chip[displayField]"></span>
-                      <co-icon class="remove-chip-icon" [icon]="icons.CrossSkinny" (click)="removeOptionFromModel(chip)"></co-icon>
-                  </div>
-              </div>
-          </ng-container>
-      </co-input-text>
-
-      <co-input-text
-              *ngIf="largeCollection"
-              [model]="filterText"
-              [placeholder]="label"
-              [required]="required"
-              [disabled]="disabled"
-              [readonly]="readonly"
-              (modelChange)="onModelChange($event)">
-      </co-input-text>
-      <div *ngIf="isLoading" class="filter-loader"><span></span></div>
-      <input type="hidden" [ngModel]="model">
+                template: `
+      <co-input-text
+              *ngIf="!largeCollection"
+              aria-haspopup="listbox"
+              [attr.aria-expanded]="isSelectOpen"
+              aria-controls="lov-popup"
+              role="combobox"
+              class="no-focus-line"
+              overlayParent
+              #parentForOverlay="overlayParent"
+              type="text"
+              [id]="label"
+              [model]="multiselect ? ((!selectedModels || selectedModels.length === 0) ? null : selectedModels ) : selectedModel"
+              [placeholder]="label"
+              [myFormInputInstance]="this"
+              [readonly]="readonly"
+              [disabled]="disabled"
+              [required]="required"
+              [noClickFocus]="false"
+              [leftIconData]=" model && model[optionIcon] ? iconCacheService.getIcon(model[optionIcon]) : leftIconData"
+              [rightIcon]="isSelectOpen ? icons.ChevronUpRegular : icons.ChevronDownRegular"
+              [showClearButton]="true"
+              [useContent]="multiselect"
+              [customHeight]="multiselect"
+              [keepFocussed]="keepFocussed"
+              (modelChange)="handleInputModelChange($event)"
+              (click)="openPopup()"
+              (rightIconClick)="toggleSelect()"
+              (keydown)="handleInputKeyDown($event)"
+              (clearIconClick)="clearModel($event)"
+              (blur)="checkModel()">
+          <ng-container *ngIf="multiselect && showChips">
+              <div class="multiselect-chips-wrapper">
+                  <div class="chips" *ngFor="let chip of model">
+                      <span class="chips-description" [textContent]="chip[displayField]"></span>
+                      <co-icon class="remove-chip-icon" [icon]="icons.CrossSkinny" (click)="removeOptionFromModel(chip)"></co-icon>
+                  </div>
+              </div>
+          </ng-container>
+      </co-input-text>
+
+      <co-input-text
+              *ngIf="largeCollection"
+              [model]="filterText"
+              [placeholder]="label"
+              [required]="required"
+              [disabled]="disabled"
+              [readonly]="readonly"
+              (modelChange)="onModelChange($event)">
+      </co-input-text>
+      <div *ngIf="isLoading" class="filter-loader"><span></span></div>
+      <input type="hidden" [ngModel]="(selectedModels && selectedModels.length) || selectedModel ? model : null">
   `,
                 providers: [
                     OverlayService,
@@ -12609,10 +12606,18 @@ class FilterItemComponent {
                 this.showButton = true;
                 this._createModelForCheckboxToText();
                 break;
+            case this.modes.CheckboxToTFText:
+                this.showButton = true;
+                this._createModelForCheckboxToTFText();
+                break;
             case this.modes.CheckboxToSimpleText:
                 this.showButton = true;
                 this._createModelForCheckboxToSimpleText();
                 break;
+            case this.modes.CheckboxToTFSimpleText:
+                this.showButton = true;
+                this._createModelForCheckboxToTFSimpleText();
+                break;
             case this.modes.CheckboxToBinary:
                 this.showButton = true;
                 this._createModelForCheckboxToBinary();
@@ -12736,6 +12741,10 @@ class FilterItemComponent {
             case this.modes.CheckboxToSimpleText:
                 this._readModelForCheckboxToText(newModel);
                 break;
+            case this.modes.CheckboxToTFText:
+            case this.modes.CheckboxToTFSimpleText:
+                this._readModelForCheckboxToTFText(newModel);
+                break;
             case this.modes.CheckboxToBinary:
                 this._readModelForCheckboxToBinary(newModel);
                 break;
@@ -12840,6 +12849,14 @@ class FilterItemComponent {
             this._model = "?='N'";
         }
     }
+    _createModelForCheckboxToTFText() {
+        if (this.checkBoxToTextModel) {
+            this._model = "?='T'";
+        }
+        else {
+            this._model = "?='F'";
+        }
+    }
     _createModelForCheckboxToSimpleText() {
         if (this.checkBoxToTextModel) {
             this._model = "J";
@@ -12848,6 +12865,14 @@ class FilterItemComponent {
             this._model = "N";
         }
     }
+    _createModelForCheckboxToTFSimpleText() {
+        if (this.checkBoxToTextModel) {
+            this._model = "T";
+        }
+        else {
+            this._model = "F";
+        }
+    }
     _createModelForCheckboxToBinary() {
         if (this.checkBoxToTextModel) {
             this._model = 1;
@@ -12965,6 +12990,15 @@ class FilterItemComponent {
             this.checkBoxToTextModel = false;
         }
     }
+    _readModelForCheckboxToTFText(checkboxToTextModel) {
+        this._model = checkboxToTextModel;
+        if (checkboxToTextModel !== undefined && checkboxToTextModel !== null) {
+            this.checkBoxToTextModel = (checkboxToTextModel.indexOf('T') > -1);
+        }
+        else {
+            this.checkBoxToTextModel = false;
+        }
+    }
     _readModelForCheckboxToBinary(checkboxToBinary) {
         this._model = checkboxToBinary;
         if (checkboxToBinary !== undefined && checkboxToBinary !== null) {
@@ -13085,12 +13119,20 @@ class FilterItemComponent {
     }
     _applyDefaultForCheckboxToText() {
         const defaultString = this.defaultValue.toString().toUpperCase();
-        this.checkBoxToTextModel = (defaultString === 'J' || defaultString === 'Y' || defaultString === 'TRUE');
-        if (this.mode === this.modes.CheckboxToText) {
-            this._createModelForCheckboxToText();
-        }
-        else {
-            this._createModelForCheckboxToSimpleText();
+        this.checkBoxToTextModel = (defaultString === 'J' || defaultString === 'T' || defaultString === 'Y' || defaultString === 'TRUE');
+        switch (this.mode) {
+            case this.modes.CheckboxToText:
+                this._createModelForCheckboxToText();
+                break;
+            case this.modes.CheckboxToSimpleText:
+                this._createModelForCheckboxToSimpleText();
+                break;
+            case this.modes.CheckboxToTFText:
+                this._createModelForCheckboxToTFText();
+                break;
+            case this.modes.CheckboxToTFSimpleText:
+                this._createModelForCheckboxToTFSimpleText();
+                break;
         }
         this.modelChange.emit(this._model);
         this.showButton = true;
@@ -13195,6 +13237,8 @@ class FilterItemComponent {
                 break;
             case this.modes.CheckboxToText:
             case this.modes.CheckboxToSimpleText:
+            case this.modes.CheckboxToTFText:
+            case this.modes.CheckboxToTFSimpleText:
                 this._applyDefaultForCheckboxToText();
                 break;
             case this.modes.CheckboxToBinary:
@@ -13348,7 +13392,7 @@ FilterItemComponent.decorators = [
               </co-input-checkbox>
             </div>
             <div class="co-filter-item-checkbox-content"
-                 *ngIf="mode === modes.CheckboxToText || mode === modes.CheckboxToSimpleText || mode === modes.CheckboxToBinary">
+                 *ngIf="mode === modes.CheckboxToText || mode === modes.CheckboxToSimpleText || mode === modes.CheckboxToBinary || mode === modes.CheckboxToTFSimpleText || mode === modes.CheckboxToTFText">
               <co-input-checkbox
                 [(model)]="checkBoxToTextModel"
                 (modelChange)="handleModelChange($event)"
@@ -14509,7 +14553,7 @@ class ScreenConfigurationDirective {
             if (myCfgObj) {
                 this._setHostVisible(myCfgObj.immediatelyVisible());
                 if (!this.screenConfigNativeElement) {
-                    this.hostComponent.required = myCfgObj.isRequired();
+                    this.hostComponent.required = this.hostComponent.required || myCfgObj.isRequired();
                     this.hostComponent.readonly = this.hostComponent.forceReadonly || this._moduleInReadonlyMode() || myCfgObj.isReadonly();
                     this.hostComponent.decimals = myCfgObj.scale;
                     this.hostComponent.maxLength = myCfgObj.maxLength;