ding-react-admin 1.0.4 → 2.0.4

package/src/crud/columns/ReferenceManyColumn.tsx

@@ -1,67 +1,67 @@
-import { useMemo } from "react";
-import type { BaseSourceProps, DisplayProps, ReferenceProps } from "../types";
-import { useRegisterColumn } from "../context/ListContext";
-import { useChoices } from "../utils/useChoices";
-
-export type ReferenceManyColumnProps = BaseSourceProps &
-  ReferenceProps &
-  DisplayProps & {
-    sortable?: boolean;
-  };
-
-function ReferenceManyColumnCell({
-  record,
-  source,
-  reference,
-  choices,
-  optionLabel,
-  optionValue,
-}: ReferenceManyColumnProps & { record: Record<string, unknown> }) {
-  const { labelsForValues } = useChoices(
-    choices,
-    reference,
-    optionLabel,
-    optionValue,
-  );
-  const raw = record[source];
-  const values = Array.isArray(raw) ? raw : [];
-  return <>{labelsForValues(values)}</>;
-}
-
-export function ReferenceManyColumn({
-  source,
-  label,
-  reference,
-  choices,
-  optionLabel = "name",
-  optionValue = "id",
-  sortable = false,
-}: ReferenceManyColumnProps) {
-  const def = useMemo(
-    () => ({
-      key: source,
-      source,
-      label,
-      sortable,
-      buildColumn: () => ({
-        title: label ?? source,
-        dataIndex: source,
-        key: source,
-        sorter: sortable ? true : undefined,
-        render: (_: unknown, record: Record<string, unknown>) => (
-          <ReferenceManyColumnCell
-            record={record}
-            source={source}
-            reference={reference}
-            choices={choices}
-            optionLabel={optionLabel}
-            optionValue={optionValue}
-          />
-        ),
-      }),
-    }),
-    [source, label, sortable, reference, choices, optionLabel, optionValue],
-  );
-  useRegisterColumn(def);
-  return null;
-}
+import { useMemo } from "react";
+import type { BaseSourceProps, DisplayProps, ReferenceProps } from "../types";
+import { useRegisterColumn } from "../context/ListContext";
+import { useChoices } from "../utils/useChoices";
+
+export type ReferenceManyColumnProps = BaseSourceProps &
+  ReferenceProps &
+  DisplayProps & {
+    sortable?: boolean;
+  };
+
+function ReferenceManyColumnCell({
+  record,
+  source,
+  reference,
+  choices,
+  optionLabel,
+  optionValue,
+}: ReferenceManyColumnProps & { record: Record<string, unknown> }) {
+  const { labelsForValues } = useChoices(
+    choices,
+    reference,
+    optionLabel,
+    optionValue,
+  );
+  const raw = record[source];
+  const values = Array.isArray(raw) ? raw : [];
+  return <>{labelsForValues(values)}</>;
+}
+
+export function ReferenceManyColumn({
+  source,
+  label,
+  reference,
+  choices,
+  optionLabel = "name",
+  optionValue = "id",
+  sortable = false,
+}: ReferenceManyColumnProps) {
+  const def = useMemo(
+    () => ({
+      key: source,
+      source,
+      label,
+      sortable,
+      buildColumn: () => ({
+        title: label ?? source,
+        dataIndex: source,
+        key: source,
+        sorter: sortable ? true : undefined,
+        render: (_: unknown, record: Record<string, unknown>) => (
+          <ReferenceManyColumnCell
+            record={record}
+            source={source}
+            reference={reference}
+            choices={choices}
+            optionLabel={optionLabel}
+            optionValue={optionValue}
+          />
+        ),
+      }),
+    }),
+    [source, label, sortable, reference, choices, optionLabel, optionValue],
+  );
+  useRegisterColumn(def);
+  return null;
+}

package/src/crud/columns/TextColumn.tsx

@@ -1,38 +1,38 @@
-import { useMemo } from "react";
-import type { BaseSourceProps } from "../types";
-import { getByPath } from "../utils/getByPath";
-import { useRegisterColumn } from "../context/ListContext";
-
-export type TextColumnProps = BaseSourceProps & {
-  sortable?: boolean;
-};
-
-export function TextColumn({ source, label, sortable = true }: TextColumnProps) {
-  const def = useMemo(
-    () => ({
-      key: source,
-      source,
-      label,
-      sortable,
-      buildColumn: () => ({
-        title: label ?? source,
-        dataIndex: source,
-        key: source,
-        sorter: sortable ? true : undefined,
-      }),
-    }),
-    [source, label, sortable],
-  );
-  useRegisterColumn(def);
-  return null;
-}
-
-export function renderDisplayValue(
-  record: Record<string, unknown>,
-  source: string,
-  display?: string | ((record: Record<string, unknown>) => unknown),
-): unknown {
-  if (typeof display === "function") return display(record);
-  if (display) return getByPath(record, display);
-  return record[source];
-}
+import { useMemo } from "react";
+import type { BaseSourceProps } from "../types";
+import { getFormValue } from "../utils/getFormValue";
+import { useRegisterColumn } from "../context/ListContext";
+
+export type TextColumnProps = BaseSourceProps & {
+  sortable?: boolean;
+};
+
+export function TextColumn({ source, label, sortable = true }: TextColumnProps) {
+  const def = useMemo(
+    () => ({
+      key: source,
+      source,
+      label,
+      sortable,
+      buildColumn: () => ({
+        title: label ?? source,
+        dataIndex: source,
+        key: source,
+        sorter: sortable ? true : undefined,
+      }),
+    }),
+    [source, label, sortable],
+  );
+  useRegisterColumn(def);
+  return null;
+}
+
+export function renderDisplayValue(
+  record: Record<string, unknown>,
+  source: string,
+  display?: string | ((record: Record<string, unknown>) => unknown),
+): unknown {
+  if (typeof display === "function") return display(record);
+  if (display) return getFormValue(record, display);
+  return record[source];
+}

