Skip to content

feat(ver): enable react 19 support #463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/jsx-runtime",
"prettier"
],
"overrides": [
Expand Down
13 changes: 6 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"react-jss": "^10.10.0"
},
"peerDependencies": {
"react": "^17 || ^18",
"react-dom": "^17 || ^18"
"react": "^17 || ^18 || ^19",
"react-dom": "^17 || ^18 || ^19"
},
"devDependencies": {
"@patternfly/documentation-framework": "^6.5.20",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import { FunctionComponent } from 'react';
import DataView from '@patternfly/react-data-view/dist/dynamic/DataView';

const layoutItemStyling = {
Expand All @@ -8,10 +8,10 @@ const layoutItemStyling = {
border: 'var(--pf-t--global--border--width--box--default) dashed var(--pf-t--global--border--color--default)'
};

export const BasicExample: React.FunctionComponent = () => (
export const BasicExample: FunctionComponent = () => (
<DataView>
<div style={layoutItemStyling}>Header</div>
<div style={layoutItemStyling}>Data representation</div>
<div style={layoutItemStyling}>Footer</div>
</DataView>
)
);
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ propComponents: ['DataView']
sortValue: 1
sourceLink: https://github.com/patternfly/react-data-view/blob/main/packages/module/patternfly-docs/content/extensions/data-view/examples/DataView/DataView.md
---
import { useState, useEffect, useRef, useMemo } from 'react';
import { FunctionComponent, useState, useEffect, useRef, useMemo } from 'react';
import { Drawer, DrawerContent, DrawerContentBody } from '@patternfly/react-core';
import { CubesIcon } from '@patternfly/react-icons';
import { useDataViewPagination, useDataViewSelection, useDataViewFilters, useDataViewSort } from '@patternfly/react-data-view/dist/dynamic/Hooks';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState, useRef, useMemo } from 'react';
import { FunctionComponent, useEffect, useState, useRef, useMemo } from 'react';
import { Drawer, DrawerActions, DrawerCloseButton, DrawerContent, DrawerContentBody, DrawerHead, DrawerPanelContent, Title, Content } from '@patternfly/react-core';
import { DataView } from '@patternfly/react-data-view/dist/dynamic/DataView';
import { DataViewTable } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
Expand Down Expand Up @@ -32,7 +32,7 @@ interface RepositoryDetailProps {
setSelectedRepo: React.Dispatch<React.SetStateAction<Repository | undefined>>;
}

const RepositoryDetail: React.FunctionComponent<RepositoryDetailProps> = ({ selectedRepo, setSelectedRepo }) => {
const RepositoryDetail: FunctionComponent<RepositoryDetailProps> = ({ selectedRepo, setSelectedRepo }) => {
const context = useDataViewEventsContext();

useEffect(() => {
Expand Down Expand Up @@ -84,7 +84,7 @@ const rowActions = [
}
];

const RepositoriesTable: React.FunctionComponent<RepositoriesTableProps> = ({ selectedRepo = undefined }) => {
const RepositoriesTable: FunctionComponent<RepositoriesTableProps> = ({ selectedRepo = undefined }) => {
const selection = useDataViewSelection({ matchOption: (a, b) => a.row[0] === b.row[0] });
const { trigger } = useDataViewEventsContext();
const rows = useMemo(() => {
Expand All @@ -110,7 +110,7 @@ const RepositoriesTable: React.FunctionComponent<RepositoriesTableProps> = ({ se
);
};

export const BasicExample: React.FunctionComponent = () => {
export const BasicExample: FunctionComponent = () => {
const [ selectedRepo, setSelectedRepo ] = useState<Repository>();
const drawerRef = useRef<HTMLDivElement>(null);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-nested-ternary */
import React, { useEffect, useState, useRef, useMemo } from 'react';
import { FunctionComponent, useEffect, useState, useRef, useMemo } from 'react';
import { Drawer, DrawerActions, DrawerCloseButton, DrawerContent, DrawerContentBody, DrawerHead, DrawerPanelContent, Title, Content, EmptyState, EmptyStateBody, EmptyStateFooter, EmptyStateActions, Button, } from '@patternfly/react-core';
import { ActionsColumn, Tbody, Td, ThProps, Tr } from '@patternfly/react-table';
import { BulkSelect, BulkSelectValue } from '@patternfly/react-component-groups/dist/dynamic/BulkSelect';
Expand Down Expand Up @@ -94,7 +94,7 @@ interface RepositoryDetailProps {
setSelectedRepo: React.Dispatch<React.SetStateAction<Repository | undefined>>;
}

const RepositoryDetail: React.FunctionComponent<RepositoryDetailProps> = ({ selectedRepo, setSelectedRepo }) => {
const RepositoryDetail: FunctionComponent<RepositoryDetailProps> = ({ selectedRepo, setSelectedRepo }) => {
const context = useDataViewEventsContext();

useEffect(() => {
Expand Down Expand Up @@ -146,7 +146,7 @@ const rowActions = [
}
];

const RepositoriesTable: React.FunctionComponent<RepositoriesTableProps> = ({ selectedRepo = undefined }) => {
const RepositoriesTable: FunctionComponent<RepositoriesTableProps> = ({ selectedRepo = undefined }) => {
const { filters, onSetFilters, clearAllFilters } = useDataViewFilters<RepositoryFilters>({ initialFilters: { name: '', branch: '', workspace: [] } });

const pagination = useDataViewPagination({ perPage: 5 });
Expand Down Expand Up @@ -255,7 +255,7 @@ const RepositoriesTable: React.FunctionComponent<RepositoriesTableProps> = ({ se
);
};

export const BasicExample: React.FunctionComponent = () => {
export const BasicExample: FunctionComponent = () => {
const [ selectedRepo, setSelectedRepo ] = useState<Repository>();
const drawerRef = useRef<HTMLDivElement>(null);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { FunctionComponent } from 'react';
import { DataView, DataViewState } from '@patternfly/react-data-view/dist/dynamic/DataView';
import { DataViewTable, DataViewTr, DataViewTh } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
import { CubesIcon } from '@patternfly/react-icons';
import { Button, EmptyState, EmptyStateActions, EmptyStateBody, EmptyStateFooter, } from '@patternfly/react-core';
import { Button, EmptyState, EmptyStateActions, EmptyStateBody, EmptyStateFooter } from '@patternfly/react-core';
import { Tbody, Td, Tr } from '@patternfly/react-table';

interface Repository {
Expand All @@ -27,7 +27,7 @@ const empty = (
<Tbody>
<Tr key="loading" ouiaId={`${ouiaId}-tr-loading`}>
<Td colSpan={columns.length}>
<EmptyState headingLevel="h4" icon={CubesIcon} titleText="No data found">
<EmptyState headingLevel="h4" icon={CubesIcon} titleText="No data found">
<EmptyStateBody>There are no matching data to be displayed.</EmptyStateBody>
<EmptyStateFooter>
<EmptyStateActions>
Expand All @@ -44,10 +44,10 @@ const empty = (
</Tbody>
);

export const BasicExample: React.FunctionComponent = () => (
export const BasicExample: FunctionComponent = () => (
<DataView activeState={DataViewState.empty}>
<DataViewTable
aria-label='Repositories table'
<DataViewTable
aria-label="Repositories table"
ouiaId={ouiaId}
columns={columns}
rows={rows}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import { FunctionComponent } from 'react';
import { DataView, DataViewState } from '@patternfly/react-data-view/dist/dynamic/DataView';
import { DataViewTable, DataViewTr, DataViewTh } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
import { ErrorState } from '@patternfly/react-component-groups';
Expand Down Expand Up @@ -32,7 +32,7 @@ const error = (
</Tbody>
);

export const BasicExample: React.FunctionComponent = () => (
export const BasicExample: FunctionComponent = () => (
<DataView activeState={DataViewState.error}>
<DataViewTable
aria-label='Repositories table'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import { FunctionComponent } from 'react';
import { DataViewTable, DataViewTr, DataViewTh } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
import { ExclamationCircleIcon } from '@patternfly/react-icons';
import { Button } from '@patternfly/react-core';
Expand Down Expand Up @@ -62,6 +62,6 @@ const columns: DataViewTh[] = [

const ouiaId = 'TableExample';

export const BasicExample: React.FunctionComponent = () => (
export const BasicExample: FunctionComponent = () => (
<DataViewTable aria-label='Repositories table' ouiaId={ouiaId} columns={columns} rows={rows} />
);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import { FunctionComponent } from 'react';
import { DataView, DataViewState } from '@patternfly/react-data-view/dist/dynamic/DataView';
import { DataViewTable, DataViewTr, DataViewTh } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
import { SkeletonTableBody, SkeletonTableHead } from '@patternfly/react-component-groups';
Expand All @@ -10,13 +10,13 @@ const columns: DataViewTh[] = [ 'Repositories', 'Branches', 'Pull requests', 'Wo

const ouiaId = 'TableExample';

const headLoading = <SkeletonTableHead columns={columns} />
const headLoading = <SkeletonTableHead columns={columns} />;
const bodyLoading = <SkeletonTableBody rowsCount={5} columnsCount={columns.length} />;

export const BasicExample: React.FunctionComponent = () => (
export const BasicExample: FunctionComponent = () => (
<DataView activeState={DataViewState.loading}>
<DataViewTable
aria-label='Repositories table'
aria-label="Repositories table"
ouiaId={ouiaId}
columns={columns}
rows={rows}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import { FunctionComponent } from 'react';
import { DataView } from '@patternfly/react-data-view/dist/dynamic/DataView';
import { DataViewTable, DataViewTh, DataViewTrTree } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
import { useDataViewSelection } from '@patternfly/react-data-view/dist/dynamic/Hooks';
Expand Down Expand Up @@ -52,7 +52,7 @@ const columns: DataViewTh[] = [ 'Repositories', 'Branches', 'Pull requests', 'Wo

const ouiaId = 'TreeTableExample';

export const BasicExample: React.FunctionComponent = () => {
export const BasicExample: FunctionComponent = () => {
const selection = useDataViewSelection({ matchOption: (a, b) => a.id === b.id });

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-nested-ternary */
import React, { useMemo } from 'react';
import { FunctionComponent, useMemo } from 'react';
import { useDataViewSort } from '@patternfly/react-data-view/dist/dynamic/Hooks';
import { DataViewTable, DataViewTr, DataViewTh } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
import { ThProps } from '@patternfly/react-table';
Expand Down Expand Up @@ -41,7 +41,7 @@ const sortData = (data: Repository[], sortBy: string | undefined, direction: 'as

const ouiaId = 'TableExample';

export const MyTable: React.FunctionComponent = () => {
export const MyTable: FunctionComponent = () => {
const [ searchParams, setSearchParams ] = useSearchParams();
const { sortBy, direction, onSort } = useDataViewSort({ searchParams, setSearchParams });
const sortByIndex = useMemo(() => COLUMNS.findIndex(item => item.key === sortBy), [ sortBy ]);
Expand Down Expand Up @@ -79,7 +79,7 @@ export const MyTable: React.FunctionComponent = () => {
);
};

export const BasicExample: React.FunctionComponent = () => (
export const BasicExample: FunctionComponent = () => (
<BrowserRouter>
<MyTable/>
</BrowserRouter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sortValue: 3
propComponents: ['DataViewTableBasic', 'DataViewTableTree', 'DataViewTrTree', 'DataViewTrObject']
sourceLink: https://github.com/patternfly/react-data-view/blob/main/packages/module/patternfly-docs/content/extensions/data-view/examples/Table/Table.md
---
import { useMemo } from 'react';
import { FunctionComponent, useMemo } from 'react';
import { BrowserRouter, useSearchParams } from 'react-router-dom';
import { Button, EmptyState, EmptyStateActions, EmptyStateBody, EmptyStateFooter } from '@patternfly/react-core';
import { CubesIcon, FolderIcon, FolderOpenIcon, LeafIcon, ExclamationCircleIcon } from '@patternfly/react-icons';
Expand Down
1 change: 1 addition & 0 deletions packages/module/patternfly-docs/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import React from 'react';
import { Title, PageSection } from '@patternfly/react-core';

Expand Down
18 changes: 10 additions & 8 deletions packages/module/src/DataView/DataView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { render } from '@testing-library/react';
import DataView from './DataView';

Expand All @@ -11,11 +10,14 @@ const layoutItemStyling = {

describe('DataView component', () => {
test('should render correctly', () => {
expect(render(
<DataView>
<div style={layoutItemStyling}>Header</div>
<div style={layoutItemStyling}>Data representation</div>
<div style={layoutItemStyling}>Footer</div>
</DataView>)).toMatchSnapshot();
expect(
render(
<DataView>
<div style={layoutItemStyling}>Header</div>
<div style={layoutItemStyling}>Data representation</div>
<div style={layoutItemStyling}>Footer</div>
</DataView>
)
).toMatchSnapshot();
});
});
});
8 changes: 4 additions & 4 deletions packages/module/src/DataView/DataView.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import { FC, Children } from 'react';
import { Stack, StackItem, StackProps } from '@patternfly/react-core';
import { DataViewSelection, InternalContextProvider } from '../InternalContext';

Expand All @@ -24,19 +24,19 @@ export interface DataViewProps extends StackProps {

export type DataViewImpementationProps = Omit<DataViewProps, 'onSelect' | 'isItemSelected' | 'isItemSelectDisabled'>;

const DataViewImplementation: React.FC<DataViewImpementationProps> = ({
const DataViewImplementation: FC<DataViewImpementationProps> = ({
children, ouiaId = 'DataView', ...props
}: DataViewImpementationProps) => (
<Stack data-ouia-component-id={`${ouiaId}-stack`} {...props}>
{React.Children.map(children, (child, index) => (
{Children.map(children, (child, index) => (
<StackItem data-ouia-component-id={`${ouiaId}-stack-item-${index}`}>
{child}
</StackItem>
))}
</Stack>
)

export const DataView: React.FC<DataViewProps> = ({ children, selection, activeState, ...props }: DataViewProps) => (
export const DataView: FC<DataViewProps> = ({ children, selection, activeState, ...props }: DataViewProps) => (
<InternalContextProvider selection={selection} activeState={activeState} >
<DataViewImplementation {...props}>{children}</DataViewImplementation>
</InternalContextProvider>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { render } from '@testing-library/react';
import DataViewCheckboxFilter, { DataViewCheckboxFilterProps } from './DataViewCheckboxFilter';
import DataViewToolbar from '../DataViewToolbar';
Expand Down
Loading
Loading