From 83452f328213c7f5296652efd3d017f8b3e0184a Mon Sep 17 00:00:00 2001 From: Wes Reed <reedws@ucmail.uc.edu> Date: Tue, 6 Dec 2022 16:45:41 -0500 Subject: [PATCH 1/2] fix: brought back custom modal attributes from v3 --- packages/coreui-react/src/components/modal/CModal.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/coreui-react/src/components/modal/CModal.tsx b/packages/coreui-react/src/components/modal/CModal.tsx index 5bfb7a61..65ae9667 100644 --- a/packages/coreui-react/src/components/modal/CModal.tsx +++ b/packages/coreui-react/src/components/modal/CModal.tsx @@ -108,6 +108,7 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>( transition = true, unmountOnClose = true, visible, + ...attributes }, ref, ) => { @@ -232,6 +233,7 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>( fullscreen={fullscreen} scrollable={scrollable} size={size} + {...attributes} > <CModalContent ref={modalContentRef}>{children}</CModalContent> </CModalDialog> From a060bb7b28fa06df4db64a1c07063b6359b0ffd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= <lukasz@holeczek.pl> Date: Mon, 19 Dec 2022 15:48:07 +0100 Subject: [PATCH 2/2] Update CModal.tsx --- packages/coreui-react/src/components/modal/CModal.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/coreui-react/src/components/modal/CModal.tsx b/packages/coreui-react/src/components/modal/CModal.tsx index 65ae9667..125b2148 100644 --- a/packages/coreui-react/src/components/modal/CModal.tsx +++ b/packages/coreui-react/src/components/modal/CModal.tsx @@ -108,7 +108,7 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>( transition = true, unmountOnClose = true, visible, - ...attributes + ...rest }, ref, ) => { @@ -233,9 +233,10 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>( fullscreen={fullscreen} scrollable={scrollable} size={size} - {...attributes} > - <CModalContent ref={modalContentRef}>{children}</CModalContent> + <CModalContent {...rest} ref={modalContentRef}> + {children} + </CModalContent> </CModalDialog> </div> </CModalContext.Provider>