Skip to content

Commit 8baaa90

Browse files
kdinevkdinev
authored
Merge branch 'master' into feat/app-from-image-skill
2 parents 5efeacd + 73ed670 commit 8baaa90

42 files changed

Lines changed: 148 additions & 383 deletions

File tree

Some content is hidden

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

‎angular.json‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"index": "src/index.html",
2424
"polyfills": [
25-
"zone.js"
25+
"zone.js"
2626
],
2727
"tsConfig": "src/tsconfig.app.json",
2828
"assets": [
@@ -31,7 +31,12 @@
3131
"src/web.config"
3232
],
3333
"styles": [
34-
"src/styles/styles.scss"
34+
"src/styles/styles.scss",
35+
{
36+
"input": "src/styles/grid-cell-merging-alternate-theme.scss",
37+
"bundleName": "grid-cell-merging-alternate-theme",
38+
"inject": false
39+
}
3540
],
3641
"scripts": [],
3742
"extractLicenses": false,
@@ -346,11 +351,19 @@
346351
"projects/igniteui-angular-elements/src/styles.scss"
347352
],
348353
"scripts": [
349-
{ "input": "./node_modules/lit-html/lit-html.js", "inject": false },
350-
{ "input": "./node_modules/lit-html/development/directive.js", "inject": false }
354+
{
355+
"input": "./node_modules/lit-html/lit-html.js",
356+
"inject": false
357+
},
358+
{
359+
"input": "./node_modules/lit-html/development/directive.js",
360+
"inject": false
361+
}
351362
],
352363
"stylePreprocessorOptions": {
353-
"includePaths": ["node_modules"]
364+
"includePaths": [
365+
"node_modules"
366+
]
354367
},
355368
"browser": "projects/igniteui-angular-elements/src/main.ts"
356369
},
@@ -382,7 +395,10 @@
382395
],
383396
"outputHashing": "none",
384397
"optimization": true,
385-
"externalDependencies": ["lit", "igniteui-i18n-core"]
398+
"externalDependencies": [
399+
"lit",
400+
"igniteui-i18n-core"
401+
]
386402
},
387403
"development": {
388404
"optimization": false,
@@ -391,8 +407,8 @@
391407
"namedChunks": true
392408
},
393409
"dev-app": {
394-
"browser": "projects/igniteui-angular-elements/src/main.app.ts",
395-
"tsConfig": "projects/igniteui-angular-elements/tsconfig.app.json"
410+
"browser": "projects/igniteui-angular-elements/src/main.app.ts",
411+
"tsConfig": "projects/igniteui-angular-elements/tsconfig.app.json"
396412
}
397413
},
398414
"defaultConfiguration": "production"
@@ -419,7 +435,7 @@
419435
"builder": "@angular/build:karma",
420436
"options": {
421437
"main": "projects/igniteui-angular-elements/src/test.ts",
422-
"polyfills": [
438+
"polyfills": [
423439
"projects/igniteui-angular-elements/src/polyfills.ts"
424440
],
425441
"tsConfig": "projects/igniteui-angular-elements/tsconfig.spec.json",
@@ -433,7 +449,9 @@
433449
"projects/igniteui-angular-elements/src/styles.scss"
434450
],
435451
"stylePreprocessorOptions": {
436-
"includePaths": ["node_modules"]
452+
"includePaths": [
453+
"node_modules"
454+
]
437455
},
438456
"scripts": []
439457
}
@@ -572,7 +590,9 @@
572590
"projects/igniteui-angular-performance/src/styles.scss"
573591
],
574592
"stylePreprocessorOptions": {
575-
"includePaths": ["node_modules"]
593+
"includePaths": [
594+
"node_modules"
595+
]
576596
}
577597
},
578598
"configurations": {

‎projects/igniteui-angular/core/src/core/styles/components/grid/_grid-component.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -458,14 +458,6 @@
458458
@extend %igx-grid__outlet !optional;
459459
}
460460

461-
@include e(loading-outlet) {
462-
@extend %igx-grid__loading-outlet !optional;
463-
}
464-
465-
@include e(row-editing-outlet) {
466-
@extend %igx-grid__row-editing-outlet !optional;
467-
}
468-
469461
@include e(addrow-snackbar) {
470462
@extend %igx-grid__addrow-snackbar !optional;
471463
}

‎projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,7 @@
13721372
}
13731373

13741374
%igx-grid__tr--merged {
1375+
border-bottom: 0;
13751376
border-block-end: 0;
13761377
}
13771378

@@ -2335,35 +2336,6 @@
23352336

