From 71456a1eeea2be8ef251ab08502d8969bd90db1d Mon Sep 17 00:00:00 2001 From: CyberCookie Date: Thu, 16 Jan 2025 23:11:19 +0200 Subject: [PATCH] rename JSX to React.JSX --- client_core/router/Router/index.tsx | 4 ++-- client_core/router/Router/types.d.ts | 2 +- .../DropdownSearch/helpers/get_search_options_elements.tsx | 2 +- client_core/ui/DropdownSearch/index.tsx | 2 +- .../ui/NumberPicker/helpers/get_step_buttons_types.d.ts | 2 +- client_core/ui/Pagination/index.tsx | 6 +++--- client_core/ui/Pagination/types.d.ts | 2 +- .../ui/Ranger/helpers/get_range_area_elements_types.d.ts | 4 ++-- client_core/ui/Select/index.tsx | 2 +- client_core/ui/_internals/label.tsx | 4 ++-- client_core/ui/_internals/types.d.ts | 2 +- .../components/DataTable/getEnchancedDataTableProps.tsx | 4 ++-- demo_app/client/main/pages/DemoComponents/index.tsx | 2 +- eslint.config.js | 3 +-- 14 files changed, 20 insertions(+), 21 deletions(-) diff --git a/client_core/router/Router/index.tsx b/client_core/router/Router/index.tsx index 2697497a..d630b8d3 100644 --- a/client_core/router/Router/index.tsx +++ b/client_core/router/Router/index.tsx @@ -97,7 +97,7 @@ function Router(props: RouterProps) { const lastIndex = childrenDepth - 1 if (prevChildrenArray[lastIndex].traversePath == childrenArray[lastIndex].traversePath) { childrenArray.push({ - El: () => '' as unknown as JSX.Element, + El: () => '' as unknown as React.JSX.Element, traversePath: `${childrenArray[lastIndex].traversePath}/`, historyState: null }) @@ -163,7 +163,7 @@ function Router(props: RouterProps) { } - return resultElement as JSX.Element + return resultElement as React.JSX.Element } diff --git a/client_core/router/Router/types.d.ts b/client_core/router/Router/types.d.ts index b7c7062d..dd125eea 100644 --- a/client_core/router/Router/types.d.ts +++ b/client_core/router/Router/types.d.ts @@ -25,7 +25,7 @@ type GetPageParams = { onEnter: ChildrenArrayEl['onEnter'] onLeave: ChildrenArrayEl['onLeave'] urlParams: URLparams - resultElement: JSX.Element | undefined + resultElement: React.JSX.Element | undefined } diff --git a/client_core/ui/DropdownSearch/helpers/get_search_options_elements.tsx b/client_core/ui/DropdownSearch/helpers/get_search_options_elements.tsx index cb68b298..399f13c3 100644 --- a/client_core/ui/DropdownSearch/helpers/get_search_options_elements.tsx +++ b/client_core/ui/DropdownSearch/helpers/get_search_options_elements.tsx @@ -10,7 +10,7 @@ function getSearchOptions(props: MergedProps, state: State, onSelect: onSelectIn const { searchString, arrowSelectIndex } = state const searchLower = searchString?.toLowerCase() - const options: JSX.Element[] = [] + const options: React.JSX.Element[] = [] let selectedOption, selectedOptionIndex for (let i = 0; i < searchOptions.length; i++) { const option = searchOptions[i] diff --git a/client_core/ui/DropdownSearch/index.tsx b/client_core/ui/DropdownSearch/index.tsx index a9d6a352..fb7ee9aa 100644 --- a/client_core/ui/DropdownSearch/index.tsx +++ b/client_core/ui/DropdownSearch/index.tsx @@ -87,7 +87,7 @@ const DropdownSearch = component( const isShowOptions = isFocused && (showOnFocus || (searchString ? searchString.length : 0) >= minInputLength) - let optionsElement: JSX.Element | undefined + let optionsElement: React.JSX.Element | undefined let selectedOption: Option | undefined let selectedOptionIndex: number | undefined if (isShowOptions) { diff --git a/client_core/ui/NumberPicker/helpers/get_step_buttons_types.d.ts b/client_core/ui/NumberPicker/helpers/get_step_buttons_types.d.ts index 56e406da..a779f106 100644 --- a/client_core/ui/NumberPicker/helpers/get_step_buttons_types.d.ts +++ b/client_core/ui/NumberPicker/helpers/get_step_buttons_types.d.ts @@ -14,7 +14,7 @@ type GetStepperButtons = ( onPickerFocus: ComponentFocusEventHandler | undefined } ) => { - stepperElement: JSX.Element + stepperElement: React.JSX.Element isDisabledUp: boolean isDisabledDown: boolean } diff --git a/client_core/ui/Pagination/index.tsx b/client_core/ui/Pagination/index.tsx index 5f72c028..477a41c8 100644 --- a/client_core/ui/Pagination/index.tsx +++ b/client_core/ui/Pagination/index.tsx @@ -58,7 +58,7 @@ const getPageElement: GetPageElement = (page: number, { curPage, theme }) => ( key={ page } data-page={ page } children={ page } /> ) -function fillGap(start: number, end: number, result: JSX.Element[], props: MergedProps, isLastGap?: boolean) { +function fillGap(start: number, end: number, result: React.JSX.Element[], props: MergedProps, isLastGap?: boolean) { const { theme, separator } = props const elementToPush = (start - end) == 1 @@ -69,7 +69,7 @@ function fillGap(start: number, end: number, result: JSX.Element[], props: Merge result.push(elementToPush) } -function getElementsRange(from: number, to: number, result: JSX.Element[], props: MergedProps) { +function getElementsRange(from: number, to: number, result: React.JSX.Element[], props: MergedProps) { for (let i = from; i <= to; i++) { result.push(getPageElement(i, props)) } @@ -82,7 +82,7 @@ function getPaginationVisuals(mergedProps: MergedProps, numberOfPages: number) { const middlePluseSide = elementsByMiddle + elementsBySide const maxLength = middlePluseSide * 2 + 3 - const result: JSX.Element[] = [] + const result: React.JSX.Element[] = [] if (maxLength > numberOfPages) getElementsRange(1, numberOfPages, result, mergedProps) diff --git a/client_core/ui/Pagination/types.d.ts b/client_core/ui/Pagination/types.d.ts index e67f34a8..82dc2d4e 100644 --- a/client_core/ui/Pagination/types.d.ts +++ b/client_core/ui/Pagination/types.d.ts @@ -3,7 +3,7 @@ import type { } from '../_internals/types' -type GetPageElement = (page: number, props: MergedProps) => JSX.Element +type GetPageElement = (page: number, props: MergedProps) => React.JSX.Element type Theme = { diff --git a/client_core/ui/Ranger/helpers/get_range_area_elements_types.d.ts b/client_core/ui/Ranger/helpers/get_range_area_elements_types.d.ts index de2a242e..419e3e0f 100644 --- a/client_core/ui/Ranger/helpers/get_range_area_elements_types.d.ts +++ b/client_core/ui/Ranger/helpers/get_range_area_elements_types.d.ts @@ -6,13 +6,13 @@ type GetRangeElement = ( className: string | undefined, width: number, isVertical: MergedProps['isVertical'] -) => JSX.Element +) => React.JSX.Element type GetRangePickerElement = ( key: string, props: MergedProps, width: number -) => JSX.Element +) => React.JSX.Element export type { GetRangeElement, GetRangePickerElement } \ No newline at end of file diff --git a/client_core/ui/Select/index.tsx b/client_core/ui/Select/index.tsx index 4f68d53c..1820b368 100644 --- a/client_core/ui/Select/index.tsx +++ b/client_core/ui/Select/index.tsx @@ -92,7 +92,7 @@ const Select = component( } - let optionsElement: JSX.Element + let optionsElement: React.JSX.Element let selectedOption: Props['options'][number] | undefined let selectedOptionIndex: number | undefined diff --git a/client_core/ui/_internals/label.tsx b/client_core/ui/_internals/label.tsx index 353163ac..c0d405a1 100644 --- a/client_core/ui/_internals/label.tsx +++ b/client_core/ui/_internals/label.tsx @@ -2,10 +2,10 @@ import React from 'react' type WithLabel = ( - input: JSX.Element, + input: React.JSX.Element, labelProps: ReactTagAttributes, labelTextProps: ReactTagAttributes -) => JSX.Element +) => React.JSX.Element const withLabel: WithLabel = (input, labelProps, labelTextProps) => ( diff --git a/client_core/ui/_internals/types.d.ts b/client_core/ui/_internals/types.d.ts index 708beee6..3cebc96a 100644 --- a/client_core/ui/_internals/types.d.ts +++ b/client_core/ui/_internals/types.d.ts @@ -73,7 +73,7 @@ type CoreUIComponent< > = { defaults: _Defaults ID: string -} & React.MemoExoticComponent<(props: _Props) => JSX.Element> +} & React.MemoExoticComponent<(props: _Props) => React.JSX.Element> type CoreUIComponentWithDefaults<_Component extends CoreUIComponent> = { (...args: Parameters<_Component>): ReturnType<_Component> diff --git a/demo_app/client/main/pages/DemoComponents/components/DataTable/getEnchancedDataTableProps.tsx b/demo_app/client/main/pages/DemoComponents/components/DataTable/getEnchancedDataTableProps.tsx index 78c183c8..c9ee09f9 100644 --- a/demo_app/client/main/pages/DemoComponents/components/DataTable/getEnchancedDataTableProps.tsx +++ b/demo_app/client/main/pages/DemoComponents/components/DataTable/getEnchancedDataTableProps.tsx @@ -79,10 +79,10 @@ function getHeadLabelMenuTableCell = demoComponents diff --git a/eslint.config.js b/eslint.config.js index a2b39ad7..cbb9aad5 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -108,8 +108,7 @@ const config = typeScriptEslintCreateConfig( '@typescript-eslint/ban-types': 0, '@typescript-eslint/no-base-to-string': 0, '@typescript-eslint/only-throw-error': 0, - '@typescript-eslint/await-thenable': 0, - "@typescript-eslint/no-redundant-type-constituents": 0 + '@typescript-eslint/await-thenable': 0 } } )