Skip to content

Commit f745d49

Browse files
authored
CardView: FieldTemplate demo fixes (#30143)
1 parent 79cc35d commit f745d49

File tree

21 files changed

+75
-24
lines changed

21 files changed

+75
-24
lines changed

apps/demos/Demos/CardView/FieldTemplate/Angular/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<dx-card-view [dataSource]="tasks" cardsPerRow="auto" [cardMinWidth]="260">
1+
<dx-card-view [dataSource]="tasks" cardsPerRow="auto" [cardMinWidth]="240">
22
<dxo-card-view-paging [pageSize]="12" />
33
<dxo-card-view-card-header [visible]="true" template="headerTemplate" />
44

apps/demos/Demos/CardView/FieldTemplate/Angular/app/app.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ if (window && window.config?.packageConfigPaths) {
2828
selector: 'demo-app',
2929
templateUrl: `.${modulePrefix}/app.component.html`,
3030
styleUrls: [`.${modulePrefix}/app.component.css`],
31-
providers: [Service],
3231
})
3332
export class AppComponent {
3433
tasks: Task[];
@@ -52,7 +51,7 @@ export class AppComponent {
5251
EmployeeComponent,
5352
ProgressComponent,
5453
],
55-
providers: [EmployeeService, PriorityService],
54+
providers: [Service, EmployeeService, PriorityService],
5655
bootstrap: [AppComponent],
5756
})
5857
export class AppModule { }
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
button {
2+
background: none;
3+
border: none;
4+
padding: 0;
5+
color: var(--dx-color-link);
6+
text-decoration: underline;
7+
cursor: pointer;
8+
font: inherit;
9+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a href="#">{{ text }}</a>
1+
<button>{{ text }}</button>

apps/demos/Demos/CardView/FieldTemplate/Angular/app/employee/employee.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if (window && window.config?.packageConfigPaths) {
1010
@Component({
1111
selector: 'employee',
1212
templateUrl: `.${modulePrefix}/employee/employee.component.html`,
13+
styleUrls: [`.${modulePrefix}/employee/employee.component.css`],
1314
})
1415
export class EmployeeComponent implements OnChanges {
1516
employees: Employee[];

apps/demos/Demos/CardView/FieldTemplate/Angular/app/progress-bar/progress-bar.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (window && window.config?.packageConfigPaths) {
1414
export class ProgressComponent {
1515
@Input() value: number;
1616

17-
getStatusFormat(ratio: number): string {
18-
return `${ratio * 100}%`;
17+
getStatusFormat(_, value: number): string {
18+
return `${value}%`;
1919
}
2020
}

apps/demos/Demos/CardView/FieldTemplate/React/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const App = () => (
1010
<CardView
1111
dataSource={tasks}
1212
cardsPerRow="auto"
13-
cardMinWidth={260}
13+
cardMinWidth={240}
1414
>
1515
<CardHeader
1616
visible={true}

apps/demos/Demos/CardView/FieldTemplate/React/Employee.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ interface EmployeeProps {
88
const Employee = ({ employeeID }: EmployeeProps) => {
99
const employee = useMemo<Employee>(() => {
1010
return employees.find(e => e.ID === employeeID);
11-
}, [employeeID]);
11+
}, [employeeID, employees]);
1212

13-
return <a href="#">{ employee.Name }</a>
13+
return <button className='task__link-button'>{ employee.Name }</button>
1414
}
1515

1616
export default Employee;

apps/demos/Demos/CardView/FieldTemplate/React/Priority.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface PriorityProps {
88
const Priority = ({ priorityID }: PriorityProps) => {
99
const priority = useMemo<Priority>(() => {
1010
return priorities.find(p => p.id === priorityID);
11-
}, [priorityID]);
11+
}, [priorityID, priorities]);
1212

1313
return (
1414
<div className={`task__priority task__priority--${priority.postfix}`}>

apps/demos/Demos/CardView/FieldTemplate/React/Progress.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const Progress = ({ value }: ProgressProps) => {
1010
<ProgressBar
1111
value={value}
1212
elementAttr={{ 'aria-label': 'Progress Bar' }}
13-
statusFormat={(ratio) => `${ratio * 100}%`}
13+
statusFormat={(_, value: number) => `${value}%`}
1414
/>
1515
</div>;
1616
}

0 commit comments

Comments
 (0)