23362337
%igx-grid__outlet {
23372338
--ig-size: var(--grid-size);
2338-
2339-
z-index: 10002;
2340-
position: fixed;
2341-
}
2342-
2343-
%igx-grid__loading-outlet {
2344-
width: 100%;
2345-
height: 100%;
2346-
z-index: -1;
2347-
position: absolute;
2348-
2349-
> %overlay-wrapper--modal {
2350-
background: none;
2351-
}
2352-
2353-
%circular-display {
2354-
width: rem(50);
2355-
height: rem(50);
2356-
}
2357-
}
2358-
2359-
%igx-grid__row-editing-outlet {
2360-
z-index: 10000;
2361-
position: absolute;
2362-
2363-
%overlay-wrapper {
2364-
/* Change wrapper position from 'fixed' to 'absolute' so that it is hidden when scrolled below the parent grid body content. */
2365-
position: absolute;
2366-
}
23672339
}
23682340

23692341
%igx-grid__addrow-snackbar {

‎projects/igniteui-angular/core/src/services/overlay/overlay.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,6 @@ export class IgxOverlayService implements OnDestroy {
136136
this._document = this.document;
137137
}
138138

139-
/**
140-
* @param position Preset position settings. Default position is 'center'
141-
* @param outlet The outlet container to attach the overlay to
142-
* @returns Non-modal overlay settings based on Global or Container position strategy and the provided position.
143-
*
144-
* @deprecated in version 21.2.0. The outlet parameter is deprecated. Please provide the container or outlet element through the
145-
* `createAbsoluteOverlaySettings` method when calling `attach` method.
146-
* Creates overlay settings with global or container position strategy and preset position settings
147-
*/
148-
public static createAbsoluteOverlaySettings(
149-
position?: AbsolutePosition, outlet?: IgxOverlayOutletDirective | ElementRef): OverlaySettings;
150139
/**
151140
* Creates overlay settings with global or container position strategy and preset position settings.
152141
*
@@ -159,6 +148,17 @@ export class IgxOverlayService implements OnDestroy {
159148
*/
160149
public static createAbsoluteOverlaySettings(
161150
position?: AbsolutePosition, useContainerStrategy?: boolean): OverlaySettings;
151+
/**
152+
* @param position Preset position settings. Default position is 'center'
153+
* @param outlet The outlet container to attach the overlay to
154+
* @returns Non-modal overlay settings based on Global or Container position strategy and the provided position.
155+
*
156+
* @deprecated in version 21.2.0. The outlet parameter is deprecated. Please provide the container or outlet element through the
157+
* `createAbsoluteOverlaySettings` method when calling `attach` method.
158+
* Creates overlay settings with global or container position strategy and preset position settings
159+
*/
160+
public static createAbsoluteOverlaySettings(
161+
position?: AbsolutePosition, outlet?: IgxOverlayOutletDirective | ElementRef): OverlaySettings;
162162
public static createAbsoluteOverlaySettings(
163163
position?: AbsolutePosition, containerOrOutlet?: IgxOverlayOutletDirective | ElementRef | boolean): OverlaySettings {
164164
const positionSettings = this.createAbsolutePositionSettings(position);

‎projects/igniteui-angular/date-picker/src/date-picker/date-picker.component.spec.ts‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ import { IFormattingViews, IgxCalendarComponent, IgxCalendarHeaderTemplateDirect
99
import { IgxCalendarContainerComponent } from './calendar-container/calendar-container.component';
1010
import { IgxDatePickerComponent } from './date-picker.component';
1111
import {
12-
IgxOverlayOutletDirective,
1312
IgxOverlayService,
1413
OverlayCancelableEventArgs, OverlayClosingEventArgs, OverlayEventArgs, OverlaySettings,
15-
WEEKDAYS,
16-
BaseFormatter,
17-
I18N_FORMATTER
14+
WEEKDAYS
1815
} from 'igniteui-angular/core';
1916
import { ChangeDetectorRef, Component, DebugElement, ElementRef, EventEmitter, Injector, QueryList, Renderer2, ViewChild } from '@angular/core';
2017
import { By } from '@angular/platform-browser';
@@ -1064,7 +1061,6 @@ describe('IgxDatePicker', () => {
10641061
expect(datePicker.isDropdown).toEqual(true);
10651062
expect(datePicker.minValue).toEqual(undefined);
10661063
expect(datePicker.maxValue).toEqual(undefined);
1067-
expect(datePicker.outlet).toEqual(undefined);
10681064
expect(datePicker.specialDates).toEqual(null);
10691065
expect(datePicker.spinDelta).toEqual(undefined);
10701066
expect(datePicker.spinLoop).toEqual(true);
@@ -1152,15 +1148,6 @@ describe('IgxDatePicker', () => {
11521148
expect(datePicker.maxValue).toEqual(today);
11531149
datePicker.maxValue = '12/12/1998';
11541150
expect(datePicker.maxValue).toEqual('12/12/1998');
1155-
datePicker.outlet = null;
1156-
expect(datePicker.outlet).toEqual(null);
1157-
const mockEl: ElementRef = jasmine.createSpyObj<ElementRef>('mockEl', ['nativeElement']);
1158-
datePicker.outlet = mockEl;
1159-
expect(datePicker.outlet).toEqual(mockEl);
1160-
const mockOverlayDirective: IgxOverlayOutletDirective =
1161-
jasmine.createSpyObj<IgxOverlayOutletDirective>('mockEl', ['nativeElement']);
1162-
datePicker.outlet = mockOverlayDirective;
1163-
expect(datePicker.outlet).toEqual(mockOverlayDirective);
11641151
const specialDates: DateRangeDescriptor[] = [{ type: DateRangeType.Weekdays },
11651152
{ type: DateRangeType.Before, dateRange: [today] }];
11661153
datePicker.specialDates = specialDates;
@@ -1286,21 +1273,18 @@ describe('IgxDatePicker', () => {
12861273
datePicker.open();
12871274
expect(overlay.attach).toHaveBeenCalledWith(IgxCalendarContainerComponent, viewsContainerRef, baseDropdownSettings);
12881275
expect(overlay.show).toHaveBeenCalledWith(mockOverlayId);
1289-
const mockOutlet = {} as any;
1290-
datePicker.outlet = mockOutlet;
12911276
datePicker.open();
12921277
expect(overlay.attach).toHaveBeenCalledWith(
12931278
IgxCalendarContainerComponent,
12941279
viewsContainerRef,
1295-
Object.assign({}, baseDropdownSettings, { outlet: mockOutlet }),
1280+
Object.assign({}, baseDropdownSettings),
12961281
);
12971282
expect(overlay.show).toHaveBeenCalledWith(mockOverlayId);
12981283
let mockSettings: OverlaySettings = {
12991284
closeOnEscape: true,
13001285
closeOnOutsideClick: true,
13011286
modal: false
13021287
};
1303-
datePicker.outlet = null;
13041288
datePicker.open(mockSettings);
13051289
expect(overlay.attach).toHaveBeenCalledWith(
13061290
IgxCalendarContainerComponent,

‎projects/igniteui-angular/date-picker/src/date-picker/date-picker.component.ts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
ChangeDetectorRef,
66
Component,
77
ContentChild,
8-
ElementRef,
98
EventEmitter,
109
HostBinding,
1110
HostListener,
@@ -243,25 +242,6 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
243242
@Input()
244243
public spinDelta: Pick<DatePartDeltas, 'date' | 'month' | 'year'>;
245244

246-
/**
247-
* Gets/Sets the container used for the popup element.
248-
* @remarks
249-
* `outlet` is an instance of `IgxOverlayOutletDirective` or an `ElementRef`.
250-
* @example
251-
* ```html
252-
* <div igxOverlayOutlet #outlet="overlay-outlet"></div>
253-
* //..
254-
* <igx-date-picker [outlet]="outlet"></igx-date-picker>
255-
* //..
256-
* ```
257-
*
258-
* @deprecated in version 21.2.0. Overlays now use the HTML Popover API and no longer move to the document
259-
* body by default, so using outlet is also no longer needed - just define the overlay in the intended
260-
* DOM tree position instead.
261-
*/
262-
@Input()
263-
public override outlet: IgxOverlayOutletDirective | ElementRef;
264-
265245
/**
266246
* Gets/Sets the value of `id` attribute.
267247
*

‎projects/igniteui-angular/date-picker/src/date-range-picker/date-range-picker.component.ts‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ import {
3737
DateTimeUtil,
3838
IgxPickerActionsDirective,
3939
isDateInRanges,
40-
PickerCalendarOrientation,
41-
IgxOverlayOutletDirective
40+
PickerCalendarOrientation
4241
} from 'igniteui-angular/core';
4342
import { IgxCalendarContainerComponent } from '../date-picker/calendar-container/calendar-container.component';
4443
import { PickerBaseDirective } from '../date-picker/picker-base.directive';
@@ -364,26 +363,6 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
364363
@Input()
365364
public override placeholder = '';
366365

367-
/**
368-
* Gets/Sets the container used for the popup element.
369-
*
370-
* @remarks
371-
* `outlet` is an instance of `IgxOverlayOutletDirective` or an `ElementRef`.
372-
* @example
373-
* ```html
374-
* <div igxOverlayOutlet #outlet="overlay-outlet"></div>
375-
* //..
376-
* <igx-date-range-picker [outlet]="outlet"></igx-date-range-picker>
377-
* //..
378-
* ```
379-
*
380-
* @deprecated in version 21.2.0. Overlays now use the HTML Popover API and no longer move to the document
381-
* body by default, so using outlet is also no longer needed - just define the overlay in the intended
382-
* DOM tree position instead.
383-
*/
384-
@Input()
385-
public override outlet: IgxOverlayOutletDirective | ElementRef<any>;
386-
387366
/**
388367
* Show/hide week numbers
389368
*

‎projects/igniteui-angular/directives/src/directives/toggle/toggle.directive.spec.ts‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
55
import { IgxToggleActionDirective, IgxToggleDirective } from './toggle.directive';
66

77
import { first } from 'rxjs/operators';
8-
import { AbsoluteScrollStrategy, AutoPositionStrategy, CancelableEventArgs, ConnectedPositioningStrategy, HorizontalAlignment, IgxOverlayOutletDirective, IgxOverlayService, OffsetMode, OverlaySettings } from 'igniteui-angular/core';
8+
import { AbsoluteScrollStrategy, AutoPositionStrategy, CancelableEventArgs, ConnectedPositioningStrategy, HorizontalAlignment, IgxOverlayService, OffsetMode, OverlaySettings } from 'igniteui-angular/core';
99

1010
describe('IgxToggle', () => {
1111
const HIDDEN_TOGGLER_CLASS = 'igx-toggle--hidden';
@@ -15,7 +15,6 @@ describe('IgxToggle', () => {
1515
imports: [
1616
NoopAnimationsModule,
1717
IgxToggleActionTestComponent,
18-
IgxToggleOutletComponent,
1918
IgxToggleServiceInjectComponent,
2019
IgxOverlayServiceComponent,
2120
IgxToggleTestComponent,
@@ -610,29 +609,6 @@ describe('IgxToggle', () => {
610609
expect(toggle.closing.emit).toHaveBeenCalledWith({ id: '0', owner: toggle, cancel: false, event: new Event('click') });
611610
expect(toggle.closed.emit).toHaveBeenCalledTimes(1);
612611
}));
613-
614-
it('should pass IgxOverlayOutletDirective input from IgxToggleActionDirective', () => {
615-
const fixture = TestBed.createComponent(IgxToggleOutletComponent);
616-
const outlet = fixture.debugElement.query(By.css('.outlet-container')).nativeElement;
617-
const toggleSpy = spyOn(IgxToggleDirective.prototype, 'toggle');
618-
const button = fixture.debugElement.query(By.directive(IgxToggleActionDirective)).nativeElement;
619-
fixture.detectChanges();
620-
621-
const settings: OverlaySettings = {
622-
target: button,
623-
positionStrategy: jasmine.any(ConnectedPositioningStrategy) as any,
624-
closeOnOutsideClick: true,
625-
modal: false,
626-
scrollStrategy: jasmine.any(AbsoluteScrollStrategy) as any,
627-
outlet: jasmine.any(IgxOverlayOutletDirective) as any,
628-
excludeFromOutsideClick: [button]
629-
};
630-
631-
fixture.componentInstance.toggleAction.onClick();
632-
expect(IgxToggleDirective.prototype.toggle).toHaveBeenCalledWith(settings);
633-
const directive = toggleSpy.calls.mostRecent().args[0].outlet as IgxOverlayOutletDirective;
634-
expect(directive.nativeElement).toBe(outlet);
635-
});
636612
});
637613
});
638614

@@ -678,16 +654,6 @@ export class IgxToggleActionTestComponent {
678654
}
679655
}
680656

681-
@Component({
682-
template: `
683-
<button type="button" [igxToggleAction]="toggleRef" [overlaySettings]="{}" [igxToggleOutlet]="outlet"></button>
684-
<div igxToggle #toggleRef="toggle"></div>
685-
<div igxOverlayOutlet #outlet="overlay-outlet" class="outlet-container"></div>
686-
`,
687-
imports: [IgxToggleActionDirective, IgxToggleDirective, IgxOverlayOutletDirective]
688-
})
689-
export class IgxToggleOutletComponent extends IgxToggleActionTestComponent { }
690-
691657
@Component({
692658
template: `
693659
<button type="button" igxToggleAction="toggleID">Open/Close Toggle</button>

0 commit comments

Comments
 (0)