es-grid-template 1.8.60 → 1.8.61

package/es/grid-component/InternalTable.js

@@ -13,7 +13,7 @@ import 'dayjs/locale/vi';
 // import GridEdit from "./table/GridEdit"
 // import InfiniteTable from "./table/InfiniteTable";
 
-import Grid from "./table/Grid";
+// import Grid from "./table/Grid"
 import en from "rc-master-ui/es/date-picker/locale/en_US";
 import vi from "rc-master-ui/es/date-picker/locale/vi_VN";
 import enDr from "rc-master-ui/es/locales/en_US";
@@ -116,15 +116,12 @@ const ResizableTitle = props => {
     })))
   );
 };
-const TableBodyCell = props => {
-  const dragState = useContext(DragIndexContext);
-  return /*#__PURE__*/React.createElement("div", _extends({}, props, {
-    style: {
-      ...props.style,
-      ...dragActiveStyle(dragState, props.id)
-    }
-  }));
-};
+
+// const TableBodyCell = (props: any) => {
+//   const dragState = useContext<DragIndexState>(DragIndexContext)
+//   return <div {...props} style={{ ...props.style, ...dragActiveStyle(dragState, props.id) }} />
+// }
+
 const SortableHeaderCell = ({
   children,
   columnKey
@@ -190,6 +187,8 @@ const InternalTable = props => {
     onSorter,
     defaultSorter,
     toolbarItems,
+    allowSortering,
+    allowFiltering,
     ...rest
   } = props;
   const id = React.useMemo(() => {
@@ -497,17 +496,17 @@ const InternalTable = props => {
       }
       return {
         ...transformedColumn,
-        ...(transformedColumn.allowFiltering === false ? {} : {
+        ...(transformedColumn.allowFiltering === false || allowFiltering === false ? {} : {
           ...getColumnSearchProps(column)
         }),
-        // sorter: (column.sorter === false ? undefined : {
-        //   // @ts-ignore
-        //   compare: (a: any, b: any) => onSorter ? a : a[column.field] - b[column.field],
-        //   multiple: sortMultiple ? colIndex : undefined
-
-        // }),
+        sorter: column.sorter === false || allowSortering === false ? undefined : {
+          // @ts-ignore
+          compare: (a, b) => onSorter ? a : a[column.field] - b[column.field],
+          multiple: sortMultiple ? colIndex : undefined
+        },
         // @ts-ignore
-        sorter: (a, b) => a[column.field] - b[column.field],
+        // sorter: (a, b) => a[column.field] - b[column.field],
+
         sortIcon: args => {
           const {
             sortOrder
@@ -978,13 +977,14 @@ const InternalTable = props => {
     } // scroll height auto, không quá  600
     ,
     height: propsHeight,
-    scrollHeight: scrollHeight
-    // components={{
-    //   header: { cell: ResizableTitle },
-    //   body: { cell: TableBodyCell }
-    // }}
-    ,
-
+    scrollHeight: scrollHeight,
+    toolbarItems: toolbarItems,
+    components: {
+      header: {
+        cell: ResizableTitle
+      }
+      // body: { cell: TableBodyCell }
+    },
     onFilter: val => {
       handleOnFilter(val);
     },
@@ -1045,7 +1045,7 @@ const InternalTable = props => {
     strategy: horizontalListSortingStrategy
   }, /*#__PURE__*/React.createElement(DragIndexContext.Provider, {
     value: dragIndex
-  }, /*#__PURE__*/React.createElement(Grid, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(Group, _extends({}, rest, {
     t: t,
     id: faker.string.alpha(20),
     locale: locale,
@@ -1087,10 +1087,8 @@ const InternalTable = props => {
     components: {
       header: {
         cell: ResizableTitle
-      },
-      body: {
-        cell: TableBodyCell
       }
+      // body: { cell: TableBodyCell }
     }
     // setTooltipContent={setTooltipContent}
     ,

package/es/grid-component/hooks/useColumns.d.ts

@@ -15,7 +15,5 @@ interface UseColumnsConfig<RecordType> {
     rowKey?: any;
     onMouseHover?: any;
 }
-declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [
-    any
-];
+declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [any];
 export default useColumns;

package/es/table-component/hook/useColumns.js

@@ -155,6 +155,7 @@ export function convertToTanStackColumns({
       enableColumnFilter: allowFiltering !== false
     };
     if (children) {
+      newCol.size = undefined;
       // @ts-ignore
       newCol.columns = convertToTanStackColumns({
         columns: children,

package/lib/grid-component/InternalTable.js

@@ -14,7 +14,6 @@ var _server = _interopRequireDefault(require("react-dom/server"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 require("dayjs/locale/es");
 require("dayjs/locale/vi");
-var _Grid = _interopRequireDefault(require("./table/Grid"));
 var _en_US = _interopRequireDefault(require("rc-master-ui/es/date-picker/locale/en_US"));
 var _vi_VN = _interopRequireDefault(require("rc-master-ui/es/date-picker/locale/vi_VN"));
 var _en_US2 = _interopRequireDefault(require("rc-master-ui/es/locales/en_US"));
@@ -43,6 +42,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 // import GridEdit from "./table/GridEdit"
 // import InfiniteTable from "./table/InfiniteTable";
 
+// import Grid from "./table/Grid"
+
 // import useColumns from "./hooks/useColumns";
 
 // import 'rc-master-ui/es/date-range-picker/styles/index.less'
@@ -123,15 +124,12 @@ const ResizableTitle = props => {
     })))
   );
 };
-const TableBodyCell = props => {
-  const dragState = (0, _react.useContext)(DragIndexContext);
-  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, props, {
-    style: {
-      ...props.style,
-      ...dragActiveStyle(dragState, props.id)
-    }
-  }));
-};
+
+// const TableBodyCell = (props: any) => {
+//   const dragState = useContext<DragIndexState>(DragIndexContext)
+//   return <div {...props} style={{ ...props.style, ...dragActiveStyle(dragState, props.id) }} />
+// }
+
 const SortableHeaderCell = ({
   children,
   columnKey
@@ -197,6 +195,8 @@ const InternalTable = props => {
     onSorter,
     defaultSorter,
     toolbarItems,
+    allowSortering,
+    allowFiltering,
     ...rest
   } = props;
   const id = _react.default.useMemo(() => {
@@ -504,17 +504,17 @@ const InternalTable = props => {
       }
       return {
         ...transformedColumn,
-        ...(transformedColumn.allowFiltering === false ? {} : {
+        ...(transformedColumn.allowFiltering === false || allowFiltering === false ? {} : {
           ...getColumnSearchProps(column)
         }),
-        // sorter: (column.sorter === false ? undefined : {
-        //   // @ts-ignore
-        //   compare: (a: any, b: any) => onSorter ? a : a[column.field] - b[column.field],
-        //   multiple: sortMultiple ? colIndex : undefined
-
-        // }),
+        sorter: column.sorter === false || allowSortering === false ? undefined : {
+          // @ts-ignore
+          compare: (a, b) => onSorter ? a : a[column.field] - b[column.field],
+          multiple: sortMultiple ? colIndex : undefined
+        },
         // @ts-ignore
-        sorter: (a, b) => a[column.field] - b[column.field],
+        // sorter: (a, b) => a[column.field] - b[column.field],
+
         sortIcon: args => {
           const {
             sortOrder
@@ -985,13 +985,14 @@ const InternalTable = props => {
     } // scroll height auto, không quá  600
     ,
     height: propsHeight,
-    scrollHeight: scrollHeight
-    // components={{
-    //   header: { cell: ResizableTitle },
-    //   body: { cell: TableBodyCell }
-    // }}
-    ,
-
+    scrollHeight: scrollHeight,
+    toolbarItems: toolbarItems,
+    components: {
+      header: {
+        cell: ResizableTitle
+      }
+      // body: { cell: TableBodyCell }
+    },
     onFilter: val => {
       handleOnFilter(val);
     },
@@ -1052,7 +1053,7 @@ const InternalTable = props => {
     strategy: _sortable.horizontalListSortingStrategy
   }, /*#__PURE__*/_react.default.createElement(DragIndexContext.Provider, {
     value: dragIndex
-  }, /*#__PURE__*/_react.default.createElement(_Grid.default, (0, _extends2.default)({}, rest, {
+  }, /*#__PURE__*/_react.default.createElement(_Group.default, (0, _extends2.default)({}, rest, {
     t: t,
     id: _faker.faker.string.alpha(20),
     locale: locale,
@@ -1094,10 +1095,8 @@ const InternalTable = props => {
     components: {
       header: {
         cell: ResizableTitle
-      },
-      body: {
-        cell: TableBodyCell
       }
+      // body: { cell: TableBodyCell }
     }
     // setTooltipContent={setTooltipContent}
     ,

package/lib/table-component/hook/useColumns.js

@@ -166,6 +166,7 @@ function convertToTanStackColumns({
       enableColumnFilter: allowFiltering !== false
     };
     if (children) {
+      newCol.size = undefined;
       // @ts-ignore
       newCol.columns = convertToTanStackColumns({
         columns: children,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.8.60",
+  "version": "1.8.61",
   "description": "es-grid-template",
   "keywords": [
     "react",