yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-15 01:28:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16441 from strapi/fix/nested-repeatable-components-can-be-reordered

Browse Source
This commit is contained in:
Josh 2023-04-21 12:19:56 +01:00 committed by GitHub
commit 2edcb60e35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Component.js
View File

@ -97,11 +97,17 @@ const DraggedItem = ({
const accordionRef = useRef(null); const accordionRef = useRef(null);
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const [parentFieldName] = componentFieldName.split('.'); /**
* The last item in the fieldName array will be the index of this component.
* Drag and drop should be isolated to the parent component so nested repeatable
* components are not affected by the drag and drop of the parent component in
* their own re-ordering context.
*/
const componentKey = componentFieldName.split('.').slice(0, -1).join('.');
const [{ handlerId, isDragging, handleKeyDown }, boxRef, dropRef, dragRef, dragPreviewRef] = const [{ handlerId, isDragging, handleKeyDown }, boxRef, dropRef, dragRef, dragPreviewRef] =
useDragAndDrop(!isReadOnly, { useDragAndDrop(!isReadOnly, {
type: `${ItemTypes.COMPONENT}_${parentFieldName}`, type: `${ItemTypes.COMPONENT}_${componentKey}`,
index, index,
item: { item: {
displayedValue, displayedValue,