dynamic-modal 1.1.4 → 1.1.7

package/src/interfaces/make-select.ts

@@ -1,15 +1,15 @@
-import { IField, IFieldProps } from './field'
-import { IModalLiveDataCondition } from './modal'
-import { IOption } from './option'
-
-export interface IMakeSelect extends IField {
-  elementType: 'select'
-  options: Array<IOption>
-  liveData?: IModalLiveDataCondition
-  isSearch?: boolean
-  isMulti?: boolean
-}
-
-export interface IMakeSelectProps extends IFieldProps {
-  element: Omit<IMakeSelect, 'elementType'>
-}
+import { IField, IFieldProps } from './field'
+import { IModalLiveDataCondition } from './modal'
+import { IOption } from './option'
+
+export interface IMakeSelect extends IField {
+  elementType: 'select'
+  options: Array<IOption>
+  liveData?: IModalLiveDataCondition
+  isSearch?: boolean
+  isMulti?: boolean
+}
+
+export interface IMakeSelectProps extends IFieldProps {
+  element: Omit<IMakeSelect, 'elementType'>
+}

package/src/interfaces/make-textarea.ts

@@ -1,11 +1,11 @@
-import { IField, IFieldProps } from './field'
-
-export interface IMakeTextarea extends IField {
-  elementType: 'textarea'
-  cols?: number
-  rows?: number
-}
-
-export interface IMakeTextareaProps extends IFieldProps {
-  element: Omit<IMakeTextarea, 'elementType'>
-}
+import { IField, IFieldProps } from './field'
+
+export interface IMakeTextarea extends IField {
+  elementType: 'textarea'
+  cols?: number
+  rows?: number
+}
+
+export interface IMakeTextareaProps extends IFieldProps {
+  element: Omit<IMakeTextarea, 'elementType'>
+}

package/src/interfaces/make-toggle.ts

@@ -1,9 +1,9 @@
-import { IField, IFieldProps } from './field'
-
-export interface IMakeToggle extends IField {
-  elementType: 'toggle'
-}
-
-export interface IMakeToggleProps extends IFieldProps {
-  element: Omit<IMakeToggle, 'elementType'>
-}
+import { IField, IFieldProps } from './field'
+
+export interface IMakeToggle extends IField {
+  elementType: 'toggle'
+}
+
+export interface IMakeToggleProps extends IFieldProps {
+  element: Omit<IMakeToggle, 'elementType'>
+}

package/src/interfaces/make-upload.ts

@@ -1,14 +1,14 @@
-import { IField, IFieldProps } from './field'
-
-export interface IMakeUpload extends Omit<IField, 'defaultValue'> {
-  elementType: 'upload'
-  helpText?: string
-  read: boolean
-  image?: boolean
-  accept?:string
-  readAsArrayBuffer?: boolean
-}
-
-export interface IMakeUploadProps extends IFieldProps {
-  element: Omit<IMakeUpload, 'elementType'>
-}
+import { IField, IFieldProps } from './field'
+
+export interface IMakeUpload extends Omit<IField, 'defaultValue'> {
+  elementType: 'upload'
+  helpText?: string
+  read: boolean
+  image?: boolean
+  accept?:string
+  readAsArrayBuffer?: boolean
+}
+
+export interface IMakeUploadProps extends IFieldProps {
+  element: Omit<IMakeUpload, 'elementType'>
+}

package/src/interfaces/modal.ts

