Skip to content

Commit 3f3f04a

Browse files
authored
Merge branch '10.0.x' into didimmova/dataviz-exclude-themes-10.0.x
2 parents 925f4e7 + 504c60c commit 3f3f04a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+393
-216
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ All notable changes for each version of this project will be documented in this
2727
### General
2828
- `igxGrid`
2929
- **Behavioral Change** - Group rows now display the group column's header name instead of field when one is available.
30+
- Each grid now expose a default handling for boolean column types. The column will display `check` or `close` icon, instead of true/false by default.
3031
- `igx-select`, `igx-combo`, `igx-drop-down`
31-
- **Behavioral Change** - The select, combo, and dropdown items now have display block and text-overflow ellipsis enabled by default.
32+
- **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.
3233
- `IgxTransaction` - The `onStateUpdate` now emits with information of its origin. The emitted value is of type `StateUpdateEvent`, which has two properties:
3334
- `origin` - it can vary within the values of the `TransactionEventOrigin` interface;
3435
- `actions` - contains information about the transactions, that caused the emission of the event.
@@ -43,6 +44,12 @@ All notable changes for each version of this project will be documented in this
4344
- `IgxSelect` support for `igxHint` directive added.
4445
- Allows the user to add `igxHint` to be displayed bellow the input element.
4546

47+
## 9.1.9
48+
49+
### New Features
50+
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
51+
- Expose a setter for grid's `outlet` property, which can be used to set the outlet used to attach the grid's overlays to.
52+
4653
## 9.1.4
4754

4855
### New Features

package-lock.json

Lines changed: 3 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,13 @@
5353
"@angular/platform-browser-dynamic": "^10.0.0",
5454
"@angular/router": "^10.0.0",
5555
"@types/hammerjs": "^2.0.36",
56-
"@types/jszip": "^3.4.1",
5756
"@types/source-map": "0.5.2",
5857
"classlist.js": "^1.1.20150312",
5958
"core-js": "^2.6.11",
6059
"core-js-pure": "^3.6.5",
6160
"hammerjs": "^2.0.8",
6261
"igniteui-trial-watermark": "^1.0.3",
63-
"jszip": "^3.4.0",
62+
"jszip": "^3.5.0",
6463
"resize-observer-polyfill": "^1.5.1",
6564
"rxjs": "^6.5.4",
6665
"tslib": "^2.0.0",

projects/igniteui-angular/ng-package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
},
88
"whitelistedNonPeerDependencies": [
99
"@types/hammerjs",
10-
"@types/jszip",
1110
"core-js-pure",
1211
"hammerjs",
1312
"jszip",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
},
1010
"whitelistedNonPeerDependencies": [
1111
"@types/hammerjs",
12-
"@types/jszip",
1312
"core-js-pure",
1413
"hammerjs",
1514
"jszip",

projects/igniteui-angular/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,9 @@
6767
],
6868
"dependencies": {
6969
"@types/hammerjs": "^2.0.36",
70-
"@types/jszip": "^3.1.7",
7170
"core-js-pure": "^3.6.5",
7271
"hammerjs": "^2.0.8",
73-
"jszip": "^3.3.0",
72+
"jszip": "^3.5.0",
7473
"tslib": "^2.0.0",
7574
"resize-observer-polyfill": "^1.5.1",
7675
"igniteui-trial-watermark": "^1.0.3"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
2828
{ name: 'tslib', target: PackageTarget.NONE },
2929
{ name: 'resize-observer-polyfill', target: PackageTarget.REGULAR },
3030
{ name: '@types/hammerjs', target: PackageTarget.DEV },
31-
{ name: '@types/jszip', target: PackageTarget.DEV },
3231
{ name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
3332
{ name: 'core-js-pure', target: PackageTarget.NONE },
3433
// peerDependencies

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,11 +637,11 @@ describe('igxCombo', () => {
637637
expect(inputGroupElement.classList.contains(CSS_CLASS_INPUTGROUP)).toBeTruthy();
638638
expect(inputGroupElement.classList.contains('igx-input-group--box')).toBeTruthy();
639639
expect(inputGroupElement.classList.contains('igx-input-group--placeholder')).toBeTruthy();
640-
expect(inputGroupElement.childElementCount).toEqual(2);
640+
expect(inputGroupElement.childElementCount).toEqual(3);
641641

642642
const inputGroupWrapper = inputGroupElement.children[0];
643643
expect(inputGroupWrapper.classList.contains(CSS_CLASS_INPUTGROUP_WRAPPER)).toBeTruthy();
644-
expect(inputGroupWrapper.childElementCount).toEqual(2);
644+
expect(inputGroupWrapper.childElementCount).toEqual(1);
645645

646646
const inputGroupBundle = inputGroupWrapper.children[0];
647647
expect(inputGroupBundle.classList.contains(CSS_CLASS_INPUTGROUP_BUNDLE)).toBeTruthy();
@@ -660,7 +660,7 @@ describe('igxCombo', () => {
660660
expect(dropDownButton.classList.contains(CSS_CLASS_TOGGLEBUTTON)).toBeTruthy();
661661
expect(dropDownButton.childElementCount).toEqual(1);
662662

663-
const inputGroupBorder = inputGroupWrapper.children[1];
663+
const inputGroupBorder = inputGroupElement.children[1];
664664
expect(inputGroupBorder.classList.contains(CSS_CLASS_INPUTGROUP_BORDER)).toBeTruthy();
665665
expect(inputGroupBorder.childElementCount).toEqual(0);
666666

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,9 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
874874
onInputClick(event: Event) {
875875
event.stopPropagation();
876876
event.preventDefault();
877-
this.toggle();
877+
if (!this.disabled) {
878+
this.toggle();
879+
}
878880
}
879881

880882
/**

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,13 @@
187187
box-shadow: --var($theme, 'shadow');
188188
transition: $transition;
189189
border-radius: --var($theme, 'border-radius');
190+
191+
button {
192+
// The margin here is required to fix a bug in Safari #7858
193+
margin-top: 0;
194+
margin-#{$right}: 0;
195+
margin-bottom: 0;
196+
}
190197
}
191198

192199
%igx-group-item {

0 commit comments

Comments
 (0)