@react-typed-forms/schemas 7.3.2 → 8.1.0

package/src/tailwind.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { DefaultRendererOptions } from "./renderers";
 
-export const defaultTailwindTheme: DefaultRendererOptions = {
+export const defaultTailwindTheme = {
   label: {
     groupLabelClass: "font-bold",
     requiredElement: <span className="text-red-500"> *</span>,
@@ -26,4 +26,4 @@ export const defaultTailwindTheme: DefaultRendererOptions = {
   data: {
     displayOnlyClass: "flex flex-row items-center gap-2",
   },
-};
+} satisfies DefaultRendererOptions;

package/src/types.ts

@@ -65,6 +65,7 @@ export interface ControlDefinition {
   title?: string | null;
   styleClass?: string | null;
   layoutClass?: string | null;
+  labelClass?: string | null;
   dynamic?: DynamicProperty[] | null;
   adornments?: ControlAdornment[] | null;
   children?: ControlDefinition[] | null;
@@ -90,7 +91,8 @@ export enum DynamicPropertyType {
   Display = "Display",
   Style = "Style",
   LayoutStyle = "LayoutStyle",
-  AllowedOptions = "AllowedOptions"
+  AllowedOptions = "AllowedOptions",
+  Label = "Label",
 }
 
 export interface EntityExpression {

package/src/util.ts

@@ -389,18 +389,25 @@ export function cleanDataForSchema(
 
 export function getAllReferencedClasses(c: ControlDefinition): string[] {
   const childClasses = c.children?.flatMap(getAllReferencedClasses);
-  const tc = clsx(c.styleClass, c.layoutClass);
+  const tc = clsx(
+    getOverrideClass(c.styleClass),
+    getOverrideClass(c.layoutClass),
+    getOverrideClass(c.labelClass),
+  );
   if (childClasses && !tc) return childClasses;
   if (!tc) return [];
   if (childClasses) return [tc, ...childClasses];
   return [tc];
 }
 
-export function jsonPathString(jsonPath: JsonPath[]) {
+export function jsonPathString(
+  jsonPath: JsonPath[],
+  customIndex?: (n: number) => string,
+) {
   let out = "";
   jsonPath.forEach((v, i) => {
     if (typeof v === "number") {
-      out += "[" + v + "]";
+      out += customIndex?.(v) ?? "[" + v + "]";
     } else {
       if (i > 0) out += ".";
       out += v;
@@ -408,3 +415,31 @@ export function jsonPathString(jsonPath: JsonPath[]) {
   });
   return out;
 }
+
+export function findChildDefinition(
+  parent: ControlDefinition,
+  childPath: number | number[],
+): ControlDefinition {
+  if (Array.isArray(childPath)) {
+    let base = parent;
+    childPath.forEach((x) => (base = base.children![x]));
+    return base;
+  }
+  return parent.children![childPath];
+}
+
+export function getOverrideClass(className?: string | null) {
+  if (className && className.startsWith("@ ")) {
+    return className.substring(2);
+  }
+  return className;
+}
+
+export function rendererClass(
+  controlClass?: string | null,
+  globalClass?: string | null,
+) {
+  const oc = getOverrideClass(controlClass);
+  if (oc === controlClass) return clsx(controlClass, globalClass);
+  return oc ? oc : undefined;
+}