@solidstarters/solid-core-ui 1.1.23 → 1.1.25

package/src/components/core/model/FieldMetaData.tsx

@@ -59,7 +59,11 @@ const FieldMetaData = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldMetaD
 
   // Function to delete a row
   const deleteRow = (rowData: any) => {
-    setFieldMetaData((prevData: any) => prevData.filter((item: any) => item.name !== rowData.name)); // Remove the row from the data array
+    setFieldMetaData((prevData: any) => {
+      const updatedData = prevData.filter((item: any) => item.name !== rowData.name);
+      setIsDirty(true); // Ensure dirty state is updated immediately
+      return updatedData;
+    });
   };
 
   // Template for the trash (delete) icon column

package/src/components/core/model/FieldMetaDataForm.tsx

@@ -109,7 +109,6 @@ const SelectionStaticValues = ({ enumValue, onUpdate, onDelete, onAdd }: any) =>
       <Button
         icon="pi pi-plus"
         size="small"
-        className="small-button"
         onClick={onAdd}
         type="button"
       />
@@ -118,7 +117,6 @@ const SelectionStaticValues = ({ enumValue, onUpdate, onDelete, onAdd }: any) =>
       <Button
         icon="pi pi-trash"
         size="small"
-        className="small-button"
         onClick={onDelete}
         outlined
         severity="danger"
@@ -1189,7 +1187,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                     >
                       <div className="formgrid grid">
                         {currentFields.includes("displayName") && (
-                          <div className="field col-6 flex-flex-column gap-2">
+                          <div className="field col-6 flex-flex-column gap-2 mt-2">
                             <label htmlFor="displayName" className="form-field-label">
                               Display Name
                             </label>
@@ -1408,7 +1406,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                             </div>
                           )}
                           {currentFields.includes("defaultValue") && (
-                            <div className="field col-6 flex-flex-column gap-2">
+                            <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <label
                                 htmlFor="defaultValue"
                                 className="form-field-label"
@@ -1472,7 +1470,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                                   value={formik.values.defaultValue ? formik.values.defaultValue : "false"}
                                   onChange={(e) => formik.setFieldValue("defaultValue", e.value)} // Custom handling for boolean input
                                   options={booleanOptions}
-                                  className={classNames(" flex boolean-switch", {
+                                  className={classNames("", {
                                     "p-invalid": isFormFieldValid(formik, "defaultValue"),
                                   })}
                                 />
@@ -1657,7 +1655,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                                   formik.setFieldValue("mediaEmbedded", e.value);
                                 }}
                                 options={booleanOptions}
-                                className={classNames(" flex boolean-switch", {
+                                className={classNames("", {
                                   "p-invalid": isFormFieldValid(
                                     formik,
                                     "mediaEmbedded"
@@ -2425,7 +2423,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                       )}
                       {(currentFields.includes("regexPattern") || currentFields.includes("min") || currentFields.includes("max") || currentFields.includes("ormType")) && ormTypeOptions && selectedType.value !== 'relation' &&
                         <>
-                          <p className="form-wrapper-heading text-base">Validations</p>
+                          <p className="form-wrapper-heading text-base mt-3">Validations</p>
                           <div className="formgrid grid">
                             {(currentFields.includes("regexPattern") && selectedType.value === "password") &&
                               <>

package/src/components/layout/AppSidebar.tsx

@@ -178,7 +178,7 @@ const AppSidebar = () => {
                     })}
                 </div>
 
-                {/* <UserProfileMenu></UserProfileMenu> */}
+                <UserProfileMenu></UserProfileMenu>
             </div>
             {currentMenu && (
                 <div className={`sidebar-right ${visibleNavbar ? "open" : ""}`}>

package/src/helpers/registry.ts

@@ -1,3 +1,4 @@
+import { CustomHtml } from "@/components/core/form/widgets/CustomHtml";
 import React from "react";
 
 type ExtensionRegistry = {
@@ -49,4 +50,15 @@ export const getExtensionComponent = (name: string): React.ComponentType<any> |
 export const getExtensionFunction = (name: string) => {
     // console.log(`Registry state: `, extensionRegistry);
     return extensionRegistry.functions[name];
-};
+};
+
+
+// Register all the dynamic widget & functions from inside solid-core-ui
+// Common
+registerExtensionComponent("CustomHtml", CustomHtml);
+
+
+// ModuleMetadata
+
+
+// ModelMetadata

package/src/index.ts

@@ -629,7 +629,8 @@ export type {
     LayoutNode,
     LayoutNodeType,
     SolidUiEvents,
-    SolidUiEvent
+    SolidUiEvent,
+    SolidFormWidgetProps
 } from '@/types';
 export { GeneralSettings } from '@/components/common/GeneralSettings';
 

package/src/types/index.d.ts

@@ -25,7 +25,8 @@ import {
     LayoutNode,
     LayoutNodeType,
     SolidUiEvents,
-    SolidUiEvent
+    SolidUiEvent,
+    SolidFormWidgetProps
 } from './solid-core';
 
 type ChildContainerProps = {
@@ -54,5 +55,6 @@ export type {
     LayoutNode,
     LayoutNodeType,
     SolidUiEvents,
-    SolidUiEvent
+    SolidUiEvent,
+    SolidFormWidgetProps
 };

package/src/types/solid-core.d.ts

@@ -70,7 +70,7 @@ export type LayoutAttribute = {
 };
 
 // Generic representation of any node in our layout 
-export type LayoutNodeType = "form" | "sheet" | "notebook" | "page" | "row" | "column" | "field";
+export type LayoutNodeType = "form" | "sheet" | "notebook" | "page" | "row" | "column" | "field" | "div" | "p" | "span" | "h1" | "h2" | "h3";
 export type LayoutNode = {
     type: LayoutNodeType;
     attrs: LayoutAttribute;
@@ -78,11 +78,19 @@ export type LayoutNode = {
 };
 
 // Event type
-export type SolidUiEvents = "onFieldChange" | "onFieldBlur";
+export type SolidUiEvents = "onFieldChange" | "onFieldBlur" | "onCustomWidgetRender";
 export type SolidUiEvent = {
     type: SolidUiEvents;
-    modifiedField: string;
-    modifiedFieldValue: any;
+    modifiedField?: string;
+    modifiedFieldValue?: any;
+    // This comes from Formik...
+    formData: Record<string, any>;
+    viewMetadata: SolidView;
+    fieldsMetadata: FieldsMetadata;
+};
+
+export type SolidFormWidgetProps = {
+    field: any;
     // This comes from Formik...
     formData: Record<string, any>;
     viewMetadata: SolidView;