Merge pull request #757 from eisbuk/fix/collection-of-fixes-4

Make the buttons default to 'type="button"' to prevent form submissio…
eisbuk · May 2, 2023 · 455ac7b · 455ac7b
2 parents 73e223f + a4b8992
commit 455ac7b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/packages/ui/src/Button/Button.tsx b/packages/ui/src/Button/Button.tsx
@@ -46,21 +46,25 @@ const Button: React.FC<ButtonProps> = ({
     children
   );
 
-  return React.createElement(as, { ...props, className, disabled }, [
-    startAdornment && (
-      <div key="start-adornment" className="h-5 shrink-0">
-        {startAdornment}
-      </div>
-    ),
+  return React.createElement(
+    as,
+    { type: "button", ...props, className, disabled },
+    [
+      startAdornment && (
+        <div key="start-adornment" className="h-5 shrink-0">
+          {startAdornment}
+        </div>
+      ),
 
-    content,
+      content,
 
-    endAdornment && (
-      <div key="end-adornment" className="h-5 shrink-0">
-        {endAdornment}
-      </div>
-    ),
-  ]);
+      endAdornment && (
+        <div key="end-adornment" className="h-5 shrink-0">
+          {endAdornment}
+        </div>
+      ),
+    ]
+  );
 };
 
 const baseClasses = [

diff --git a/packages/ui/src/IconButton/IconButton.tsx b/packages/ui/src/IconButton/IconButton.tsx
@@ -47,6 +47,7 @@ const IconButton: React.FC<IconButtonProps> = ({
   ...props
 }) => (
   <button
+    type="button"
     {...props}
     title={alt}
     className={[