diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js index 13ea6e9e6b..e1d4291abf 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js @@ -13,7 +13,7 @@ import Drag from '@strapi/icons/Drag'; import { composeRefs } from '../../../utils'; import { RELATION_GUTTER } from '../constants'; -const ChildrenWrapper = styled(Flex)` +const StackWrapper = styled(Stack)` width: 100%; /* Used to prevent endAction to be pushed out of container */ min-width: 0; @@ -189,7 +189,7 @@ export const RelationItem = ({ data-handler-id={handlerId} {...props} > - + {canDrag ? ( ) : null} - {children} - + {children} + {endAction && {endAction}} )} diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap index 988afaf250..bc7fc14d92 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap @@ -86,14 +86,10 @@ exports[`Content-Manager || RelationInput || RelationItem should render and matc data-handler-id="T0" >
-
- First relation -
+ First relation
diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap index 4577ae1a35..d4bcad26d4 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap @@ -113,14 +113,10 @@ exports[`Content-Manager || RelationInput || RelationList should render and matc data-handler-id="T0" >
-
- First relation -
+ First relation
@@ -134,14 +130,10 @@ exports[`Content-Manager || RelationInput || RelationList should render and matc data-handler-id="T2" >
-
- Second relation -
+ Second relation
diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/__snapshots__/RelationInput.test.js.snap b/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/__snapshots__/RelationInput.test.js.snap index 16217dac15..0c2c4ff3a3 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/__snapshots__/RelationInput.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/__snapshots__/RelationInput.test.js.snap @@ -168,7 +168,7 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = padding-top: 8px; } -.c23 { +.c24 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -180,7 +180,7 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = width: 1px; } -.c21 { +.c22 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -194,21 +194,21 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = outline: none; } -.c21 svg { +.c22 svg { height: 12px; width: 12px; } -.c21 svg > g, -.c21 svg path { +.c22 svg > g, +.c22 svg path { fill: #ffffff; } -.c21[aria-disabled='true'] { +.c22[aria-disabled='true'] { pointer-events: none; } -.c21:after { +.c22:after { -webkit-transition-property: all; transition-property: all; -webkit-transition-duration: 0.2s; @@ -223,11 +223,11 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = border: 2px solid transparent; } -.c21:focus-visible { +.c22:focus-visible { outline: none; } -.c21:focus-visible:after { +.c22:focus-visible:after { border-radius: 8px; content: ''; position: absolute; @@ -238,7 +238,7 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = border: 2px solid #4945ff; } -.c22 { +.c23 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -256,26 +256,26 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = border: none; } -.c22 svg > g, -.c22 svg path { +.c23 svg > g, +.c23 svg path { fill: #8e8ea9; } -.c22:hover svg > g, -.c22:hover svg path { +.c23:hover svg > g, +.c23:hover svg path { fill: #666687; } -.c22:active svg > g, -.c22:active svg path { +.c23:active svg > g, +.c23:active svg path { fill: #a5a5ba; } -.c22[aria-disabled='true'] { +.c23[aria-disabled='true'] { background-color: #eaeaef; } -.c22[aria-disabled='true'] svg path { +.c23[aria-disabled='true'] svg path { fill: #666687; } @@ -543,7 +543,7 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = border: 2px solid #4945ff; } -.c24 { +.c21 { width: 100%; min-width: 0; } @@ -757,18 +757,18 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] = draggable="true" >
Drag @@ -812,36 +812,32 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] =
- - + + Relation 1 + + + +
+
+ + Draft +
Drag @@ -937,30 +933,26 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] =
-
- - - Relation 2 - - -
-
+ - Published + Relation 2 -
+ +
+
+ + Published +
Drag @@ -1056,21 +1048,17 @@ exports[`Content-Manager || RelationInput should render and match snapshot 1`] =
-
- - - Relation 3 - + + + Relation 3 -
+