Merge pull request #17 from ntindle/basic-same-sizing

Author: ntindle

src/components/GridfinityCalculator.tsx

@@ -25,6 +25,7 @@ const GridfinityCalculator: React.FC = () => {
     customPrinterSize: settings.customPrinterSize,
     useHalfSize: settings.useHalfSize,
     preferHalfSize: settings.preferHalfSize,
+    preferUniformBaseplates: settings.preferUniformBaseplates,
     numDrawers: settings.numDrawers,
   });
 
@@ -102,6 +103,8 @@ const GridfinityCalculator: React.FC = () => {
               setUseHalfSize={settings.setUseHalfSize}
               preferHalfSize={settings.preferHalfSize}
               setPreferHalfSize={settings.setPreferHalfSize}
+              preferUniformBaseplates={settings.preferUniformBaseplates}
+              setPreferUniformBaseplates={settings.setPreferUniformBaseplates}
             />
           </CardContent>
         </Card>

src/components/GridfinityCalculator/BinOptions.tsx

@@ -7,6 +7,8 @@ const BinOptions = ({
   setUseHalfSize,
   preferHalfSize,
   setPreferHalfSize,
+  preferUniformBaseplates,
+  setPreferUniformBaseplates,
 }) => {
   return (
     <div className="space-y-6 p-4">
@@ -38,6 +40,16 @@ const BinOptions = ({
             }}
           />
         </div>
+        <div className="flex items-center justify-between">
+          <Label htmlFor="prefer-uniform-baseplates" className="flex-1">
+            Prefer uniform baseplate sizes
+          </Label>
+          <Switch
+            id="prefer-uniform-baseplates"
+            checked={preferUniformBaseplates}
+            onCheckedChange={setPreferUniformBaseplates}
+          />
+        </div>
       </div>
     </div>
   );

src/contexts/SettingsContext.tsx

@@ -62,8 +62,8 @@ export const usePrinterSettings = () => {
 
 // eslint-disable-next-line react-refresh/only-export-components
 export const useBinOptions = () => {
-  const { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize } = useSettings();
-  return { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize };
+  const { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize, preferUniformBaseplates, setPreferUniformBaseplates } = useSettings();
+  return { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize, preferUniformBaseplates, setPreferUniformBaseplates };
 };
 
 // eslint-disable-next-line react-refresh/only-export-components

src/hooks/useGridfinityCalculation.test.ts

@@ -39,6 +39,7 @@ describe.skip('useGridfinityCalculation', () => {
         customPrinterSize: null,
         useHalfSize: false,
         preferHalfSize: false,
+        preferUniformBaseplates: false,
         numDrawers: 1,
       })
     );
@@ -64,6 +65,7 @@ describe.skip('useGridfinityCalculation', () => {
         customPrinterSize: customSize,
         useHalfSize: false,
         preferHalfSize: false,
+        preferUniformBaseplates: false,
         numDrawers: 1,
       })
     );
@@ -79,6 +81,7 @@ describe.skip('useGridfinityCalculation', () => {
         customPrinterSize: null,
         useHalfSize: true,
         preferHalfSize: false,
+        preferUniformBaseplates: false,
         numDrawers: 1,
       })
     );
@@ -95,6 +98,7 @@ describe.skip('useGridfinityCalculation', () => {
         customPrinterSize: null,
         useHalfSize: false,
         preferHalfSize: false,
+        preferUniformBaseplates: false,
         numDrawers: 3,
       })
     );
@@ -111,6 +115,7 @@ describe.skip('useGridfinityCalculation', () => {
           customPrinterSize: null,
           useHalfSize: false,
           preferHalfSize: false,
+          preferUniformBaseplates: false,
           numDrawers: 1,
         }),
       {
@@ -138,6 +143,7 @@ describe.skip('useGridfinityCalculation', () => {
         customPrinterSize: null,
         useHalfSize: false,
         preferHalfSize: false,
+        preferUniformBaseplates: false,
         numDrawers: 1,
       })
     );
@@ -154,6 +160,7 @@ describe.skip('useGridfinityCalculation', () => {
         customPrinterSize: null,
         useHalfSize: false,
         preferHalfSize: false,
+        preferUniformBaseplates: false,
         numDrawers: 1,
       })
     );
@@ -170,6 +177,7 @@ describe.skip('useGridfinityCalculation', () => {
           customPrinterSize: null,
           useHalfSize,
           preferHalfSize: false,
+          preferUniformBaseplates: false,
           numDrawers: 1,
         }),
       {

src/hooks/useGridfinityCalculation.ts

@@ -12,6 +12,7 @@ export interface CalculationInput {
   customPrinterSize?: PrinterSize;
   useHalfSize: boolean;
   preferHalfSize: boolean;
+  preferUniformBaseplates: boolean;
   numDrawers: number;
 }
 
@@ -42,6 +43,7 @@ export const useGridfinityCalculation = ({
   customPrinterSize,
   useHalfSize,
   preferHalfSize,
+  preferUniformBaseplates,
   numDrawers,
 }: CalculationInput): CalculationOutput => {
   const [result, setResult] = useState<CalculationResultWithDrawers | null>(null);
@@ -63,9 +65,10 @@ export const useGridfinityCalculation = ({
       drawerSize,
       printerSize,
       useHalfSize,
-      preferHalfSize
+      preferHalfSize,
+      preferUniformBaseplates
     );
-  }, [drawerSize, printerSize, useHalfSize, preferHalfSize]);
+  }, [drawerSize, printerSize, useHalfSize, preferHalfSize, preferUniformBaseplates]);
 
   // Update state when calculation changes
   useEffect(() => {

src/hooks/useGridfinitySettings.ts

@@ -18,6 +18,8 @@ export interface GridfinitySettings {
   setUseHalfSize: (value: boolean) => void;
   preferHalfSize: boolean;
   setPreferHalfSize: (value: boolean) => void;
+  preferUniformBaseplates: boolean;
+  setPreferUniformBaseplates: (value: boolean) => void;
 
   // Drawer count
   numDrawers: number;
@@ -63,6 +65,11 @@ export const useGridfinitySettings = (): GridfinitySettings => {
     false
   );
 
+  const [preferUniformBaseplates, setPreferUniformBaseplates] = usePersistedState<boolean>(
+    'gridfinity_preferUniformBaseplates',
+    false
+  );
+
   // Number of drawers
   const [numDrawers, setNumDrawers] = usePersistedState<number>(
     'gridfinity_numDrawers',
@@ -98,6 +105,7 @@ export const useGridfinitySettings = (): GridfinitySettings => {
     setSelectedPrinter('Bambu Lab A1');
     setUseHalfSize(false);
     setPreferHalfSize(false);
+    setPreferUniformBaseplates(false);
     setNumDrawers(1);
     setUseMm(false);
     setCustomPrinterSize({ x: 200, y: 200, z: 200 });
@@ -117,6 +125,8 @@ export const useGridfinitySettings = (): GridfinitySettings => {
     setUseHalfSize: handleUseHalfSizeChange,
     preferHalfSize,
     setPreferHalfSize: handlePreferHalfSizeChange,
+    preferUniformBaseplates,
+    setPreferUniformBaseplates,
 
     // Drawer count
     numDrawers,