Skip to content

Commit 48d7747

Browse files
authored
Merge pull request #1972 from Infineon/1945-ifxtable-paginationpagesize-not-working
Advanced Table: implements paginationItemsPerPage prop to the advanced table
2 parents 01ef1ae + 05a9f95 commit 48d7747

File tree

22 files changed

+2241
-684
lines changed

22 files changed

+2241
-684
lines changed

examples/wrapper-components/react-vite-js/package-lock.json

Lines changed: 210 additions & 295 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/wrapper-components/react-vite-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"test:local": "run-p preview:link watch:library"
1919
},
2020
"dependencies": {
21-
"@infineon/infineon-design-system-react": "37.6.1--canary.1966.e96d71b6f98f75b52431f1400b252ee3aa720e04.0",
21+
"@infineon/infineon-design-system-react": "37.8.0--canary.1972.48f8ab6f949c52ae531b360a79534ba48d82824f.0",
2222
"path": "^0.12.7",
2323
"react": "^18.3.1",
2424
"react-dom": "^18.3.1"

examples/wrapper-components/react-vite-js/src/components/Pagination/Pagination.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ export default function App() {
66
const [currentPage, setCurrentPage] = useState(1)
77
const [postsPerPage, setPostsPerPage] = useState(10)
88

9+
const itemsPerPage = JSON.stringify([
10+
{ value: 10, label: '10', selected: true },
11+
{ value: 20, label: '20', selected: false },
12+
{ value: 30, label: '30', selected: false }
13+
]);
14+
915
const rows = data.map((item) => ({ firstName: item.first_name, lastName: item.last_name, email: item.email, phone: item.phone }));
1016
const indexOfLastPost = currentPage * postsPerPage;
1117
const indexOfFirstPost = indexOfLastPost - postsPerPage;
@@ -43,7 +49,7 @@ export default function App() {
4349
currentPage={1}
4450
total={36}
4551
onIfxPageChange={handlePageChange}
46-
items-per-page='[{"value":"ten","label":"10","selected":true}, {"value":"Twenty","label":"20","selected":false}, {"value":"Thirty","label":"30","selected":false}]'
52+
items-per-page={itemsPerPage}
4753
/>
4854
</div>
4955
);

examples/wrapper-components/react-vite-js/src/components/Table/Table.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ function Table() {
5757
rows={tableRowsWithBtn}
5858
table-height="auto"
5959
pagination="false"
60-
pagination-page-size="10"
6160
filter-orientation="none"
6261
></ifx-table>
6362

@@ -66,10 +65,10 @@ function Table() {
6665
<IfxTable
6766
row-height="default"
6867
cols='[{"headerName":"Make","field":"make","sortable":true,"sort":"desc","unSortIcon":true},{"headerName":"Model","field":"model","sortable":true,"unSortIcon":true},{"headerName":"Price","field":"price"},{"headerName":"Age","field":"age"}]'
69-
rows='[{"make":"Toyota","model":"Celica","price":35000,"age":10},{"make":"Ford","model":"Mondeo","price":32000,"age":12},{"make":"Porsche","model":"Boxster","price":72000},{"make":"Bmw","model":"x","price":72000},{"make":"Mercedes","model":"y","price":72000},{"make":"Ferrari","model":"z","price":72000},{"make":"Chrysler","model":"a","price":72000},{"make":"Range rover","model":"b","price":72000},{"make":"Tesla","model":"x","price":72000},{"make":"Audi","model":"3","price":72000},{"make":"Landrover","model":"x","price":72000}]'
68+
rows='[{"make":"Toyota","model":"Celica","price":35000,"age":10},{"make":"Ford","model":"Mondeo","price":32000,"age":12},{"make":"Porsche","model":"Boxster","price":72000},{"make":"Bmw","model":"x","price":72000},{"make":"Mercedes","model":"y","price":72000},{"make":"Ferrari","model":"z","price":72000},{"make":"Chrysler","model":"a","price":72000},{"make":"Range rover","model":"b","price":72000},{"make":"Tesla","model":"x","price":72000},{"make":"Audi","model":"3","price":72000},{"make":"Landrover","model":"x","price":72000}, {"make":"Toyota","model":"Celica","price":35000,"age":10},{"make":"Ford","model":"Mondeo","price":32000,"age":12},{"make":"Porsche","model":"Boxster","price":72000},{"make":"Bmw","model":"x","price":72000},{"make":"Mercedes","model":"y","price":72000},{"make":"Ferrari","model":"z","price":72000},{"make":"Chrysler","model":"a","price":72000},{"make":"Range rover","model":"b","price":72000},{"make":"Tesla","model":"x","price":72000},{"make":"Audi","model":"3","price":72000},{"make":"Landrover","model":"x","price":72000}]'
7069
table-height="auto"
71-
pagination="false"
72-
pagination-page-size="10"
70+
pagination="true"
71+
paginationItemsPerPage='[{"value":"10","selected":true}, {"value":"20","selected":false}, {"value":"30","selected":false}]'
7372
filter-orientation="sidebar">
7473
<IfxFilterTypeGroup slot="sidebar-filter">
7574
<div slot="filter-search">

examples/wrapper-components/vue-javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"test:local": "run-p preview:link watch:library"
1616
},
1717
"dependencies": {
18-
"@infineon/infineon-design-system-vue": "37.6.1--canary.1966.e96d71b6f98f75b52431f1400b252ee3aa720e04.0",
18+
"@infineon/infineon-design-system-vue": "37.8.0--canary.1972.48f8ab6f949c52ae531b360a79534ba48d82824f.0",
1919
"@vitejs/plugin-vue": "^4.0.0",
2020
"@vitejs/plugin-vue-jsx": "^4.0.0",
2121
"vite": "^5.0.12",

examples/wrapper-components/vue-javascript/src/components/AdvancedTable.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ifx-table row-height="default"
66
cols='[{"headerName":"Make","field":"make","sortable":true,"sort":"desc","unSortIcon":true},{"headerName":"Model","field":"model","sortable":true,"unSortIcon":true},{"headerName":"Price","field":"price"},{"headerName":"Age","field":"age"}]'
77
rows='[{"make":"Toyota","model":"Celica","price":35000,"age":10},{"make":"Ford","model":"Mondeo","price":32000,"age":12},{"make":"Porsche","model":"Boxster","price":72000},{"make":"Bmw","model":"x","price":72000},{"make":"Mercedes","model":"y","price":72000},{"make":"Ferrari","model":"z","price":72000},{"make":"Chrysler","model":"a","price":72000},{"make":"Range rover","model":"b","price":72000},{"make":"Tesla","model":"x","price":72000},{"make":"Audi","model":"3","price":72000},{"make":"Landrover","model":"x","price":72000}]'
8-
table-height="auto" pagination="false" pagination-page-size="10" filter-orientation="sidebar">
8+
table-height="auto" pagination="false" filter-orientation="sidebar">
99
<ifx-filter-type-group slot="sidebar-filter">
1010
<div slot="filter-search">
1111
<ifx-filter-search filter-orientation="sidebar" filter-name="search"></ifx-filter-search>
@@ -71,7 +71,6 @@
7171
row-height="default"
7272
table-height="auto"
7373
pagination="false"
74-
pagination-page-size="10"
7574
filter-orientation="none">
7675
</ifx-table>
7776

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "37.6.1--canary.1966.e96d71b6f98f75b52431f1400b252ee3aa720e04.0",
3+
"version": "37.8.0--canary.1972.48f8ab6f949c52ae531b360a79534ba48d82824f.0",
44
"command": {
55
"publish": {
66
"verifyAccess": false

0 commit comments

Comments
 (0)