Skip to content

Commit 1c18b3b

Browse files
committed
fix: remove JSX annotation and import
Refs: HAUKI-747
1 parent a305641 commit 1c18b3b

47 files changed

Lines changed: 107 additions & 127 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useCallback, useMemo, useState, type JSX } from 'react';
1+
import { useCallback, useMemo, useState } from 'react';
22
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
33
import 'hds-core';
44
import { CookieBanner, CookieConsentContextProvider } from 'hds-react';
@@ -47,7 +47,7 @@ const getPersistentTokens = (): OptionalAuthTokens => {
4747
return getTokens();
4848
};
4949

50-
const App = (): JSX.Element => {
50+
const App = () => {
5151
const hasOpenerWindow =
5252
!!document.referrer && document.referrer !== window.location.href;
5353

src/common/selectedDatePeriodsContext/SelectedDatePeriodsContext.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import React, {
44
useEffect,
55
useMemo,
66
useCallback,
7-
type JSX,
87
} from 'react';
98
import store from '../utils/storage/sessionStorage';
109
import { DatePeriod } from '../lib/types';
@@ -34,7 +33,7 @@ export const SelectedDatePeriodsProvider = ({
3433
children,
3534
}: {
3635
children: React.ReactNode;
37-
}): JSX.Element => {
36+
}) => {
3837
const [selectedDatePeriods, setSelectedDatePeriods] = useState<DatePeriod[]>(
3938
() => {
4039
const storedDatePeriods: DatePeriod[] =

src/components/button/Button.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
ButtonVariant as HDSButtonVariant,
66
LoadingSpinner,
77
} from 'hds-react';
8-
import React, { type JSX } from 'react';
8+
import React from 'react';
99
import './Button.scss';
1010

1111
type ButtonTypeVariant = 'button' | 'submit' | 'reset' | undefined;
@@ -47,7 +47,7 @@ export const SecondaryButton = ({
4747
'aria-expanded': ariaExpanded,
4848
style,
4949
ref,
50-
}: SecondaryButtonProps): JSX.Element => {
50+
}: SecondaryButtonProps) => {
5151
return (
5252
<HDSButton
5353
aria-expanded={ariaExpanded}
@@ -86,7 +86,7 @@ export const PrimaryButton = ({
8686
'aria-expanded': ariaExpanded,
8787
style,
8888
ref,
89-
}: ButtonProps): JSX.Element => {
89+
}: ButtonProps) => {
9090
return (
9191
<HDSButton
9292
aria-expanded={ariaExpanded}
@@ -129,7 +129,7 @@ export const SupplementaryButton = ({
129129
'aria-expanded': ariaExpanded,
130130
style,
131131
ref,
132-
}: ButtonProps): JSX.Element => {
132+
}: ButtonProps) => {
133133
return (
134134
<HDSButton
135135
aria-expanded={ariaExpanded}

src/components/collapse/Collapse.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { ReactNode, useState, type JSX } from 'react';
1+
import React, { ReactNode, useState } from 'react';
22
import { IconAngleDown, IconAngleUp } from 'hds-react';
33
import './Collapse.scss';
44

@@ -26,7 +26,7 @@ const CollapseButton = ({
2626
isOpen,
2727
toggleOpen,
2828
children,
29-
}: CollapseButtonProps): JSX.Element => {
29+
}: CollapseButtonProps) => {
3030
const onKeyDown = (event: React.KeyboardEvent<HTMLButtonElement>): void => {
3131
if (event.keyCode === 13) {
3232
toggleOpen();
@@ -57,7 +57,7 @@ const Collapse = ({
5757
title,
5858
children,
5959
isOpen,
60-
}: CollapseProps): JSX.Element => {
60+
}: CollapseProps) => {
6161
const buttonId = `${collapseContentId}-button`;
6262
const [isOpenState, setOpen] = useState<boolean>(isOpen);
6363

src/components/exception-opening-hours-form/ExceptionOpeningHoursForm.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import OpeningHoursForm, {
66
OpeningHoursFormProps,
77
} from '../opening-hours-form/OpeningHoursForm';
88

9-
import type { JSX } from "react";
109

1110
const ExceptionOpeningHoursForm = ({
1211
copyFrom,
1312
...props
1413
}: Omit<OpeningHoursFormProps, 'config'> & {
1514
copyFrom?: DatePeriod;
16-
}): JSX.Element => {
15+
}) => {
1716
const { t } = useTranslation();
1817

1918
const config: FormConfig = {

src/components/exception-opening-hours-state-toggle/ExceptionOpeningHoursStateToggle.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ReactNode, useState, type JSX } from 'react';
1+
import { ReactNode, useState } from 'react';
22
import { useTranslation } from 'react-i18next';
33
import { RadioButton, SelectionGroup } from 'hds-react';
44
import { useFormContext } from 'react-hook-form';
@@ -18,7 +18,7 @@ const ExceptionOpeningHoursStateToggle = ({
1818
initiallyOpen: boolean;
1919
onClose: () => void;
2020
onOpen: () => void;
21-
}): JSX.Element => {
21+
}) => {
2222
const { t } = useTranslation();
2323
const [isOpen, setOpen] = useState<boolean>(initiallyOpen);
2424
const { watch } = useFormContext<DatePeriod>();

src/components/exception-opening-hours-validity/ExceptionOpeningHoursValidity.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import { defaultTimeSpanGroup } from '../../constants';
1212
import ExceptionOpeningHoursStateToggle from '../exception-opening-hours-state-toggle/ExceptionOpeningHoursStateToggle';
1313
import './ExceptionOpeningHoursValidity.scss';
1414

15-
import type { JSX } from "react";
1615

17-
const ExceptionOpeningHoursValidity = (): JSX.Element => {
16+
const ExceptionOpeningHoursValidity = () => {
1817
const { t } = useTranslation();
1918
const { language = Language.FI } = useAppContext();
2019
const { getValues, setValue, watch } = useFormContext<DatePeriod>();
@@ -41,7 +40,7 @@ const ExceptionOpeningHoursValidity = (): JSX.Element => {
4140
render={({
4241
field: { name, onBlur, onChange, ref, value },
4342
fieldState,
44-
}): JSX.Element => (
43+
}) => (
4544
<DateInput
4645
id="exception-start-date"
4746
className="exception-date"
@@ -82,7 +81,7 @@ const ExceptionOpeningHoursValidity = (): JSX.Element => {
8281
render={({
8382
field: { name, onBlur, onChange, ref, value },
8483
fieldState,
85-
}): JSX.Element => (
84+
}) => (
8685
<DateInput
8786
id="exception-end-date"
8887
className="exception-date"

src/components/footer/HaukiFooter.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import { useTranslation } from 'react-i18next';
33
import { useAppContext } from '../../App-context';
44
import './HaukiFooter.scss';
55

6-
import type { JSX } from "react";
76

8-
const HaukiFooter = (): JSX.Element => {
7+
const HaukiFooter = () => {
98
const { language } = useAppContext();
109
const { t } = useTranslation();
1110

src/components/header/HaukiHeader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import React, { type JSX } from 'react';
2+
import React from 'react';
33
import { useNavigate, useParams } from 'react-router-dom';
44
import {
55
IconCrossCircleFill,
@@ -19,7 +19,7 @@ import toast from '../notification/Toast';
1919
import { Language } from '../../common/lib/types';
2020
import { languageOptions } from '../../constants';
2121

22-
const HaukiHeader = (): JSX.Element => {
22+
const HaukiHeader = () => {
2323
const { hasOpenerWindow, closeAppWindow, language, setLanguage } =
2424
useAppContext();
2525
const authProps: Partial<AuthContextProps> = useAuth();

src/components/holiday-opening-hours/HolidayOpeningHours.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
} from '../../common/lib/types';
77
import { TimeSpan } from '../opening-hours-preview/OpeningHoursPreview';
88

9-
import type { JSX } from "react";
109

1110
type Props = {
1211
datePeriod?: DatePeriod;
@@ -16,7 +15,7 @@ type Props = {
1615
const HolidayOpeningHours = ({
1716
datePeriod,
1817
datePeriodConfig,
19-
}: Props): JSX.Element => {
18+
}: Props) => {
2019
const { t } = useTranslation();
2120
if (datePeriod) {
2221
return (

0 commit comments

Comments
 (0)