[material-ui][Transitions] External ownerState is incorrectly forward…

…ed to inner components (#41187)
mui · Feb 20, 2024 · 633682d · 633682d
1 parent daee6ef
commit 633682d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/mui-material/src/Accordion/Accordion.js b/packages/mui-material/src/Accordion/Accordion.js
@@ -180,8 +180,6 @@ const Accordion = React.forwardRef(function Accordion(inProps, ref) {
     ownerState,
   });
 
-  delete transitionProps.ownerState;
-
   return (
     <AccordionRoot
       className={clsx(classes.root, className)}

diff --git a/packages/mui-material/src/Collapse/Collapse.js b/packages/mui-material/src/Collapse/Collapse.js
@@ -287,9 +287,11 @@ const Collapse = React.forwardRef(function Collapse(inProps, ref) {
             [isHorizontal ? 'minWidth' : 'minHeight']: collapsedSize,
             ...style,
           }}
-          ownerState={{ ...ownerState, state }}
           ref={handleRef}
           {...childProps}
+          // `ownerState` is set after `childProps` to override any existing `ownerState` property in `childProps`
+          // that might have been forwarded from the Transition component.
+          ownerState={{ ...ownerState, state }}
         >
           <CollapseWrapper
             ownerState={{ ...ownerState, state }}