Merge pull request #5728 from marmelab/Fix-EditGuesser

Fix EditGuesser is broken

packages/ra-core/src/core/useResourceContext.ts

@@ -12,7 +12,7 @@ import { ResourceContext, ResourceContextValue } from './ResourceContext';
 export const useResourceContext = <
     ResourceInformationsType extends Partial<{ resource: string }>
 >(
-    props: ResourceInformationsType
+    props?: ResourceInformationsType
 ): ResourceContextValue => {
     const context = useContext(ResourceContext);
 
@@ -29,7 +29,7 @@ export const useResourceContext = <
             // );
         }
         // Ignored because resource is often optional (as it is injected) in components which passes the props to this hook
-        return props.resource;
+        return props && props.resource;
     }
 
     return context;

packages/ra-ui-materialui/src/detail/EditGuesser.tsx

@@ -3,15 +3,19 @@ import { useEffect, useState } from 'react';
 import inflection from 'inflection';
 import {
     useEditController,
+    EditContextProvider,
     InferredElement,
+    useResourceContext,
+    useEditContext,
     getElementsFromRecords,
 } from 'ra-core';
 
 import { EditView } from './EditView';
 import editFieldTypes from './editFieldTypes';
 
 const EditViewGuesser = props => {
-    const { record, resource } = props;
+    const resource = useResourceContext();
+    const { record } = useEditContext();
     const [inferredChild, setInferredChild] = useState(null);
     useEffect(() => {
         if (record && !inferredChild) {
@@ -47,8 +51,13 @@ ${inferredChild.getRepresentation()}
 
 EditViewGuesser.propTypes = EditView.propTypes;
 
-const EditGuesser = props => (
-    <EditViewGuesser {...props} {...useEditController(props)} />
-);
+const EditGuesser = props => {
+    const controllerProps = useEditController(props);
+    return (
+        <EditContextProvider value={controllerProps}>
+            <EditViewGuesser {...props} />
+        </EditContextProvider>
+    );
+};
 
 export default EditGuesser;