Merge remote-tracking branch 'origin/v11.x-beta' into master-SUP-14476

CHANGELOG.md

@@ -5,6 +5,12 @@
 ### Features
 
 * Added official support for Angular 13
+## 11.0.0-beta.2 (2022-12-01)
+
+### Fixes
+
+* Hide close UI element on toast when dismissOnClick is disabled (SUP-14476)
+* Fixed min/max value behavior on number input (SUP-12404)
 
 ## 7.10.3 (2021-02-04)
 

package.json

@@ -106,12 +106,14 @@
     "@types/node": "^16.11.33",
     "@types/sortablejs": "~1.10.6",
     "@types/webpack-env": "~1.15.3",
+    "@types/gulp-sass": "^5.0.0",
     "codelyzer": "^6.0.0",
     "gulp": "^4.0.0",
     "gulp-filter": "~6.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.1.0",
     "gulp-util": "~3.0.8",
+    "gulp-sass": "^5.1.0",
     "highlight.js": "~10.2.0",
     "jasmine-core": "^3.6.0",
     "jasmine-spec-reporter": "^6.0.0",
@@ -127,7 +129,7 @@
     "node-sass-tilde-importer": "^1.0.2",
     "npm": "^6.14.10",
     "protractor": "^7.0.0",
-    "puppeteer": "latest",
+    "puppeteer": "5.5.0",
     "raw-loader": "^1.0.0",
     "sass": "^1.51.0",
     "ts-node": "9.1.1",

src/components/input/input.component.ts

@@ -5,6 +5,7 @@ import {
     ElementRef,
     EventEmitter,
     forwardRef,
+    HostListener,
     Input,
     OnChanges,
     OnInit,
@@ -218,6 +219,18 @@ export class InputField implements AfterViewInit, ControlValueAccessor, OnInit,
         }
     }
 
+    @HostListener('keydown', ['$event'])
+    public onKeyDown(event) {
+        if (this.type === 'number') {
+            const keyboardEvent = event as KeyboardEvent;
+            if ((keyboardEvent.key === '-' && event.target.value) || keyboardEvent.key === '+') {
+                keyboardEvent.preventDefault();
+            } else if (keyboardEvent.key === '-' && !event.target.value) {
+                event.target.value = '-';
+            }
+        }
+    }
+
     onBlur(e: Event): void {
         e.stopPropagation();
         const target = e.target as HTMLInputElement;
@@ -232,6 +245,7 @@ export class InputField implements AfterViewInit, ControlValueAccessor, OnInit,
 
     onInput(e: Event): void {
         const target = e.target as HTMLInputElement;
+        this.updateValue(target);
         const value = this.currentValue = this.normalizeValue(target.value);
         this.onChange(value);
         this.change.emit(value);
@@ -265,4 +279,14 @@ export class InputField implements AfterViewInit, ControlValueAccessor, OnInit,
             return val == null ? '' : String(val);
         }
     }
+
+    private updateValue(target: HTMLInputElement): void {
+        if (this.type === 'number') {
+            if (this.max && Number(target.value) > this.max) {
+                target.value = String(this.max);
+            } else if (this.min && Number(target.value) < this.min) {
+                target.value = String(this.min);
+            }
+        }
+    }
 }

src/components/notification/toast.tpl.html

@@ -4,7 +4,8 @@
      [ngClass]="type"
      (click)="dismiss()"
 >
-    <span class="gtx-toast-btn_close">
+    <span class="gtx-toast-btn_close"
+        [hidden]="!dismissOnClick">
         <icon>close</icon>
     </span>
     <span class="action" *ngIf="actionLabel">