Merge remote-tracking branch 'upstream/main' into singleton-httpx-client

Author: HansKallekleiv

frontend/src/lib/components/Input/input.tsx

@@ -14,7 +14,7 @@ export type InputProps = InputUnstyledProps & {
     onValueChange?: (value: string) => void;
 };
 
-export const Input = React.forwardRef((props: InputProps, ref: React.ForwardedRef<HTMLInputElement>) => {
+export const Input = React.forwardRef((props: InputProps, ref: React.ForwardedRef<HTMLDivElement>) => {
     const {
         startAdornment,
         endAdornment,
@@ -53,7 +53,6 @@ export const Input = React.forwardRef((props: InputProps, ref: React.ForwardedRe
     const handleAdornmentClick = React.useCallback((event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
         if (internalRef.current) {
             internalRef.current.focus();
-            internalRef.current.getElementsByTagName("input")[0].focus();
         }
         event.stopPropagation();
     }, []);
@@ -167,7 +166,6 @@ export const Input = React.forwardRef((props: InputProps, ref: React.ForwardedRe
                     onChange={handleInputChange}
                     onBlur={handleInputEditingDone}
                     onKeyUp={handleKeyUp}
-                    ref={internalRef}
                     slotProps={{
                         root: {
                             className: "grow",
@@ -176,6 +174,7 @@ export const Input = React.forwardRef((props: InputProps, ref: React.ForwardedRe
                             className: resolveClassNames(
                                 "h-full focus:border-indigo-500 block w-full sm:text-sm border-gray-300 outline-none"
                             ),
+                            ref: internalRef,
                         },
                     }}
                 />