Skip to content

Commit f07cf6a

Browse files
authored
Merge branch 'master' into nrobakova/refactor-treeGrid-KyeboardNav-tests
2 parents b0f5a4d + 8ca9c0e commit f07cf6a

36 files changed

+4205
-6309
lines changed

gulpfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ function typedocBuildExportFn(cb) {
184184
}
185185

186186
function typedocImportJsonFn(cb) {
187-
spawnSync('typedoc', [TYPEDOC.PROJECT_PATH, "--generate-from-json", TYPEDOC.EXPORT_JSON_PATH],
187+
spawnSync('typedoc', [TYPEDOC.PROJECT_PATH, "--generate-from-json", TYPEDOC.EXPORT_JSON_PATH, "--warns"],
188188
{ stdio: 'inherit', shell: true});
189189
cb();
190190
}
@@ -206,6 +206,7 @@ function typedocBuildDocsJA (cb) {
206206
slash(path.join(__dirname, 'i18nRepo', 'typedoc', 'ja')),
207207
'--templateStrings',
208208
TYPEDOC.TEMPLATE_STRINGS_PATH,
209+
'--warns',
209210
'--localize',
210211
'jp'], { stdio: 'inherit', shell: true });
211212

package-lock.json

Lines changed: 3 additions & 3 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"ts-node": "~7.0.1",
116116
"tslint": "~5.12.1",
117117
"typedoc": "^0.16.9",
118-
"typedoc-plugin-localization": "^1.6.1",
118+
"typedoc-plugin-localization": "^2.2.0",
119119
"typescript": "~3.7.5",
120120
"webpack-sources": "1.3.0"
121121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ export class IgxCalendarComponent extends IgxMonthPickerBaseDirective implements
316316
/**
317317
* Sets the header template.
318318
*
319-
* @example
319+
* @example
320320
* ```html
321321
* <igx-calendar headerTemplateDirective = "igxCalendarHeader"></igx-calendar>
322322
* ```

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

Lines changed: 1904 additions & 2994 deletions
Large diffs are not rendered by default.

projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@
303303
overflow: hidden;
304304
outline-style: none;
305305
border-radius: --var($theme, 'border-radius');
306+
min-height: 300px;
307+
min-width: 300px;
306308
}
307309

308310
%igx-carousel-slide {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,7 @@
852852
%grid-mrl-block {
853853
display: grid;
854854
background: inherit;
855+
position: relative;
855856

856857
%grid-thead-item {
857858
display: flex;

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_toast.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ $_bootstrap-toast: extend(
5656
(
5757
variant: 'bootstrap',
5858
background: #fff,
59+
60+
text-color: (
61+
igx-color: ('grays', 600)
62+
)
5963
)
6064
);
6165

projects/igniteui-angular/src/lib/core/utils.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,14 @@ export const enum KEYCODES {
139139
RIGHT_ARROW = 39,
140140
DOWN_ARROW = 40,
141141
F2 = 113,
142-
TAB = 9
142+
TAB = 9,
143+
CTRL = 17,
144+
Z = 90,
145+
Y = 89,
146+
X = 88,
147+
BACKSPACE = 8,
148+
DELETE = 46,
149+
INPUT_METHOD = 229
143150
}
144151

145152
/**

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, ViewChild, ElementRef } from '@angular/core';
22
import { async, fakeAsync, TestBed, tick, flush, ComponentFixture } from '@angular/core/testing';
3-
import { FormsModule, FormGroup, FormBuilder, FormControl, ReactiveFormsModule} from '@angular/forms';
3+
import { FormsModule, FormGroup, FormBuilder, FormControl, ReactiveFormsModule } from '@angular/forms';
44
import { By } from '@angular/platform-browser';
55
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
66
import { IgxDatePickerComponent, IgxDatePickerModule } from './date-picker.component';
@@ -206,7 +206,7 @@ describe('IgxDatePicker', () => {
206206
expect(input).toEqual(document.activeElement);
207207
}));
208208

209-
it('When a modal datepicker is closed via outside click, the focus should remain on the input',
209+
it('When a modal datepicker is closed via outside click, the focus should remain on the input',
210210
fakeAsync(() => {
211211
const datePickerDom = fixture.debugElement.query(By.css('igx-date-picker'));
212212
let overlayToggle = document.getElementsByClassName('igx-overlay__wrapper--modal');
@@ -230,7 +230,7 @@ describe('IgxDatePicker', () => {
230230
expect(input).toEqual(document.activeElement);
231231
}));
232232

233-
it('When datepicker is closed upon selecting a date, the focus should remain on the input',
233+
it('When datepicker is closed upon selecting a date, the focus should remain on the input',
234234
fakeAsync(() => {
235235
const datePickerDom = fixture.debugElement.query(By.css('igx-date-picker'));
236236
let overlayToggle = document.getElementsByClassName('igx-overlay__wrapper--modal');
@@ -939,7 +939,6 @@ describe('IgxDatePicker', () => {
939939

940940
// initial input value is 20-10-11 / dd-MM-yy
941941
// focus the day part, position the caret at the beginning
942-
input.nativeElement.focus();
943942
input.nativeElement.setSelectionRange(0, 0);
944943

945944
// press arrow up
@@ -984,7 +983,6 @@ describe('IgxDatePicker', () => {
984983

985984
// initial input value is 20-10-11 / dd-MM-yy
986985
// focus the day part, position the caret at the beginning
987-
input.nativeElement.focus();
988986
input.nativeElement.setSelectionRange(0, 0);
989987

990988
// press arrow down
@@ -1036,7 +1034,6 @@ describe('IgxDatePicker', () => {
10361034

10371035
// initial input value is 20-10-11 / dd-MM-yy
10381036
// focus the day part, position the caret at the beginning
1039-
input.nativeElement.focus();
10401037
input.nativeElement.setSelectionRange(0, 0);
10411038

10421039
// up
@@ -1149,7 +1146,8 @@ describe('IgxDatePicker', () => {
11491146
expect(input).toBeDefined();
11501147
datePicker.isSpinLoop = false;
11511148

1152-
input.nativeElement.focus();
1149+
input.triggerEventHandler('focus', {});
1150+
fixture.detectChanges(); // bound transformedDate assign
11531151
UIInteractions.sendInput(input, '31-03-19');
11541152
expect(input.nativeElement.value).toBe('31-03-19');
11551153

0 commit comments

Comments
 (0)