@beinformed/ui 1.54.2 → 1.55.0

package/src/redux/_modularui/ModularUIConnector.js

@@ -71,6 +71,9 @@ const modularUIConnector = (
 
   return (Component: ComponentType<any>) => {
     const WrappedComponent = (props: any) => {
+      // explicit property for removeOnMount overwrite the setting
+      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;
+
       const dispatch = useDispatch();
       const location = useLocation();
 
@@ -78,7 +81,10 @@ const modularUIConnector = (
       const displayName = getDisplayName(Component, name, props.contextId);
 
       // Load the model through the useModUI hook
-      const modelEntry = useModularUI(displayName, url, otherOptions);
+      const modelEntry = useModularUI(displayName, url, {
+        ...otherOptions,
+        removeOnUnmount: finalRemoveOnUnmount,
+      });
       const modelKey = modelEntry?.model?.connectKey;
 
       // handle manual reload of model
@@ -114,20 +120,20 @@ const modularUIConnector = (
       // Remove model when hoc unloads
       useEffect(() => {
         return () => {
-          if (removeOnUnmount) {
+          if (finalRemoveOnUnmount) {
             dispatch(removeModelByKey(modelKey));
           }
         };
-      }, [dispatch, modelKey]);
+      }, [dispatch, modelKey, finalRemoveOnUnmount]);
 
       // Create new properties object to inject modularui properties to own props
       const locale = useLocale();
       const newProps: InjectedProps = {
         modelKey,
-        [propName]: modelEntry ? modelEntry.model : null,
+        [propName]: modelEntry?.model ?? null,
         location,
-        status: modelEntry ? modelEntry.status : null,
-        lastModification: modelEntry ? modelEntry.lastModification : null,
+        status: modelEntry?.status ?? null,
+        lastModification: modelEntry.lastModification ?? null,
         hasModel: Boolean(modelEntry),
         locale,
         fetchModularUI: handleFetch,