Skip to content

Commit ecfca96

Browse files
committed
Merge remote-tracking branch 'origin/master' into dpetev/control-flow
2 parents 3fa058c + 067f5d9 commit ecfca96

File tree

16 files changed

+129
-57
lines changed

16 files changed

+129
-57
lines changed

projects/igniteui-angular-elements/src/themes/light/fluent.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $palette: igx.$light-fluent-palette;
77

88
@include igx.core();
99
@include igx.typography($font-family: igx.$fluent-typeface, $type-scale: igx.$fluent-type-scale);
10-
@include igx.fluent-light-theme($palette: $palette, $exclude: vars.$unused-themes);
1110

1211
@include util.elements-theme(
1312
$palette: $palette,

projects/igniteui-angular/migrations/update-19_1_0/changes/theme-changes.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@
114114
"owner": "time-picker-theme",
115115
"remove": true,
116116
"type": "property"
117+
},
118+
{
119+
"name": "$palette",
120+
"owner": "color-classes",
121+
"remove": true,
122+
"type": "property"
117123
}
118124
]
119125
}

projects/igniteui-angular/migrations/update-19_1_0/index.spec.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,26 @@ describe(`Update to ${version}`, () => {
3636
);
3737
});
3838
});
39+
40+
it('should remove the $palette property from the color-classes mixin', async () => {
41+
const testFilePath = `/testSrc/appPrefix/component/test.component.scss`;
42+
43+
appTree.create(
44+
testFilePath,
45+
`@include color-classes(
46+
$palette: $some-palette,
47+
$prop: 'color',
48+
$prefix: 'bg'
49+
);`
50+
);
51+
52+
const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
53+
54+
expect(tree.readContent(testFilePath)).toEqual(
55+
`@include color-classes(
56+
$prop: 'color',
57+
$prefix: 'bg'
58+
);`
59+
);
60+
});
3961
});

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@ import {
77
} from '@angular/core';
88
import { IgxRippleDirective } from '../directives/ripple/ripple.directive';
99
import { CheckboxBaseDirective } from './checkbox-base.directive';
10-
import { IBaseEventArgs } from '../core/utils';
1110
import { ControlValueAccessor } from '@angular/forms';
1211
import { EditorProvider, EDITOR_PROVIDER } from '../core/edit-provider';
1312

14-
export interface IChangeCheckboxEventArgs extends IBaseEventArgs {
15-
checked: boolean;
16-
value?: any;
17-
}
1813
/**
1914
* Allows users to make a binary choice for a certain condition.
2015
*
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { type LabelPosition, IChangeCheckboxEventArgs } from "./checkbox-base.directive";
2+
export * from "./checkbox.component";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
(opened)="handleOpened()" (closed)="handleClosed()">
4444
@if (displaySearchInput) {
4545
<div class="igx-combo__search">
46-
<igx-input-group>
46+
<igx-input-group type="line">
4747
<input igxInput #searchInput name="searchInput" autocomplete="off" type="text"
4848
[(ngModel)]="searchValue" (ngModelChange)="handleInputChange($event)" (keyup)="handleKeyUp($event)"
4949
(keydown)="handleKeyDown($event)" (focus)="dropdown.onBlur($event)" [attr.placeholder]="getSearchPlaceholderText()"

projects/igniteui-angular/src/lib/core/styles/components/icon-button/_icon-button-theme.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@
369369
content: '';
370370
inset: 0;
371371
box-shadow: inset 0 0 0 rem(1px) var-get($outlined-theme, 'border-color');
372-
z-index: -1;
373372
border-radius: inherit;
374373
}
375374

projects/igniteui-angular/src/lib/directives/button/button.directive.ts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import {
77
Output,
88
Renderer2,
99
booleanAttribute,
10-
AfterContentInit
10+
AfterContentInit,
11+
OnDestroy
1112
} from '@angular/core';
1213
import { mkenum } from '../../core/utils';
1314
import { IBaseEventArgs } from '../../core/utils';
@@ -46,7 +47,7 @@ export type IgxButtonType = typeof IgxButtonType[keyof typeof IgxButtonType];
4647
selector: '[igxButton]',
4748
standalone: true
4849
})
49-
export class IgxButtonDirective extends IgxButtonBaseDirective implements AfterContentInit {
50+
export class IgxButtonDirective extends IgxButtonBaseDirective implements AfterContentInit, OnDestroy {
5051
private static ngAcceptInputType_type: IgxButtonType | '';
5152

5253
/**
@@ -92,6 +93,12 @@ export class IgxButtonDirective extends IgxButtonBaseDirective implements AfterC
9293
*/
9394
private _selected = false;
9495

96+
private emitSelected() {
97+
this.buttonSelected.emit({
98+
button: this
99+
});
100+
}
101+
95102
/**
96103
* Gets or sets whether the button is selected.
97104
* Mainly used in the IgxButtonGroup component and it will have no effect if set separately.
@@ -121,11 +128,11 @@ export class IgxButtonDirective extends IgxButtonBaseDirective implements AfterC
121128
}
122129

123130
public ngAfterContentInit() {
124-
this.nativeElement.addEventListener('click', () => {
125-
this.buttonSelected.emit({
126-
button: this
127-
});
128-
});
131+
this.nativeElement.addEventListener('click', this.emitSelected.bind(this));
132+
}
133+
134+
public ngOnDestroy(): void {
135+
this.nativeElement.removeEventListener('click', this.emitSelected);
129136
}
130137

131138
/**

projects/igniteui-angular/src/lib/directives/radio/radio-group.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { startWith, takeUntil } from 'rxjs/operators';
1010
import { mkenum } from '../../core/utils';
1111
import { IgxRadioComponent } from '../../radio/radio.component';
1212
import { IgxDirectionality } from '../../services/direction/directionality';
13-
import { IChangeCheckboxEventArgs } from '../../checkbox/checkbox.component';
13+
import { IChangeCheckboxEventArgs } from '../../checkbox/public_api';
1414

1515
/**
1616
* Determines the Radio Group alignment

projects/igniteui-angular/src/lib/grids/common/crud.service.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -684,12 +684,13 @@ export class IgxGridCRUDService extends IgxRowAddCrudState {
684684
return;
685685
}
686686
this.endEdit(true, event);
687-
688-
if (parentRow != null && this.grid.expansionStates.get(parentRow.key)) {
689-
this.grid.collapseRow(parentRow.key);
687+
// work with copy of original row, since context may change on collapse.
688+
const parentRowCopy = parentRow ? Object.assign(copyDescriptors(parentRow), parentRow) : null;
689+
if (parentRowCopy != null && this.grid.expansionStates.get(parentRowCopy.key)) {
690+
this.grid.collapseRow(parentRowCopy.key);
690691
}
691692

692-
this.createAddRow(parentRow, asChild);
693+
this.createAddRow(parentRowCopy, asChild);
693694

694695
this.grid.transactions.startPending();
695696
if (this.addRowParent.isPinned) {

0 commit comments

Comments
 (0)