Fix #5561: Inplace respect active prop

primefaces · Dec 8, 2023 · b1887c7 · b1887c7
1 parent 6b14037
commit b1887c7
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/components/lib/inplace/Inplace.js b/components/lib/inplace/Inplace.js
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { localeOption, PrimeReactContext } from '../api/Api';
 import { Button } from '../button/Button';
 import { useHandleStyle } from '../componentbase/ComponentBase';
+import { useUpdateEffect } from '../hooks/Hooks';
 import { TimesIcon } from '../icons/times';
 import { classNames, IconUtils, mergeProps, ObjectUtils } from '../utils/Utils';
 import { InplaceBase } from './InplaceBase';
@@ -13,7 +14,7 @@ export const Inplace = React.forwardRef((inProps, ref) => {
     const context = React.useContext(PrimeReactContext);
     const props = InplaceBase.getProps(inProps, context);
 
-    const [activeState, setActiveState] = React.useState(props.active);
+    const [activeState, setActiveState] = React.useState(undefined);
     const elementRef = React.useRef(null);
     const active = props.onToggle ? props.active : activeState;
     const metaData = {
@@ -44,6 +45,10 @@ export const Inplace = React.forwardRef((inProps, ref) => {
     };
 
     const close = (event) => {
+        if (props.disabled) {
+            return;
+        }
+
         props.onClose && props.onClose(event);
 
         if (props.onToggle) {
@@ -133,6 +138,10 @@ export const Inplace = React.forwardRef((inProps, ref) => {
         });
     };
 
+    useUpdateEffect(() => {
+        props.active ? open(null) : close(null);
+    }, [props.active]);
+
     React.useImperativeHandle(ref, () => ({
         props,
         getElement: () => elementRef.current