@kingteza/crud-component 1.40.0 → 1.41.0

package/dist/crud/CrudSearchComponent.cjs.js

@@ -1 +1 @@
-"use strict";const e=require("react/jsx-runtime"),o=require("react"),p=require("@ant-design/icons"),l=require("antd"),N=require("./CrudField.cjs.js"),w=require("../util/CrudUtil.cjs.js"),C=require("../context/CrudSearchContext.cjs.js"),M=require("../common/button/Button.cjs.js");function R({searchFields:t=[],fields:g,searchOnChange:a,onSearch:m,searchDefaultValues:b,searchFieldsCustomColumnProps:d}){const y=o.useMemo(()=>t.map(n=>typeof n=="string"?{...g.find(x=>n===x.name),required:!1}:{...g.find(r=>(n==null?void 0:n.name)===r.name),...n}).filter(n=>n&&!(n!=null&&n.hidden)),[t,g]),c=o.useMemo(()=>t.length===1?{field:22,button:2}:t.length===2?{field:11,button:2}:t.length===3?{field:6,button:6}:t.length===4?{field:5,button:4}:t.length===5?{field:4,button:4}:{field:4,button:4},[t.length]),j=o.useMemo(()=>t.length===1?{field:22,button:2}:t.length===2?{field:11,button:2}:t.length===3?{field:6,button:6}:t.length===4?{field:5,button:4}:t.length===5?{field:4,button:4}:{field:4,button:4},[t.length]),q=o.useMemo(()=>t.length===1?{field:21,button:3}:t.length===2?{field:11,button:2}:t.length===3?{field:24,button:24}:t.length===4?{field:5,button:4}:t.length===5?{field:4,button:4}:{field:4,button:4},[t.length]),[u]=l.Form.useForm(),f=o.useCallback(async n=>{if((n||a)&&m){const i=await u.validateFields();m(i)}},[u,m,a]);return o.useEffect(()=>{b&&(u.setFieldsValue(b),f(!0))},[u,b]),t!=null&&t.length?e.jsx(l.Form,{form:u,onFinish:()=>f(!0),layout:"vertical",className:"mb-2",onChange:()=>f(!1),children:e.jsx(C.CrudSearchContextProvider,{search:()=>f(!1),children:e.jsxs(l.Row,{gutter:[4,8],className:"w-100",children:[y.map((n,i)=>{const r=(d==null?void 0:d[i])??{md:c.field,sm:j.field,xs:q.field},x=w.getRealName(n.name);return o.createElement(l.Col,{...r,key:`search_field_${String(x)}`,className:"align-self-end"},e.jsx(N.default,{...n,readonly:!1,fieldClassName:"mb-0"}))}),e.jsx(l.Col,{md:c.button,sm:j.button,xs:q.button,style:{alignSelf:"end"},children:e.jsx(M,{type:"primary",htmlType:"submit",block:!0,icon:e.jsx(p.SearchOutlined,{})})})]})})}):e.jsx(e.Fragment,{})}module.exports=R;
+"use strict";const o=require("react/jsx-runtime"),e=require("react"),p=require("@ant-design/icons"),i=require("antd"),N=require("./CrudField.cjs.js"),E=require("../util/CrudUtil.cjs.js"),C=require("../context/CrudSearchContext.cjs.js"),_=require("../common/button/Button.cjs.js");function k({searchFields:t=[],fields:g,searchOnChange:c,onSearch:b,searchDefaultValues:a,searchFieldsCustomColumnProps:d}){const j=e.useMemo(()=>t.map(n=>{if(e.isValidElement(n))return n;if(typeof n=="string"){const l=g.find(m=>n===m.name);return l?{...l,required:!1}:null}const u=g.find(l=>(n==null?void 0:n.name)===l.name);return u?{...u,...n}:null}).filter(n=>e.isValidElement(n)||n&&!(n!=null&&n.hidden)),[t,g]),x=e.useMemo(()=>t.length===1?{field:22,button:2}:t.length===2?{field:11,button:2}:t.length===3?{field:6,button:6}:t.length===4?{field:5,button:4}:t.length===5?{field:4,button:4}:{field:4,button:4},[t.length]),s=e.useMemo(()=>t.length===1?{field:22,button:2}:t.length===2?{field:11,button:2}:t.length===3?{field:6,button:6}:t.length===4?{field:5,button:4}:t.length===5?{field:4,button:4}:{field:4,button:4},[t.length]),y=e.useMemo(()=>t.length===1?{field:21,button:3}:t.length===2?{field:11,button:2}:t.length===3?{field:24,button:24}:t.length===4?{field:5,button:4}:t.length===5?{field:4,button:4}:{field:4,button:4},[t.length]),[r]=i.Form.useForm(),f=e.useCallback(async n=>{if((n||c)&&b){const u=await r.validateFields();b(u)}},[r,b,c]);return e.useEffect(()=>{a&&(r.setFieldsValue(a),f(!0))},[r,a]),t!=null&&t.length?o.jsx(i.Form,{form:r,onFinish:()=>f(!0),layout:"vertical",className:"mb-2",onChange:()=>f(!1),children:o.jsx(C.CrudSearchContextProvider,{search:()=>f(!1),children:o.jsxs(i.Row,{gutter:[4,8],className:"w-100",children:[j.map((n,u)=>{const l=(d==null?void 0:d[u])??{md:x.field,sm:s.field,xs:y.field};if(e.isValidElement(n))return e.createElement(i.Col,{...l,key:`search_field_element_${u}`,className:"align-self-end"},n);const m=n,q=E.getRealName(m.name);return e.createElement(i.Col,{...l,key:`search_field_${String(q)}`,className:"align-self-end"},o.jsx(N.default,{...m,readonly:!1,fieldClassName:"mb-0"}))}),o.jsx(i.Col,{md:x.button,sm:s.button,xs:y.button,style:{alignSelf:"end"},children:o.jsx(_,{type:"primary",htmlType:"submit",block:!0,icon:o.jsx(p.SearchOutlined,{})})})]})})}):o.jsx(o.Fragment,{})}module.exports=k;

