Skip to content

Commit

Permalink
Use React.JSX instead of the global JSX removed in React 19
Browse files Browse the repository at this point in the history
  • Loading branch information
Artur- committed Jan 1, 2025
1 parent 3730c5f commit 685fac3
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { AutoCrud } from '@vaadin/hilla-react-crud';
import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
import { PersonService } from 'Frontend/generated/endpoints.js';

export function AutoCrudView(): JSX.Element {
export function AutoCrudView(): React.JSX.Element {
/* page size is defined only to make testing easier */
return (
<div className="p-l">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type Appointment from 'Frontend/generated/com/vaadin/hilla/test/reactgrid
import AppointmentModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/AppointmentModel.js';
import { AppointmentService } from 'Frontend/generated/endpoints.js';

export function AutoFormView(): JSX.Element {
export function AutoFormView(): React.JSX.Element {
const [submitted, setSubmitted] = useState<Appointment | undefined>(undefined);

function handleSubmit({ item }: SubmitEvent<Appointment>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ type GridBodyReactRendererProps<TItem> = {
item: TItem;
};

function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): JSX.Element {
function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): React.JSX.Element {
const value = item.luckyNumber;
return <span style={{ fontWeight: 'bold', color: value % 2 === 0 ? 'green' : 'red' }}>{value}</span>;
}

export function GridUseDataProviderHook(): JSX.Element {
export function GridUseDataProviderHook(): React.JSX.Element {
const [filter, setFilter] = useState<PropertyStringFilter>();
const { dataProvider, refresh } = useDataProvider(PersonService, filter);
const [savedPerson, setSavedPerson] = useState<Person | undefined>(undefined);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { AutoGrid } from '@vaadin/hilla-react-crud';
import EmployeeModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/entityreferences/EmployeeModel.js';
import { EmployeeService } from 'Frontend/generated/endpoints.js';

export function GridWithEntityReferences(): JSX.Element {
export function GridWithEntityReferences(): React.JSX.Element {
return <AutoGrid pageSize={10} service={EmployeeService} model={EmployeeModel} noHeaderFilters />;
/* page size is defined only to make testing easier */
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ type GridBodyReactRendererProps<TItem> = {
item: TItem;
};

function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): JSX.Element {
function LuckyNumberRenderer({ item }: GridBodyReactRendererProps<Person>): React.JSX.Element {
const value = item.luckyNumber;
return <span style={{ fontWeight: 'bold', color: value % 2 === 0 ? 'green' : 'red' }}>{value}</span>;
}

export function ReadOnlyGrid(): JSX.Element {
export function ReadOnlyGrid(): React.JSX.Element {
return (
<AutoGrid
pageSize={10}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ const HeaderFilterRenderer = ({ setFilter }: HeaderFilterRendererProps) => {
);
};

const FullNameRenderer = ({ item }: { item: Person }): JSX.Element => (
const FullNameRenderer = ({ item }: { item: Person }): React.JSX.Element => (
<span>
{item.firstName} {item.lastName}
</span>
);

const HeaderRenderer = () => <div>Full Name (currently: {new Date().toLocaleString()})</div>;

export function ReadOnlyGridCustomFilter(): JSX.Element {
export function ReadOnlyGridCustomFilter(): React.JSX.Element {
return (
<div>
<AutoGrid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type FilterUnion from 'Frontend/generated/com/vaadin/hilla/crud/filter/Fi
import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
import { PersonService } from 'Frontend/generated/endpoints.js';

export function ReadOnlyGridOrFilter(): JSX.Element {
export function ReadOnlyGridOrFilter(): React.JSX.Element {
const [filter, setFilter] = useState<FilterUnion | undefined>(undefined);

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Matcher from 'Frontend/generated/com/vaadin/hilla/crud/filter/PropertyStr
import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
import { PersonService } from 'Frontend/generated/endpoints.js';

export function ReadOnlyGridSinglePropertyFilter(): JSX.Element {
export function ReadOnlyGridSinglePropertyFilter(): React.JSX.Element {
const [filter, setFilter] = useState<FilterUnion | undefined>(undefined);
return (
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import CompanyModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/Com
import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
import { CompanyService, PersonService } from 'Frontend/generated/endpoints.js';

export function ReadOnlyGridWithHeaderFilters(): JSX.Element {
export function ReadOnlyGridWithHeaderFilters(): React.JSX.Element {
const [model, setModel] = useState<Array<DetachedModelConstructor<AbstractModel>>>([PersonModel]);
const [service, setService] = useState<CrudService<any>>(PersonService);
const [noHeaderFilters, setNoHeaderFilters] = useState(false);
Expand Down

0 comments on commit 685fac3

Please sign in to comment.