diff --git a/src/molecules/Select/Input.tsx b/src/molecules/Select/Input.tsx index d0b19df6..2bcadd00 100644 --- a/src/molecules/Select/Input.tsx +++ b/src/molecules/Select/Input.tsx @@ -218,8 +218,10 @@ const Input: React.SFC = ({ {renderLeftIcon} )} - = ({ name={isOpen ? 'caretUp' : 'caretDown'} /> +
); }; diff --git a/src/molecules/Select/Options/Simple.tsx b/src/molecules/Select/Options/Simple.tsx index 793af06f..5729b2d1 100644 --- a/src/molecules/Select/Options/Simple.tsx +++ b/src/molecules/Select/Options/Simple.tsx @@ -31,6 +31,7 @@ const SimpleOptions = ({ data-qaid={`${qaId}-option`} tabIndex={key} onClick={onClick} + role="option" > {label} diff --git a/src/molecules/Select/Options/index.tsx b/src/molecules/Select/Options/index.tsx index d3522e3e..1dae2f66 100644 --- a/src/molecules/Select/Options/index.tsx +++ b/src/molecules/Select/Options/index.tsx @@ -142,47 +142,50 @@ const Options = ({ return null; }; + const selectOptions = document.getElementById('selectOptions'); return ( - - - {({ - ref, - style, - isFlipped - }: { - ref: any; - style: any; - isFlipped: boolean; - }) => ( - - {renderOptions()} - - )} - - + selectOptions && ( + + + {({ + ref, + style, + isFlipped + }: { + ref: any; + style: any; + isFlipped: boolean; + }) => ( + + {renderOptions()} + + )} + + + ) ); };