Merge branch 'dev' into feat/add-integration-from-dashboard

apps/nextjs/src/components/language/current-language-combobox.tsx

@@ -6,11 +6,20 @@ import { LanguageCombobox } from "./language-combobox";
 
 interface CurrentLanguageComboboxProps {
   width?: string;
+  withinPortal?: boolean;
 }
 
-export const CurrentLanguageCombobox = ({ width }: CurrentLanguageComboboxProps) => {
+export const CurrentLanguageCombobox = ({ width, withinPortal }: CurrentLanguageComboboxProps) => {
   const currentLocale = useCurrentLocale();
   const { changeLocale, isPending } = useChangeLocale();
 
-  return <LanguageCombobox value={currentLocale} onChange={changeLocale} isPending={isPending} width={width} />;
+  return (
+    <LanguageCombobox
+      value={currentLocale}
+      onChange={changeLocale}
+      isPending={isPending}
+      width={width}
+      withinPortal={withinPortal}
+    />
+  );
 };

apps/nextjs/src/components/language/language-combobox.tsx

@@ -16,9 +16,17 @@ interface LanguageComboboxProps {
   onChange: (value: SupportedLanguage) => void;
   isPending?: boolean;
   width?: string;
+  withinPortal?: boolean;
 }
 
-export const LanguageCombobox = ({ label, value, onChange, isPending, width }: LanguageComboboxProps) => {
+export const LanguageCombobox = ({
+  label,
+  value,
+  onChange,
+  isPending,
+  width,
+  withinPortal = false,
+}: LanguageComboboxProps) => {
   const combobox = useCombobox({
     onDropdownClose: () => combobox.resetSelectedOption(),
   });
@@ -39,7 +47,7 @@ export const LanguageCombobox = ({ label, value, onChange, isPending, width }: L
   }, [combobox]);
 
   return (
-    <Combobox store={combobox} onOptionSubmit={handleOnOptionSubmit}>
+    <Combobox store={combobox} withinPortal={withinPortal} onOptionSubmit={handleOnOptionSubmit}>
       <Combobox.Target>
         <InputBase
           component="button"