Skip to content

fix(DragDropSort): support custom drag button aria-label and fix falsy id overlay #12417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
logonoff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(DragDropSort): support custom drag button aria-label and fix falsy id overlay #12417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/react-drag-drop/src/components/DragDrop/DragDropContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>

const collisionDetectionStrategy: CollisionDetection = useCallback(
(args) => {
if (activeId && activeId in items) {
if (activeId != null && activeId in items) {
return closestCenter({
...args,
droppableContainers: args.droppableContainers.filter((container) => container.id in items)
Expand Down Expand Up @@ -144,7 +144,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
if (hasRecentlyMovedContainer.current) {
lastOverId.current = activeId;
}
return lastOverId.current ? [{ id: lastOverId.current }] : [];
return lastOverId.current != null ? [{ id: lastOverId.current }] : [];
},
[activeId, items]
);
Expand All @@ -168,7 +168,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
const { id: activeId } = active;
const { id: overId } = over;

if (!overId || activeId in items) {
if (overId == null || activeId in items) {
return;
}

Expand Down Expand Up @@ -240,7 +240,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
};

const getDragOverlay = () => {
if (!activeId) {
if (activeId == null) {
return;
}
const item = findItem(activeId, findContainer(activeId));
Expand Down Expand Up @@ -290,7 +290,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
);
};

const dragOverlay = <DragOverlay>{activeId && getDragOverlay()}</DragOverlay>;
const dragOverlay = <DragOverlay>{activeId != null && getDragOverlay()}</DragOverlay>;

const portalTarget = typeof appendTo === 'function' ? appendTo() : appendTo || document.body;

Expand Down
5 changes: 4 additions & 1 deletion packages/react-drag-drop/src/components/DragDrop/Draggable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ export interface DraggableProps extends React.HTMLProps<HTMLDivElement> {
id?: string;
/** Flag indicating the draggable element should include a drag button. */
useDragButton?: boolean;
/** Accessible name of the drag button. */
dragButtonAriaLabel?: string;
}

export const Draggable: React.FunctionComponent<DraggableProps> = ({
children,
id,
className,
useDragButton = false,
dragButtonAriaLabel,
...props
}: DraggableProps) => {
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
Expand All @@ -38,7 +41,7 @@ export const Draggable: React.FunctionComponent<DraggableProps> = ({
style={style}
{...props}
>
<DragButton {...attributes} {...listeners} />
<DragButton {...attributes} {...listeners} {...(dragButtonAriaLabel && { 'aria-label': dragButtonAriaLabel })} />
{children}
</div>
) : (
Expand Down
Loading