Skip to content
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

Jump to bottom

fix(ComposedModal): align handleMouseDown between Modal, ComposedModal #15934

Merged
merged 6 commits into from Apr 10, 2024
Merged

fix(ComposedModal): align handleMouseDown between Modal, ComposedModal #15934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1976710
fix(ComposedModal): align handleMouseDown between Modal, ComposedModal
tw15egan Mar 11, 2024
4feb5c9
test(ComposedModal): update snaps
tw15egan Mar 11, 2024
0abf83a
Merge branch 'main' into composed-modal-floating-menu-fix
tw15egan Apr 10, 2024
e44b455
Merge branch 'main' into composed-modal-floating-menu-fix
tw15egan Apr 10, 2024
b4b013f
Merge branch 'main' into composed-modal-floating-menu-fix
tw15egan Apr 10, 2024
e52f445
Merge branch 'main' into composed-modal-floating-menu-fix
tw15egan Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Expand Up @@ -1485,6 +1485,7 @@ Map {
"selectorsFloatingMenus": Object {
"args": Array [
Object {
"isRequired": true,
"type": "string",
},
],
Expand Down
21 changes: 15 additions & 6 deletions packages/react/src/components/ComposedModal/ComposedModal.tsx
View file
Open in desktop
Expand Up @@ -19,7 +19,10 @@ import mergeRefs from '../../tools/mergeRefs';
import cx from 'classnames';
import toggleClass from '../../tools/toggleClass';
import requiredIfGivenPropIsTruthy from '../../prop-types/requiredIfGivenPropIsTruthy';
import wrapFocus, { wrapFocusWithoutSentinels } from '../../internal/wrapFocus';
import wrapFocus, {
elementOrParentIsFloatingMenu,
wrapFocusWithoutSentinels,
} from '../../internal/wrapFocus';
import { usePrefix } from '../../internal/usePrefix';
import { keys, match } from '../../internal/keyboard';
import { useFeatureFlag } from '../FeatureFlags';
Expand Down Expand Up @@ -202,7 +205,7 @@ export interface ComposedModalProps extends HTMLAttributes<HTMLDivElement> {
selectorPrimaryFocus?: string;

/** Specify the CSS selectors that match the floating menus. */
selectorsFloatingMenus?: Array<string | null | undefined>;
selectorsFloatingMenus?: string[];

size?: 'xs' | 'sm' | 'md' | 'lg';

Expand Down Expand Up @@ -283,10 +286,16 @@ const ComposedModal = React.forwardRef<HTMLDivElement, ComposedModalProps>(

onKeyDown?.(event);
}
function handleMousedown(evt: MouseEvent) {

function handleMousedown(evt: React.MouseEvent<HTMLDivElement>) {
const target = evt.target as Node;
evt.stopPropagation();
const isInside = innerModal.current?.contains(evt.target as Node);
if (!isInside && !preventCloseOnClickOutside) {
if (
!preventCloseOnClickOutside &&
!elementOrParentIsFloatingMenu(target, selectorsFloatingMenus) &&
innerModal.current &&
!innerModal.current.contains(target)
) {
closeModal(evt);
}
}
Expand Down Expand Up @@ -525,7 +534,7 @@ ComposedModal.propTypes = {
/**
* Specify the CSS selectors that match the floating menus
*/
selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string),
selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string.isRequired),

/**
* Specify the size variant.
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/Modal/Modal.tsx
View file
Open in desktop
Expand Up @@ -315,10 +315,10 @@ const Modal = React.forwardRef(function Modal(
const target = evt.target as Node;
evt.stopPropagation();
if (
innerModal.current &&
!innerModal.current.contains(target) &&
!preventCloseOnClickOutside &&
!elementOrParentIsFloatingMenu(target, selectorsFloatingMenus) &&
!preventCloseOnClickOutside
innerModal.current &&
!innerModal.current.contains(target)
) {
onRequestClose(evt);
}
Expand Down