From c7f44ce87d135e15cce589b6f76d6f2ea11bd44d Mon Sep 17 00:00:00 2001 From: Emerson Laurentino Date: Thu, 9 Jun 2022 12:33:57 -0300 Subject: [PATCH] fix: some ts errors --- packages/sdk/src/cart/Cart.tsx | 6 +++--- packages/sdk/src/search/Provider.tsx | 6 +++--- packages/sdk/src/ui/Provider.tsx | 6 +++--- packages/ui/src/atoms/Slider/Slider.tsx | 2 +- packages/ui/src/atoms/Spinner/Spinner.tsx | 16 ++++++++-------- packages/ui/src/molecules/Carousel/Carousel.tsx | 5 ++++- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/packages/sdk/src/cart/Cart.tsx b/packages/sdk/src/cart/Cart.tsx index 7a4d890f22..82eba55c2f 100644 --- a/packages/sdk/src/cart/Cart.tsx +++ b/packages/sdk/src/cart/Cart.tsx @@ -1,5 +1,5 @@ +import type { PropsWithChildren } from 'react' import React, { createContext, useMemo } from 'react' -import type { FC } from 'react' import { useStorage } from '../storage/useStorage' import { SDKError } from '../utils/error' @@ -57,14 +57,14 @@ export interface Props { onItemRemove?: (item?: Item) => void } -export const CartProvider: FC = ({ +export const CartProvider = ({ children, onItemAdd, initialCart, onItemRemove, onItemUpdate, namespace: nspc = 'main', -}) => { +}: PropsWithChildren) => { const namespace = `${nspc}::store::cart` const [cart, setCart] = useStorage(namespace, () => ({ ...initialState, diff --git a/packages/sdk/src/search/Provider.tsx b/packages/sdk/src/search/Provider.tsx index dfba064a31..f7d08f5dc3 100644 --- a/packages/sdk/src/search/Provider.tsx +++ b/packages/sdk/src/search/Provider.tsx @@ -1,4 +1,4 @@ -import type { FC } from 'react' +import type { PropsWithChildren } from 'react' import React, { createContext, useMemo } from 'react' import type { State as SearchState } from '../types' @@ -18,12 +18,12 @@ type Props = SearchState & { itemsPerPage: number } -export const Provider: FC = ({ +export const Provider = ({ children, itemsPerPage, onChange, ...rest -}) => { +}: PropsWithChildren) => { const { state, ...searchActions } = useSearchState(rest, onChange) const { pages, ...infiniteActions } = useSearchInfiniteState(state.page) diff --git a/packages/sdk/src/ui/Provider.tsx b/packages/sdk/src/ui/Provider.tsx index 30a3892553..58433314bc 100644 --- a/packages/sdk/src/ui/Provider.tsx +++ b/packages/sdk/src/ui/Provider.tsx @@ -1,5 +1,5 @@ +import type { Dispatch, PropsWithChildren } from 'react' import React, { createContext, useMemo, useReducer } from 'react' -import type { FC, Dispatch } from 'react' interface BaseState { displayMinicart: boolean @@ -75,12 +75,12 @@ interface Props { const defaultEffects: Effects = () => ({}) -export const Provider: FC = ({ +export const Provider = ({ children, actions = {}, effects = defaultEffects, initialState = {}, -}) => { +}: PropsWithChildren) => { const [state, dispatch] = useReducer(reducer(actions), { ...baseInitialState, ...initialState, diff --git a/packages/ui/src/atoms/Slider/Slider.tsx b/packages/ui/src/atoms/Slider/Slider.tsx index 45368e018b..292f686b4e 100644 --- a/packages/ui/src/atoms/Slider/Slider.tsx +++ b/packages/ui/src/atoms/Slider/Slider.tsx @@ -49,7 +49,7 @@ const Slider = ({ const range = useRef(null) const getPercent = useCallback( - (value) => Math.round(((value - min) / (max - min)) * 100), + (value: number) => Math.round(((value - min) / (max - min)) * 100), [min, max] ) diff --git a/packages/ui/src/atoms/Spinner/Spinner.tsx b/packages/ui/src/atoms/Spinner/Spinner.tsx index d3e16502d2..c309a75dc6 100644 --- a/packages/ui/src/atoms/Spinner/Spinner.tsx +++ b/packages/ui/src/atoms/Spinner/Spinner.tsx @@ -1,3 +1,4 @@ +import type { PropsWithChildren } from 'react' import React, { forwardRef } from 'react' export type SpinnerProps = { @@ -7,13 +8,12 @@ export type SpinnerProps = { testId?: string } -const Spinner = forwardRef(function Spinner( - { children, testId = 'store-spinner', ...otherProps }, - ref -) { - return ( - - ) -}) +const Spinner = forwardRef>( + function Spinner({ children, testId = 'store-spinner', ...otherProps }, ref) { + return ( + + ) + } +) export default Spinner diff --git a/packages/ui/src/molecules/Carousel/Carousel.tsx b/packages/ui/src/molecules/Carousel/Carousel.tsx index 7adf0917a4..2f3ba5967d 100644 --- a/packages/ui/src/molecules/Carousel/Carousel.tsx +++ b/packages/ui/src/molecules/Carousel/Carousel.tsx @@ -84,7 +84,10 @@ function Carousel({ const preRenderedSlides = infiniteMode && children ? childrenArray.slice(childrenCount - 1) : [] - const slides = preRenderedSlides.concat(children ?? [], postRenderedSlides) + const slides = preRenderedSlides.concat( + (children as any) ?? [], + postRenderedSlides + ) const slidePrevious = () => { if (