Skip to content

Commit 96cd845

Browse files
committed
fix(theme-provider): add conditional render
1 parent 6921103 commit 96cd845

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

packages/payment-widget/src/hooks/use-fields-render.hook.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import { Condition } from '@atls-ui-parts/condition'
2-
import { Layout } from '@atls-ui-parts/layout'
1+
import { Condition } from '@atls-ui-parts/condition'
2+
import { Layout } from '@atls-ui-parts/layout'
33

4-
import React from 'react'
5-
import { useIntl } from 'react-intl'
4+
import React from 'react'
5+
import { useIntl } from 'react-intl'
66

7-
import { Field } from '../interfaces'
8-
import { InputStyles } from '../interfaces'
9-
import { HandleBlurField } from '../interfaces'
10-
import { FieldState } from '../interfaces'
11-
import { HandleChangeField } from '../interfaces'
12-
import { FieldsErrors } from '../interfaces'
13-
import { MemoizedInput } from '../ui'
14-
import { translate } from '../utils/translate.util'
7+
import { Field } from '../interfaces'
8+
import { InputStyles } from '../interfaces'
9+
import { HandleBlurField } from '../interfaces'
10+
import { FieldState } from '../interfaces'
11+
import { HandleChangeField } from '../interfaces'
12+
import { FieldsErrors } from '../interfaces'
13+
import { MemoizedInput } from '../ui'
14+
import { translate } from '../utils/translate.util'
1515

1616
export const useFieldsRenderer = (
1717
fields: Field[],

packages/payment-widget/src/interfaces/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ export * from './fields.interfaces'
33
export * from './settings.interfaces'
44
export * from './receipt.interfaces'
55
export * from './styles.interfaces'
6-
export * from './theme.interfaces'

packages/payment-widget/src/interfaces/theme.interfaces.ts

-3
This file was deleted.

packages/payment-widget/src/interfaces/widget.interfaces.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ import { AdditionalField } from './fields.interfaces'
22
import { ReceiptSettings } from './receipt.interfaces'
33
import { Settings } from './settings.interfaces'
44
import { Styles } from './styles.interfaces'
5-
import { Theme } from './theme.interfaces'
65

76
export interface WidgetProps {
87
settings: Settings
98
amount?: number
109
receipt?: ReceiptSettings
1110
styles?: Styles
1211
additionalFields?: AdditionalField[]
13-
customTheme?: Theme
12+
customTheme?: boolean
1413
disabled?: boolean
1514
}

packages/payment-widget/src/ui/button/button.component.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const ButtonElement = ({ styledArray, ...props }) => {
2020
export const Button: FC<ButtonStyles> = ({ children, styledArray, ...props }) => {
2121
const [hover, hoverProps] = useHover()
2222
return (
23-
<ButtonElement hover={hover} {...hoverProps} styledArray={styledArray} {...props}>
23+
<ButtonElement hover={hover} {...hoverProps} styledArray={styledArray || []} {...props}>
2424
{children}
2525
</ButtonElement>
2626
)

packages/payment-widget/src/ui/theme/src/theme.provider.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import { ThemeProvider as EmotionThemeProvider } from '@emotion/react'
44

55
import React from 'react'
66

7-
export const ThemeProvider = ({ customTheme, children }) => (
8-
<EmotionThemeProvider theme={customTheme ?? theme}>{children}</EmotionThemeProvider>
9-
)
7+
export const ThemeProvider = ({ customTheme, children }) =>
8+
customTheme ? (
9+
<>{children}</> // eslint-disable-line
10+
) : (
11+
<EmotionThemeProvider theme={theme}>{children}</EmotionThemeProvider>
12+
)

0 commit comments

Comments
 (0)