@twintag/twintag-form 1.4.0-beta.2 → 1.4.0-beta.3

package/dist/twintag-form.react.js

@@ -14262,7 +14262,11 @@ const pc = gt({
   defaultVariants: {
     variant: "default"
   }
-}), wc = ({ type: e, defaultValue: t, children: r }) => {
+}), wc = ({
+  type: e,
+  defaultValue: t,
+  children: r
+}) => {
   const { variant: n } = it();
   return e === "single" ? /* @__PURE__ */ x.jsx(Us, { type: "single", defaultValue: t, collapsible: !0, children: /* @__PURE__ */ x.jsx("div", { className: qs({ variant: n }), children: r }) }) : /* @__PURE__ */ x.jsx(Us, { type: "multiple", children: /* @__PURE__ */ x.jsx("div", { className: qs({ variant: n }), children: r }) });
 };
@@ -14314,7 +14318,7 @@ const Xy = De({
   return /* @__PURE__ */ x.jsxs(
     ac,
     {
-      value: t ?? D8(e),
+      value: t || D8(e),
       className: c(),
       ...a,
       children: [

package/lib/components/containers/accordion.tsx

@@ -31,7 +31,11 @@ const accordionRootVariants = tv({
     variant: 'default',
   },
 });
-const AccordionRoot: FC<AccordionRootProps> = ({ type, defaultValue, children }) => {
+const AccordionRoot: FC<AccordionRootProps> = ({
+  type,
+  defaultValue,
+  children,
+}) => {
   const { variant } = useTwintagForm();
 
   if (type === 'single') {
@@ -104,7 +108,7 @@ const AccordionItem: FC<AccordionItemProps> = ({
 
   return (
     <AccordionItemPrimitive
-      value={value ?? camelize(label)}
+      value={value ? value : camelize(label)}
       className={item()}
       {...rest}
     >

package/lib/components/provider.tsx

@@ -1,163 +1,163 @@
-import type {
-  ParsedJsonComponent,
-  RawJsonComponent,
-  TwintagFormContext,
-} from '@twintag/twintag-form/types';
-import type { WithChildren } from 'twintag-types/dom';
-
-import { createContext, useContext, useMemo } from 'react';
-import { LabelToString } from 'twintag-types/dom';
-import { v4 as uuid } from 'uuid';
-
-export const twintagFormContext = createContext<TwintagFormContext>({
-  variant: 'default',
-  size: 'base',
-  inputs: new Map(),
-  components: new Map(),
-  config: [],
-  resetValues: {},
-});
-
-export const useTwintagForm = () => {
-  const context = useContext(twintagFormContext);
-
-  if (!context) {
-    throw new Error('useTwintagForm must be used within a TwintagFormProvider');
-  }
-
-  return context;
-};
-
-type Components = TwintagFormContext['components'];
-type Inputs = TwintagFormContext['inputs'];
-
-const format = (component: RawJsonComponent, components: Components) => {
-  const copy = { ...component };
-  let formattedConfig: ParsedJsonComponent;
-
-  if (copy.props) {
-    formattedConfig = { ...copy.props } as ParsedJsonComponent;
-  } else {
-    formattedConfig = { ...copy } as unknown as ParsedJsonComponent;
-  }
-
-  if (!copy.type) return Object.create(null) as ParsedJsonComponent;
-
-  const [type, subtype = undefined] = copy.type.split(':');
-  formattedConfig.id = `${type}-${uuid()}`;
-
-  const comp = components.get(type);
-
-  if (comp) {
-    formattedConfig.comp = comp;
-  }
-
-  formattedConfig.type = type;
-
-  if (subtype) {
-    formattedConfig.subtype = subtype;
-  }
-
-  if (copy.props) {
-    if (copy.props.subtype) {
-      formattedConfig.subtype = copy.props.subtype;
-    }
-
-    if (copy.props.label) {
-      const labelParsed = LabelToString.safeParse(copy.props.label);
-      formattedConfig.label = labelParsed.success
-        ? labelParsed.data
-        : undefined;
-    }
-  }
-
-  if (copy.children && Array.isArray(copy.children)) {
-    formattedConfig.items = copy.children.map((item) =>
-      format(item, components),
-    );
-  }
-
-  return formattedConfig;
-};
-
-export const getResetValues = (
-  config: ParsedJsonComponent | ParsedJsonComponent[],
-  inputs: Inputs,
-) => {
-  const stack = Array.isArray(config) ? [...config] : [config];
-
-  const resetValues = new Map<string, unknown>();
-
-  while (stack.length > 0) {
-    const currentObj = stack.pop();
-
-    if (!currentObj) continue;
-
-    for (const [key, value] of Object.entries(currentObj)) {
-      if (Array.isArray(value)) {
-        for (const item of value) {
-          stack.push(item);
-        }
-      }
-
-      if (typeof value === 'object' && value !== null) {
-        stack.push(value as unknown as ParsedJsonComponent);
-      }
-
-      if (
-        key === 'subtype' &&
-        'bind' in currentObj &&
-        typeof currentObj.bind === 'string'
-      ) {
-        resetValues.set(
-          currentObj.bind,
-          inputs.get(value as string)?.defaultValue,
-        );
-      }
-    }
-  }
-
-  return Object.fromEntries(resetValues);
-};
-
-export const TwintagFormProvider = ({
-  variant,
-  size,
-  inputs,
-  components,
-  config,
-  children,
-}: {
-  config: RawJsonComponent | RawJsonComponent[];
-  variant: TwintagFormContext['variant'];
-  size: TwintagFormContext['size'];
-  inputs: Inputs;
-  components: Components;
-} & WithChildren) => {
-  const __config = useMemo(() => {
-    if (Array.isArray(config)) {
-      return config.map((item) => format(item, components));
-    }
-
-    return format(config, components);
-  }, [config, components]);
-
-  const resetValues = useMemo(() => {
-    return getResetValues(__config, inputs);
-  }, [__config, inputs]);
-
-  return (
-    <twintagFormContext.Provider
-      value={{
-        config: __config,
-        variant,
-        size,
-        inputs,
-        components,
-        resetValues,
-      }}
-    >
-      {children}
-    </twintagFormContext.Provider>
-  );
-};
+import type {
+  ParsedJsonComponent,
+  RawJsonComponent,
+  TwintagFormContext,
+} from '@twintag/twintag-form/types';
+import type { WithChildren } from 'twintag-types/dom';
+
+import { createContext, useContext, useMemo } from 'react';
+import { LabelToString } from 'twintag-types/dom';
+import { v4 as uuid } from 'uuid';
+
+export const twintagFormContext = createContext<TwintagFormContext>({
+  variant: 'default',
+  size: 'base',
+  inputs: new Map(),
+  components: new Map(),
+  config: [],
+  resetValues: {},
+});
+
+export const useTwintagForm = () => {
+  const context = useContext(twintagFormContext);
+
+  if (!context) {
+    throw new Error('useTwintagForm must be used within a TwintagFormProvider');
+  }
+
+  return context;
+};
+
+type Components = TwintagFormContext['components'];
+type Inputs = TwintagFormContext['inputs'];
+
+const format = (component: RawJsonComponent, components: Components) => {
+  const copy = { ...component };
+  let formattedConfig: ParsedJsonComponent;
+
+  if (copy.props) {
+    formattedConfig = { ...copy.props } as ParsedJsonComponent;
+  } else {
+    formattedConfig = { ...copy } as unknown as ParsedJsonComponent;
+  }
+
+  if (!copy.type) return Object.create(null) as ParsedJsonComponent;
+
+  const [type, subtype = undefined] = copy.type.split(':');
+  formattedConfig.id = `${type}-${uuid()}`;
+
+  const comp = components.get(type);
+
+  if (comp) {
+    formattedConfig.comp = comp;
+  }
+
+  formattedConfig.type = type;
+
+  if (subtype) {
+    formattedConfig.subtype = subtype;
+  }
+
+  if (copy.props) {
+    if (copy.props.subtype) {
+      formattedConfig.subtype = copy.props.subtype;
+    }
+
+    if (copy.props.label) {
+      const labelParsed = LabelToString.safeParse(copy.props.label);
+      formattedConfig.label = labelParsed.success
+        ? labelParsed.data
+        : undefined;
+    }
+  }
+
+  if (copy.children && Array.isArray(copy.children)) {
+    formattedConfig.items = copy.children.map((item) =>
+      format(item, components),
+    );
+  }
+
+  return formattedConfig;
+};
+
+export const getResetValues = (
+  config: ParsedJsonComponent | ParsedJsonComponent[],
+  inputs: Inputs,
+) => {
+  const stack = Array.isArray(config) ? [...config] : [config];
+
+  const resetValues = new Map<string, unknown>();
+
+  while (stack.length > 0) {
+    const currentObj = stack.pop();
+
+    if (!currentObj) continue;
+
+    for (const [key, value] of Object.entries(currentObj)) {
+      if (Array.isArray(value)) {
+        for (const item of value) {
+          stack.push(item);
+        }
+      }
+
+      if (typeof value === 'object' && value !== null) {
+        stack.push(value as unknown as ParsedJsonComponent);
+      }
+
+      if (
+        key === 'subtype' &&
+        'bind' in currentObj &&
+        typeof currentObj.bind === 'string'
+      ) {
+        resetValues.set(
+          currentObj.bind,
+          inputs.get(value as string)?.defaultValue,
+        );
+      }
+    }
+  }
+
+  return Object.fromEntries(resetValues);
+};
+
+export const TwintagFormProvider = ({
+  variant,
+  size,
+  inputs,
+  components,
+  config,
+  children,
+}: {
+  config: RawJsonComponent | RawJsonComponent[];
+  variant: TwintagFormContext['variant'];
+  size: TwintagFormContext['size'];
+  inputs: Inputs;
+  components: Components;
+} & WithChildren) => {
+  const __config = useMemo(() => {
+    if (Array.isArray(config)) {
+      return config.map((item) => format(item, components));
+    }
+
+    return format(config, components);
+  }, [config, components]);
+
+  const resetValues = useMemo(() => {
+    return getResetValues(__config, inputs);
+  }, [__config, inputs]);
+
+  return (
+    <twintagFormContext.Provider
+      value={{
+        config: __config,
+        variant,
+        size,
+        inputs,
+        components,
+        resetValues,
+      }}
+    >
+      {children}
+    </twintagFormContext.Provider>
+  );
+};

package/lib/index.tsx

@@ -1,41 +1,41 @@
-import type { ComponentProps } from 'react';
-import type { RawJsonComponent } from '@twintag/twintag-form/types';
-
-import { forwardRef } from 'react';
-
-import { components, Inputs } from '@twintag/twintag-form/components/config';
-import { TwintagForm } from '@twintag/twintag-form/components/form';
-import { TwintagFormProvider } from '@twintag/twintag-form/components/provider';
-import { JsonRenderer } from '@twintag/twintag-form/components/renderer';
-
-type Props = {
-  config: RawJsonComponent[];
-  options?: Partial<{
-    defaultValues?: ComponentProps<typeof TwintagForm>['defaultValues'];
-    variant?: ComponentProps<typeof TwintagFormProvider>['variant'];
-    size?: ComponentProps<typeof TwintagFormProvider>['size'];
-    resetOnSubmit?: boolean;
-  }>;
-};
-
-export const Form = forwardRef<HTMLFormElement, Props>(
-  ({ config, options }, ref) => {
-    return (
-      <TwintagFormProvider
-        inputs={Inputs}
-        components={components}
-        variant={options?.variant}
-        size={options?.size}
-        config={config}
-      >
-        <TwintagForm
-          ref={ref}
-          defaultValues={options?.defaultValues}
-          resetOnSubmit={options?.resetOnSubmit}
-        >
-          <JsonRenderer />
-        </TwintagForm>
-      </TwintagFormProvider>
-    );
-  },
-);
+import type { ComponentProps } from 'react';
+import type { RawJsonComponent } from '@twintag/twintag-form/types';
+
+import { forwardRef } from 'react';
+
+import { components, Inputs } from '@twintag/twintag-form/components/config';
+import { TwintagForm } from '@twintag/twintag-form/components/form';
+import { TwintagFormProvider } from '@twintag/twintag-form/components/provider';
+import { JsonRenderer } from '@twintag/twintag-form/components/renderer';
+
+type Props = {
+  config: RawJsonComponent[];
+  options?: Partial<{
+    defaultValues?: ComponentProps<typeof TwintagForm>['defaultValues'];
+    variant?: ComponentProps<typeof TwintagFormProvider>['variant'];
+    size?: ComponentProps<typeof TwintagFormProvider>['size'];
+    resetOnSubmit?: boolean;
+  }>;
+};
+
+export const Form = forwardRef<HTMLFormElement, Props>(
+  ({ config, options }, ref) => {
+    return (
+      <TwintagFormProvider
+        inputs={Inputs}
+        components={components}
+        variant={options?.variant}
+        size={options?.size}
+        config={config}
+      >
+        <TwintagForm
+          ref={ref}
+          defaultValues={options?.defaultValues}
+          resetOnSubmit={options?.resetOnSubmit}
+        >
+          <JsonRenderer />
+        </TwintagForm>
+      </TwintagFormProvider>
+    );
+  },
+);

package/lib/types/index.ts

@@ -29,17 +29,16 @@ type RawProps<
       }>;
     }
   : TType extends 'accordion'
-    ? 
-      TSubtype extends 'item'
-        ? {
+    ? TSubtype extends 'item'
+      ? {
           type: TType;
           subtype: TSubtype;
           value?: string;
           label: string;
           icon: string;
         }
-          :TSubtype extends 'multiple' | 'single'
-      ? { type: TType; subtype: TSubtype; defaultValue?: string }
+      : TSubtype extends 'multiple' | 'single'
+        ? { type: TType; subtype: TSubtype; defaultValue?: string }
         : never
     : {
         type: TType;
@@ -47,12 +46,15 @@ type RawProps<
         subtype?: string;
       };
 
-export type RawJsonComponent =
-  CompType extends infer T ? T extends CompType ? {
-    type: StringLiteral<T>;
-    props?: Omit<RawProps<StringLiteral<T>>, 'type'>;
-    children?: RawJsonComponent[];
-  } : never : never
+export type RawJsonComponent = CompType extends infer T
+  ? T extends CompType
+    ? {
+        type: StringLiteral<T>;
+        props?: Omit<RawProps<StringLiteral<T>>, 'type'>;
+        children?: RawJsonComponent[];
+      }
+    : never
+  : never;
 
 export type ParsedJsonComponent<TType extends string = string> =
   RawProps<TType> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twintag/twintag-form",
-  "version": "1.4.0-beta.2",
+  "version": "1.4.0-beta.3",
   "author": "Twintag",
   "type": "module",
   "exports": {
@@ -49,9 +49,9 @@
     "tailwindcss": "^3.3.6",
     "vite": "^5.2.11",
     "vite-plugin-dts": "^3.9.1",
+    "eslint-config-custom": "1.0.0",
     "tsconfig": "0.0.0",
-    "twintag-types": "0.2.0",
-    "eslint-config-custom": "1.0.0"
+    "twintag-types": "0.2.0"
   },
   "publishConfig": {
     "access": "public"