javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-09 08:09:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into chore/update-from-main

Browse Source
This commit is contained in:
Brandy Smith
2025-07-07 09:46:55 -04:00
parent 9a053f60cb 29ec4544da
commit c16397ed5a
338 changed files with 19124 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/components/picker-column/picker-column.tsx
View File

@ -377,7 +377,27 @@ export class PickerColumn implements ComponentInterface {
* elementsFromPoint can returns multiple elements
* so find the relevant picker column option if one exists.
*/
const newActiveElement = elementsAtPoint.find((el) => el.tagName === 'ION-PICKER-COLUMN-OPTION');
let newActiveElement = elementsAtPoint.find((el) => el.tagName === 'ION-PICKER-COLUMN-OPTION');
/**
* TODO(FW-6594): Remove this workaround when iOS 16 is no longer
* supported.
*
* If `elementsFromPoint` failed to find the active element (a known
* issue on iOS 16 when elements are in a Shadow DOM and the
* referenceNode is the document), a fallback to `elementFromPoint`
* is used. While `elementsFromPoint` returns all elements,
* `elementFromPoint` returns only the top-most, which is sufficient
* for this use case and appears to handle Shadow DOM retargeting
* more reliably in this specific iOS bug.
*/
if (newActiveElement === undefined) {
const fallbackActiveElement = referenceNode.elementFromPoint(centerX, centerY);
if (fallbackActiveElement?.tagName === 'ION-PICKER-COLUMN-OPTION') {
newActiveElement = fallbackActiveElement as HTMLIonPickerColumnOptionElement;
}
}
if (activeEl !== undefined) {
this.setPickerItemActiveState(activeEl, false);