Separate default width and height vs min width and height

low-earth-orbit · Sep 18, 2024 · 969bff6 · 969bff6
1 parent 255c203
commit 969bff6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -2,5 +2,7 @@
   "trailingComma": "all",
   "semi": true,
   "singleQuote": false,
-  "printWidth": 80
+  "printWidth": 80,
+  "endOfLine": "lf",
+  "insertFinalNewline": true
 }
diff --git a/components/Canvas.tsx b/components/Canvas.tsx
@@ -18,8 +18,11 @@ import {
   redo,
   setCanvasObjects,
 } from "../redux/canvasSlice";
-import { SHAPE_MIN_HEIGHT, SHAPE_MIN_WIDTH } from "./shapes/shapeUtils";
-import { TEXT_MIN_HEIGHT, TEXT_MIN_WIDTH } from "./textFields/textFieldUtils";
+import { SHAPE_DEFAULT_HEIGHT, SHAPE_DEFAULT_WIDTH } from "./shapes/shapeUtils";
+import {
+  TEXT_DEFAULT_HEIGHT,
+  TEXT_DEFAULT_WIDTH,
+} from "./textFields/textFieldUtils";
 
 export interface StageSizeType {
   width: number;
@@ -241,8 +244,8 @@ export default function Canvas() {
       type: "text" as const,
       x: x,
       y: y,
-      width: TEXT_MIN_WIDTH,
-      height: TEXT_MIN_HEIGHT,
+      width: TEXT_DEFAULT_WIDTH,
+      height: TEXT_DEFAULT_HEIGHT,
       fill: strokeColor, // use strokeColor for fill for now
       // strokeWidth not applied to text field for now
       text: "Double click to edit.",
@@ -264,8 +267,8 @@ export default function Canvas() {
       strokeWidth: strokeWidth,
       x: x,
       y: y,
-      width: SHAPE_MIN_WIDTH,
-      height: SHAPE_MIN_HEIGHT,
+      width: SHAPE_DEFAULT_WIDTH,
+      height: SHAPE_DEFAULT_HEIGHT,
     }; // common shape properties
 
     let newShape: CanvasObjectType;

diff --git a/components/shapes/shapeUtils.ts b/components/shapes/shapeUtils.ts
@@ -12,5 +12,7 @@ export const getStrokeWidth = (
   }
 };
 
-export const SHAPE_MIN_WIDTH = 50;
-export const SHAPE_MIN_HEIGHT = 50;
+export const SHAPE_MIN_WIDTH = 5;
+export const SHAPE_MIN_HEIGHT = 5;
+export const SHAPE_DEFAULT_WIDTH = 50;
+export const SHAPE_DEFAULT_HEIGHT = 50;
diff --git a/components/textFields/textFieldUtils.ts b/components/textFields/textFieldUtils.ts
@@ -1,2 +1,4 @@
-export const TEXT_MIN_WIDTH = 200;
-export const TEXT_MIN_HEIGHT = 50;
+export const TEXT_DEFAULT_WIDTH = 200;
+export const TEXT_DEFAULT_HEIGHT = 50;
+export const TEXT_MIN_WIDTH = 5;
+export const TEXT_MIN_HEIGHT = 5;