Skip to content

Commit 0ba76be

Browse files
ChronosSFChronosSF
authored
Merge branch 'master' into mkirova/tbody-size-refactor
2 parents 66887d4 + b248b4c commit 0ba76be

File tree

7 files changed

+263
-203
lines changed

7 files changed

+263
-203
lines changed

‎projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@
114114
$not-material-theme: $variant != 'material';
115115

116116
$card-heading-padding: rem(16px, 16px);
117-
$card-content-padding: rem(16px);
118-
$card-actions-padding: rem(8px);
119117

120118
$card-tgroup-margin: 0 em(16px);
121119

@@ -159,7 +157,7 @@
159157
%igx-card-header {
160158
display: flex;
161159
flex-flow: row wrap;
162-
align-content: flex-start;
160+
align-items: center;
163161
width: 100%;
164162
padding: $card-heading-padding;
165163
color: var-get($theme, 'header-text-color');
@@ -168,10 +166,6 @@
168166
display: block;
169167
padding: 0;
170168
}
171-
172-
@if $variant == 'fluent' {
173-
padding: rem(16px) rem(8px);
174-
}
175169
}
176170

177171
%igx-card-header--vertical {
@@ -195,7 +189,6 @@
195189
}
196190

197191
%igx-card-header-thumbnail {
198-
align-self: flex-start;
199192
margin-inline-end: rem(16px);
200193

201194
@if $variant == 'indigo' {
@@ -235,7 +228,7 @@
235228
%igx-card-content {
236229
display: block;
237230
width: 100%;
238-
padding: $card-content-padding;
231+
padding: rem(16px);
239232
color: var-get($theme, 'content-text-color');
240233
overflow: auto;
241234
}
@@ -259,6 +252,14 @@
259252
}
260253

261254
%igx-card-actions {
255+
$card-actions-padding: map.get((
256+
'material': rem(8px) rem(16px),
257+
'fluent': rem(8px) rem(16px),
258+
'bootstrap': rem(16px),
259+
'indigo': rem(16px),
260+
), $variant);
261+
262+
262263
display: flex;
263264
flex-flow: row wrap;
264265
justify-content: space-between;
@@ -283,29 +284,26 @@
283284

284285
@if $variant == 'bootstrap' {
285286
%igx-card-content {
286-
@if $variant == 'bootstrap' {
287-
padding-block: rem(16px) rem(24px);
288-
padding-inline: rem(24px);
289-
}
290-
}
291-
292-
%igx-card-actions {
293-
padding: rem(16px);
287+
padding-block-end: rem(24px);
294288
}
295289
}
296290

297291
@if $variant == 'indigo' {
298-
%igx-card-content,
299-
%igx-card-actions {
300-
padding: rem(16px);
292+
%igx-card-content {
293+
padding-block-end: rem(8px);
294+
}
295+
296+
%igx-card-content:last-child {
297+
padding-block-end: rem(16px);
301298
}
302299

303-
%igx-card-content + %igx-card-actions {
304-
padding-block-start: rem(8px);
300+
%igx-card-header {
301+
padding-block-end: 0;
305302
}
306303

307-
%igx-card-header + %igx-card-content {
308-
padding-block-start: 0;
304+
%igx-card-header:last-child,
305+
%igx-card-header:first-child {
306+
padding-block-end: rem(16px);
309307
}
310308
}
311309

‎projects/igniteui-angular/src/lib/core/styles/components/query-builder/_query-builder-theme.scss‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,18 +486,31 @@
486486
--ig-body-2-text-transform: unset;
487487

488488
padding-inline: rem(32px);
489-
489+
490490
color: color($color: 'gray', $variant: if($theme-variant == 'light', 600, 900));
491491
border: rem(1px) dashed color($color: 'gray', $variant: if($theme-variant == 'light', 600, 300));
492492
background: transparent;
493493
}
494494
}
495-
495+
496496
%filter-tree__expression-item-keyboard-ghost {
497497
.igx-chip__item {
498498
box-shadow: var(--ghost-shadow);
499499
background: var(--ghost-background);
500+
color: var(--focus-text-color);
500501
}
502+
503+
.igx-chip:hover {
504+
.igx-chip__item {
505+
box-shadow: var(--ghost-shadow);
506+
background: var(--ghost-background);
507+
color: var(--focus-text-color);
508+
509+
@if $variant == 'indigo' {
510+
border-color: var(--border-color);
511+
}
512+
}
513+
}
501514
}
502515

503516
%filter-tree__expression-column {

‎projects/igniteui-angular/src/lib/query-builder/query-builder-functions.spec.ts‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -934,4 +934,71 @@ export class QueryBuilderFunctions {
934934

935935
return [dropGhost, prevElement, nextElement, newChipContents];
936936
}
937+
938+
public static verifyGhostPositionOnMouseDrag(fix: ComponentFixture<any>, draggedChip: any, X: number, Y: number, moveDown: boolean) {
939+
const ghostPositionVisits: boolean[] = [false, false, false, false, false, false, false, false];
940+
const draggedChipCenter = QueryBuilderFunctions.getElementCenter(draggedChip.chipArea.nativeElement);
941+
const dragDir = draggedChip.dragDirective;
942+
943+
//pickup chip
944+
dragDir.onPointerDown({ pointerId: 1, pageX: draggedChipCenter.X, pageY: draggedChipCenter.Y });
945+
fix.detectChanges();
946+
947+
//trigger ghost
948+
QueryBuilderFunctions.dragMove(dragDir, draggedChipCenter.X + 10, draggedChipCenter.Y + 10);
949+
fix.detectChanges();
950+
951+
spyOn(dragDir.ghostElement, 'dispatchEvent').and.callThrough();
952+
953+
let target = moveDown ? 350 : 0;
954+
let shift = moveDown ? 1 : -1
955+
//Drag ghost up or down and check if drop ghost is rendered in the expected positions
956+
for (let i = moveDown ? 0 : 350; moveDown ? i <= target : i >= target; i += shift) {
957+
Y += moveDown ? 1 : -1;
958+
959+
QueryBuilderFunctions.dragMove(dragDir, X, Y);
960+
tick();
961+
fix.detectChanges();
962+
963+
const [dropGhost, prevElement, nextElement] = QueryBuilderFunctions.getDropGhostAndItsSiblings(fix);
964+
965+
if (i < 40 && !ghostPositionVisits[0]) {
966+
if (i <= 42) tick(50);
967+
if (!dropGhost) ghostPositionVisits[0] = true;
968+
}
969+
970+
if (i > 35 && i < 122 && !ghostPositionVisits[1]) {
971+
if (dropGhost && !prevElement && nextElement == 'OrderName Equals foo') ghostPositionVisits[1] = true;
972+
}
973+
974+
if (i > 120 && i < 165 && !ghostPositionVisits[2]) {
975+
if (dropGhost && prevElement == 'OrderName Equals foo' && nextElement === 'or OrderName Ends With a OrderDate Today') ghostPositionVisits[2] = true;
976+
}
977+
978+
if (i > 166 && i < 201 && !ghostPositionVisits[3]) {
979+
if (dropGhost && !prevElement && nextElement == 'OrderName Ends With a') ghostPositionVisits[3] = true;
980+
}
981+
982+
if (i > 202 && i < 241 && !ghostPositionVisits[4]) {
983+
if (dropGhost && prevElement == 'OrderName Ends With a' && nextElement === 'OrderDate Today') ghostPositionVisits[4] = true;
984+
}
985+
986+
if (i > 240 && i < 273 && !ghostPositionVisits[5]) {
987+
if (dropGhost && prevElement == 'OrderDate Today' && !nextElement) ghostPositionVisits[5] = true;
988+
}
989+
990+
if (i > 256 && i < 316 && !ghostPositionVisits[6]) {
991+
if (X > 400 || (dropGhost && prevElement == 'or OrderName Ends With a OrderDate Today' && !nextElement)) ghostPositionVisits[6] = true;
992+
}
993+
994+
if (i > 320 && !ghostPositionVisits[7]) {
995+
if (i >= 340) tick(50);
996+
if (!dropGhost) ghostPositionVisits[7] = true;
997+
}
998+
}
999+
1000+
//When dragged to the end, check results
1001+
expect(ghostPositionVisits).not.toContain(false,
1002+
`Ghost was not rendered on position(s) ${ghostPositionVisits.reduce((arr, e, ix) => ((e == false) && arr.push(ix), arr), []).toString()}`);
1003+
}
9371004
}

‎projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts‎

Lines changed: 14 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2511,88 +2511,24 @@ describe('IgxQueryBuilder', () => {
25112511
expect(chipComponents[1].nativeElement.getBoundingClientRect().height).toBe(0);
25122512
});
25132513

2514-
xit('Should render drop ghost properly when mouse dragged.', fakeAsync(() => {
2514+
it('Should render drop ghost properly when mouse dragged down on the left.', fakeAsync(() => {
25152515
const draggedChip = chipComponents[1].componentInstance;
2516-
const draggedChipCenter = QueryBuilderFunctions.getElementCenter(draggedChip.chipArea.nativeElement);
2517-
const dragDir = draggedChip.dragDirective;
2518-
2519-
let X = 100, Y = 75;
2520-
2521-
//pickup chip
2522-
dragDir.onPointerDown({ pointerId: 1, pageX: draggedChipCenter.X, pageY: draggedChipCenter.Y });
2523-
fix.detectChanges();
2524-
2525-
//trigger ghost
2526-
QueryBuilderFunctions.dragMove(dragDir, draggedChipCenter.X + 10, draggedChipCenter.Y + 10);
2527-
fix.detectChanges();
2528-
2529-
spyOn(dragDir.ghostElement, 'dispatchEvent').and.callThrough();
2530-
2531-
const ghostPositionVisits: boolean[] = [false, false, false, false, false, false, false, false]
2532-
2533-
let i = 0, pass = 1, inc = 1;
2534-
2535-
//Drag ghost up and down four times and check if drop ghost is rendered in the expected positions
2536-
while (pass <= 4) {
2537-
i += inc;
2538-
Y += inc;
2539-
2540-
QueryBuilderFunctions.dragMove(dragDir, X, Y);
2541-
tick();
2542-
fix.detectChanges();
2543-
2544-
const [dropGhost, prevElement, nextElement] = QueryBuilderFunctions.getDropGhostAndItsSiblings(fix);
2545-
2546-
if (i < 40 && !ghostPositionVisits[0]) {
2547-
if (i <= 42) tick(50);
2548-
if (!dropGhost) ghostPositionVisits[0] = true;
2549-
}
2550-
2551-
if (i > 35 && i < 122 && !ghostPositionVisits[1]) {
2552-
if (dropGhost && !prevElement && nextElement == 'OrderName Equals foo') ghostPositionVisits[1] = true;
2553-
}
2554-
2555-
if (i > 120 && i < 165 && !ghostPositionVisits[2]) {
2556-
if (dropGhost && prevElement == 'OrderName Equals foo' && nextElement === 'or OrderName Ends With a OrderDate Today') ghostPositionVisits[2] = true;
2557-
}
2558-
2559-
if (i > 166 && i < 201 && !ghostPositionVisits[3]) {
2560-
if (dropGhost && !prevElement && nextElement == 'OrderName Ends With a') ghostPositionVisits[3] = true;
2561-
}
2562-
2563-
if (i > 202 && i < 241 && !ghostPositionVisits[4]) {
2564-
if (dropGhost && prevElement == 'OrderName Ends With a' && nextElement === 'OrderDate Today') ghostPositionVisits[4] = true;
2565-
}
2566-
2567-
if (i > 240 && i < 273 && !ghostPositionVisits[5]) {
2568-
if (dropGhost && prevElement == 'OrderDate Today' && !nextElement) ghostPositionVisits[5] = true;
2569-
}
2570-
2571-
if (i > 256 && i < 316 && !ghostPositionVisits[6]) {
2572-
if (pass > 2 || (dropGhost && prevElement == 'or OrderName Ends With a OrderDate Today' && !nextElement)) ghostPositionVisits[6] = true;
2573-
}
2574-
2575-
if (i > 320 && !ghostPositionVisits[7]) {
2576-
if (i >= 340) tick(50);
2577-
if (!dropGhost) ghostPositionVisits[7] = true;
2578-
}
2579-
2580-
//When dragged to the end, check results and reverse direction for next pass
2581-
if (i === 350 || i === 0) {
2582-
expect(ghostPositionVisits).not.toContain(false,
2583-
`Ghost was not rendered on position(s) ${ghostPositionVisits.reduce((arr, e, ix) => ((e == false) && arr.push(ix), arr), []).toString()} on pass:${pass}`);
2516+
QueryBuilderFunctions.verifyGhostPositionOnMouseDrag(fix, draggedChip, 100, 75, true);
2517+
}));
25842518

2585-
ghostPositionVisits.fill(false);
2586-
pass++;
2587-
inc *= -1;
2588-
if (pass % 2 === 0) Y -= ROW_HEIGHT;
2589-
if (pass % 2 !== 0) Y += ROW_HEIGHT;
2519+
it('Should render drop ghost properly when mouse dragged up on the left.', fakeAsync(() => {
2520+
const draggedChip = chipComponents[1].componentInstance;
2521+
QueryBuilderFunctions.verifyGhostPositionOnMouseDrag(fix, draggedChip, 100, 75 + 350, false);
2522+
}));
25902523

2591-
//go to the left and test the whole chip div as well(blank space to the right)
2592-
if (pass == 3) X += 400;
2593-
}
2594-
}
2524+
it('Should render drop ghost properly when mouse dragged down on the right.', fakeAsync(() => {
2525+
const draggedChip = chipComponents[1].componentInstance;
2526+
QueryBuilderFunctions.verifyGhostPositionOnMouseDrag(fix, draggedChip, 500, 75, true);
2527+
}));
25952528

2529+
it('Should render drop ghost properly when mouse dragged up on the right.', fakeAsync(() => {
2530+
const draggedChip = chipComponents[1].componentInstance;
2531+
QueryBuilderFunctions.verifyGhostPositionOnMouseDrag(fix, draggedChip, 500, 75 + 350, false);
25962532
}));
25972533

25982534
it('Should position drop ghost below the target condition on dragging down.', () => {

0 commit comments

Comments
 (0)