package/src/crud/context/FilterContext.tsx

@@ -1,71 +1,71 @@
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useState,
-  type ReactNode,
-} from "react";
-import type { FilterDefinition } from "../types";
-
-type FilterContextValue = {
-  registerFilter: (def: FilterDefinition) => () => void;
-  filters: FilterDefinition[];
-  values: Record<string, unknown>;
-  setFilterValue: (source: string, value: unknown) => void;
-};
-
-const FilterContext = createContext<FilterContextValue | null>(null);
-
-export function FilterContextProvider({
-  children,
-  values,
-  setFilterValue,
-}: {
-  children: ReactNode;
-  values: Record<string, unknown>;
-  setFilterValue: (source: string, value: unknown) => void;
-}) {
-  const [filters, setFilters] = useState<FilterDefinition[]>([]);
-
-  const registerFilter = useCallback((def: FilterDefinition) => {
-    setFilters((prev) => {
-      const idx = prev.findIndex((f) => f.key === def.key);
-      if (idx < 0) return [...prev, def];
-      if (prev[idx] === def) return prev;
-      const next = [...prev];
-      next[idx] = def;
-      return next;
-    });
-    return () => {
-      setFilters((prev) => prev.filter((f) => f.key !== def.key));
-    };
-  }, []);
-
-  const value = useMemo(
-    (): FilterContextValue => ({
-      filters,
-      values,
-      setFilterValue,
-      registerFilter,
-    }),
-    [filters, values, setFilterValue, registerFilter],
-  );
-
-  return (
-    <FilterContext.Provider value={value}>{children}</FilterContext.Provider>
-  );
-}
-
-export function useFilterContext() {
-  return useContext(FilterContext);
-}
-
-export function useRegisterFilter(def: FilterDefinition) {
-  const registerFilter = useFilterContext()?.registerFilter;
-  useEffect(() => {
-    if (!registerFilter) return;
-    return registerFilter(def);
-  }, [registerFilter, def]);
-}
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+  type ReactNode,
+} from "react";
+import type { FilterDefinition } from "../types";
+
+type FilterContextValue = {
+  registerFilter: (def: FilterDefinition) => () => void;
+  filters: FilterDefinition[];
+  values: Record<string, unknown>;
+  setFilterValue: (source: string, value: unknown) => void;
+};
+
+const FilterContext = createContext<FilterContextValue | null>(null);
+
+export function FilterContextProvider({
+  children,
+  values,
+  setFilterValue,
+}: {
+  children: ReactNode;
+  values: Record<string, unknown>;
+  setFilterValue: (source: string, value: unknown) => void;
+}) {
+  const [filters, setFilters] = useState<FilterDefinition[]>([]);
+
+  const registerFilter = useCallback((def: FilterDefinition) => {
+    setFilters((prev) => {
+      const idx = prev.findIndex((f) => f.key === def.key);
+      if (idx < 0) return [...prev, def];
+      if (prev[idx] === def) return prev;
+      const next = [...prev];
+      next[idx] = def;
+      return next;
+    });
+    return () => {
+      setFilters((prev) => prev.filter((f) => f.key !== def.key));
+    };
+  }, []);
+
+  const value = useMemo(
+    (): FilterContextValue => ({
+      filters,
+      values,
+      setFilterValue,
+      registerFilter,
+    }),
+    [filters, values, setFilterValue, registerFilter],
+  );
+
+  return (
+    <FilterContext.Provider value={value}>{children}</FilterContext.Provider>
+  );
+}
+
+export function useFilterContext() {
+  return useContext(FilterContext);
+}
+
+export function useRegisterFilter(def: FilterDefinition) {
+  const registerFilter = useFilterContext()?.registerFilter;
+  useEffect(() => {
+    if (!registerFilter) return;
+    return registerFilter(def);
+  }, [registerFilter, def]);
+}

package/src/crud/context/FormContext.tsx

