Skip to content

Commit

Permalink
Merge branch 'master' of github.com:DevoInc/genesys-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
soslayando committed Jan 31, 2025
2 parents e9af775 + 6702144 commit 1b1b1ac
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 16 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [17.3.0](https://github.com/DevoInc/genesys-ui/compare/v17.2.0...v17.3.0) (2025-01-30)

### Features

* **Panel:** added bottomContent prop to the PanelHeader component to render a custom content below all the header content. ([3ccc523](https://github.com/DevoInc/genesys-ui/commit/3ccc523314c23b00b394009c046d1cbcfce7ab5d))
* **TableHeadRow:** add tableId prop for improved accessibility ([fe2e330](https://github.com/DevoInc/genesys-ui/commit/fe2e3302a0e605f2e2a863bd265d2c478d35552b))

## [17.2.0](https://github.com/DevoInc/genesys-ui/compare/v17.1.1...v17.2.0) (2025-01-30)

### Features
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "genesys-ui",
"version": "17.2.0",
"version": "17.3.0",
"description": "",
"type": "module",
"private": true,
Expand Down
4 changes: 2 additions & 2 deletions packages/code/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devoinc/genesys-ui-code",
"version": "17.2.0",
"version": "17.3.0",
"description": "",
"type": "module",
"types": "./dist/index.d.ts",
Expand All @@ -26,7 +26,7 @@
"dpdm": "dpdm --exit-code circular:1 ./src/index.ts"
},
"peerDependencies": {
"@devoinc/genesys-ui": "^17.2.0",
"@devoinc/genesys-ui": "^17.3.0",
"ahooks": ">=3.0",
"monaco-editor-core": "0.x",
"react": ">=17.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/color/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devoinc/genesys-ui-color",
"version": "17.2.0",
"version": "17.3.0",
"description": "",
"type": "module",
"scripts": {
Expand Down Expand Up @@ -29,7 +29,7 @@
"author": "",
"license": "MIT",
"peerDependencies": {
"@devoinc/genesys-ui": "^17.2.0",
"@devoinc/genesys-ui": "^17.3.0",
"polished": ">=4.0",
"react": ">=17.0",
"react-dom": ">=17.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devoinc/genesys-ui",
"version": "17.2.0",
"version": "17.3.0",
"description": "",
"type": "module",
"types": "./dist/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions packages/datetime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devoinc/genesys-ui-datetime",
"version": "17.2.0",
"version": "17.3.0",
"description": "",
"type": "module",
"scripts": {
Expand Down Expand Up @@ -31,7 +31,7 @@
"license": "MIT",
"peerDependencies": {
"@devoinc/genesys-icons": "4.x || 5.x || 6.x",
"@devoinc/genesys-ui": "^17.2.0",
"@devoinc/genesys-ui": "^17.3.0",
"date-fns": ">=4.0",
"react": ">=17.0",
"react-popper": "2.x",
Expand Down
6 changes: 3 additions & 3 deletions packages/table/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devoinc/genesys-ui-table",
"version": "17.2.0",
"version": "17.3.0",
"description": "Genesys composable table",
"type": "module",
"scripts": {
Expand Down Expand Up @@ -31,8 +31,8 @@
"license": "MIT",
"peerDependencies": {
"@devoinc/genesys-icons": "4.x || 5.x || 6.x",
"@devoinc/genesys-ui": "^17.2.0",
"@devoinc/genesys-ui-datetime": "^17.2.0",
"@devoinc/genesys-ui": "^17.3.0",
"@devoinc/genesys-ui-datetime": "^17.3.0",
"@tanstack/react-virtual": "3.x",
"date-fns": ">=4.0",
"@date-fns/tz": ">=1.0",
Expand Down
8 changes: 7 additions & 1 deletion packages/table/src/core/TableHeadRow/TableHeadRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,20 @@ interface TableHeadRowProps {
density?: TDensity;
showFilters: boolean;
children: React.ReactNode;
tableId: string;
}

export const TableHeadRow: React.FC<TableHeadRowProps> = ({
density,
showFilters,
children,
tableId,
}) => (
<StyledTableHeadRow $density={density} $compactHeader={showFilters}>
<StyledTableHeadRow
$density={density}
$compactHeader={showFilters}
id={!showFilters ? `${tableId}__head_filter` : `${tableId}__head_name`}
>
{children}
</StyledTableHeadRow>
);
9 changes: 7 additions & 2 deletions packages/table/src/core/TableWrapper/TableWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ export const TableWrapper: React.FC = () => {
scrolled={rowVirtualizer.scrollOffset !== 0}
width={width}
>
<TableHeadRow density={density} showFilters={showFilters}>
<TableHeadRow
density={density}
showFilters={showFilters}
tableId={id}
>
{colDefs.map((colDef) => {
const virtualColumn = items.find(
(item) => item.key === colDef.id,
Expand Down Expand Up @@ -111,7 +115,7 @@ export const TableWrapper: React.FC = () => {
})}
</TableHeadRow>
{showFilters ? (
<TableHeadRow density={density} showFilters={false}>
<TableHeadRow density={density} showFilters={false} tableId={id}>
{colDefs.map((colDef) => {
const virtualColumn = items.find(
(item) => item.key === colDef.id,
Expand All @@ -125,6 +129,7 @@ export const TableWrapper: React.FC = () => {
width={virtualColumn ? `${virtualColumn.size}px` : 'auto'}
offsetX={virtualColumn ? virtualColumn.start : undefined}
filter={true}
title={colDef.headerName}
>
{colDef?.headerOnFilterPosition ? (
colDef?.headerRenderer ? (
Expand Down
4 changes: 2 additions & 2 deletions packages/upload/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devoinc/genesys-ui-upload",
"version": "17.2.0",
"version": "17.3.0",
"description": "",
"type": "module",
"scripts": {
Expand Down Expand Up @@ -30,7 +30,7 @@
"license": "MIT",
"peerDependencies": {
"@devoinc/genesys-icons": "4.x || 5.x || 6.x",
"@devoinc/genesys-ui": "^17.2.0",
"@devoinc/genesys-ui": "^17.3.0",
"filepond-plugin-file-validate-size": "2.x",
"filepond-plugin-file-validate-type": "1.x",
"filepond-plugin-image-preview": "4.x",
Expand Down

0 comments on commit 1b1b1ac

Please sign in to comment.