gbs-add-block 0.0.49 → 0.0.50

package/README.md

@@ -1,4 +1,4 @@
-# GBS Building Blocks 2.0 (v0.0.49)
+# GBS Building Blocks 2.0 (v0.0.50)
 
 Latest and upgraded version of GBS building blocks with headless UI and removed dependencies.
 
@@ -6,7 +6,7 @@ Latest and upgraded version of GBS building blocks with headless UI and removed
 
 For detailed documentation on usage and props, Please visit: [Building Block Documentation v2.0](https://blackmax-designs.gitbook.io/building-block-v2.0)
 
-## What's New 🎉 (Ver 0.0.49)
+## What's New 🎉 (Ver 0.0.50)
 
 - Update on form renderer
 - Refactored Code for Better Readability

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gbs-add-block",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "description": "React Component Library",
   "files": [
     "index.js",

package/source/components/formrenderer/index.tsx

@@ -1,149 +1,111 @@
-/**
- * Copyright (c) Grampro Business Services and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import React, { useEffect, useRef, useState } from "react";
+import React, { useRef, useState, FormEvent } from "react";
 import { useFormContext } from "@grampro/headless-helpers";
-import { FormElement, FormItem, FormRendererProps } from "./types";
 import InputHandles from "./componentHandles/InputHandles";
 import SelectHandles from "./componentHandles/SelectHandles";
 import MultiHandles from "./componentHandles/MultiHandles";
 import DatePickerHandles from "./componentHandles/DatePickerHandles";
 import CheckboxHandles from "./componentHandles/CheckBoxHandles";
+import { FormItem, FormRendererProps } from "./types";
+
+// Component mapping
+const COMPONENT_MAP = {
+  input: InputHandles,
+  select: SelectHandles,
+  "multi-select": MultiHandles,
+  datepicker: DatePickerHandles,
+  checkbox: CheckboxHandles,
+} as const;
+
+const validateField = (
+  field: HTMLInputElement | null,
+  item: FormItem
+): boolean => {
+  if (!item.required || !item.name || field?.disabled) {
+    return true;
+  }
+  // Explicitly check for null and empty value
+  if (!field) {
+    return false;
+  }
+  return field.value.trim() !== "";
+};
 
-const FormRenderer = ({
+const FormRenderer: React.FC<FormRendererProps> = ({
   onSubmit,
-  sourceData,
+  sourceData = [],
   formFormationClass = "grid grid-cols-1 text-left gap-4",
   formParentClass = "w-96",
-}: FormRendererProps) => {
-  const formRef = useRef<FormElement>(null);
+}) => {
+  const formRef = useRef<HTMLFormElement>(null);
   const [requirementError, setRequirementError] = useState<string[]>([]);
-
   const { context, updateContext } = useFormContext();
 
-  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+  // Handle form submission
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    const requirementErrorItems: string[] = [];
 
-    sourceData?.forEach((item: FormItem) => {
-      if (item.required && item.name) {
+    const requirementErrorItems = sourceData
+      .filter((item) => item.required && item.name)
+      .reduce((errors: string[], item) => {
         const field = formRef.current?.querySelector(
           `[name="${item.name}"]`
         ) as HTMLInputElement | null;
 
-        if (!field || !field.value.trim()) {
-          requirementErrorItems.push(item.name);
+        if (!validateField(field, item)) {
+          errors.push(item.name!);
         }
-      }
-    });
+        return errors;
+      }, []);
 
     setRequirementError(requirementErrorItems);
 
-    if (requirementErrorItems.length > 0) return;
+    if (requirementErrorItems.length === 0 && onSubmit && formRef.current) {
+      onSubmit(new FormData(formRef.current));
+    }
+  };
 
-    const formData = new FormData(formRef.current as HTMLFormElement);
-    if (onSubmit) onSubmit(formData);
+  // Render form component based on the type
+  const renderFormComponent = (item: FormItem, index: number) => {
+    if (item.component === "button") {
+      return (
+        <div key={index} className="w-full mt-1">
+          <button
+            type={item.button_type}
+            className="w-full bg-black text-white py-2 rounded-xl hover:bg-gray-800"
+          >
+            {item.value}
+          </button>
+        </div>
+      );
+    }
+
+    const Component = item.component && COMPONENT_MAP[item.component];
+    if (!Component) return null;
+
+    return (
+      <Component
+        key={index}
+        item={item}
+        requirementError={requirementError}
+        setRequirementError={setRequirementError}
+        formRef={formRef}
+        onChangeEvent={item.onChangeEvent}
+        context={context}
+        updateContext={updateContext}
+      />
+    );
   };
 
+  // If no source data is found, return a message
+  if (!sourceData.length) {
+    return <div>No Source Data Found</div>;
+  }
+
   return (
     <form ref={formRef} onSubmit={handleSubmit} className={formParentClass}>
-      {sourceData && sourceData?.length > 0 ? (
-        <div className={formFormationClass}>
-          {sourceData.map((item: FormItem, index: number) => {
-            switch (item.component) {
-              case "input":
-                return (
-                  <InputHandles
-                    key={index}
-                    item={item}
-                    requirementError={requirementError}
-                    setRequirementError={setRequirementError}
-                    onChangeEvent={item.onChangeEvent}
-                    formRef={formRef}
-                    context={context}
-                    updateContext={updateContext}
-                  />
-                );
-
-              case "select":
-                return (
-                  <SelectHandles
-                    key={index}
-                    item={item}
-                    requirementError={requirementError}
-                    setRequirementError={setRequirementError}
-                    formRef={formRef}
-                    onChangeEvent={item.onChangeEvent}
-                    context={context}
-                    updateContext={updateContext}
-                  />
-                );
-
-              case "multi-select":
-                return (
-                  <MultiHandles
-                    key={index}
-                    item={item}
-                    requirementError={requirementError}
-                    setRequirementError={setRequirementError}
-                    formRef={formRef}
-                    onChangeEvent={item.onChangeEvent}
-                    context={context}
-                    updateContext={updateContext}
-                  />
-                );
-
-              case "datepicker":
-                return (
-                  <DatePickerHandles
-                    key={index}
-                    item={item}
-                    requirementError={requirementError}
-                    setRequirementError={setRequirementError}
-                    formRef={formRef}
-                    onChangeEvent={item.onChangeEvent}
-                  />
-                );
-
-              case "checkbox":
-                return (
-                  <CheckboxHandles
-                    key={index}
-                    item={item}
-                    requirementError={requirementError}
-                    setRequirementError={setRequirementError}
-                    formRef={formRef}
-                    onChangeEvent={item.onChangeEvent}
-                    sourceData={sourceData}
-                    context={context}
-                    updateContext={updateContext}
-                  />
-                );
-
-              case "button":
-                return (
-                  <div key={index} className="w-full mt-1">
-                    <button
-                      type={item.button_type}
-                      className="w-full bg-black text-white py-2 rounded-xl hover:bg-gray-800"
-                    >
-                      {item.value}
-                    </button>
-                  </div>
-                );
-
-              default:
-                return null;
-            }
-          })}
-        </div>
-      ) : (
-        <div>No Source Data Found</div>
-      )}
+      <div className={formFormationClass}>
+        {sourceData.map(renderFormComponent)}
+      </div>
     </form>
   );
 };

package/source/components/formrenderer/types.ts

@@ -9,7 +9,13 @@ export interface FormElement extends HTMLFormElement {
 export type FormItem = {
   id?: string;
   name?: string;
-  component?: string;
+  component?:
+    | "input"
+    | "select"
+    | "multi-select"
+    | "datepicker"
+    | "checkbox"
+    | "button";
   type?: string;
   required?: boolean | string;
   placeholder?: string;