Skip to content

Commit 569f6ff

Browse files
authored
Merge branch 'master' into sstoychev/change-pagingmode-enum
2 parents 31562f9 + 044db87 commit 569f6ff

File tree

8 files changed

+81
-15
lines changed

8 files changed

+81
-15
lines changed

package-lock.json

Lines changed: 4 additions & 4 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
@@ -74,7 +74,7 @@
7474
"@types/source-map": "0.5.2",
7575
"express": "^4.21.1",
7676
"fflate": "^0.8.1",
77-
"igniteui-theming": "^17.1.0",
77+
"igniteui-theming": "^17.2.0",
7878
"igniteui-trial-watermark": "^3.0.2",
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.2",

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"tslib": "^2.3.0",
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
76-
"igniteui-theming": "^17.1.0",
76+
"igniteui-theming": "^17.2.0",
7777
"@igniteui/material-icons-extended": "^3.1.0"
7878
},
7979
"peerDependencies": {

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1648,6 +1648,18 @@
16481648
[igxPrefix] {
16491649
overflow: hidden;
16501650
}
1651+
1652+
igx-prefix,
1653+
[igxPrefix] {
1654+
background: var(--igx-input-group-input-prefix-background, transparent);
1655+
color: var(--igx-input-group-input-prefix-color, var(--ig-primary-500));
1656+
}
1657+
1658+
igx-suffix,
1659+
[igxSuffix] {
1660+
background: var(--igx-input-group-input-suffix-background, transparent);
1661+
color: var(--igx-input-group-input-suffix-color, var(--ig-primary-500));
1662+
}
16511663
}
16521664

16531665
%igx-input-group-fluent-search--focused {
@@ -1731,6 +1743,10 @@
17311743
%form-group-bundle--fluent--focus {
17321744
border-color: var-get($theme, 'focused-border-color');
17331745
border-width: rem(2px);
1746+
1747+
&:hover {
1748+
border-color: var-get($theme, 'focused-border-color');
1749+
}
17341750
}
17351751

17361752
%form-group-bundle-error--fluent,
@@ -1846,7 +1862,6 @@
18461862
}
18471863

18481864
%fluent-label-focused {
1849-
color: color(null, 'gray', 800);
18501865
transform: translateY(0) scale(1);
18511866
}
18521867

projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@
425425
justify-content: center;
426426
border-radius: var-get($theme, 'item-border-radius');
427427
color: var-get($theme, 'item-text-color');
428-
background: var-get($theme, 'item-background');
429428

430429
@if $bootstrap-theme or $variant == 'fluent' {
431430
border-bottom: var-get($theme, 'border-width') solid var-get($theme, 'border-color');
@@ -436,9 +435,6 @@
436435
}
437436

438437
&:hover {
439-
color: var-get($theme, 'item-text-color-hover');
440-
background: var-get($theme, 'item-background-hover');
441-
442438
%igx-list__item-lines {
443439
color: currentColor;
444440
}
@@ -544,9 +540,15 @@
544540
align-items: center;
545541
position: relative;
546542
border-radius: var-get($theme, 'item-border-radius');
547-
background: inherit;
543+
background: var-get($theme, 'item-background');
548544
z-index: 2;
549545
gap: if($variant == 'indigo', rem(8px), rem(16px));
546+
547+
&:hover,
548+
&:focus-within {
549+
color: var-get($theme, 'item-text-color-hover');
550+
background: var-get($theme, 'item-background-hover');
551+
}
550552
}
551553

552554
%igx-list-header,

src/app/list/list.sample.html

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@
22
<section class="sample-content" [igSize]="properties.size">
33
<article class="sample-column">
44
<h5 class="sample-title">Angular List</h5>
5-
<igx-list>
5+
<igx-list [allowLeftPanning]="properties.enablePanning" [allowRightPanning]="properties.enablePanning">
6+
<ng-template igxListItemLeftPanning>
7+
<div class="pan pan--left">
8+
<igx-icon>delete</igx-icon>Delete
9+
</div>
10+
</ng-template>
11+
<ng-template igxListItemRightPanning>
12+
<div class="pan pan--right">
13+
<igx-icon>call</igx-icon>Dial
14+
</div>
15+
</ng-template>
616
<igx-list-item [isHeader]="true" selected>Employees List</igx-list-item>
717
@for (employee of employeeItems; track employee) {
818
<igx-list-item [selected]="employee.selected">

src/app/list/list.sample.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
11
.sample-title {
22
text-align: center;
33
}
4+
5+
.pan {
6+
display: flex;
7+
color: white;
8+
width: 100%;
9+
padding-left: 10px;
10+
align-items: center;
11+
}
12+
13+
.pan--left {
14+
flex-direction: row-reverse;
15+
background-color:orange;
16+
}
17+
18+
.pan--right {
19+
flex-direction: row;
20+
background-color:limegreen;
21+
}

src/app/list/list.sample.ts

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import {
3030
PropertyChangeService,
3131
PropertyPanelConfig,
3232
} from '../properties-panel/property-change.service';
33+
import { HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
34+
import Hammer from 'hammerjs';
3335

3436
defineComponents(
3537
IgcListComponent,
@@ -79,15 +81,27 @@ interface Employee {
7981
IgxAvatarComponent,
8082
IgxButtonModule,
8183
IgxButtonDirective,
82-
IgSizeDirective
84+
IgSizeDirective,
85+
HammerModule
86+
],
87+
providers: [
88+
{
89+
provide: HAMMER_GESTURE_CONFIG,
90+
useClass: class {
91+
public overrides = {
92+
pan: { direction: Hammer.DIRECTION_HORIZONTAL }
93+
}
94+
}
95+
}
8396
]
8497
})
8598
export class ListSampleComponent {
8699
public panelConfig: PropertyPanelConfig = {
87100
size: {
88101
control: {
89102
type: 'button-group',
90-
options: ['small', 'medium', 'large']
103+
options: ['small', 'medium', 'large'],
104+
defaultValue: 'medium'
91105
}
92106
},
93107
hideTitle: {
@@ -145,6 +159,13 @@ export class ListSampleComponent {
145159
type: 'boolean',
146160
defaultValue: false
147161
}
162+
},
163+
enablePanning: {
164+
label: 'Item Panning',
165+
control: {
166+
type: 'boolean',
167+
defaultValue: false
168+
}
148169
}
149170
}
150171

0 commit comments

Comments
 (0)