Merge branch 'master' into pagination-text-consist

Author: Akshat55

src/file-uploader/file-uploader.component.ts

@@ -231,6 +231,9 @@ export class FileUploader implements ControlValueAccessor {
 	onDragOver(event) {
 		event.stopPropagation();
 		event.preventDefault();
+		if (this.disabled) {
+			return;
+		}
 		this.dragOver = true;
 	}
 
@@ -243,6 +246,9 @@ export class FileUploader implements ControlValueAccessor {
 	onDrop(event) {
 		event.stopPropagation();
 		event.preventDefault();
+		if (this.disabled) {
+			return;
+		}
 
 		const transferredFiles: Array<File> = Array.from(event.dataTransfer.files);
 		const newFiles = new Set<FileItem>(this.files);

src/layer/layer.directive.ts

@@ -23,16 +23,19 @@ export class LayerDirective implements AfterContentInit {
 	/**
 	 * @deprecated as of v5 - Use `cdsLayer` input property instead
 	 */
-	@Input() set ibmLayer(level: 0 | 1 | 2) {
+	@Input() set ibmLayer(level: 0 | 1 | 2 | "") {
 		this.cdsLayer = level;
 	}
 
 	/**
 	 * Override layer level
+	 * Empty string has been added as an option for Angular 16+ to resolve type errors
 	 */
-	@Input() set cdsLayer(level: 0 | 1 | 2) {
-		this._passedLevel = level;
-		this.layer = level;
+	@Input() set cdsLayer(level: 0 | 1 | 2 | "") {
+		if (typeof(level) === "number") {
+			this._passedLevel = level;
+			this.layer = level;
+		}
 	}
 
 	get cdsLayer() {