@colijnit/corecomponents_v12 256.1.9 → 256.1.11

package/bundles/colijnit-corecomponents_v12.umd.js

@@ -2278,7 +2278,8 @@
             this.excludeUserModelChange = false;
             this.noFormGroupControl = false;
             this.keepFocus = false;
-            this.validationError = "";
+            this.canceled = false;
+            this.validationError = '';
             this._markedAsUserTouched = false;
             this._destroyed = false;
             this._hasOnPushCdStrategy = false;
@@ -2685,6 +2686,8 @@
             this.input = undefined;
         };
         BaseInputComponent.prototype.cancelClick = function (event) {
+            this.canceled = true;
+            this.conditionResolver(this.canceled);
             this.keepFocus = true;
             if (this._initialModelSet) {
                 this.model = this._initialModel;
@@ -2737,19 +2740,34 @@
             }
             this.focus.next();
         };
+        BaseInputComponent.prototype.waitForCancelCondition = function () {
+            var _this = this;
+            return new Promise(function (resolve) {
+                _this.conditionResolver = resolve; // Save the resolver to be called later
+            });
+        };
         BaseInputComponent.prototype.doBlur = function (event, handleCommit) {
             if (handleCommit === void 0) { handleCommit = true; }
             return __awaiter(this, void 0, void 0, function () {
+                var cancelTimeout, result;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            if (!(this.showSaveCancel && handleCommit && this._modelDirtyForCommit)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this._handleCommit(event, false)];
+                            cancelTimeout = new Promise(function (resolve) { return setTimeout(resolve, 300); });
+                            return [4 /*yield*/, Promise.race([this.waitForCancelCondition(), cancelTimeout])];
                         case 1:
-                            _a.sent();
-                            _a.label = 2;
+                            result = _a.sent();
+                            // If canceled
+                            if (result) {
+                                return [2 /*return*/];
+                            }
+                            if (!(this.showSaveCancel && handleCommit && this._modelDirtyForCommit)) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this._handleCommit(event, false)];
                         case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3:
                             setTimeout(function () {
                                 if (_this.keepFocus || _this.keepFocussed) {
                                     if (event) {
@@ -3070,12 +3088,12 @@
             });
         };
         BaseInputComponent.prototype._createNewFocusEvent = function (element) {
-            var eventType = "onfocusin" in element ? "focusin" : "focus", bubbles = "onfocusin" in element, focusEvent;
-            if ("createEvent" in document) {
-                focusEvent = document.createEvent("Event");
+            var eventType = 'onfocusin' in element ? 'focusin' : 'focus', bubbles = 'onfocusin' in element, focusEvent;
+            if ('createEvent' in document) {
+                focusEvent = document.createEvent('Event');
                 focusEvent.initEvent(eventType, bubbles, true);
             }
-            else if ("Event" in window) {
+            else if ('Event' in window) {
                 focusEvent = new Event(eventType, { bubbles: bubbles, cancelable: true });
             }
             return focusEvent;
@@ -3100,7 +3118,7 @@
         return BaseInputComponent;
     }());
     BaseInputComponent.BaseFormInputComponentIndex = 0;
-    BaseInputComponent.HiddenClass = "hidden";
+    BaseInputComponent.HiddenClass = 'hidden';
     BaseInputComponent.decorators = [
         { type: i0.Directive },
         { type: i0.Injectable }
@@ -3114,7 +3132,7 @@
         { type: i0.ElementRef, decorators: [{ type: i0.Optional }] }
     ]; };
     BaseInputComponent.propDecorators = {
-        validationErrorContainer: [{ type: i0.ViewChild, args: ["validationError", { read: i0.ViewContainerRef },] }],
+        validationErrorContainer: [{ type: i0.ViewChild, args: ['validationError', { read: i0.ViewContainerRef },] }],
         _ngModel: [{ type: i0.ViewChild, args: [forms.NgModel, { static: true },] }],
         showSaveCancel: [{ type: i0.Input }],
         model: [{ type: i0.Input }],
@@ -3132,11 +3150,11 @@
         forceRequired: [{ type: i0.Input }],
         validators: [{ type: i0.Input }],
         asyncValidators: [{ type: i0.Input }],
-        hidden: [{ type: i0.Input }, { type: i0.HostBinding, args: ["class." + BaseInputComponent.HiddenClass,] }],
+        hidden: [{ type: i0.Input }, { type: i0.HostBinding, args: ['class.' + BaseInputComponent.HiddenClass,] }],
         decimals: [{ type: i0.Input }],
         icon: [{ type: i0.Input }],
         customCssClass: [{ type: i0.Input }],
-        redErrorBackground: [{ type: i0.Input }, { type: i0.HostBinding, args: ["class.cc-red-error-background",] }],
+        redErrorBackground: [{ type: i0.Input }, { type: i0.HostBinding, args: ['class.cc-red-error-background',] }],
         myFormInputInstance: [{ type: i0.Input }],
         commitOnBlur: [{ type: i0.Input }],
         nativeBlur: [{ type: i0.Output }],
@@ -3148,29 +3166,29 @@
         modelChange: [{ type: i0.Output }],
         userModelChange: [{ type: i0.Output }],
         hiddenChange: [{ type: i0.Output }],
-        focused: [{ type: i0.HostBinding, args: ["class.cc-input-focused",] }],
-        formInput: [{ type: i0.HostBinding, args: ["class.form-input",] }],
-        customWidth: [{ type: i0.Input }, { type: i0.HostBinding, args: ["class.custom-width",] }],
+        focused: [{ type: i0.HostBinding, args: ['class.cc-input-focused',] }],
+        formInput: [{ type: i0.HostBinding, args: ['class.form-input',] }],
+        customWidth: [{ type: i0.Input }, { type: i0.HostBinding, args: ['class.custom-width',] }],
         customHeight: [{ type: i0.Input }, { type: i0.HostBinding, args: ['class.custom-height',] }],
         noTriangleGraphic: [{ type: i0.Input }],
         keepFocussed: [{ type: i0.Input }],
-        halfWidth: [{ type: i0.Input }, { type: i0.HostBinding, args: ["class.half-width",] }],
-        fullWidth: [{ type: i0.Input }, { type: i0.HostBinding, args: ["class.full-width-important",] }],
+        halfWidth: [{ type: i0.Input }, { type: i0.HostBinding, args: ['class.half-width',] }],
+        fullWidth: [{ type: i0.Input }, { type: i0.HostBinding, args: ['class.full-width-important',] }],
         excludeUserModelChange: [{ type: i0.Input }],
         noFormGroupControl: [{ type: i0.Input }],
-        formSubmitted: [{ type: i0.HostBinding, args: ["class.form-submitted",] }],
-        hasNoLabel: [{ type: i0.HostBinding, args: ["class.hasnolabel",] }],
-        hasValue: [{ type: i0.HostBinding, args: ["class.hasvalue",] }],
-        invalid: [{ type: i0.HostBinding, args: ["class.invalid",] }],
-        isDisabled: [{ type: i0.HostBinding, args: ["class.disabled",] }],
-        isReadonly: [{ type: i0.HostBinding, args: ["class.read-only",] }],
-        isRequired: [{ type: i0.HostBinding, args: ["class.required",] }],
-        touchedInvalid: [{ type: i0.HostBinding, args: ["class.cc-touched-invalid",] }],
-        valid: [{ type: i0.HostBinding, args: ["class.valid",] }],
-        validationDisabled: [{ type: i0.HostBinding, args: ["class.no-validation",] }],
-        onClick: [{ type: i0.HostListener, args: ["click", ["$event"],] }],
-        onFocusIn: [{ type: i0.HostListener, args: ["focusin",] }],
-        handleKeyDown: [{ type: i0.HostListener, args: ["keydown", ["$event"],] }]
+        formSubmitted: [{ type: i0.HostBinding, args: ['class.form-submitted',] }],
+        hasNoLabel: [{ type: i0.HostBinding, args: ['class.hasnolabel',] }],
+        hasValue: [{ type: i0.HostBinding, args: ['class.hasvalue',] }],
+        invalid: [{ type: i0.HostBinding, args: ['class.invalid',] }],
+        isDisabled: [{ type: i0.HostBinding, args: ['class.disabled',] }],
+        isReadonly: [{ type: i0.HostBinding, args: ['class.read-only',] }],
+        isRequired: [{ type: i0.HostBinding, args: ['class.required',] }],
+        touchedInvalid: [{ type: i0.HostBinding, args: ['class.cc-touched-invalid',] }],
+        valid: [{ type: i0.HostBinding, args: ['class.valid',] }],
+        validationDisabled: [{ type: i0.HostBinding, args: ['class.no-validation',] }],
+        onClick: [{ type: i0.HostListener, args: ['click', ['$event'],] }],
+        onFocusIn: [{ type: i0.HostListener, args: ['focusin',] }],
+        handleKeyDown: [{ type: i0.HostListener, args: ['keydown', ['$event'],] }]
     };
     __decorate([
         InputBoolean()