@erpsquad/common 1.10.77 → 1.10.78

package/dist/chunks/{android-12-switch-CJmu5zpr.esm.js → android-12-switch-BQHaGZz6.esm.js}

@@ -27598,253 +27598,310 @@ const UploadMedia = memo((props) => {
     getSelectedFiles(value)
   ] });
 });
+const EMPTY_EDIT_PROPERTIES = Object.freeze({});
+const CACHE_NORMALISED = Symbol.for("erpsquad.inlineEdit.cacheNormalised");
+const isCacheNormalised = (cache) => Boolean(cache && cache[CACHE_NORMALISED]);
+const markCacheNormalised = (cache) => {
+  cache[CACHE_NORMALISED] = true;
+  return cache;
+};
+const isBlank = (value) => value === void 0 || value === null || value === "";
+const shallowEqual = (a = {}, b = {}) => {
+  if (a === b) return true;
+  const aKeys = Object.keys(a);
+  const bKeys = Object.keys(b);
+  if (aKeys.length !== bKeys.length) return false;
+  return aKeys.every((key) => Object.is(a[key], b[key]));
+};
+const rowSubscribers = /* @__PURE__ */ new Map();
+const subscribeToRow = (rowId, listener) => {
+  let listeners = rowSubscribers.get(rowId);
+  if (!listeners) {
+    listeners = /* @__PURE__ */ new Set();
+    rowSubscribers.set(rowId, listeners);
+  }
+  listeners.add(listener);
+  return () => {
+    listeners == null ? void 0 : listeners.delete(listener);
+    if (listeners && listeners.size === 0) rowSubscribers.delete(rowId);
+  };
+};
+const publishRowCache = (rowId, cache) => {
+  var _a;
+  (_a = rowSubscribers.get(rowId)) == null ? void 0 : _a.forEach((listener) => listener(cache));
+};
+const readInitialValue = (mrtColumn, row) => {
+  var _a;
+  const columnDef = (mrtColumn == null ? void 0 : mrtColumn.columnDef) ?? {};
+  const columnId = mrtColumn == null ? void 0 : mrtColumn.id;
+  const {
+    valueKey,
+    is_multiple: isMultiple,
+    defaultValue
+  } = columnDef.editProperties ?? EMPTY_EDIT_PROPERTIES;
+  const variant = columnDef.editVariant;
+  const accessorValue = (_a = row == null ? void 0 : row.original) == null ? void 0 : _a[columnId];
+  const boundValue = valueKey ? _.get(row == null ? void 0 : row.original, valueKey) : accessorValue;
+  const accessorIsSafeFallback = !valueKey || valueKey === columnId;
+  const rawValue = boundValue !== void 0 ? boundValue : accessorIsSafeFallback ? accessorValue : void 0;
+  if (variant === "select" && isMultiple) {
+    if (isBlank(boundValue)) return defaultValue ?? [];
+    return Array.isArray(boundValue) ? boundValue : [boundValue];
+  }
+  if (variant === "date" || variant === "date_time") {
+    const dateSource = boundValue !== void 0 ? boundValue : accessorValue;
+    if (isBlank(dateSource)) return void 0;
+    return dayjs(dateSource).isValid() ? dayjs(dateSource) : void 0;
+  }
+  if (variant === "select") {
+    return isBlank(boundValue) ? defaultValue ?? "" : boundValue;
+  }
+  if (variant === "checkbox") {
+    return isBlank(rawValue) ? Boolean(defaultValue) : Boolean(rawValue);
+  }
+  return isBlank(rawValue) && defaultValue !== void 0 ? defaultValue : rawValue;
+};
+const buildInitialCache = (row) => {
+  const cache = {};
+  row.getAllCells().forEach((cell) => {
+    var _a;
+    const enableEditing = (_a = cell.column.columnDef) == null ? void 0 : _a.enableEditing;
+    if (enableEditing === void 0 || enableEditing === true) {
+      cache[cell.column.id] = readInitialValue(cell.column, row);
+    }
+  });
+  return markCacheNormalised(cache);
+};
+const extractValue = (event, type) => {
+  var _a;
+  switch (type) {
+    case "date":
+    case "file":
+    case "image":
+    case "phone":
+      return event;
+    case "checkbox":
+      return (_a = event == null ? void 0 : event.target) == null ? void 0 : _a.checked;
+    default:
+      return (event == null ? void 0 : event.target) ? event.target.value : event;
+  }
+};
 const InlineEditFields = ({
-  // cell,
   column,
   row,
-  // table,
   col,
-  // callback,
   errors,
   validationSchema: validationSchema2,
   setValidationErrors,
   onChangeRowField,
   getSelectedData
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  const [inputValue, setInputValue] = useState();
-  const [isInitialSet, setIsInitialSet] = useState(false);
-  const customFilter = useRef(null);
-  const editCols = row.getAllCells().map((col2) => col2.column.columnDef).filter(
-    (col2) => (col2 == null ? void 0 : col2.enableEditing) === void 0 || (col2 == null ? void 0 : col2.enableEditing) === true
+  var _a;
+  const [values, setValues] = useState(() => (row == null ? void 0 : row._valuesCache) ?? {});
+  const [customFilter, setCustomFilter] = useState(null);
+  const editVariant = col == null ? void 0 : col.editVariant;
+  const fieldProperties = ((_a = column.columnDef) == null ? void 0 : _a.editProperties) ?? EMPTY_EDIT_PROPERTIES;
+  const columnId = column.id;
+  const rowId = row.id;
+  useEffect(
+    () => subscribeToRow(rowId, (cache) => {
+      setValues((prev) => shallowEqual(prev, cache) ? prev : cache);
+    }),
+    [rowId]
   );
-  const editVariant = col.editVariant;
-  const fieldProperties = ((_a = column.columnDef) == null ? void 0 : _a.editProperties) || {};
-  let fieldDisbled = false;
-  if (fieldProperties == null ? void 0 : fieldProperties.disable) {
-    if (typeof fieldProperties.disable === "function") {
-      fieldDisbled = Boolean(fieldProperties == null ? void 0 : fieldProperties.disable(row, row._valuesCache));
-    } else {
-      fieldDisbled = Boolean(fieldProperties.disable);
-    }
-  }
-  const handleCustomFilter = useCallback(async (row2, values) => {
-    try {
-      if (typeof fieldProperties.customeFilter === "function") {
-        const filter = await fieldProperties.customeFilter(row2, values);
-        customFilter.current = filter;
-        return filter;
-      } else {
-        customFilter.current = fieldProperties == null ? void 0 : fieldProperties.customeFilter;
-      }
-    } catch (error) {
-      return null;
-    }
-  }, [fieldProperties, row, row._valuesCache]);
   useEffect(() => {
-    handleCustomFilter(row, row._valuesCache);
-  }, [handleCustomFilter, row, row._valuesCache]);
-  const valueKey = fieldProperties == null ? void 0 : fieldProperties.valueKey;
-  let defaultValue = "";
-  if (editVariant === "select" && (fieldProperties == null ? void 0 : fieldProperties.is_multiple)) {
-    defaultValue = valueKey ? _.get(row.original, valueKey, []) : [];
-  } else {
-    defaultValue = valueKey ? _.get(row.original, valueKey, row.original[column.id]) : row.original[column.id];
-  }
-  const validate = async (value) => {
-    try {
-      await validationSchema2.validateAt(
-        column.id,
-        {
-          [column.id]: value
-        },
-        {
-          abortEarly: false
-        }
-      );
-      const fe = {};
-      for (const e in errors) {
-        if (e != column.id) {
-          fe[e] = errors[e];
-        }
-      }
-      setValidationErrors(fe);
-    } catch (err) {
-      if (err instanceof Yup.ValidationError) {
-        const e = {};
-        err.inner.forEach((error) => {
-          if (error.path) {
-            e[error.path] = error.message;
-          }
-        });
-        const em = { ...errors, ...e };
-        setValidationErrors(em);
-      }
-    }
-  };
-  const onChange = async (e, type, selectedData) => {
-    const data = selectedData;
-    let value;
-    switch (type) {
-      case "date":
-      case "file":
-      case "image":
-      case "phone":
-        value = e;
-        break;
-      case "text":
-      case "number":
-        value = e.target.value;
-        break;
-      case "checkbox":
-        value = e.target.checked;
-        break;
-      default:
-        value = e.target.value;
-        break;
-    }
-    setInputValue({ ...inputValue, [column.id]: value });
-    if (onChangeRowField) {
-      const v = await onChangeRowField(e, type, row, col, data);
-      if (v) {
-        row._valuesCache = { ...row._valuesCache, ...v };
-      }
+    const existing = row._valuesCache;
+    if (isCacheNormalised(existing)) {
+      setValues(existing);
+      return;
     }
-    row._valuesCache = { ...row._valuesCache, [column.id]: value };
-    const updatedCache = { ...row._valuesCache };
-    setInputValue(updatedCache);
-    window.dispatchEvent(new CustomEvent("row-cache-updated", { detail: { rowId: row.id, cache: updatedCache } }));
-    await validate(value);
-  };
-  useEffect(() => {
-    setInputValue({ ...inputValue, ...row._valuesCache });
-  }, [row._valuesCache]);
+    const seeded = buildInitialCache(row);
+    row._valuesCache = seeded;
+    setValues(seeded);
+    publishRowCache(rowId, seeded);
+  }, [rowId]);
+  const rawCustomFilter = fieldProperties.customeFilter;
   useEffect(() => {
-    const handleCacheUpdate = (e) => {
-      if (e.detail.rowId === row.id) {
-        setInputValue({ ...e.detail.cache });
+    if (editVariant !== "select" || rawCustomFilter === void 0) return;
+    if (typeof rawCustomFilter !== "function") {
+      setCustomFilter(rawCustomFilter ?? null);
+      return;
+    }
+    let cancelled = false;
+    (async () => {
+      try {
+        const filter = await rawCustomFilter(row, row._valuesCache);
+        if (!cancelled) setCustomFilter(filter ?? null);
+      } catch {
+        if (!cancelled) setCustomFilter(null);
       }
+    })();
+    return () => {
+      cancelled = true;
     };
-    window.addEventListener("row-cache-updated", handleCacheUpdate);
-    return () => window.removeEventListener("row-cache-updated", handleCacheUpdate);
-  }, [row.id]);
-  useEffect(() => {
-    if (!isInitialSet) {
-      const editFields = Object.keys(row._valuesCache || {});
-      const dValues = {};
-      row.getAllCells().forEach((cell) => {
-        var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
-        if (((_a2 = cell.column.columnDef) == null ? void 0 : _a2.enableEditing) === void 0 || ((_b2 = cell.column.columnDef) == null ? void 0 : _b2.enableEditing) === true) {
-          const { is_multiple, valueKey: valueKey2 } = ((_c2 = cell.column.columnDef) == null ? void 0 : _c2.editProperties) || {};
-          if (editFields.length === 0 || editFields.includes(cell.column.id)) {
-            const cachedValue = (_d2 = row._valuesCache) == null ? void 0 : _d2[cell.column.id];
-            const vl = _.get(row.original, valueKey2);
-            if (editVariant === "select" && is_multiple) {
-              dValues[cell.column.id] = cachedValue ?? (vl ? Array.isArray(vl) ? vl : [vl] : []);
-            } else if (editVariant === "date" || editVariant === "date_time") {
-              dValues[cell.column.id] = cachedValue ?? (vl ? dayjs(vl).isValid() ? dayjs(vl) : void 0 : dayjs(row.original[cell.column.id]).isValid() ? dayjs(row.original[cell.column.id]) : void 0);
-            } else if (editVariant === "select" && valueKey2) {
-              const idValue = _.get(row.original, valueKey2);
-              const cellDefaultValue = (_f2 = (_e2 = cell.column.columnDef) == null ? void 0 : _e2.editProperties) == null ? void 0 : _f2.defaultValue;
-              const rawValue = idValue === void 0 || idValue === null ? "" : idValue;
-              dValues[cell.column.id] = cachedValue ?? ((rawValue === "" || rawValue === void 0 || rawValue === null) && cellDefaultValue !== void 0 ? cellDefaultValue : rawValue);
-            } else {
-              const rawValue = _.get(
-                row.original,
-                valueKey2,
-                row.original[cell.column.id]
-              );
-              const cellDefaultValue = (_h2 = (_g2 = cell.column.columnDef) == null ? void 0 : _g2.editProperties) == null ? void 0 : _h2.defaultValue;
-              dValues[cell.column.id] = cachedValue ?? ((rawValue === "" || rawValue === void 0 || rawValue === null) && cellDefaultValue !== void 0 ? cellDefaultValue : rawValue);
-            }
+  }, [rawCustomFilter, editVariant, row, values]);
+  const isFieldDisabled = useMemo(() => {
+    const { disable } = fieldProperties;
+    if (typeof disable === "function") {
+      return Boolean(disable(row, row._valuesCache));
+    }
+    return Boolean(disable);
+  }, [fieldProperties, row, values]);
+  const shouldAutoFocus = useMemo(() => {
+    const firstEditable = row.getAllCells().map((cell) => cell.column.columnDef).find(
+      (def) => (def == null ? void 0 : def.enableEditing) === void 0 || (def == null ? void 0 : def.enableEditing) === true
+    );
+    return (firstEditable == null ? void 0 : firstEditable.accessorKey) === columnId;
+  }, [row, columnId]);
+  const columnDefaultValue = useMemo(
+    () => readInitialValue(column, row),
+    [column, row]
+  );
+  const currentValue = (values == null ? void 0 : values[columnId]) !== void 0 ? values[columnId] : columnDefaultValue;
+  const dateValue = useMemo(() => {
+    if (isBlank(currentValue)) return void 0;
+    return dayjs(currentValue).isValid() ? dayjs(currentValue) : void 0;
+  }, [currentValue]);
+  const fieldError = errors == null ? void 0 : errors[columnId];
+  const validate = useCallback(
+    async (value) => {
+      if (!validationSchema2) return;
+      try {
+        await validationSchema2.validateAt(
+          columnId,
+          { [columnId]: value },
+          { abortEarly: false }
+        );
+        setValidationErrors((prev) => {
+          if (!prev || prev[columnId] === void 0) return prev ?? {};
+          const next = { ...prev };
+          delete next[columnId];
+          return next;
+        });
+      } catch (err) {
+        if (err instanceof Yup.ValidationError) {
+          const fieldErrors = {};
+          err.inner.forEach((error) => {
+            if (error.path) fieldErrors[error.path] = error.message;
+          });
+          if (!err.inner.length && err.path) {
+            fieldErrors[err.path] = err.message;
           }
+          setValidationErrors((prev) => ({ ...prev ?? {}, ...fieldErrors }));
         }
-      });
-      row._valuesCache = dValues;
-      setInputValue(dValues);
-      setIsInitialSet(true);
-    }
-  }, [row, editVariant, isInitialSet]);
-  const handleMinDate = (state) => typeof state == "function" ? state(row) : state;
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-    (!editVariant || editVariant === "number") && /* @__PURE__ */ jsxRuntimeExports.jsx(
+      }
+    },
+    [columnId, setValidationErrors, validationSchema2]
+  );
+  const handleChange = useCallback(
+    async (event, type, selectedData) => {
+      const value = extractValue(event, type);
+      const optimistic = { ...row._valuesCache ?? {}, [columnId]: value };
+      row._valuesCache = optimistic;
+      setValues(optimistic);
+      publishRowCache(rowId, optimistic);
+      if (onChangeRowField) {
+        const patch = await onChangeRowField(event, type, row, col, selectedData);
+        if (patch) {
+          const merged = { ...row._valuesCache, ...patch, [columnId]: value };
+          row._valuesCache = merged;
+          setValues(merged);
+          publishRowCache(rowId, merged);
+        }
+      }
+      await validate(value);
+    },
+    [col, columnId, onChangeRowField, row, rowId, validate]
+  );
+  const resolveDateBoundary = useCallback(
+    (boundary) => typeof boundary === "function" ? boundary(row) : boundary,
+    [row]
+  );
+  if (!editVariant || editVariant === "number") {
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
       TextField$2,
       {
-        defaultValue,
-        onChange: (e) => onChange(e, editVariant),
-        value: inputValue == null ? void 0 : inputValue[column.id],
-        autoFocus: ((_b = editCols == null ? void 0 : editCols[0]) == null ? void 0 : _b.accessorKey) === column.id,
+        defaultValue: columnDefaultValue,
+        onChange: (e) => handleChange(e, editVariant),
+        value: currentValue ?? "",
+        autoFocus: shouldAutoFocus,
         type: editVariant || "text",
-        error: (errors == null ? void 0 : errors[column.id]) ? true : false,
-        helperText: errors == null ? void 0 : errors[column.id],
+        error: Boolean(fieldError),
+        helperText: fieldError,
         placeholder: (fieldProperties == null ? void 0 : fieldProperties.placeholder) || "",
         name: (fieldProperties == null ? void 0 : fieldProperties.field_name) || "",
-        disabled: fieldDisbled
+        disabled: isFieldDisabled
       }
-    ),
-    editVariant === "select" && /* @__PURE__ */ jsxRuntimeExports.jsxs(Box, { display: "flex", flexDirection: "column", width: "100%", children: [
+    );
+  }
+  if (editVariant === "select") {
+    const isMultiple = Boolean(fieldProperties == null ? void 0 : fieldProperties.is_multiple);
+    const selectValue = isMultiple ? Array.isArray(currentValue) ? currentValue : [] : currentValue ?? "";
+    return /* @__PURE__ */ jsxRuntimeExports.jsxs(Box, { display: "flex", flexDirection: "column", width: "100%", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(
         SearchableSelect,
         {
           name: (fieldProperties == null ? void 0 : fieldProperties.field_name) || "",
-          defaultValue,
+          defaultValue: columnDefaultValue,
           placeholder: (fieldProperties == null ? void 0 : fieldProperties.placeholder) || "",
-          searchPlaceholder: `Search ${col.header}`,
-          onChange: (e, row2) => onChange(e, "select", row2),
+          searchPlaceholder: `Search ${(col == null ? void 0 : col.header) ?? ""}`,
+          onChange: (e, selectedRow) => handleChange(e, "select", selectedRow),
           apiType: fieldProperties == null ? void 0 : fieldProperties.apiType,
-          autoFocus: ((_c = editCols == null ? void 0 : editCols[0]) == null ? void 0 : _c.accessorKey) === column.id,
+          autoFocus: shouldAutoFocus,
           options: col == null ? void 0 : col.editSelectOptions,
-          customeFilter: customFilter.current,
+          customeFilter: customFilter,
           filterKey: fieldProperties == null ? void 0 : fieldProperties.filterKey,
           labelKey: fieldProperties == null ? void 0 : fieldProperties.labelKey,
           valueKey: fieldProperties == null ? void 0 : fieldProperties.bindingKey,
-          attributes: fieldProperties.attributes,
+          attributes: fieldProperties == null ? void 0 : fieldProperties.attributes,
           isInternal: (fieldProperties == null ? void 0 : fieldProperties.isInternal) || !(fieldProperties == null ? void 0 : fieldProperties.apiType),
-          multiple: fieldProperties == null ? void 0 : fieldProperties.is_multiple,
-          value: (fieldProperties == null ? void 0 : fieldProperties.is_multiple) ? Array.isArray(inputValue == null ? void 0 : inputValue[column.id]) ? inputValue == null ? void 0 : inputValue[column.id] : [] : inputValue == null ? void 0 : inputValue[column.id],
-          getSelectedData: (row2) => getSelectedData(fieldProperties == null ? void 0 : fieldProperties.field_name, row2),
-          disabled: fieldDisbled
+          multiple: isMultiple,
+          value: selectValue,
+          getSelectedData: (selectedRow) => getSelectedData == null ? void 0 : getSelectedData(fieldProperties == null ? void 0 : fieldProperties.field_name, selectedRow),
+          disabled: isFieldDisabled
         }
       ),
-      (errors == null ? void 0 : errors[column.id]) && /* @__PURE__ */ jsxRuntimeExports.jsx(Typography, { color: "theme.error.600", type: "s5", children: errors == null ? void 0 : errors[column.id] })
-    ] }),
-    editVariant === "date" && /* @__PURE__ */ jsxRuntimeExports.jsx(
+      fieldError && /* @__PURE__ */ jsxRuntimeExports.jsx(Typography, { color: "theme.error.600", type: "s5", children: fieldError })
+    ] });
+  }
+  if (editVariant === "date") {
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
       DatePicker2,
       {
         name: (fieldProperties == null ? void 0 : fieldProperties.field_name) || "",
-        defaultValue,
-        onChange: (v) => onChange(v, "date"),
-        textFieldProps: {
-          autoFocus: ((_d = editCols == null ? void 0 : editCols[0]) == null ? void 0 : _d.accessorKey) === column.id
-        },
-        error: (errors == null ? void 0 : errors[column.id]) ? true : false,
-        helperText: errors == null ? void 0 : errors[column.id],
+        defaultValue: columnDefaultValue,
+        onChange: (v) => handleChange(v, "date"),
+        textFieldProps: { autoFocus: shouldAutoFocus },
+        error: Boolean(fieldError),
+        helperText: fieldError,
         format: fieldProperties == null ? void 0 : fieldProperties.dateFormat,
         placeholder: (fieldProperties == null ? void 0 : fieldProperties.placeholder) || (fieldProperties == null ? void 0 : fieldProperties.dateFormat),
-        value: dayjs(row._valuesCache[column.id]).isValid() ? dayjs(row._valuesCache[column.id]) : void 0,
-        disabled: fieldDisbled,
-        minDate: () => handleMinDate(fieldProperties == null ? void 0 : fieldProperties.min_date),
-        maxDate: () => handleMinDate(fieldProperties == null ? void 0 : fieldProperties.min_date)
+        value: dateValue,
+        disabled: isFieldDisabled,
+        minDate: () => resolveDateBoundary(fieldProperties == null ? void 0 : fieldProperties.min_date),
+        maxDate: () => resolveDateBoundary(fieldProperties == null ? void 0 : fieldProperties.max_date)
       }
-    ),
-    editVariant === "date_time" && /* @__PURE__ */ jsxRuntimeExports.jsx(
+    );
+  }
+  if (editVariant === "date_time") {
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
       DateTimePicker2,
       {
         name: (fieldProperties == null ? void 0 : fieldProperties.field_name) || "",
-        defaultValue,
-        onChange: (v) => onChange(v, "date"),
-        textFieldProps: {
-          autoFocus: ((_e = editCols == null ? void 0 : editCols[0]) == null ? void 0 : _e.accessorKey) === column.id
-        },
-        error: (errors == null ? void 0 : errors[column.id]) ? true : false,
-        helperText: errors == null ? void 0 : errors[column.id],
+        defaultValue: columnDefaultValue,
+        onChange: (v) => handleChange(v, "date"),
+        textFieldProps: { autoFocus: shouldAutoFocus },
+        error: Boolean(fieldError),
+        helperText: fieldError,
         format: fieldProperties == null ? void 0 : fieldProperties.dateFormat,
         placeholder: (fieldProperties == null ? void 0 : fieldProperties.placeholder) || (fieldProperties == null ? void 0 : fieldProperties.dateFormat),
-        value: dayjs(row._valuesCache[column.id]).isValid() ? dayjs(row._valuesCache[column.id]) : void 0,
-        disabled: fieldDisbled
+        value: dateValue,
+        disabled: isFieldDisabled
       }
-    ),
-    (editVariant === "file" || editVariant === "image") && /* @__PURE__ */ jsxRuntimeExports.jsxs(Box, { display: "flex", flexDirection: "column", children: [
+    );
+  }
+  if (editVariant === "file" || editVariant === "image") {
+    return /* @__PURE__ */ jsxRuntimeExports.jsxs(Box, { display: "flex", flexDirection: "column", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(
         UploadMedia,
         {
@@ -27854,48 +27911,51 @@ const InlineEditFields = ({
           label: "",
           type: editVariant,
           max_size: 10,
-          onChange: (v) => onChange(v, "file"),
-          error: (errors == null ? void 0 : errors[column.id]) ? true : false,
-          multiple: Boolean(column == null ? void 0 : column.is_multiple),
-          value: row._valuesCache[column.id]
+          onChange: (v) => handleChange(v, "file"),
+          error: Boolean(fieldError),
+          multiple: Boolean((fieldProperties == null ? void 0 : fieldProperties.is_multiple) ?? (col == null ? void 0 : col.is_multiple)),
+          value: currentValue
         }
       ),
-      (errors == null ? void 0 : errors[column.id]) && /* @__PURE__ */ jsxRuntimeExports.jsx(Typography, { color: "theme.error.600", type: "s5", children: errors == null ? void 0 : errors[column.id] })
-    ] }),
-    editVariant === "phone" && /* @__PURE__ */ jsxRuntimeExports.jsx(
+      fieldError && /* @__PURE__ */ jsxRuntimeExports.jsx(Typography, { color: "theme.error.600", type: "s5", children: fieldError })
+    ] });
+  }
+  if (editVariant === "phone") {
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
       PhoneInput,
       {
         name: (fieldProperties == null ? void 0 : fieldProperties.field_name) || "",
-        default_value: defaultValue,
-        onChange: (v) => onChange(v, "phone"),
-        textFieldProps: {
-          autoFocus: ((_f = editCols == null ? void 0 : editCols[0]) == null ? void 0 : _f.accessorKey) === column.id
-        },
-        error: (errors == null ? void 0 : errors[column.id]) ? true : false,
-        helperText: errors == null ? void 0 : errors[column.id],
+        default_value: columnDefaultValue,
+        onChange: (v) => handleChange(v, "phone"),
+        textFieldProps: { autoFocus: shouldAutoFocus },
+        error: Boolean(fieldError),
+        helperText: fieldError,
         format: fieldProperties == null ? void 0 : fieldProperties.dateFormat,
         placeholder: (fieldProperties == null ? void 0 : fieldProperties.placeholder) || (fieldProperties == null ? void 0 : fieldProperties.dateFormat),
-        value: (_g = row._valuesCache) == null ? void 0 : _g[column.id],
-        disabled: fieldDisbled,
+        value: currentValue,
+        disabled: isFieldDisabled,
         isInlineEditing: true
       }
-    ),
-    editVariant === "checkbox" && /* @__PURE__ */ jsxRuntimeExports.jsx(
+    );
+  }
+  if (editVariant === "checkbox") {
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
       Checkbox,
       {
         name: (fieldProperties == null ? void 0 : fieldProperties.field_name) || "",
-        defaultChecked: Boolean(defaultValue),
-        onChange: (v) => onChange(v, "checkbox"),
-        error: (errors == null ? void 0 : errors[column.id]) ? true : false,
-        helperText: errors == null ? void 0 : errors[column.id],
-        format: fieldProperties == null ? void 0 : fieldProperties.dateFormat,
-        placeholder: (fieldProperties == null ? void 0 : fieldProperties.placeholder) || (fieldProperties == null ? void 0 : fieldProperties.dateFormat),
-        value: (_h = row._valuesCache) == null ? void 0 : _h[column.id],
-        disabled: fieldDisbled
+        defaultChecked: Boolean(columnDefaultValue),
+        onChange: (v) => handleChange(v, "checkbox"),
+        error: Boolean(fieldError),
+        helperText: fieldError,
+        placeholder: fieldProperties == null ? void 0 : fieldProperties.placeholder,
+        value: Boolean(currentValue),
+        disabled: isFieldDisabled
       }
-    )
-  ] });
+    );
+  }
+  return null;
 };
+const InlineEditFields$1 = React__default.memo(InlineEditFields);
 const TableWrapper = styled$2(Box, {
   shouldForwardProp: (prop) => prop !== "disableMaxHeight"
 })(({ theme: { palette }, disableMaxHeight }) => {
@@ -28318,7 +28378,7 @@ const MaterialTable = React__default.memo(({
           ...editDisplayMode === "row" ? {
             Edit: ({ cell, row: row2, table: table2, column }) => {
               return /* @__PURE__ */ jsxRuntimeExports.jsx(
-                InlineEditFields,
+                InlineEditFields$1,
                 {
                   cell,
                   column,
@@ -41928,4 +41988,4 @@ export {
   DynamicTagsInput as y,
   DynamicTime as z
 };
-//# sourceMappingURL=android-12-switch-CJmu5zpr.esm.js.map
+//# sourceMappingURL=android-12-switch-BQHaGZz6.esm.js.map