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

package/dist/admin/chunks/{Input-D6obstp0.mjs → Input-hScqTWvW.mjs}

@@ -5,7 +5,7 @@ import { useStrapiApp, useElementOnScreen, createContext, useField, useForm, use
 import { Box, SingleSelect, SingleSelectOption, Typography, Flex, Button, Popover, Field, Menu, IconButton, Tooltip, useComposedRefs, Portal, FocusTrap, Divider, VisuallyHidden, Accordion, MenuItem, Grid as Grid$1, TextInput, Modal, TextButton, Dialog, Loader, EmptyStateLayout, Link as Link$2, Combobox, ComboboxOption, IconButtonGroup } from '@strapi/design-system';
 import { CodeBlock as CodeBlock$1, HeadingOne, HeadingTwo, HeadingThree, HeadingFour, HeadingFive, HeadingSix, Image as Image$1, NumberList, BulletList, Paragraph, Quotes, More, Link as Link$1, Drag, Collapse, Bold, Italic, Underline, StrikeThrough, Code, Expand, PlusCircle, Trash, EyeStriked, ArrowLeft, ArrowsOut, WarningCircle, ArrowClockwise, Cross, CheckCircle, Loader as Loader$1, Plus } from '@strapi/icons';
 import { useIntl } from 'react-intl';
-import { g as getTranslation, c as useDocumentContext, d as useDocumentLayout, e as createDefaultForm, t as transformDocument, f as useLazyGetDocumentQuery, h as createYupSchema, P as PERMISSIONS, i as DocumentRBAC, j as DocumentActionButton, D as DocumentStatus, C as COLLECTION_TYPES, S as SINGLE_TYPES, k as buildValidParams, l as contentManagerApi, m as useDoc, n as CLONE_PATH, o as useDocumentRBAC } from './index-CIOT3ggy.mjs';
+import { g as getTranslation, c as useDocumentContext, d as useDocumentLayout, e as createDefaultForm, t as transformDocument, f as useLazyGetDocumentQuery, h as createYupSchema, P as PERMISSIONS, i as DocumentRBAC, j as DocumentActionButton, D as DocumentStatus, C as COLLECTION_TYPES, S as SINGLE_TYPES, k as buildValidParams, l as contentManagerApi, m as useDoc, n as CLONE_PATH, o as useDocumentRBAC } from './index-DsOgMEE-.mjs';
 import { styled, css, keyframes } from 'styled-components';
 import { Editor as Editor$1, Transforms, Node, Element, Range, Path, Point, createEditor } from 'slate';
 import { withHistory } from 'slate-history';
@@ -61,7 +61,7 @@ import 'prismjs/components/prism-typescript';
 import 'prismjs/components/prism-tsx';
 import 'prismjs/components/prism-vbnet';
 import 'prismjs/components/prism-yaml';
-import { p as prefixFileUrlWithBackendUrl, u as useGetRelationsQuery, g as getRelationLabel, a as useDebounce, b as useLazySearchRelationsQuery, c as usePrev } from './usePrev-DAWUYIPh.mjs';
+import { p as prefixFileUrlWithBackendUrl, u as useGetRelationsQuery, g as getRelationLabel, a as useDebounce, b as useLazySearchRelationsQuery, c as usePrev } from './usePrev-BJk2lXYH.mjs';
 import { D as DIRECTIONS, u as useDragAndDrop, I as ItemTypes, g as getIn, a as DROP_SENSITIVITY } from './objects-D2z-IJgu.mjs';
 import * as Toolbar from '@radix-ui/react-toolbar';
 import { getEmptyImage } from 'react-dnd-html5-backend';
@@ -1778,6 +1778,7 @@ const EditorToolbarObserver = ({ observedComponents, menuTriggerVariant = 'ghost
                 maxHeight: "100%",
                 minWidth: "256px",
                 popoverPlacement: "bottom-end",
+                zIndex: 2,
                 children: observedComponents.slice(menuIndex).map((component)=>/*#__PURE__*/ jsx(React.Fragment, {
                         children: component.menu
                     }, component.key))
@@ -3665,8 +3666,16 @@ const DynamicComponent = ({ componentUid, disabled, index, name, onRemoveCompone
     const formValues = useForm('DynamicComponent', (state)=>state.values);
     const documentMeta = useDocumentContext('DynamicComponent', (state)=>state.meta);
     const rootDocumentMeta = useDocumentContext('DynamicComponent', (state)=>state.rootDocumentMeta);
-    const isRootDocument = rootDocumentMeta.model === documentMeta.model;
-    const { edit: { components } } = useDocumentLayout(isRootDocument ? documentMeta.model : rootDocumentMeta.model);
+    const { edit: { components: rootComponents } } = useDocumentLayout(rootDocumentMeta.model);
+    const { edit: { components: relatedComponents } } = useDocumentLayout(documentMeta.model);
+    // Merge the root level components and related components
+    const components = React.useMemo(()=>({
+            ...rootComponents,
+            ...relatedComponents
+        }), [
+        rootComponents,
+        relatedComponents
+    ]);
     const document = useDocumentContext('DynamicComponent', (state)=>state.document);
     const title = React.useMemo(()=>{
         const { mainField } = components[componentUid]?.settings ?? {
@@ -4351,6 +4360,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();
         }
     };
@@ -4410,6 +4423,7 @@ const RelationModalForm = ({ relation, triggerButtonLabel })=>{
                                                 }
                                             }
                                         },
+                                        width: "100%",
                                         children: triggerButtonLabel
                                     })
                                 })
