From cb3299d1efd76c4e0cae04b17611a5b548844a89 Mon Sep 17 00:00:00 2001
From: Rizky <rizky@avolut.com>
Date: Tue, 9 Jul 2024 21:29:26 -0700
Subject: [PATCH] fix

---
 comps/form/field/Field.tsx          | 16 +++++++++++++--
 comps/form/field/type/TypeInput.tsx |  8 +++++---
 comps/form/field/type/TypeMoney.tsx | 31 ++++++++---------------------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/comps/form/field/Field.tsx b/comps/form/field/Field.tsx
index a284a7c..5181f4e 100755
--- a/comps/form/field/Field.tsx
+++ b/comps/form/field/Field.tsx
@@ -36,7 +36,8 @@ export const Field: FC<FieldProp> = (arg) => {
   delete props.className;
 
   return (
-    <label
+    <LabelDiv
+      mode={sub_type === "table-edit" ? "div" : "label"}
       className={cx(
         "field",
         "c-flex",
@@ -89,6 +90,17 @@ export const Field: FC<FieldProp> = (arg) => {
           </div>
         )}
       </div>
-    </label>
+    </LabelDiv>
   );
 };
+
+const LabelDiv = (arg: any) => {
+  const props = { ...arg };
+  const mode = arg.mode;
+  delete props.mode;
+
+  if (mode === "label") {
+    return <label {...props} />;
+  }
+  return <div {...props} />;
+};
diff --git a/comps/form/field/type/TypeInput.tsx b/comps/form/field/type/TypeInput.tsx
index b55e8df..e071fa4 100755
--- a/comps/form/field/type/TypeInput.tsx
+++ b/comps/form/field/type/TypeInput.tsx
@@ -59,7 +59,6 @@ export const FieldTypeInput: FC<{
     type_field = "text";
   }
 
-  let display: any = null;
   let value: any = fm.data[field.name] || "";
 
   // let value: any = "2024-05-14T05:58:01.376Z" // case untuk date time
@@ -176,7 +175,11 @@ export const FieldTypeInput: FC<{
         />
       );
     case "money":
-      return <FieldMoney field={field} fm={fm} prop={prop} arg={arg} />;
+      return (
+        <>
+          <FieldMoney field={field} fm={fm} prop={prop} arg={arg} />
+        </>
+      );
     case "rich-text":
       return <FieldRichText field={field} fm={fm} prop={prop} />;
     case "date":
@@ -230,7 +233,6 @@ export const FieldTypeInput: FC<{
         spellCheck={false}
         onFocus={(e) => {
           field.focused = true;
-          display = "";
           field.render();
           prop.onFocus?.(e);
         }}
diff --git a/comps/form/field/type/TypeMoney.tsx b/comps/form/field/type/TypeMoney.tsx
index c481b8d..ae6c230 100755
--- a/comps/form/field/type/TypeMoney.tsx
+++ b/comps/form/field/type/TypeMoney.tsx
@@ -13,39 +13,21 @@ export const FieldMoney: FC<{
   let value: any = fm.data[field.name];
   const input = useLocal({
     value: 0 as any,
-    display: false as any,
     ref: null as any,
   });
   useEffect(() => {
     input.value = value;
     input.render();
   }, [fm.data[field.name]]);
-  let display: any = null;
+
   const disabled =
     typeof field.disabled === "function" ? field.disabled() : field.disabled;
   const money = formatMoney(Number(value) || 0);
   return (
     <div className="c-flex-grow c-flex-row c-flex c-w-full c-h-full">
-      {/* <div
-        className={cx(
-          input.display ? "c-hidden" : "",
-          "c-flex-grow c-px-2 c-flex c-flex-row c-items-center",
-          isEmptyString(value) ? "c-text-gray-400" : ""
-        )}
-        onClick={() => {
-          if (input.ref) {
-            input.display = !input.display;
-            input.ref.focus();
-            input.render();
-          }
-        }}
-      >
-        {isEmptyString(value) ? arg.placeholder : money}
-      </div> */}
       <input
         ref={(el) => (input.ref = el)}
         type={"text"}
-        onClick={() => {}}
         onChange={(ev) => {
           const rawValue = ev.currentTarget.value
             .replace(/[^0-9,-]/g, "")
@@ -80,20 +62,23 @@ export const FieldMoney: FC<{
         value={formatCurrency(input.value)}
         disabled={disabled}
         className={cx(
-          // !input.display ? "c-hidden" : "",
           "c-flex-1 c-bg-transparent c-outline-none c-px-2 c-text-sm c-w-full"
         )}
         spellCheck={false}
-        onFocus={() => {
+        onFocus={(e) => {
           field.focused = true;
           field.render();
+          prop.onFocus?.(e);
+        }}
+        onClick={(e) => {
+          e.stopPropagation();
         }}
         placeholder={arg.placeholder || ""}
-        onBlur={() => {
+        onBlur={(e) => {
           field.focused = false;
-          input.display = !input.display;
           input.render();
           field.render();
+          prop.onBlur?.(e);
         }}
       />
     </div>