Merge pull request #18 from bleu-fi/remove-number-scroll

Remove number scroll and add placeholder on CommandMenu
bleu · Feb 8, 2024 · 2ea0964 · 2ea0964
2 parents bd8c1a4 + 03af3e1
commit 2ea0964
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/components/Cmdk.tsx b/src/components/Cmdk.tsx
@@ -13,7 +13,11 @@ import {
 } from "@/components/ui";
 import { cn } from "@/lib/utils";
 
-export function CommandMenu({ commands, ...props }) {
+export function CommandMenu({
+  commands,
+  placeholder = "Busca global",
+  ...props
+}) {
   const navigate = useNavigate();
   const [open, setOpen] = React.useState(false);
 
@@ -45,7 +49,7 @@ export function CommandMenu({ commands, ...props }) {
         onClick={() => setOpen(true)}
         {...props}
       >
-        <span className="inline-flex">Busca global</span>
+        <span className="inline-flex">{placeholder}</span>
         <kbd className="bg-muted top- pointer-events-none absolute right-1.5 hidden h-5 select-none items-center gap-1 rounded border px-1.5 font-mono text-[10px] font-medium opacity-100 sm:flex">
           <span className="text-xs">⌘</span>K
         </kbd>

diff --git a/src/components/FormBuilder/fields/InputField.tsx b/src/components/FormBuilder/fields/InputField.tsx
@@ -29,6 +29,11 @@ export const InputField = withConditional<InputFieldProps>(
       .min(field.length?.minimum || 0)
       .max(field.length?.maximum || Infinity);
 
+    const numberInputOnWheelPreventChange = (e) => {
+      e.target.blur();
+      e.stopPropagation();
+    };
+
     return (
       <FormField
         control={form.control}
@@ -52,6 +57,10 @@ export const InputField = withConditional<InputFieldProps>(
                 placeholder={field.placeholder}
                 {...formField}
                 type={field.mode}
+                onWheel={(event) =>
+                  field.mode === "number" &&
+                  numberInputOnWheelPreventChange(event)
+                }
               />
             </FormControl>
             <FormMessage />

diff --git a/src/components/FormBuilder/fields/RichTextEditorField.tsx b/src/components/FormBuilder/fields/RichTextEditorField.tsx
@@ -40,7 +40,9 @@ export const RichTextEditorField = withConditional<RichTextEditorFieldProps>(
             <FormDescription>{field.description}</FormDescription>
             <input hidden {...formField} value={formField.value} />
             <RichTextEditor
-              initialValue={formField.value}
+              initialValue={
+                typeof formField.value === "string" ? formField.value : ""
+              }
               onChange={handleRichTextChange}
             />
             <FormMessage />