@@ -4522,6 +4536,10 @@ const RelationModalForm = ({ relation, triggerButtonLabel })=>{
 const CustomTextButton = styled(TextButton)`
   & > span {
     font-size: ${({ theme })=>theme.fontSizes[2]};
+    width: inherit;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 `;
 const RelationModalBody = ({ children })=>{
@@ -4571,7 +4589,9 @@ const RelationModalBody = ({ children })=>{
         documentId: documentMeta.documentId,
         document: documentResponse.document,
         meta: documentResponse.meta,
-        onPreview
+        onPreview,
+        fromRelationModal: true,
+        fromPreview: onPreview !== undefined
     };
     return /*#__PURE__*/ jsx(Modal.Body, {
         children: /*#__PURE__*/ jsxs(DocumentRBAC, {
@@ -5208,8 +5228,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
                         }
                     }
@@ -7656,7 +7676,13 @@ const MemoizedWysiwyg = /*#__PURE__*/ React.memo(Wysiwyg);
  * components such as Blocks / Relations.
  */ const InputRenderer = ({ visible, hint: providedHint, document, ...props })=>{
     const { model: rootModel } = useDoc();
-    const documentLayout = useDocumentLayout(document.schema?.uid ?? rootModel);
+    const rootDocumentMeta = useDocumentContext('DynamicComponent', (state)=>state.rootDocumentMeta);
+    const { edit: { components: rootComponents } } = useDocumentLayout(rootDocumentMeta.model);
+    const { edit: { components: relatedComponents } } = 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 = useForm('InputRenderer', (state)=>state.disabled);
@@ -7680,7 +7706,6 @@ const MemoizedWysiwyg = /*#__PURE__*/ React.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 = useField(props.name);
     if (!visible) {
@@ -8447,4 +8472,4 @@ const ComponentInput = ({ label, required, name, attribute, disabled, labelActio
 const MemoizedComponentInput = /*#__PURE__*/ React.memo(ComponentInput);
 
 export { DisconnectButton as D, FlexWrapper as F, LinkEllipsis as L, MemoizedUIDInput as M, NotAllowedInput as N, FormLayout as a, useDynamicZone as b, useFieldHint as c, MemoizedWysiwyg as d, DynamicZone as e, MemoizedComponentInput as f, MemoizedBlocksInput as g, useLazyComponents as u };
-//# sourceMappingURL=Input-D6obstp0.mjs.map
+//# sourceMappingURL=Input-hScqTWvW.mjs.map