Fix #5425: CascadeSelect fix for StrictMode

primefaces · Nov 28, 2023 · f3a9ce9 · f3a9ce9
1 parent 05f9124
commit f3a9ce9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/components/lib/cascadeselect/CascadeSelect.js b/components/lib/cascadeselect/CascadeSelect.js
@@ -401,6 +401,7 @@ export const CascadeSelect = React.memo(
                                 optionGroupIcon={props.optionGroupIcon}
                                 optionLabel={props.optionLabel}
                                 optionValue={props.optionValue}
+                                parentActive={props.value != null}
                                 level={0}
                                 optionGroupLabel={props.optionGroupLabel}
                                 optionGroupChildren={props.optionGroupChildren}

diff --git a/components/lib/cascadeselect/CascadeSelectSub.js b/components/lib/cascadeselect/CascadeSelectSub.js
@@ -5,7 +5,7 @@ import { AngleRightIcon } from '../icons/angleright';
 import { Ripple } from '../ripple/Ripple';
 import { DomHandler, IconUtils, ObjectUtils, classNames, mergeProps } from '../utils/Utils';
 export const CascadeSelectSub = React.memo((props) => {
-    const [activeOptionState, setActiveOptionState] = React.useState(null);
+    const [activeOptionState, setActiveOptionState] = React.useState(props.parentActive);
     const elementRef = React.useRef(null);
     const context = React.useContext(PrimeReactContext);
     const { ptm, cx } = props;
@@ -173,7 +173,9 @@ export const CascadeSelectSub = React.memo((props) => {
     });
 
     useUpdateEffect(() => {
-        setActiveOptionState(null);
+        if (!props.parentActive) {
+            setActiveOptionState(null);
+        }
     }, [props.parentActive]);
 
     const createSubmenu = (option) => {