Merge pull request #508 from mashmatrix/support-legacy-environments-without-css-escape

Author: stomita

src/scripts/Lookup.tsx

@@ -270,11 +270,14 @@ const LookupScopeSelector: FC<LookupScopeSelectorProps> = ({
         return;
       }
 
-      const targetElement = scopeDropdown.querySelector(
-        `#${CSS.escape(getScopeOptionId(nextFocusedIndex))}`
+      const targetElement = document.getElementById(
+        getScopeOptionId(nextFocusedIndex)
       );
 
-      if (!(targetElement instanceof HTMLElement)) {
+      if (
+        !(targetElement instanceof HTMLElement) ||
+        !scopeDropdown.contains(targetElement)
+      ) {
         return;
       }
 
@@ -1118,12 +1121,15 @@ export const Lookup = createFC<LookupProps, { isFormElement: boolean }>(
           return;
         }
 
-        const dropdownContainer = dropdownElRef.current;
-        const targetElement = dropdownContainer.querySelector(
-          `#${CSS.escape(getOptionId(nextFocusedValue))}`
+        const targetElement = document.getElementById(
+          getOptionId(nextFocusedValue)
         );
 
-        if (!(targetElement instanceof HTMLElement)) {
+        const dropdownContainer = dropdownElRef.current;
+        if (
+          !(targetElement instanceof HTMLElement) ||
+          !dropdownContainer.contains(targetElement)
+        ) {
           return;
         }
 

src/scripts/Picklist.tsx

@@ -308,12 +308,15 @@ export const Picklist: (<MultiSelect extends boolean | undefined>(
           return;
         }
 
-        const dropdownContainer = dropdownElRef.current;
-        const targetElement = dropdownContainer.querySelector(
-          `#${CSS.escape(`${optionIdPrefix}-${nextFocusedValue}`)}`
+        const targetElement = document.getElementById(
+          `${optionIdPrefix}-${nextFocusedValue}`
         );
 
-        if (!(targetElement instanceof HTMLElement)) {
+        const dropdownContainer = dropdownElRef.current;
+        if (
+          !(targetElement instanceof HTMLElement) ||
+          !dropdownContainer.contains(targetElement)
+        ) {
           return;
         }