package/dist/crud/CrudSearchComponent.d.ts

@@ -1,4 +1,5 @@
 import { ColProps } from 'antd/lib';
+import { ReactElement } from 'react';
 import { ReadonlyCrudFields } from './CrudComponent';
 export type CrudSearchOption<T> = {
     required?: boolean;
@@ -28,7 +29,7 @@ export type CrudSearchOption<T> = {
     disableToday?: boolean;
 });
 export interface CrudSearchComponentProps<T, FormType> {
-    searchFields?: Array<keyof T | CrudSearchOption<T>>;
+    searchFields?: Array<keyof T | CrudSearchOption<T> | ReactElement>;
     fields: ReadonlyCrudFields<T>;
     searchOnChange?: boolean;
     searchDefaultValues?: FormType;

package/dist/crud/CrudSearchComponent.es.js

@@ -1,97 +1,124 @@
-import { jsx as o, Fragment as v, jsxs as S } from "react/jsx-runtime";
-import { useMemo as u, useCallback as j, useEffect as C, createElement as E } from "react";
+import { jsx as f, Fragment as S, jsxs as c } from "react/jsx-runtime";
+import { useMemo as r, isValidElement as d, useCallback as j, useEffect as C, createElement as k } from "react";
 import { SearchOutlined as R } from "@ant-design/icons";
-import { Form as N, Row as _, Col as w } from "antd";
-import q from "./CrudField.es.js";
-import B from "../util/CrudUtil.es.js";
-import { CrudSearchContextProvider as M } from "../context/CrudSearchContext.es.js";
-import T from "../common/button/Button.es.js";
-function J({
+import { Form as w, Row as $, Col as a } from "antd";
+import h from "./CrudField.es.js";
+import q from "../util/CrudUtil.es.js";
+import { CrudSearchContextProvider as B } from "../context/CrudSearchContext.es.js";
+import M from "../common/button/Button.es.js";
+function K({
   searchFields: t = [],
   fields: i,
-  searchOnChange: p,
+  searchOnChange: y,
   onSearch: g,
   searchDefaultValues: b,
-  searchFieldsCustomColumnProps: r
+  searchFieldsCustomColumnProps: p
 }) {
-  const k = u(
-    () => t.map((n) => typeof n == "string" ? {
-      ...i.find((d) => n === d.name),
-      required: !1
-    } : {
-      ...i.find(
-        (l) => (n == null ? void 0 : n.name) === l.name
-      ),
-      ...n
-    }).filter((n) => n && !(n != null && n.hidden)),
+  const v = r(
+    () => t.map((n) => {
+      if (d(n))
+        return n;
+      if (typeof n == "string") {
+        const e = i.find((u) => n === u.name);
+        return e ? {
+          ...e,
+          required: !1
+        } : null;
+      }
+      const o = i.find(
+        (e) => (n == null ? void 0 : n.name) === e.name
+      );
+      return o ? {
+        ...o,
+        ...n
+      } : null;
+    }).filter((n) => d(n) || n && !(n != null && n.hidden)),
     [t, i]
-  ), a = u(
+  ), x = r(
     () => t.length === 1 ? { field: 22, button: 2 } : t.length === 2 ? { field: 11, button: 2 } : t.length === 3 ? { field: 6, button: 6 } : t.length === 4 ? { field: 5, button: 4 } : t.length === 5 ? { field: 4, button: 4 } : { field: 4, button: 4 },
     [t.length]
-  ), y = u(
+  ), N = r(
     () => t.length === 1 ? { field: 22, button: 2 } : t.length === 2 ? { field: 11, button: 2 } : t.length === 3 ? { field: 6, button: 6 } : t.length === 4 ? { field: 5, button: 4 } : t.length === 5 ? { field: 4, button: 4 } : { field: 4, button: 4 },
     [t.length]
-  ), x = u(
+  ), _ = r(
     () => t.length === 1 ? { field: 21, button: 3 } : t.length === 2 ? { field: 11, button: 2 } : t.length === 3 ? { field: 24, button: 24 } : t.length === 4 ? { field: 5, button: 4 } : t.length === 5 ? { field: 4, button: 4 } : { field: 4, button: 4 },
     [t.length]
-  ), [f] = N.useForm(), e = j(
+  ), [l] = w.useForm(), m = j(
     async (n) => {
-      if ((n || p) && g) {
-        const m = await f.validateFields();
-        g(m);
+      if ((n || y) && g) {
+        const o = await l.validateFields();
+        g(o);
       }
     },
-    [f, g, p]
+    [l, g, y]
   );
   return C(() => {
-    b && (f.setFieldsValue(b), e(!0));
-  }, [f, b]), t != null && t.length ? /* @__PURE__ */ o(
-    N,
+    b && (l.setFieldsValue(b), m(!0));
+  }, [l, b]), t != null && t.length ? /* @__PURE__ */ f(
+    w,
     {
-      form: f,
-      onFinish: () => e(!0),
+      form: l,
+      onFinish: () => m(!0),
       layout: "vertical",
       className: "mb-2",
-      onChange: () => e(!1),
-      children: /* @__PURE__ */ o(M, { search: () => e(!1), children: /* @__PURE__ */ S(_, { gutter: [4, 8], className: "w-100", children: [
-        k.map((n, m) => {
-          const l = (r == null ? void 0 : r[m]) ?? {
-            md: a.field,
-            sm: y.field,
-            xs: x.field
-          }, d = B.getRealName(n.name);
-          return /* @__PURE__ */ E(
-            w,
+      onChange: () => m(!1),
+      children: /* @__PURE__ */ f(B, { search: () => m(!1), children: /* @__PURE__ */ c($, { gutter: [4, 8], className: "w-100", children: [
+        v.map((n, o) => {
+          const e = (p == null ? void 0 : p[o]) ?? {
+            md: x.field,
+            sm: N.field,
+            xs: _.field
+          };
+          if (d(n))
+            return /* @__PURE__ */ k(
+              a,
+              {
+                ...e,
+                key: `search_field_element_${o}`,
+                className: "align-self-end"
+              },
+              n
+            );
+          const u = n, E = q.getRealName(u.name);
+          return /* @__PURE__ */ k(
+            a,
             {
-              ...l,
-              key: `search_field_${String(d)}`,
+              ...e,
+              key: `search_field_${String(E)}`,
               className: "align-self-end"
             },
-            /* @__PURE__ */ o(q, { ...n, readonly: !1, fieldClassName: "mb-0" })
+            /* @__PURE__ */ f(
+              h,
+              {
+                ...u,
+                readonly: !1,
+                fieldClassName: "mb-0"
+              }
+            )
           );
         }),
-        /* @__PURE__ */ o(
-          w,
+        /* @__PURE__ */ f(
+          a,
           {
-            md: a.button,
-            sm: y.button,
-            xs: x.button,
+            md: x.button,
+            sm: N.button,
+            xs: _.button,
             style: { alignSelf: "end" },
-            children: /* @__PURE__ */ o(
-              T,
+            children: /* @__PURE__ */ f(
+              M,
               {
                 type: "primary",
                 htmlType: "submit",
                 block: !0,
-                icon: /* @__PURE__ */ o(R, {})
+                icon: /* @__PURE__ */ f(R, {})
               }
             )
           }
         )
       ] }) })
     }
-  ) : /* @__PURE__ */ o(v, {});
+  ) : /* @__PURE__ */ f(S, {});
 }
 export {
-  J as default
+  K as default
 };

package/dist/locale/translations/en.cjs.js

@@ -1 +1 @@
-"use strict";const e={str:{delete:"Delete",clone:"Clone",update:"Update",new:"New",back:"Back",next:"Next",save:"Save",import:"Import",cancel:"Cancel",print:"Print",hide:"Hide",no:"No",action:"Action",remove:"Remove",view:"View",ok:"Ok",yes:"Yes",warning:"Warning",success:"Success",error:"Error",retry:"Retry",previous:"Previous",unhide:"Unhide",downloadCsvTemplate:"Download CSV Template",importCsvFile:"Import CSV File",export:"Export",goBack:"Go Back",refresh:"Refresh",fileUploadMessage1:"Drag file here or ",fileUploadMessage2:"Click to Upload",rotateLeft:"Rotate Left",rotateRight:"Rotate Right",flipHorizontal:"Flip Horizontal",flipVertical:"Flip Vertical",skipCrop:"Skip Crop",showFields:"Show Fields"},err:{save:"An error occurred while saving",validation:{required:"is required",minLength8:"must be at least 8 characters",percentage:"must be a percentage",maximumValueExceeded:"must be less than %maxValue%",invalidNic:"must be a valid NIC",invalid:"must be a valid",integer:"must be an integer"},notFound:"Not Found"},message:{loading:{saving:"Saving"},uploadButtonText:"Click to Upload"},qus:{importWithIssues:"Some fields have issues. Do you want to proceed with the import?",doYouWantToDelete:"Do you want to delete?",doYouWantToHide:"Do you want to hide?",doYouWantToUnhide:"Do you want to unhide?"}};module.exports=e;
+"use strict";const e={str:{delete:"Delete",clone:"Clone",update:"Update",new:"New",back:"Back",next:"Next",save:"Save",import:"Import",cancel:"Cancel",print:"Print",hide:"Hide",no:"No",action:"Action",remove:"Remove",view:"View",ok:"Ok",yes:"Yes",warning:"Warning",success:"Success",error:"Error",retry:"Retry",previous:"Previous",unhide:"Unhide",downloadCsvTemplate:"Download CSV Template",importCsvFile:"Import CSV File",export:"Export",goBack:"Go Back",refresh:"Refresh",fileUploadMessage1:"Drag file here or ",fileUploadMessage2:"Click to Upload",rotateLeft:"Rotate Left",rotateRight:"Rotate Right",flipHorizontal:"Flip Horizontal",flipVertical:"Flip Vertical",skipCrop:"Skip Crop",showFields:"Show Fields"},err:{save:"An error occurred while saving",validation:{required:"is required",minLength8:"must be at least 8 characters",percentage:"must be a percentage",maximumValueExceeded:"must be less than %maxValue%",invalidNic:"must be a valid NIC",invalid:"must be a valid",invalidEmail:"Invalid email address",integer:"must be an integer"},notFound:"Not Found"},message:{loading:{saving:"Saving"},uploadButtonText:"Click to Upload"},qus:{importWithIssues:"Some fields have issues. Do you want to proceed with the import?",doYouWantToDelete:"Do you want to delete?",doYouWantToHide:"Do you want to hide?",doYouWantToUnhide:"Do you want to unhide?"}};module.exports=e;

package/dist/locale/translations/en.d.ts

@@ -46,6 +46,7 @@ declare const _default: {
             maximumValueExceeded: string;
             invalidNic: string;
             invalid: string;
+            invalidEmail: string;
             integer: string;
         };
         notFound: string;

package/dist/locale/translations/en.es.js

@@ -46,6 +46,7 @@ const e = {
       maximumValueExceeded: "must be less than %maxValue%",
       invalidNic: "must be a valid NIC",
       invalid: "must be a valid",
+      invalidEmail: "Invalid email address",
       integer: "must be an integer"
     },
     notFound: "Not Found"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kingteza/crud-component",
   "private": false,
-  "version": "1.40.0",
+  "version": "1.41.0",
   "description": "React CRUD component library with Ant Design",
   "keywords": [
     "react",