diff --git a/src/BaseSelect/index.tsx b/src/BaseSelect/index.tsx index c2dea864..51f143f4 100644 --- a/src/BaseSelect/index.tsx +++ b/src/BaseSelect/index.tsx @@ -628,6 +628,7 @@ const BaseSelect = React.forwardRef((props, ref) // We should give focus back to selector if clicked item is not focusable if (popupElement?.contains(target as HTMLElement) && triggerOpen) { + (event.nativeEvent as any)._ori_target = target; // Tell `open` not to close since it's safe in the popup triggerOpen(true); } diff --git a/tests/ShadowTrigger.test.tsx b/tests/ShadowTrigger.test.tsx new file mode 100644 index 00000000..7d21e9f6 --- /dev/null +++ b/tests/ShadowTrigger.test.tsx @@ -0,0 +1,50 @@ +import { act, render, waitFor } from '@testing-library/react'; +import React from 'react'; +import Select from '../src'; + +// The default trigger mock renders popups inline and does not exercise portals. +jest.mock('@rc-component/trigger', () => jest.requireActual('@rc-component/trigger').default); + +it('keeps the popup open inside a separate closed shadow root and closes outside', async () => { + const host = document.createElement('div'); + const popupHost = document.createElement('div'); + document.body.append(host, popupHost); + const root = host.attachShadow({ mode: 'closed' }); + const popupRoot = popupHost.attachShadow({ mode: 'closed' }); + const mount = document.createElement('div'); + const popupMount = document.createElement('div'); + const outside = document.createElement('div'); + root.appendChild(mount); + popupRoot.append(popupMount, outside); + const onPopupVisibleChange = jest.fn(); + const { unmount } = render( +