Merge branch '10.0.x' into ibarakov/fix-7379-10.0.x

Author: DiyanDimitrov

CHANGELOG.md

@@ -28,7 +28,7 @@ All notable changes for each version of this project will be documented in this
 - `igxGrid`
     - **Behavioral Change** - Group rows now display the group column's header name instead of field when one is available.
 - `igx-select`, `igx-combo`, `igx-drop-down`
-    - **Behavioral Change** - The select, combo, and dropdown items now have display block and text-overflow ellipsis enabled by default.
+    - **Behavioral Change** - The select, combo, and dropdown items now have display block and text-overflow ellipsis enabled by default. This requires styling to be handled on the application-level if there is something more than a simple text in the item.
 - `IgxTransaction` - The `onStateUpdate` now emits with information of its origin. The emitted value is of type `StateUpdateEvent`, which has two properties:
     - `origin` - it can vary within the values of the `TransactionEventOrigin` interface;
     - `actions` - contains information about the transactions, that caused the emission of the event.

package-lock.json

@@ -53,14 +53,13 @@
     "@angular/platform-browser-dynamic": "^10.0.0",
     "@angular/router": "^10.0.0",
     "@types/hammerjs": "^2.0.36",
-    "@types/jszip": "^3.4.1",
     "@types/source-map": "0.5.2",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.6.11",
     "core-js-pure": "^3.6.5",
     "hammerjs": "^2.0.8",
     "igniteui-trial-watermark": "^1.0.3",
-    "jszip": "^3.4.0",
+    "jszip": "^3.5.0",
     "resize-observer-polyfill": "^1.5.1",
     "rxjs": "^6.5.4",
     "tslib": "^2.0.0",

package.json

@@ -7,7 +7,6 @@
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
-      "@types/jszip",
       "core-js-pure",
       "hammerjs",
       "jszip",

projects/igniteui-angular/ng-package.json

@@ -9,7 +9,6 @@
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
-      "@types/jszip",
       "core-js-pure",
       "hammerjs",
       "jszip",

projects/igniteui-angular/ng-package.prod.json

@@ -67,10 +67,9 @@
     ],
     "dependencies": {
         "@types/hammerjs": "^2.0.36",
-        "@types/jszip": "^3.1.7",
         "core-js-pure": "^3.6.5",
         "hammerjs": "^2.0.8",
-        "jszip": "^3.3.0",
+        "jszip": "^3.5.0",
         "tslib": "^2.0.0",
         "resize-observer-polyfill": "^1.5.1",
         "igniteui-trial-watermark": "^1.0.3"

projects/igniteui-angular/package.json

@@ -28,7 +28,6 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
         { name: 'tslib', target: PackageTarget.NONE },
         { name: 'resize-observer-polyfill', target: PackageTarget.REGULAR },
         { name: '@types/hammerjs', target: PackageTarget.DEV },
-        { name: '@types/jszip', target: PackageTarget.DEV },
         { name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
         { name: 'core-js-pure', target: PackageTarget.NONE },
         // peerDependencies

projects/igniteui-angular/schematics/utils/dependency-handler.ts

@@ -2461,6 +2461,13 @@ describe('igxCombo', () => {
                 expect(combo.valid).toEqual(IgxComboState.INITIAL);
                 expect(combo.comboInput.valid).toEqual(IgxInputState.INITIAL);
             });
+            it('should not open on click if combo is disabled', () => {
+                combo.disabled = true;
+                fixture.detectChanges();
+                UIInteractions.simulateClickEvent(combo.comboInput.nativeElement);
+                fixture.detectChanges();
+                expect(combo.dropdown.collapsed).toBeTruthy();
+            });
             it('should be possible to be enabled/disabled when used as a form control', () => {
                 const form = fixture.componentInstance.reactiveForm;
                 const comboFormReference = form.controls.townCombo;

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

@@ -874,7 +874,9 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
     onInputClick(event: Event) {
         event.stopPropagation();
         event.preventDefault();
-        this.toggle();
+        if (!this.disabled) {
+            this.toggle();
+        }
     }
 
     /**

projects/igniteui-angular/src/lib/combo/combo.component.ts

@@ -195,7 +195,7 @@
         background: --var($theme, 'item-background');
         min-width: $group-item-min-width;
         display: flex;
-        flex: 1 0 0%;
+        flex: 1 0 auto;
         justify-content: center;
         align-items: center;
         text-decoration: none;