@@ -1,39 +1,39 @@
-import { createContext, useContext, type ReactNode } from "react";
-
-type FormMetaContextValue = {
-  resource: string;
-  isNew: boolean;
-  disabled?: boolean;
-};
-
-const FormMetaContext = createContext<FormMetaContextValue | null>(null);
-
-export function FormMetaProvider({
-  children,
-  resource,
-  isNew,
-  disabled,
-}: {
-  children: ReactNode;
-  resource: string;
-  isNew: boolean;
-  disabled?: boolean;
-}) {
-  return (
-    <FormMetaContext.Provider value={{ resource, isNew, disabled }}>
-      {children}
-    </FormMetaContext.Provider>
-  );
-}
-
-export function useFormMeta() {
-  const ctx = useContext(FormMetaContext);
-  if (!ctx) {
-    throw new Error("Field components must be used within ResourceForm");
-  }
-  return ctx;
-}
-
-export function useFormMetaOptional() {
-  return useContext(FormMetaContext);
-}
+import { createContext, useContext, type ReactNode } from "react";
+
+type FormMetaContextValue = {
+  resource: string;
+  isNew: boolean;
+  disabled?: boolean;
+};
+
+const FormMetaContext = createContext<FormMetaContextValue | null>(null);
+
+export function FormMetaProvider({
+  children,
+  resource,
+  isNew,
+  disabled,
+}: {
+  children: ReactNode;
+  resource: string;
+  isNew: boolean;
+  disabled?: boolean;
+}) {
+  return (
+    <FormMetaContext.Provider value={{ resource, isNew, disabled }}>
+      {children}
+    </FormMetaContext.Provider>
+  );
+}
+
+export function useFormMeta() {
+  const ctx = useContext(FormMetaContext);
+  if (!ctx) {
+    throw new Error("Field components must be used within a resource form");
+  }
+  return ctx;
+}
+
+export function useFormMetaOptional() {
+  return useContext(FormMetaContext);
+}

package/src/crud/context/FormSectionContext.tsx

@@ -1,22 +1,22 @@
-import { createContext, useContext, type MutableRefObject, type ReactNode } from "react";
-
-const FormSectionSourcesContext =
-  createContext<MutableRefObject<Set<string>> | null>(null);
-
-export function FormSectionSourcesProvider({
-  sourcesRef,
-  children,
-}: {
-  sourcesRef: MutableRefObject<Set<string>>;
-  children: ReactNode;
-}) {
-  return (
-    <FormSectionSourcesContext.Provider value={sourcesRef}>
-      {children}
-    </FormSectionSourcesContext.Provider>
-  );
-}
-
-export function useFormSectionSourcesOptional() {
-  return useContext(FormSectionSourcesContext);
-}
+import { createContext, useContext, type MutableRefObject, type ReactNode } from "react";
+
+const FormSectionSourcesContext =
+  createContext<MutableRefObject<Set<string>> | null>(null);
+
+export function FormSectionSourcesProvider({
+  sourcesRef,
+  children,
+}: {
+  sourcesRef: MutableRefObject<Set<string>>;
+  children: ReactNode;
+}) {
+  return (
+    <FormSectionSourcesContext.Provider value={sourcesRef}>
+      {children}
+    </FormSectionSourcesContext.Provider>
+  );
+}
+
+export function useFormSectionSourcesOptional() {
+  return useContext(FormSectionSourcesContext);
+}

package/src/crud/context/InlineFieldsRegistry.tsx

@@ -0,0 +1,61 @@
+import {
+  createContext,
+  useContext,
+  useEffect,
+  type RefObject,
+  type ReactNode,
+} from "react";
+
+export type InlineFieldRegistration = {
+  field: string;
+  sources: string[];
+  payloadKey?: string;
+  transformRows?: (rows: Record<string, unknown>[]) => unknown;
+};
+
+const InlineFieldsRegistryContext =
+  createContext<RefObject<Map<string, InlineFieldRegistration>> | null>(
+    null,
+  );
+
+export function InlineFieldsRegistryProvider({
+  children,
+  registryRef,
+}: {
+  children: ReactNode;
+  registryRef: RefObject<Map<string, InlineFieldRegistration>>;
+}) {
+  return (
+    <InlineFieldsRegistryContext.Provider value={registryRef}>
+      {children}
+    </InlineFieldsRegistryContext.Provider>
+  );
+}
+
+export function useInlineFieldsRegistryOptional() {
+  return useContext(InlineFieldsRegistryContext);
+}
+
+/** Register an inline field array (`useFieldArray` name) for save payload cleaning. */
+export function useRegisterInlineField(
+  field: string,
+  sources: string[],
+  payloadKey?: string,
+  transformRows?: (rows: Record<string, unknown>[]) => unknown,
+  enabled = true,
+) {
+  const registryRef = useInlineFieldsRegistryOptional();
+
+  useEffect(() => {
+    if (!enabled || !registryRef) return;
+    registryRef.current.set(field, {
+      field,
+      sources,
+      payloadKey,
+      transformRows,
+    });
+    return () => {
+      registryRef.current.delete(field);
+    };
+  }, [registryRef, field, sources, payloadKey, transformRows, enabled]);
+}