@strapi/content-manager 5.12.0-beta.2 → 5.12.1

package/dist/admin/chunks/{Input-C2r54bIL.js → Input-D3aI7eJe.js}

@@ -6,7 +6,7 @@ var strapiAdmin = require('@strapi/admin/strapi-admin');
 var designSystem = require('@strapi/design-system');
 var Icons = require('@strapi/icons');
 var reactIntl = require('react-intl');
-var index = require('./index-BA_JLxKS.js');
+var index = require('./index-CB_ymrXf.js');
 var styledComponents = require('styled-components');
 var slate = require('slate');
 var slateHistory = require('slate-history');
@@ -62,7 +62,7 @@ require('prismjs/components/prism-typescript');
 require('prismjs/components/prism-tsx');
 require('prismjs/components/prism-vbnet');
 require('prismjs/components/prism-yaml');
-var usePrev = require('./usePrev-BglKW7a4.js');
+var usePrev = require('./usePrev-BXNyqdUp.js');
 var objects = require('./objects-BJTP843m.js');
 var Toolbar = require('@radix-ui/react-toolbar');
 var reactDndHtml5Backend = require('react-dnd-html5-backend');
@@ -1800,6 +1800,7 @@ const EditorToolbarObserver = ({ observedComponents, menuTriggerVariant = 'ghost
                 maxHeight: "100%",
                 minWidth: "256px",
                 popoverPlacement: "bottom-end",
+                zIndex: 2,
                 children: observedComponents.slice(menuIndex).map((component)=>/*#__PURE__*/ jsxRuntime.jsx(React__namespace.Fragment, {
                         children: component.menu
                     }, component.key))
@@ -3687,8 +3688,16 @@ const DynamicComponent = ({ componentUid, disabled, index: index$1, name, onRemo
     const formValues = strapiAdmin.useForm('DynamicComponent', (state)=>state.values);
     const documentMeta = index.useDocumentContext('DynamicComponent', (state)=>state.meta);
     const rootDocumentMeta = index.useDocumentContext('DynamicComponent', (state)=>state.rootDocumentMeta);
-    const isRootDocument = rootDocumentMeta.model === documentMeta.model;
-    const { edit: { components } } = index.useDocumentLayout(isRootDocument ? documentMeta.model : rootDocumentMeta.model);
+    const { edit: { components: rootComponents } } = index.useDocumentLayout(rootDocumentMeta.model);
+    const { edit: { components: relatedComponents } } = index.useDocumentLayout(documentMeta.model);
+    // Merge the root level components and related components
+    const components = React__namespace.useMemo(()=>({
+            ...rootComponents,
+            ...relatedComponents
+        }), [
+        rootComponents,
+        relatedComponents
+    ]);
     const document = index.useDocumentContext('DynamicComponent', (state)=>state.document);
     const title = React__namespace.useMemo(()=>{
         const { mainField } = components[componentUid]?.settings ?? {
@@ -4373,6 +4382,10 @@ const RelationModalForm = ({ relation, triggerButtonLabel })=>{
                 changeDocument(previousRelation);
             }
         } else {
+            // Add current relation to history before opening a new one in case we are opening a new one
+            if (currentDocumentMeta && Object.keys(currentDocumentMeta).length > 0) {
+                addDocumentToHistory(currentDocumentMeta);
+            }
             handleToggleModal();
         }
     };
@@ -4432,6 +4445,7 @@ const RelationModalForm = ({ relation, triggerButtonLabel })=>{
                                                 }
                                             }
                                         },
+                                        width: "100%",
                                         children: triggerButtonLabel
                                     })
                                 })
@@ -4544,6 +4558,10 @@ const RelationModalForm = ({ relation, triggerButtonLabel })=>{
 const CustomTextButton = styledComponents.styled(designSystem.TextButton)`
   & > span {
     font-size: ${({ theme })=>theme.fontSizes[2]};
+    width: inherit;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 `;
 const RelationModalBody = ({ children })=>{
@@ -4593,7 +4611,9 @@ const RelationModalBody = ({ children })=>{
         documentId: documentMeta.documentId,
         document: documentResponse.document,
         meta: documentResponse.meta,
-        onPreview
+        onPreview,
+        fromRelationModal: true,
+        fromPreview: onPreview !== undefined
     };
     return /*#__PURE__*/ jsxRuntime.jsx(designSystem.Modal.Body, {
         children: /*#__PURE__*/ jsxRuntime.jsxs(index.DocumentRBAC, {
@@ -5230,8 +5250,8 @@ const RelationsList = ({ data, serverData, disabled, name, isLoading, relationTy
                     ...{
                         apiData: {
                             id: relation.id,
-                            documentId: relation.documentId,
-                            locale: relation.locale,
+                            documentId: relation.documentId ?? relation.apiData?.documentId ?? '',
+                            locale: relation.locale || relation.apiData?.locale,
                             position
                         }
                     }
@@ -7678,7 +7698,13 @@ const MemoizedWysiwyg = /*#__PURE__*/ React__namespace.memo(Wysiwyg);
  * components such as Blocks / Relations.
  */ const InputRenderer = ({ visible, hint: providedHint, document, ...props })=>{
     const { model: rootModel } = index.useDoc();
-    const documentLayout = index.useDocumentLayout(document.schema?.uid ?? rootModel);
+    const rootDocumentMeta = index.useDocumentContext('DynamicComponent', (state)=>state.rootDocumentMeta);
+    const { edit: { components: rootComponents } } = index.useDocumentLayout(rootDocumentMeta.model);
+    const { edit: { components: relatedComponents } } = index.useDocumentLayout(document.schema?.uid ?? rootModel);
+    const components = {
+        ...rootComponents,
+        ...relatedComponents
+    };
     const collectionType = document.schema?.kind === 'collectionType' ? 'collection-types' : 'single-types';
     const isInDynamicZone = useDynamicZone('isInDynamicZone', (state)=>state.isInDynamicZone);
     const isFormDisabled = strapiAdmin.useForm('InputRenderer', (state)=>state.disabled);
@@ -7702,7 +7728,6 @@ const MemoizedWysiwyg = /*#__PURE__*/ React__namespace.memo(Wysiwyg);
         props.attribute.customField
     ] : undefined);
     const hint = useFieldHint(providedHint, props.attribute);
-    const components = documentLayout.edit.components;
     // We pass field in case of Custom Fields to keep backward compatibility
     const field = strapiAdmin.useField(props.name);
     if (!visible) {
@@ -8481,4 +8506,4 @@ exports.NotAllowedInput = NotAllowedInput;
 exports.useDynamicZone = useDynamicZone;
 exports.useFieldHint = useFieldHint;
 exports.useLazyComponents = useLazyComponents;
-//# sourceMappingURL=Input-C2r54bIL.js.map
+//# sourceMappingURL=Input-D3aI7eJe.js.map