@fctc/widget-logic 2.3.2 → 2.3.3

package/dist/index.js

@@ -6987,43 +6987,28 @@ var tableController = ({ data }) => {
 var import_react23 = require("react");
 var import_hooks15 = require("@fctc/interface-logic/hooks");
 var import_store10 = require("@fctc/interface-logic/store");
-
-// src/environment.ts
-var environment_exports = {};
-__reExport(environment_exports, require("@fctc/interface-logic/environment"));
-
-// src/widget/advance/table/table-group/controller.ts
 var tableGroupController = (props) => {
-  const env = (0, environment_exports.getEnv)();
+  const { env } = (0, provider_exports.useEnv)();
   const {
-    rows,
     columns,
-    indexRow,
     row,
     model,
     viewData,
-    renderField,
     level,
     specification,
-    domain,
     context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef
+    checkedAll
   } = props;
   const [pageGroup, setPageGroup] = (0, import_react23.useState)(0);
   const { groupByDomain, selectedTags } = (0, import_store10.useAppSelector)(import_store10.selectSearch);
   const { selectedRowKeys } = (0, import_store10.useAppSelector)(import_store10.selectList);
   const appDispatch = (0, import_store10.useAppDispatch)();
-  const { toDataJS } = (0, import_hooks15.useOdooDataTransform)();
-  const initVal = toDataJS(row, viewData, model);
   const [isShowGroup, setIsShowGroup] = (0, import_react23.useState)(false);
   const [colEmptyGroup, setColEmptyGroup] = (0, import_react23.useState)({
     fromStart: 1,
     fromEnd: 1
   });
+  const domain = row?.__domain;
   const processedData = (0, import_react23.useMemo)(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
@@ -7053,15 +7038,14 @@ var tableGroupController = (props) => {
     groupby: [groupByDomain?.contexts[level]?.group_by]
   };
   const queryKey = [
-    `data-${model}--${level}-row${indexRow}`,
+    `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
     pageGroup
   ];
   const {
-    data: dataResponse,
-    isFetched: isQueryFetched,
-    isPlaceholderData,
+    data: dataGroup,
+    isFetched: isDataGroupFetched,
     isLoading,
     isFetching
   } = (0, import_hooks15.useGetListData)(listDataProps, queryKey, enabled);
@@ -7072,13 +7056,12 @@ var tableGroupController = (props) => {
   } = tableController({
     data: {
       fields: viewData?.views?.list?.fields,
-      records: dataResponse?.records ?? dataResponse?.groups,
+      records: dataGroup?.records ?? dataGroup?.groups,
       dataModel: viewData?.models?.[model],
       context: env.context,
-      typeTable: dataResponse?.groups ? "group" : "list"
+      typeTable: dataGroup?.groups ? "group" : "list"
     }
   });
-  const leftPadding = level > 1 ? level * 8 + "px" : "0px";
   (0, import_react23.useEffect)(() => {
     if (isShowGroup && selectedTags?.length > 0) {
       setIsShowGroup(false);
@@ -7090,7 +7073,7 @@ var tableGroupController = (props) => {
   )?.[1] : row[group_by_field_name];
   const nameGroupWithCount = `${typeof nameGroup === "string" ? nameGroup : typeof nameGroup === "boolean" && nameGroup ? i18n_default.t("yes") : i18n_default.t("no")} (${row[`${group_by_field_name?.split(":")?.[0]}_count`]})`;
   const allIdsNull = selectedRowKeys?.every((item) => item === void 0);
-  const handleExpandChildGroup = () => {
+  const onExpandChildGroup = () => {
     if (isLoading || isFetching) return;
     const toggleShowGroup = () => setIsShowGroup((prev) => !prev);
     if (allIdsNull || typeTableGroup === "group") {
@@ -7103,7 +7086,7 @@ var tableGroupController = (props) => {
         (id) => !ids.includes(id)
       );
       appDispatch((0, import_store10.setSelectedRowKeys)(filteredIds));
-    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isQueryFetched) {
+    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isDataGroupFetched) {
       const clonedKeys = [...selectedRowKeys];
       appDispatch((0, import_store10.setSelectedRowKeys)([...clonedKeys, -1]));
       setTimeout(() => appDispatch((0, import_store10.setSelectedRowKeys)(clonedKeys)), 500);
@@ -7114,39 +7097,22 @@ var tableGroupController = (props) => {
     toggleShowGroup();
   };
   (0, import_react23.useEffect)(() => {
-    if (!isQueryFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
+    if (!isDataGroupFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
       return;
     }
     const clonedKeys = [...selectedRowKeys];
     (0, import_store10.setSelectedRowKeys)([...clonedKeys, -1]);
     setTimeout(() => (0, import_store10.setSelectedRowKeys)(clonedKeys), 500);
-  }, [isQueryFetched]);
+  }, [isDataGroupFetched]);
   return {
-    handleExpandChildGroup,
+    onExpandChildGroup,
     colEmptyGroup,
-    leftPadding,
     isShowGroup,
-    isQueryFetched,
+    isDataGroupFetched,
     nameGroupWithCount,
-    columns,
-    row,
-    isPlaceholderData,
     columnsGroup,
-    indexRow,
     rowsGroup,
-    model,
-    viewData,
-    renderField,
-    level,
-    specification,
-    context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef,
-    initVal,
-    dataResponse,
+    dataGroup,
     pageGroup,
     setPageGroup
   };
@@ -7429,6 +7395,12 @@ __reExport(constants_exports, require("@fctc/interface-logic/constants"));
 
 // src/index.ts
 __reExport(index_exports, constants_exports, module.exports);
+
+// src/environment.ts
+var environment_exports = {};
+__reExport(environment_exports, require("@fctc/interface-logic/environment"));
+
+// src/index.ts
 __reExport(index_exports, environment_exports, module.exports);
 __reExport(index_exports, provider_exports, module.exports);
 

package/dist/index.mjs

@@ -7028,10 +7028,7 @@ var tableController = ({ data }) => {
 
 // src/widget/advance/table/table-group/controller.ts
 import { useEffect as useEffect14, useMemo as useMemo13, useState as useState15 } from "react";
-import {
-  useOdooDataTransform,
-  useGetListData as useGetListData2
-} from "@fctc/interface-logic/hooks";
+import { useGetListData as useGetListData2 } from "@fctc/interface-logic/hooks";
 import {
   useAppSelector as useAppSelector6,
   selectSearch as selectSearch5,
@@ -7039,44 +7036,28 @@ import {
   useAppDispatch as useAppDispatch6,
   setSelectedRowKeys as setSelectedRowKeys2
 } from "@fctc/interface-logic/store";
-
-// src/environment.ts
-var environment_exports = {};
-__reExport(environment_exports, environment_star);
-import * as environment_star from "@fctc/interface-logic/environment";
-
-// src/widget/advance/table/table-group/controller.ts
 var tableGroupController = (props) => {
-  const env = (0, environment_exports.getEnv)();
+  const { env } = (0, provider_exports.useEnv)();
   const {
-    rows,
     columns,
-    indexRow,
     row,
     model,
     viewData,
-    renderField,
     level,
     specification,
-    domain,
     context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef
+    checkedAll
   } = props;
   const [pageGroup, setPageGroup] = useState15(0);
   const { groupByDomain, selectedTags } = useAppSelector6(selectSearch5);
   const { selectedRowKeys } = useAppSelector6(selectList4);
   const appDispatch = useAppDispatch6();
-  const { toDataJS } = useOdooDataTransform();
-  const initVal = toDataJS(row, viewData, model);
   const [isShowGroup, setIsShowGroup] = useState15(false);
   const [colEmptyGroup, setColEmptyGroup] = useState15({
     fromStart: 1,
     fromEnd: 1
   });
+  const domain = row?.__domain;
   const processedData = useMemo13(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
@@ -7106,15 +7087,14 @@ var tableGroupController = (props) => {
     groupby: [groupByDomain?.contexts[level]?.group_by]
   };
   const queryKey = [
-    `data-${model}--${level}-row${indexRow}`,
+    `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
     pageGroup
   ];
   const {
-    data: dataResponse,
-    isFetched: isQueryFetched,
-    isPlaceholderData,
+    data: dataGroup,
+    isFetched: isDataGroupFetched,
     isLoading,
     isFetching
   } = useGetListData2(listDataProps, queryKey, enabled);
@@ -7125,13 +7105,12 @@ var tableGroupController = (props) => {
   } = tableController({
     data: {
       fields: viewData?.views?.list?.fields,
-      records: dataResponse?.records ?? dataResponse?.groups,
+      records: dataGroup?.records ?? dataGroup?.groups,
       dataModel: viewData?.models?.[model],
       context: env.context,
-      typeTable: dataResponse?.groups ? "group" : "list"
+      typeTable: dataGroup?.groups ? "group" : "list"
     }
   });
-  const leftPadding = level > 1 ? level * 8 + "px" : "0px";
   useEffect14(() => {
     if (isShowGroup && selectedTags?.length > 0) {
       setIsShowGroup(false);
@@ -7143,7 +7122,7 @@ var tableGroupController = (props) => {
   )?.[1] : row[group_by_field_name];
   const nameGroupWithCount = `${typeof nameGroup === "string" ? nameGroup : typeof nameGroup === "boolean" && nameGroup ? i18n_default.t("yes") : i18n_default.t("no")} (${row[`${group_by_field_name?.split(":")?.[0]}_count`]})`;
   const allIdsNull = selectedRowKeys?.every((item) => item === void 0);
-  const handleExpandChildGroup = () => {
+  const onExpandChildGroup = () => {
     if (isLoading || isFetching) return;
     const toggleShowGroup = () => setIsShowGroup((prev) => !prev);
     if (allIdsNull || typeTableGroup === "group") {
@@ -7156,7 +7135,7 @@ var tableGroupController = (props) => {
         (id) => !ids.includes(id)
       );
       appDispatch(setSelectedRowKeys2(filteredIds));
-    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isQueryFetched) {
+    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isDataGroupFetched) {
       const clonedKeys = [...selectedRowKeys];
       appDispatch(setSelectedRowKeys2([...clonedKeys, -1]));
       setTimeout(() => appDispatch(setSelectedRowKeys2(clonedKeys)), 500);
@@ -7167,39 +7146,22 @@ var tableGroupController = (props) => {
     toggleShowGroup();
   };
   useEffect14(() => {
-    if (!isQueryFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
+    if (!isDataGroupFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
       return;
     }
     const clonedKeys = [...selectedRowKeys];
     setSelectedRowKeys2([...clonedKeys, -1]);
     setTimeout(() => setSelectedRowKeys2(clonedKeys), 500);
-  }, [isQueryFetched]);
+  }, [isDataGroupFetched]);
   return {
-    handleExpandChildGroup,
+    onExpandChildGroup,
     colEmptyGroup,
-    leftPadding,
     isShowGroup,
-    isQueryFetched,
+    isDataGroupFetched,
     nameGroupWithCount,
-    columns,
-    row,
-    isPlaceholderData,
     columnsGroup,
-    indexRow,
     rowsGroup,
-    model,
-    viewData,
-    renderField,
-    level,
-    specification,
-    context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef,
-    initVal,
-    dataResponse,
+    dataGroup,
     pageGroup,
     setPageGroup
   };
@@ -7488,6 +7450,13 @@ import * as constants_star from "@fctc/interface-logic/constants";
 
 // src/index.ts
 __reExport(index_exports, constants_exports);
+
+// src/environment.ts
+var environment_exports = {};
+__reExport(environment_exports, environment_star);
+import * as environment_star from "@fctc/interface-logic/environment";
+
+// src/index.ts
 __reExport(index_exports, environment_exports);
 __reExport(index_exports, provider_exports);
 

package/dist/widget.d.mts

@@ -238,36 +238,17 @@ declare const tableController: ({ data }: ITableProps) => {
 };
 
 declare const tableGroupController: (props: any) => {
-    handleExpandChildGroup: () => void;
+    onExpandChildGroup: () => void;
     colEmptyGroup: {
         fromStart: number;
         fromEnd: number;
     };
-    leftPadding: string;
     isShowGroup: boolean;
-    isQueryFetched: boolean;
+    isDataGroupFetched: boolean;
     nameGroupWithCount: string;
-    columns: any;
-    row: any;
-    isPlaceholderData: boolean;
     columnsGroup: any;
-    indexRow: any;
     rowsGroup: any[];
-    model: any;
-    viewData: any;
-    renderField: any;
-    level: any;
-    specification: any;
-    context: any;
-    checkedAll: any;
-    isDisplayCheckbox: any;
-    isAutoSelect: any;
-    setIsAutoSelect: any;
-    selectedRowKeysRef: any;
-    initVal: {
-        [x: string]: any;
-    };
-    dataResponse: any;
+    dataGroup: any;
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;
 };

package/dist/widget.d.ts

@@ -238,36 +238,17 @@ declare const tableController: ({ data }: ITableProps) => {
 };
 
 declare const tableGroupController: (props: any) => {
-    handleExpandChildGroup: () => void;
+    onExpandChildGroup: () => void;
     colEmptyGroup: {
         fromStart: number;
         fromEnd: number;
     };
-    leftPadding: string;
     isShowGroup: boolean;
-    isQueryFetched: boolean;
+    isDataGroupFetched: boolean;
     nameGroupWithCount: string;
-    columns: any;
-    row: any;
-    isPlaceholderData: boolean;
     columnsGroup: any;
-    indexRow: any;
     rowsGroup: any[];
-    model: any;
-    viewData: any;
-    renderField: any;
-    level: any;
-    specification: any;
-    context: any;
-    checkedAll: any;
-    isDisplayCheckbox: any;
-    isAutoSelect: any;
-    setIsAutoSelect: any;
-    selectedRowKeysRef: any;
-    initVal: {
-        [x: string]: any;
-    };
-    dataResponse: any;
+    dataGroup: any;
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;
 };

package/dist/widget.js

@@ -6712,43 +6712,28 @@ var tableController = ({ data }) => {
 var import_react23 = require("react");
 var import_hooks15 = require("@fctc/interface-logic/hooks");
 var import_store10 = require("@fctc/interface-logic/store");
-
-// src/environment.ts
-var environment_exports = {};
-__reExport(environment_exports, require("@fctc/interface-logic/environment"));
-
-// src/widget/advance/table/table-group/controller.ts
 var tableGroupController = (props) => {
-  const env = (0, environment_exports.getEnv)();
+  const { env } = (0, provider_exports.useEnv)();
   const {
-    rows,
     columns,
-    indexRow,
     row,
     model,
     viewData,
-    renderField,
     level,
     specification,
-    domain,
     context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef
+    checkedAll
   } = props;
   const [pageGroup, setPageGroup] = (0, import_react23.useState)(0);
   const { groupByDomain, selectedTags } = (0, import_store10.useAppSelector)(import_store10.selectSearch);
   const { selectedRowKeys } = (0, import_store10.useAppSelector)(import_store10.selectList);
   const appDispatch = (0, import_store10.useAppDispatch)();
-  const { toDataJS } = (0, import_hooks15.useOdooDataTransform)();
-  const initVal = toDataJS(row, viewData, model);
   const [isShowGroup, setIsShowGroup] = (0, import_react23.useState)(false);
   const [colEmptyGroup, setColEmptyGroup] = (0, import_react23.useState)({
     fromStart: 1,
     fromEnd: 1
   });
+  const domain = row?.__domain;
   const processedData = (0, import_react23.useMemo)(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
@@ -6778,15 +6763,14 @@ var tableGroupController = (props) => {
     groupby: [groupByDomain?.contexts[level]?.group_by]
   };
   const queryKey = [
-    `data-${model}--${level}-row${indexRow}`,
+    `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
     pageGroup
   ];
   const {
-    data: dataResponse,
-    isFetched: isQueryFetched,
-    isPlaceholderData,
+    data: dataGroup,
+    isFetched: isDataGroupFetched,
     isLoading,
     isFetching
   } = (0, import_hooks15.useGetListData)(listDataProps, queryKey, enabled);
@@ -6797,13 +6781,12 @@ var tableGroupController = (props) => {
   } = tableController({
     data: {
       fields: viewData?.views?.list?.fields,
-      records: dataResponse?.records ?? dataResponse?.groups,
+      records: dataGroup?.records ?? dataGroup?.groups,
       dataModel: viewData?.models?.[model],
       context: env.context,
-      typeTable: dataResponse?.groups ? "group" : "list"
+      typeTable: dataGroup?.groups ? "group" : "list"
     }
   });
-  const leftPadding = level > 1 ? level * 8 + "px" : "0px";
   (0, import_react23.useEffect)(() => {
     if (isShowGroup && selectedTags?.length > 0) {
       setIsShowGroup(false);
@@ -6815,7 +6798,7 @@ var tableGroupController = (props) => {
   )?.[1] : row[group_by_field_name];
   const nameGroupWithCount = `${typeof nameGroup === "string" ? nameGroup : typeof nameGroup === "boolean" && nameGroup ? i18n_default.t("yes") : i18n_default.t("no")} (${row[`${group_by_field_name?.split(":")?.[0]}_count`]})`;
   const allIdsNull = selectedRowKeys?.every((item) => item === void 0);
-  const handleExpandChildGroup = () => {
+  const onExpandChildGroup = () => {
     if (isLoading || isFetching) return;
     const toggleShowGroup = () => setIsShowGroup((prev) => !prev);
     if (allIdsNull || typeTableGroup === "group") {
@@ -6828,7 +6811,7 @@ var tableGroupController = (props) => {
         (id) => !ids.includes(id)
       );
       appDispatch((0, import_store10.setSelectedRowKeys)(filteredIds));
-    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isQueryFetched) {
+    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isDataGroupFetched) {
       const clonedKeys = [...selectedRowKeys];
       appDispatch((0, import_store10.setSelectedRowKeys)([...clonedKeys, -1]));
       setTimeout(() => appDispatch((0, import_store10.setSelectedRowKeys)(clonedKeys)), 500);
@@ -6839,39 +6822,22 @@ var tableGroupController = (props) => {
     toggleShowGroup();
   };
   (0, import_react23.useEffect)(() => {
-    if (!isQueryFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
+    if (!isDataGroupFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
       return;
     }
     const clonedKeys = [...selectedRowKeys];
     (0, import_store10.setSelectedRowKeys)([...clonedKeys, -1]);
     setTimeout(() => (0, import_store10.setSelectedRowKeys)(clonedKeys), 500);
-  }, [isQueryFetched]);
+  }, [isDataGroupFetched]);
   return {
-    handleExpandChildGroup,
+    onExpandChildGroup,
     colEmptyGroup,
-    leftPadding,
     isShowGroup,
-    isQueryFetched,
+    isDataGroupFetched,
     nameGroupWithCount,
-    columns,
-    row,
-    isPlaceholderData,
     columnsGroup,
-    indexRow,
     rowsGroup,
-    model,
-    viewData,
-    renderField,
-    level,
-    specification,
-    context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef,
-    initVal,
-    dataResponse,
+    dataGroup,
     pageGroup,
     setPageGroup
   };

package/dist/widget.mjs

@@ -6730,10 +6730,7 @@ var tableController = ({ data }) => {
 
 // src/widget/advance/table/table-group/controller.ts
 import { useEffect as useEffect14, useMemo as useMemo13, useState as useState15 } from "react";
-import {
-  useOdooDataTransform,
-  useGetListData as useGetListData2
-} from "@fctc/interface-logic/hooks";
+import { useGetListData as useGetListData2 } from "@fctc/interface-logic/hooks";
 import {
   useAppSelector as useAppSelector6,
   selectSearch as selectSearch5,
@@ -6741,44 +6738,28 @@ import {
   useAppDispatch as useAppDispatch6,
   setSelectedRowKeys as setSelectedRowKeys2
 } from "@fctc/interface-logic/store";
-
-// src/environment.ts
-var environment_exports = {};
-__reExport(environment_exports, environment_star);
-import * as environment_star from "@fctc/interface-logic/environment";
-
-// src/widget/advance/table/table-group/controller.ts
 var tableGroupController = (props) => {
-  const env = (0, environment_exports.getEnv)();
+  const { env } = (0, provider_exports.useEnv)();
   const {
-    rows,
     columns,
-    indexRow,
     row,
     model,
     viewData,
-    renderField,
     level,
     specification,
-    domain,
     context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef
+    checkedAll
   } = props;
   const [pageGroup, setPageGroup] = useState15(0);
   const { groupByDomain, selectedTags } = useAppSelector6(selectSearch5);
   const { selectedRowKeys } = useAppSelector6(selectList4);
   const appDispatch = useAppDispatch6();
-  const { toDataJS } = useOdooDataTransform();
-  const initVal = toDataJS(row, viewData, model);
   const [isShowGroup, setIsShowGroup] = useState15(false);
   const [colEmptyGroup, setColEmptyGroup] = useState15({
     fromStart: 1,
     fromEnd: 1
   });
+  const domain = row?.__domain;
   const processedData = useMemo13(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
@@ -6808,15 +6789,14 @@ var tableGroupController = (props) => {
     groupby: [groupByDomain?.contexts[level]?.group_by]
   };
   const queryKey = [
-    `data-${model}--${level}-row${indexRow}`,
+    `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
     pageGroup
   ];
   const {
-    data: dataResponse,
-    isFetched: isQueryFetched,
-    isPlaceholderData,
+    data: dataGroup,
+    isFetched: isDataGroupFetched,
     isLoading,
     isFetching
   } = useGetListData2(listDataProps, queryKey, enabled);
@@ -6827,13 +6807,12 @@ var tableGroupController = (props) => {
   } = tableController({
     data: {
       fields: viewData?.views?.list?.fields,
-      records: dataResponse?.records ?? dataResponse?.groups,
+      records: dataGroup?.records ?? dataGroup?.groups,
       dataModel: viewData?.models?.[model],
       context: env.context,
-      typeTable: dataResponse?.groups ? "group" : "list"
+      typeTable: dataGroup?.groups ? "group" : "list"
     }
   });
-  const leftPadding = level > 1 ? level * 8 + "px" : "0px";
   useEffect14(() => {
     if (isShowGroup && selectedTags?.length > 0) {
       setIsShowGroup(false);
@@ -6845,7 +6824,7 @@ var tableGroupController = (props) => {
   )?.[1] : row[group_by_field_name];
   const nameGroupWithCount = `${typeof nameGroup === "string" ? nameGroup : typeof nameGroup === "boolean" && nameGroup ? i18n_default.t("yes") : i18n_default.t("no")} (${row[`${group_by_field_name?.split(":")?.[0]}_count`]})`;
   const allIdsNull = selectedRowKeys?.every((item) => item === void 0);
-  const handleExpandChildGroup = () => {
+  const onExpandChildGroup = () => {
     if (isLoading || isFetching) return;
     const toggleShowGroup = () => setIsShowGroup((prev) => !prev);
     if (allIdsNull || typeTableGroup === "group") {
@@ -6858,7 +6837,7 @@ var tableGroupController = (props) => {
         (id) => !ids.includes(id)
       );
       appDispatch(setSelectedRowKeys2(filteredIds));
-    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isQueryFetched) {
+    } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isDataGroupFetched) {
       const clonedKeys = [...selectedRowKeys];
       appDispatch(setSelectedRowKeys2([...clonedKeys, -1]));
       setTimeout(() => appDispatch(setSelectedRowKeys2(clonedKeys)), 500);
@@ -6869,39 +6848,22 @@ var tableGroupController = (props) => {
     toggleShowGroup();
   };
   useEffect14(() => {
-    if (!isQueryFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
+    if (!isDataGroupFetched || !rowsGroup || !checkedAll || allIdsNull || typeTableGroup === "group") {
       return;
     }
     const clonedKeys = [...selectedRowKeys];
     setSelectedRowKeys2([...clonedKeys, -1]);
     setTimeout(() => setSelectedRowKeys2(clonedKeys), 500);
-  }, [isQueryFetched]);
+  }, [isDataGroupFetched]);
   return {
-    handleExpandChildGroup,
+    onExpandChildGroup,
     colEmptyGroup,
-    leftPadding,
     isShowGroup,
-    isQueryFetched,
+    isDataGroupFetched,
     nameGroupWithCount,
-    columns,
-    row,
-    isPlaceholderData,
     columnsGroup,
-    indexRow,
     rowsGroup,
-    model,
-    viewData,
-    renderField,
-    level,
-    specification,
-    context,
-    checkedAll,
-    isDisplayCheckbox,
-    isAutoSelect,
-    setIsAutoSelect,
-    selectedRowKeysRef,
-    initVal,
-    dataResponse,
+    dataGroup,
     pageGroup,
     setPageGroup
   };

package/package.json

@@ -1,96 +1,96 @@
-{
-  "name": "@fctc/widget-logic",
-  "version": "2.3.2",
-  "types": "dist/index.d.ts",
-  "main": "dist/index.cjs",
-  "module": "dist/index.mjs",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
-    },
-    "./hooks": {
-      "types": "./dist/hooks.d.ts",
-      "import": "./dist/hooks.mjs",
-      "require": "./dist/hooks.cjs"
-    },
-    "./widget": {
-      "types": "./dist/widget.d.ts",
-      "import": "./dist/widget.mjs",
-      "require": "./dist/widget.cjs"
-    },
-    "./icons": {
-      "types": "./dist/icons.d.ts",
-      "import": "./dist/icons.mjs",
-      "require": "./dist/icons.cjs"
-    },
-    "./utils": {
-      "types": "./dist/utils.d.ts",
-      "import": "./dist/utils.mjs",
-      "require": "./dist/utils.cjs"
-    },
-    "./store": {
-      "types": "./dist/store.d.ts",
-      "import": "./dist/store.mjs",
-      "require": "./dist/store.cjs"
-    },
-    "./config": {
-      "types": "./dist/config.d.ts",
-      "import": "./dist/config.mjs",
-      "require": "./dist/config.cjs"
-    },
-    "./constants": {
-      "types": "./dist/constants.d.ts",
-      "import": "./dist/constants.mjs",
-      "require": "./dist/constants.cjs"
-    },
-    "./environment": {
-      "types": "./dist/environment.d.ts",
-      "import": "./dist/environment.mjs",
-      "require": "./dist/environment.cjs"
-    },
-    "./provider": {
-      "types": "./dist/provider.d.ts",
-      "import": "./dist/provider.mjs",
-      "require": "./dist/provider.cjs"
-    },
-    "./services": {
-      "types": "./dist/services.d.ts",
-      "import": "./dist/services.mjs",
-      "require": "./dist/services.cjs"
-    },
-    "./types": {
-      "types": "./dist/types.d.ts",
-      "import": "./dist/types.mjs",
-      "require": "./dist/types.cjs"
-    }
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@fctc/interface-logic": "^2.3.0",
-    "@headlessui/react": "^2.2.6",
-    "@tanstack/react-query": "^5.84.0",
-    "i18next": "^25.3.2",
-    "i18next-browser-languagedetector": "^8.2.0",
-    "react-i18next": "^15.6.1",
-    "react-tooltip": "^5.29.1"
-  },
-  "devDependencies": {
-    "@types/react": "^18.3.1",
-    "jest": "^29.7.0",
-    "react": "18.0.0",
-    "tsup": "^8.0.0",
-    "typescript": "^5.8.2"
-  },
-  "packageManager": "yarn@1.22.0",
-  "peerDependencies": {
-    "@fctc/interface-logic": "^1.6.9"
-  }
-}
+{
+  "name": "@fctc/widget-logic",
+  "version": "2.3.3",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
+    },
+    "./hooks": {
+      "types": "./dist/hooks.d.ts",
+      "import": "./dist/hooks.mjs",
+      "require": "./dist/hooks.cjs"
+    },
+    "./widget": {
+      "types": "./dist/widget.d.ts",
+      "import": "./dist/widget.mjs",
+      "require": "./dist/widget.cjs"
+    },
+    "./icons": {
+      "types": "./dist/icons.d.ts",
+      "import": "./dist/icons.mjs",
+      "require": "./dist/icons.cjs"
+    },
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "import": "./dist/utils.mjs",
+      "require": "./dist/utils.cjs"
+    },
+    "./store": {
+      "types": "./dist/store.d.ts",
+      "import": "./dist/store.mjs",
+      "require": "./dist/store.cjs"
+    },
+    "./config": {
+      "types": "./dist/config.d.ts",
+      "import": "./dist/config.mjs",
+      "require": "./dist/config.cjs"
+    },
+    "./constants": {
+      "types": "./dist/constants.d.ts",
+      "import": "./dist/constants.mjs",
+      "require": "./dist/constants.cjs"
+    },
+    "./environment": {
+      "types": "./dist/environment.d.ts",
+      "import": "./dist/environment.mjs",
+      "require": "./dist/environment.cjs"
+    },
+    "./provider": {
+      "types": "./dist/provider.d.ts",
+      "import": "./dist/provider.mjs",
+      "require": "./dist/provider.cjs"
+    },
+    "./services": {
+      "types": "./dist/services.d.ts",
+      "import": "./dist/services.mjs",
+      "require": "./dist/services.cjs"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.mjs",
+      "require": "./dist/types.cjs"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@fctc/interface-logic": "^2.3.0",
+    "@headlessui/react": "^2.2.6",
+    "@tanstack/react-query": "^5.84.0",
+    "i18next": "^25.3.2",
+    "i18next-browser-languagedetector": "^8.2.0",
+    "react-i18next": "^15.6.1",
+    "react-tooltip": "^5.29.1"
+  },
+  "devDependencies": {
+    "@types/react": "^18.3.1",
+    "jest": "^29.7.0",
+    "react": "18.0.0",
+    "tsup": "^8.0.0",
+    "typescript": "^5.8.2"
+  },
+  "packageManager": "yarn@1.22.0",
+  "peerDependencies": {
+    "@fctc/interface-logic": "^1.6.9"
+  }
+}