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

package/package.json

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

package/src/components/ra-buttons/CreateInDialogButton.tsx

@@ -1,7 +1,7 @@
 import { Button as RaButton } from './Button';
 import { Toolbar } from '@/components/ra-forms';
 import { PlusCircleOutlined } from '@ant-design/icons';
-import { Breakpoint, Button, Dialog } from '@mui/material';
+import { Breakpoint, Button, Dialog, DialogContent } from '@mui/material';
 import { CreateBase, UseCreateMutateParams, useResourceContext, useTranslate } from 'ra-core';
 import { ButtonProps, CreateButton, CreateButtonProps, CreateProps, SaveButton } from 'ra-ui-materialui';
 import React, { Children, PropsWithChildren, useCallback, useState } from 'react';
@@ -158,24 +158,26 @@ function CreateInDialogButton(props: CreateInDialogButtonProps) {
           fullWidth={fullWidth}
           fullScreen={fullScreen}
         >
-          {React.isValidElement(Child)
-            ? React.cloneElement(Child, {
-                ...Child.props,
-                modal: true,
-                toolbar: (
-                  <Toolbar>
-                    <Button variant="text" size="medium" onClick={handleClose}>
-                      {translate('ra.action.cancel')}
-                    </Button>
-                    {onSubmit ? (
-                      <SubmitButton onSubmit={onSubmit!} closeDialog={handleClose} />
-                    ) : (
-                      <SaveButton type="button" />
-                    )}
-                  </Toolbar>
-                )
-              })
-            : null}
+          <DialogContent sx={{ m: 0, p: 0 }}>
+            {React.isValidElement(Child)
+              ? React.cloneElement(Child, {
+                  ...Child.props,
+                  modal: true,
+                  toolbar: (
+                    <Toolbar>
+                      <Button variant="text" size="medium" onClick={handleClose}>
+                        {translate('ra.action.cancel')}
+                      </Button>
+                      {onSubmit ? (
+                        <SubmitButton onSubmit={onSubmit!} closeDialog={handleClose} />
+                      ) : (
+                        <SaveButton type="button" />
+                      )}
+                    </Toolbar>
+                  )
+                })
+              : null}
+          </DialogContent>
         </Dialog>
       </CreateBase>
     </>

package/src/components/ra-buttons/EditInDialogButton.tsx

@@ -1,6 +1,6 @@
 import { Button } from './Button';
 import { Toolbar } from '@/components/ra-forms';
-import { Breakpoint, Dialog } from '@mui/material';
+import { Breakpoint, Dialog, DialogContent } from '@mui/material';
 import { EditBase, UseUpdateMutateParams, useRecordContext } from 'ra-core';
 import { EditButton, EditProps, SaveButton } from 'ra-ui-materialui';
 import React, { Children, PropsWithChildren, useCallback, useState } from 'react';
@@ -76,7 +76,16 @@ type EditInDialogButtonProps = PropsWithChildren &
     onSubmit?: SubmitFunction;
   };
 function EditInDialogButton(props: EditInDialogButtonProps): JSX.Element {
-  const { children, maxWidth = 'md', fullWidth = true, fullScreen, mutationOptions, onSubmit, scroll, ...rest } = props;
+  const {
+    children,
+    maxWidth = 'md',
+    fullWidth = true,
+    fullScreen,
+    mutationOptions,
+    onSubmit,
+    scroll = 'paper',
+    ...rest
+  } = props;
   const [open, setOpen] = useState(false);
   const Child = Children.only(children);
   const handleOpen = useCallback(() => setOpen(true), []);
@@ -110,28 +119,30 @@ function EditInDialogButton(props: EditInDialogButtonProps): JSX.Element {
           fullScreen={fullScreen}
           keepMounted={false}
         >
-          {React.isValidElement(Child)
-            ? React.cloneElement(Child, {
-                ...Child.props,
-                modal: true,
-                toolbar: (
-                  <Toolbar>
-                    <Button
-                      disableIconOnly
-                      variant="text"
-                      size="medium"
-                      onClick={handleClose}
-                      label="ra.action.cancel"
-                    />
-                    {onSubmit ? (
-                      <SubmitButton onSubmit={onSubmit!} closeDialog={handleClose} />
-                    ) : (
-                      <SaveButton type="button" />
-                    )}
-                  </Toolbar>
-                )
-              })
-            : null}
+          <DialogContent sx={{ m: 0, p: 0 }}>
+            {React.isValidElement(Child)
+              ? React.cloneElement(Child, {
+                  ...Child.props,
+                  modal: true,
+                  toolbar: (
+                    <Toolbar>
+                      <Button
+                        disableIconOnly
+                        variant="text"
+                        size="medium"
+                        onClick={handleClose}
+                        label="ra.action.cancel"
+                      />
+                      {onSubmit ? (
+                        <SubmitButton onSubmit={onSubmit!} closeDialog={handleClose} />
+                      ) : (
+                        <SaveButton type="button" />
+                      )}
+                    </Toolbar>
+                  )
+                })
+              : null}
+          </DialogContent>
         </Dialog>
       </EditBase>
     </>

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

@@ -11,6 +11,7 @@ function AttachmentField({
   disabled,
   showUser = false,
   userResource = 'entities/user',
+  rootEntity = undefined,
   ...props
 }: AttachmentFieldProps): JSX.Element {
   const [user, setUser] = useState<any>(null);
@@ -22,7 +23,7 @@ function AttachmentField({
       e.preventDefault();
       e.stopPropagation();
       const item = get(record, props?.source);
-      const entity = resource.replace('entities/', '');
+      const entity = rootEntity || resource.replace('entities/', '');
       const attachment = await dataProvider.getFile(
         `/attachments/${entity}/${entityId || record?.id}/${property || props?.source}/${item?.id || record?.id}`
       );
@@ -31,7 +32,7 @@ function AttachmentField({
       link.download = get(record, props?.title || props?.source);
       link.click();
     },
-    [dataProvider, record, entityId, resource, property, props?.source, props?.title]
+    [dataProvider, record, entityId, resource, rootEntity, property, props?.source, props?.title]
   );
   const _record = useMemo(
     () => ({
@@ -89,6 +90,11 @@ type AttachmentFieldProps = BaseAttachmentFieldProps & {
    * If true, the user data associated with the single attachment will be displayed.
    */
   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.
+   */
+  rootEntity?: string;
 };
 
 export { AttachmentField };

package/src/playground/components/ra-forms/CategoryForm.jsx

@@ -1,4 +1,5 @@
 import { BooleanInput, LocalizedTextInput, SimpleForm, required } from '@/';
+import { ArrayInput, SimpleFormIterator } from 'ra-ui-materialui';
 
 function requiredAtLeastOneTranslation(message = 'ra.validation.at_least_one_translation') {
   return (value, values) => {