@@ -1,46 +1,47 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { CSSProperties } from 'react'
-import { IMakeSelect } from './make-select'
-import { IMakeInput } from './make-input'
-import { IMakeTextarea } from './make-textarea'
-import { IMakeToggle } from './make-toggle'
-import { IMakeDescription } from './make-description'
-import { IMakeFieldGroup } from './make-field-group'
-import { IMakeUpload } from './make-upload'
-import { IOption } from './option'
-import { IMakeButton } from './make-button'
-
-export type IModalField = IMakeSelect | IMakeInput | IMakeFieldGroup | IMakeTextarea | IMakeToggle | IMakeDescription | IMakeUpload | IMakeButton
-
-export type IFormField = IMakeSelect | IMakeInput | IMakeTextarea | IMakeToggle
-
-export type IModalRenderCondition =  Record<string, Array<string | number | boolean> | undefined>
-
-export type IModalLiveDataCondition = {
-  action: (data: string, ...args: any[]) => Promise<Array<IOption>>
-  condition: Array<string>
-}
-
-export interface IModalConfigProps {
-  reservedData?: Record<string, any>
-  title: string
-  fields: Array<IModalField>
-  out: (data: any) => void
-  onClose?: () => void
-  style?: CSSProperties;
-  overFlowBody?: string | number
-  minHeightBody?: string | number
-  actions: {
-    containerStyle?: CSSProperties
-    cancel?: Omit<IMakeButton, 'elementType'>
-    action: Omit<IMakeButton, 'elementType'>
-  }
-}
-
-export type IModalConfigLoader<T = any, D = any> = (props: T, action: (modalResult: D) => void) => IModalConfigProps
-
-export interface IModal {
-  open: boolean;
-  close: () => void
-  config: IModalConfigProps
-}
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { CSSProperties } from 'react'
+import { IMakeSelect } from './make-select'
+import { IMakeInput } from './make-input'
+import { IMakeTextarea } from './make-textarea'
+import { IMakeToggle } from './make-toggle'
+import { IMakeDescription } from './make-description'
+import { IMakeFieldGroup } from './make-field-group'
+import { IMakeUpload } from './make-upload'
+import { IOption } from './option'
+import { IMakeButton } from './make-button'
+
+export type IModalField = IMakeSelect | IMakeInput | IMakeFieldGroup | IMakeTextarea | IMakeToggle | IMakeDescription | IMakeUpload | IMakeButton
+
+export type IFormField = IMakeSelect | IMakeInput | IMakeTextarea | IMakeToggle
+
+export type IModalRenderCondition =  Record<string, Array<string | number | boolean> | undefined>
+
+export type IModalLiveDataCondition = {
+  action: (data: string, ...args: any[]) => Promise<Array<IOption>>
+  condition: Array<string>
+}
+
+export interface IModalConfigProps {
+  reservedData?: Record<string, any>
+  title: string
+  fields: Array<IModalField>
+  out: (data: any) => void
+  onClose?: () => void
+  style?: CSSProperties
+  overFlowBody?: string | number
+  minHeightBody?: string | number
+  useSubmit?: boolean
+  actions: {
+    containerStyle?: CSSProperties
+    cancel?: Omit<IMakeButton, 'elementType'>
+    action: Omit<IMakeButton, 'elementType'>
+  }
+}
+
+export type IModalConfigLoader<T = any, D = any> = (props: T, action: (modalResult: D) => void) => IModalConfigProps
+
+export interface IModal {
+  open: boolean
+  close: () => void
+  config: IModalConfigProps
+}

package/src/interfaces/option.ts

