From 447e882ac703123b49bab0195d27918265c7cd53 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Fri, 30 Sep 2022 09:35:18 +0900 Subject: [PATCH] component override --- packages/react-ui/components/VulcanComponents/Consumer.tsx | 5 +++-- packages/react-ui/components/core/LoadingButton.tsx | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/react-ui/components/VulcanComponents/Consumer.tsx b/packages/react-ui/components/VulcanComponents/Consumer.tsx index 522997e0..ec365926 100644 --- a/packages/react-ui/components/VulcanComponents/Consumer.tsx +++ b/packages/react-ui/components/VulcanComponents/Consumer.tsx @@ -4,9 +4,10 @@ import { VulcanComponentsContext } from "./Context"; export const VulcanComponentsConsumer = VulcanComponentsContext.Consumer; -export const useVulcanComponents = () => { +export const useVulcanComponents = (components?: any[]) => { const val = useContext(VulcanComponentsContext); - return val; + const Components = {...val.Components, ...components} + return {...val, Components}; }; export const withVulcanComponents = (C) => (props) => { diff --git a/packages/react-ui/components/core/LoadingButton.tsx b/packages/react-ui/components/core/LoadingButton.tsx index 4b0d7b3a..b52a8a6b 100644 --- a/packages/react-ui/components/core/LoadingButton.tsx +++ b/packages/react-ui/components/core/LoadingButton.tsx @@ -7,6 +7,7 @@ export interface LoadingButtonProps extends ButtonProps { onClick?: any; children?: React.ReactNode; className?: string; + components?: any[] } export const LoadingButton = ({ loading, @@ -14,9 +15,10 @@ export const LoadingButton = ({ onClick, children, className = "", + components, ...rest }: LoadingButtonProps & any) => { - const Components = useVulcanComponents(); + const Components = useVulcanComponents(components); const wrapperStyle: CSSProperties = { position: "relative",