fix: Prevent dragging options in Collection preferences from causing page overflow #1072
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| import styles from '../styles.css.js'; | ||
| import DragHandle from '../../internal/drag-handle'; | ||
| import InternalToggle from '../../toggle/internal'; | ||
| import React, { ForwardedRef, forwardRef } from 'react'; | ||
| import { SyntheticListenerMap } from '@dnd-kit/core/dist/hooks/utilities'; | ||
| import { OptionWithVisibility } from './utils'; | ||
| import { useUniqueId } from '../../internal/hooks/use-unique-id'; | ||
|
|
||
| const componentPrefix = 'content-display-option'; | ||
| export const getClassName = (suffix?: string) => styles[[componentPrefix, suffix].filter(Boolean).join('-')]; | ||
|
|
||
| export interface ContentDisplayItemProps { | ||
| dragHandleAriaLabel?: string; | ||
| listeners?: SyntheticListenerMap; | ||
| onToggle?: (option: OptionWithVisibility) => void; | ||
| option: OptionWithVisibility; | ||
| } | ||
|
|
||
| const ContentDisplayOption = forwardRef( | ||
| ( | ||
| { dragHandleAriaLabel, listeners, onToggle, option }: ContentDisplayItemProps, | ||
| ref: ForwardedRef<HTMLDivElement> | ||
| ) => { | ||
| const idPrefix = useUniqueId(componentPrefix); | ||
| const controlId = `${idPrefix}-control-${option.id}`; | ||
|
|
||
| const dragHandleAttributes = { | ||
| ['aria-label']: [dragHandleAriaLabel, option.label].join(', '), | ||
| }; | ||
|
|
||
| return ( | ||
| <div ref={ref} className={getClassName('content')}> | ||
| <DragHandle attributes={dragHandleAttributes} listeners={listeners} /> | ||
|
|
||
| <label className={getClassName('label')} htmlFor={controlId}> | ||
| {option.label} | ||
| </label> | ||
| <div className={getClassName('toggle')}> | ||
| <InternalToggle | ||
| checked={!!option.visible} | ||
| onChange={() => onToggle && onToggle(option)} | ||
| disabled={option.alwaysVisible === true} | ||
| controlId={controlId} | ||
| /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
| ); | ||
|
|
||
| export default ContentDisplayOption; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| import React from 'react'; | ||
| import { useSortable } from '@dnd-kit/sortable'; | ||
| import { CSS } from '@dnd-kit/utilities'; | ||
| import { OptionWithVisibility } from './utils'; | ||
| import ContentDisplayOption, { getClassName } from './content-display-option'; | ||
| import clsx from 'clsx'; | ||
| import styles from '../styles.css.js'; | ||
|
|
||
| export default function DraggableOption({ | ||
| dragHandleAriaLabel, | ||
| onKeyDown, | ||
| onToggle, | ||
| option, | ||
| }: { | ||
| dragHandleAriaLabel?: string; | ||
| onKeyDown?: (event: React.KeyboardEvent) => void; | ||
| onToggle: (option: OptionWithVisibility) => void; | ||
| option: OptionWithVisibility; | ||
| }) { | ||
| const { isDragging, isSorting, listeners, setNodeRef, transform } = useSortable({ | ||
| id: option.id, | ||
| }); | ||
| const style = { | ||
| transform: CSS.Translate.toString(transform), | ||
| }; | ||
|
|
||
| const combinedListeners = { | ||
| ...listeners, | ||
| onKeyDown: (event: React.KeyboardEvent) => { | ||
| if (onKeyDown) { | ||
| onKeyDown(event); | ||
| } | ||
| if (listeners?.onKeyDown) { | ||
| listeners.onKeyDown(event); | ||
| } | ||
| }, | ||
| }; | ||
|
|
||
| return ( | ||
| <li className={clsx(getClassName(), isDragging && styles.placeholder, isSorting && styles.sorting)} style={style}> | ||
| <ContentDisplayOption | ||
| ref={setNodeRef} | ||
| listeners={combinedListeners} | ||
| dragHandleAriaLabel={dragHandleAriaLabel} | ||
| onToggle={onToggle} | ||
| option={option} | ||
| /> | ||
| </li> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use
page.pause()instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done