Merge pull request #613 from pkpdapp-team/PKPDX-34

PKPDX 34
pkpdapp-team · Dec 3, 2024 · 0a1369f · 0a1369f
2 parents 647a1d5 + 18209ee
commit 0a1369f
Show file tree

Hide file tree

Showing 13 changed files with 888 additions and 423 deletions.
diff --git a/frontend-v2/src/components/DynamicTabs.tsx b/frontend-v2/src/components/DynamicTabs.tsx
@@ -37,6 +37,7 @@ interface DynamicTabsProps {
   tabErrors?: { [key: string]: string };
   isOtherSpeciesSelected?: boolean;
   tumourModelWithNoKillModel?: boolean;
+  marginBottom?: number;
 }
 
 interface TabPanelProps {
@@ -58,6 +59,7 @@ export const DynamicTabs: FC<PropsWithChildren<DynamicTabsProps>> = ({
   tabErrors,
   isOtherSpeciesSelected,
   tumourModelWithNoKillModel,
+  marginBottom = 5,
   children,
 }) => {
   const [currentTab, setCurrentTab] = useState(0);
@@ -113,7 +115,7 @@ export const DynamicTabs: FC<PropsWithChildren<DynamicTabsProps>> = ({
   return (
     <TabContext.Provider value={{ currentTab, setCurrentTab }}>
       <Box sx={{ width: "100%" }}>
-        <Box sx={{ borderBottom: 1, borderColor: "divider", marginBottom: 5 }}>
+        <Box sx={{ borderBottom: 1, borderColor: "divider", marginBottom: marginBottom }}>
           <Tabs
             value={currentTab}
             onChange={handleChange}

diff --git a/frontend-v2/src/components/SelectField.tsx b/frontend-v2/src/components/SelectField.tsx
@@ -63,6 +63,7 @@ function SelectField<T extends FieldValues>({
             {getLabel(label || "", Boolean(rules?.required))}
           </InputLabel>
           <Select
+            sx={sx}
             size={size}
             labelId={labelId}
             name={name}