@@ -1,4 +1,4 @@
-export interface IOption {
-  id: string
-  name: string
+export interface IOption {
+  id: string
+  name: string
 }

package/src/interfaces/portal.ts

@@ -1,8 +1,8 @@
-import { ReactNode } from 'react'
-
-export interface IPortal {
-  children: ReactNode
-  closeTime: number
-  portalOpen: boolean
-  portalTag?: string
-}
+import { ReactNode } from 'react'
+
+export interface IPortal {
+  children: ReactNode
+  closeTime: number
+  portalOpen: boolean
+  portalTag?: string
+}

package/src/modal.tsx

@@ -1,164 +1,196 @@
-'use client'
-
-import React, { useContext, useEffect, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { Portal } from './components/portal/portal'
-import MakeToggle from './components/make-toggle/make-toggle'
-import MakeInput from './components/make-input/make-input'
-import MakeSelect from './components/make-select/make-select'
-import MakeTextarea from './components/make-textarea/make-textarea'
-import { IModal, IModalField, IModalConfigProps, IFormField } from './interfaces/modal'
-import MakeDescription from './components/make-description/make-description'
-import { IFieldProps } from './interfaces/field'
-import MakeUpload from './components/make-upload/make-upload'
-import MakeButton from './components/make-button/make-button'
-import { IMakeInput } from './interfaces/make-input'
-import { IMakeSelect } from './interfaces/make-select'
-import { IMakeTextarea } from './interfaces/make-textarea'
-import { IMakeToggle } from './interfaces/make-toggle'
-import { IMakeDescription } from './interfaces/make-description'
-import { IMakeUpload } from './interfaces/make-upload'
-import { IMakeButton } from './interfaces/make-button'
-import { ComponentStateContext } from './context/component/component-state'
-
-export const Modal = ({ open, close, config }: IModal) => {
-  const { ModalButtonAction, ModalButtonCancel } = useContext(ComponentStateContext)
-  const [modalReady, setModalReady] = useState<IModalConfigProps | undefined>(undefined)
-  const [defaultLoaded, setDefaultLoaded] = useState<boolean>(false)
-
-  const {
-    control,
-    handleSubmit,
-    getValues,
-    unregister,
-    setValue,
-    watch
-  } = useForm()
-
-  const formValueHandler = (element: IFormField) => {
-    if (['group', 'upload', 'text'].includes(element.elementType)) return
-    if(!element.defaultValue && element.renderIf) {
-      unregister(element.name)
-      return
-    }
-    
-    const defaultValue = element.defaultValue ?? ''
-    const parsedValue: boolean | string | Array<string> | undefined = defaultValue === 'true' ? true : defaultValue === 'false' ? false : defaultValue
-    setValue(element.name, parsedValue ?? '')
-  }
-
-  const autoLoadGroup = (groupFields: Array<IModalField>) => {
-    groupFields.forEach(element => {
-      formValueHandler(element as IFormField)
-    })
-  }
-
-  const autoLoadField = (modalFields: Array<IModalField>) => {
-    if (defaultLoaded) return
-
-    modalFields.forEach(element => {
-      if (element.elementType === 'group') {
-        autoLoadGroup(element.groups)
-        return
-      }
-      formValueHandler(element as IFormField)
-    })
-
-    setDefaultLoaded(true)
-  }
-
-  const getRender = ({ elementType, ...element }: IModalField, index: number, isEndOfRender: boolean = false) => {
-    if (isEndOfRender && modalReady) setTimeout(() => autoLoadField(modalReady.fields), 200)
-
-    const props: IFieldProps = {
-      control,
-      watch,
-      setValue,
-      unregister
-    }
-
-    return elementType === 'input'
-      ? <MakeInput {...props} key={`modal-input-${index}`} element={element as IMakeInput} />
-      : elementType === 'select'
-        ? <MakeSelect {...props} key={`modal-select-${index}`} element={element as IMakeSelect} />
-        : elementType === 'textarea'
-          ? <MakeTextarea {...props} key={`modal-textarea-${index}`} element={element as IMakeTextarea} />
-          : elementType === 'toggle'
-            ? <MakeToggle {...props} key={`modal-toggle-${index}`} element={element as IMakeToggle} />
-            : elementType === 'text'
-                ? <MakeDescription {...props} key={`modal-text-${index}`} element={element as IMakeDescription} />
-                : elementType === 'upload'
-                  ? <MakeUpload {...props} key={`modal-upload-${index}`} element={element as IMakeUpload} />
-                  : elementType === 'button'
-                    ? <MakeButton {...props} key={`modal-button-${index}`} element={element as IMakeButton} />
-                    : null
-  }
-
-  const closeHandler = (): void => {
-    if (modalReady?.onClose) modalReady.onClose()
-      
-    setTimeout(() => {
-      const form = getValues()
-      unregister(Object.keys(form))
-      setModalReady(undefined)
-      setDefaultLoaded(false)
-      close()
-    }, 200)
-  }
-
-  const actionHandler = (data: Record<string, string | number | object>): void => {
-    modalReady?.out({ ...(modalReady?.reservedData ?? {}), ...data })
-    closeHandler()
-  }
-
-  useEffect(() => {
-    if (open && !modalReady) setModalReady(config)
-  }, [config, modalReady, open])
-
-  return (
-    modalReady
-      ? <Portal closeTime={200} portalOpen={open} portalTag={'#modal-portal'}>
-        <div className='rounded bg-white relative w-auto h-auto min-h-[200px] min-w-[500px]' style={modalReady.style} >
-          <form className='flex flex-col p-4 gap-4' autoComplete='off' onSubmit={handleSubmit(actionHandler)}>
-            <h2 className='text-bold text-center border-b pb-4 font-semibold'>{modalReady.title}</h2>
-            <div
-              className='flex flex-col gap-4 py-4'
-              style={{
-                overflowY: modalReady.overFlowBody ? 'auto' : undefined,
-                height: modalReady.overFlowBody,
-                minHeight: modalReady.minHeightBody
-              }}
-            >
-              {
-                modalReady.fields.map((element, index) => {
-                  const isEndOfRender: boolean = index + 1 === modalReady.fields.length
-
-                  if (element.elementType === 'group') {
-                    return (
-                      <div key={`modal-group-${index}`} className='flex flex-col w-full gap-2'>
-                        { element.title && <h3 className='font-bold border-b-2 pb-2 mb-2'>{element.title}</h3> }
-                        <div key={`modal-group-${index}`} className='flex gap-4 w-full' style={element.style}>
-                          {
-                            element.groups
-                            .filter(sub => ['input', 'select', 'toggle', 'multiselect', 'upload', 'button', 'autocomplete'].includes(sub.elementType))
-                            .map((sub, subIndex) => getRender(sub, index + subIndex, isEndOfRender))
-                          }
-                        </div>
-                      </div>
-                    )
-                  } else { return getRender(element, index, isEndOfRender) }
-                })
-              }
-            </div>
-            <div className='flex gap-4 items-center justify-center border-t' style={modalReady?.actions.containerStyle}>
-              {modalReady.actions.cancel && <ModalButtonCancel {...modalReady.actions.cancel} onClick={closeHandler} />}
-              <ModalButtonAction {...modalReady.actions.action} type='submit' />
-            </div>
-          </form>
-        </div>
-      </Portal>
-      : null
-  )
-}
-
-export default Modal
+'use client'
+
+import React, { useContext, useEffect, useState } from 'react'
+import { useForm } from 'react-hook-form'
+import { Portal } from './components/portal/portal'
+import MakeToggle from './components/make-toggle/make-toggle'
+import MakeInput from './components/make-input/make-input'
+import MakeSelect from './components/make-select/make-select'
+import MakeTextarea from './components/make-textarea/make-textarea'
+import { IModal, IModalField, IModalConfigProps, IFormField } from './interfaces/modal'
+import MakeDescription from './components/make-description/make-description'
+import { IFieldProps } from './interfaces/field'
+import MakeUpload from './components/make-upload/make-upload'
+import MakeButton from './components/make-button/make-button'
+import { IMakeInput } from './interfaces/make-input'
+import { IMakeSelect } from './interfaces/make-select'
+import { IMakeTextarea } from './interfaces/make-textarea'
+import { IMakeToggle } from './interfaces/make-toggle'
+import { IMakeDescription } from './interfaces/make-description'
+import { IMakeUpload } from './interfaces/make-upload'
+import { IMakeButton } from './interfaces/make-button'
+import { ComponentStateContext } from './context/component/component-state'
+
+export const Modal = ({ open, close, config }: IModal) => {
+  const { ModalButtonAction, ModalButtonCancel } = useContext(ComponentStateContext)
+  const [modalReady, setModalReady] = useState<IModalConfigProps | undefined>(undefined)
+  const [defaultLoaded, setDefaultLoaded] = useState<boolean>(false)
+
+  const {
+    control,
+    handleSubmit,
+    getValues,
+    unregister,
+    setValue,
+    watch,
+    trigger,
+    getFieldState
+  } = useForm()
+
+  const formValueHandler = (element: IFormField) => {
+    if (['group', 'upload', 'text'].includes(element.elementType)) return
+    if(!element.defaultValue && element.renderIf) {
+      unregister(element.name)
+      return
+    }
+    
+    const defaultValue = element.defaultValue ?? ''
+    const parsedValue: boolean | string | Array<string> | undefined = defaultValue === 'true' ? true : defaultValue === 'false' ? false : defaultValue
+    setValue(element.name, parsedValue ?? '')
+  }
+
+  const autoLoadGroup = (groupFields: Array<IModalField>) => {
+    groupFields.forEach(element => {
+      formValueHandler(element as IFormField)
+    })
+  }
+
+  const autoLoadField = (modalFields: Array<IModalField>) => {
+    if (defaultLoaded) return
+
+    modalFields.forEach(element => {
+      if (element.elementType === 'group') {
+        autoLoadGroup(element.groups)
+        return
+      }
+      formValueHandler(element as IFormField)
+    })
+
+    setDefaultLoaded(true)
+  }
+
+  
+  const getUseSubmit = (modalConfig: IModalConfigProps): boolean => {
+    const useSubmit = modalConfig.useSubmit === undefined ? true : modalConfig.useSubmit === false ? false : true
+
+    return useSubmit
+  }
+
+  const getRender = ({ elementType, ...element }: IModalField, index: number, isEndOfRender: boolean = false) => {
+    if (isEndOfRender && modalReady) setTimeout(() => autoLoadField(modalReady.fields), 200)
+
+    const props: IFieldProps = {
+      control,
+      watch,
+      setValue,
+      unregister
+    }
+
+    return elementType === 'input'
+      ? <MakeInput {...props} key={`modal-input-${index}`} element={element as IMakeInput} />
+      : elementType === 'select'
+        ? <MakeSelect {...props} key={`modal-select-${index}`} element={element as IMakeSelect} />
+        : elementType === 'textarea'
+          ? <MakeTextarea {...props} key={`modal-textarea-${index}`} element={element as IMakeTextarea} />
+          : elementType === 'toggle'
+            ? <MakeToggle {...props} key={`modal-toggle-${index}`} element={element as IMakeToggle} />
+            : elementType === 'text'
+                ? <MakeDescription {...props} key={`modal-text-${index}`} element={element as IMakeDescription} />
+                : elementType === 'upload'
+                  ? <MakeUpload {...props} key={`modal-upload-${index}`} element={element as IMakeUpload} />
+                  : elementType === 'button'
+                    ? <MakeButton {...props} key={`modal-button-${index}`} element={element as IMakeButton} />
+                    : null
+  }
+
+
+  const closeHandler = (): void => {
+    if (modalReady?.onClose) modalReady.onClose()
+      
+    setTimeout(() => {
+      const form = getValues()
+      unregister(Object.keys(form))
+      setModalReady(undefined)
+      setDefaultLoaded(false)
+      close()
+    }, 200)
+  }
+
+  const manualSubmit = async (): Promise<void> => {
+    const form = getValues()
+    const fields = Object.keys(form)
+    await trigger(fields)
+
+    const validations: Array<boolean> = fields.map(field => {
+      const { invalid } = getFieldState(field)
+
+      return invalid
+    })
+
+    const result = validations.some(isInvalid => isInvalid) ? undefined : form
+
+    if(!result) return
+    
+    actionHandler({ ...(modalReady?.reservedData ?? {}), ...form })
+  }
+
+  const actionHandler = (data: Record<string, string | number | object>): void => {
+    modalReady?.out({ ...(modalReady?.reservedData ?? {}), ...data })
+    closeHandler()
+  }
+
+  useEffect(() => {
+    if (open && !modalReady) setModalReady(config)
+  }, [config, modalReady, open])
+
+  return (
+    modalReady
+      ? <Portal closeTime={200} portalOpen={open} portalTag={'#modal-portal'}>
+        <div className='rounded bg-white relative w-auto h-auto min-h-[200px] min-w-[500px]' style={modalReady.style} >
+          <form className='flex flex-col p-4 gap-4' autoComplete='off' onSubmit={handleSubmit(actionHandler)}>
+            <h2 className='text-bold text-center border-b pb-4 font-semibold'>{modalReady.title}</h2>
+            <div
+              className='flex flex-col gap-4 py-4'
+              style={{
+                overflowY: modalReady.overFlowBody ? 'auto' : undefined,
+                height: modalReady.overFlowBody,
+                minHeight: modalReady.minHeightBody
+              }}
+            >
+              {
+                modalReady.fields.map((element, index) => {
+                  const isEndOfRender: boolean = index + 1 === modalReady.fields.length
+
+                  if (element.elementType === 'group') {
+                    return (
+                      <div key={`modal-group-${index}`} className='flex flex-col w-full gap-2'>
+                        { element.title && <h3 className='font-bold border-b-2 pb-2 mb-2'>{element.title}</h3> }
+                        <div key={`modal-group-${index}`} className='flex gap-4 w-full' style={element.style}>
+                          {
+                            element.groups
+                            .filter(sub => ['input', 'select', 'toggle', 'multiselect', 'upload', 'button', 'autocomplete'].includes(sub.elementType))
+                            .map((sub, subIndex) => getRender(sub, index + subIndex, isEndOfRender))
+                          }
+                        </div>
+                      </div>
+                    )
+                  } else { return getRender(element, index, isEndOfRender) }
+                })
+              }
+            </div>
+            <div className='flex gap-4 items-center justify-center border-t' style={modalReady?.actions.containerStyle}>
+              {modalReady.actions.cancel && <ModalButtonCancel {...modalReady.actions.cancel} onClick={closeHandler} />}
+              {
+                getUseSubmit(modalReady) ? 
+                <ModalButtonAction {...modalReady.actions.action} type='submit' />:
+                <ModalButtonAction {...modalReady.actions.action} onClick={manualSubmit} type='button' />
+              }
+            </div>
+          </form>
+        </div>
+      </Portal>
+      : null
+  )
+}
+
+export default Modal

package/src/tools/general.ts

@@ -1,8 +1,8 @@
-'use client'
-
-export const generateId = (): string => {
-  return Math.random()
-    .toString(36)
-    .split('.')[1]
-    .substring(0, 6)
-}
+'use client'
+
+export const generateId = (): string => {
+  return Math.random()
+    .toString(36)
+    .split('.')[1]
+    .substring(0, 6)
+}

package/tsconfig.json

@@ -1,13 +1,13 @@
-{
-  "compilerOptions": {
-    "target": "ES2016",
-    "module": "commonjs",
-    "declaration": true,
-    "outDir": "./dist",
-    "strict": true,
-    "jsx": "react",
-    "esModuleInterop": true,
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*"]
-}
+{
+  "compilerOptions": {
+    "target": "ES2016",
+    "module": "commonjs",
+    "declaration": true,
+    "outDir": "./dist",
+    "strict": true,
+    "jsx": "react",
+    "esModuleInterop": true,
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*"]
+}