@applica-software-guru/react-admin 1.5.257 → 1.5.259

package/package.json

@@ -115,5 +115,5 @@
   "type": "module",
   "types": "dist/index.d.ts",
   "typings": "dist/index.d.ts",
-  "version": "1.5.257"
+  "version": "1.5.259"
 }

package/src/components/ra-fields/AttachmentField.tsx

@@ -6,12 +6,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDataProvider, useRecordContext, useResourceContext, useTranslate } from 'react-admin';
 
 function AttachmentField({
-  entityId,
+  entityId: _entityId,
   property,
   disabled,
   showUser = false,
   userResource = 'entities/user',
-  rootEntity = undefined,
+  resource: _resource,
   ...props
 }: AttachmentFieldProps): JSX.Element {
   const [user, setUser] = useState<any>(null);
@@ -23,16 +23,17 @@ function AttachmentField({
       e.preventDefault();
       e.stopPropagation();
       const item = get(record, props?.source);
-      const entity = rootEntity || resource.replace('entities/', '');
+      const entity = _resource || resource.replace('entities/', '');
+      const entityId = _entityId || record?.id;
       const attachment = await dataProvider.getFile(
-        `/attachments/${entity}/${entityId || record?.id}/${property || props?.source}/${item?.id || record?.id}`
+        `/attachments/${entity}/${entityId}/${property || props?.source}/${item?.id || record?.id}`
       );
       const link = document.createElement('a');
       link.href = attachment;
       link.download = get(record, props?.title || props?.source);
       link.click();
     },
-    [dataProvider, record, entityId, resource, rootEntity, property, props?.source, props?.title]
+    [dataProvider, record, _entityId, resource, _resource, property, props?.source, props?.title]
   );
   const _record = useMemo(
     () => ({
@@ -91,10 +92,10 @@ type AttachmentFieldProps = BaseAttachmentFieldProps & {
    */
   showUser?: boolean;
   /**
-   * When the AttachmentInput is used inside a nested form, you can specify the root entity to use for the REST calls.
-   * If not specified, the default value is the current entity passed by context.
+   * When the AttachmentInput is used inside a nested form, you can specify the root resource to use for the REST calls.
+   * If not specified, the default value is the current resource passed by context.
    */
-  rootEntity?: string;
+  resource?: string;
 };
 
 export { AttachmentField };

package/src/components/ra-inputs/AttachmentInput.tsx

@@ -68,7 +68,7 @@ function AttachmentInput({
       {/** @ts-ignore */}
       <StyledFileInput type={type} multiple={multiple} disabled={disabled}>
         {/* @ts-ignore */}
-        {React.cloneElement(children, { ...children.props, entityId, property })}
+        {React.cloneElement(children, { entityId, property, ...children.props })}
       </StyledFileInput>
     </LabeledInput>
   );