next-helios-fe 1.8.80 → 1.8.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-helios-fe",
-  "version": "1.8.80",
+  "version": "1.8.82",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/table/index.tsx

@@ -355,7 +355,9 @@ export const Table: TableComponentProps = ({
                                     ? "null"
                                     : value?.toString()
                                 }
-                                checked={categoryFilter.includes(value)}
+                                checked={
+                                  categoryFilter.includes(value) ?? false
+                                }
                                 readOnly
                               />
                             </div>
@@ -378,7 +380,7 @@ export const Table: TableComponentProps = ({
                   placeholder="search.."
                   value={
                     filter?.find((filterItem) => filterItem.key === item.key)
-                      ?.value
+                      ?.value || ""
                   }
                   onChange={(e) => {
                     setFilter(
@@ -626,7 +628,9 @@ export const Table: TableComponentProps = ({
                         <Form.Checkbox
                           options={{ disableHover: true }}
                           label={item.title}
-                          checked={!excludedColumn?.includes(item.key)}
+                          checked={
+                            !excludedColumn?.includes(item.key) ? true : false
+                          }
                           readOnly
                         />
                       </div>
@@ -700,15 +704,25 @@ export const Table: TableComponentProps = ({
                         filteredData?.length !== 0 &&
                         filteredData?.filter((item) => {
                           return selected?.find((selectedItem) => {
-                            return selectedItem.id === item.id;
+                            return (
+                              selectedItem[
+                                options?.customDataIdName ?? "id"
+                              ] === item[options?.customDataIdName ?? "id"]
+                            );
                           });
                         })?.length === filteredData?.length
+                          ? true
+                          : false
                       }
                       onChange={(e) => {
                         if (
                           filteredData?.filter((item) => {
                             return selected?.find((selectedItem) => {
-                              return selectedItem.id === item.id;
+                              return (
+                                selectedItem[
+                                  options?.customDataIdName ?? "id"
+                                ] === item[options?.customDataIdName ?? "id"]
+                              );
                             });
                           })?.length === filteredData?.length
                         ) {
@@ -716,7 +730,12 @@ export const Table: TableComponentProps = ({
                             checkbox?.onChange(
                               selected?.filter((prev) => {
                                 return !filteredData?.find((filteredItem) => {
-                                  return filteredItem.id === prev.id;
+                                  return (
+                                    filteredItem[
+                                      options?.customDataIdName ?? "id"
+                                    ] ===
+                                    prev[options?.customDataIdName ?? "id"]
+                                  );
                                 });
                               })
                             );
@@ -724,16 +743,45 @@ export const Table: TableComponentProps = ({
                             setSelected((prev) => {
                               return prev.filter((prevItem) => {
                                 return !filteredData?.find((filteredItem) => {
-                                  return filteredItem.id === prevItem.id;
+                                  return (
+                                    filteredItem[
+                                      options?.customDataIdName ?? "id"
+                                    ] ===
+                                    prevItem[options?.customDataIdName ?? "id"]
+                                  );
                                 });
                               });
                             });
                           }
                         } else {
                           if (checkbox?.onChange) {
-                            checkbox?.onChange([...selected, ...filteredData]);
+                            checkbox?.onChange([
+                              ...selected,
+                              ...filteredData.filter((item) => {
+                                return !selected?.find((selectedItem) => {
+                                  return (
+                                    selectedItem[
+                                      options?.customDataIdName ?? "id"
+                                    ] ===
+                                    item[options?.customDataIdName ?? "id"]
+                                  );
+                                });
+                              }),
+                            ]);
                           } else {
-                            setSelected((prev) => [...prev, ...filteredData]);
+                            setSelected((prev) => [
+                              ...prev,
+                              ...filteredData.filter((item) => {
+                                return !prev.find((prevItem) => {
+                                  return (
+                                    prevItem[
+                                      options?.customDataIdName ?? "id"
+                                    ] ===
+                                    item[options?.customDataIdName ?? "id"]
+                                  );
+                                });
+                              }),
+                            ]);
                           }
                         }
                       }}