newVersion

PandaTechAM · Mar 13, 2024 · 6ff4efe · 6ff4efe
1 parent 4d43c3f
commit 6ff4efe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "beautiful-react-table",
-  "version": "7.4.1",
+  "version": "7.4.2",
   "description": "My first react typescript package",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

diff --git a/src/Models/table.models.ts b/src/Models/table.models.ts
@@ -34,7 +34,7 @@ export interface IProps<T extends Object> {
   rowsFreezeAction?: boolean
   isEnableAggregates?: boolean
   aggregates?: any
-  EmptyDataIcon?: React.MemoExoticComponent<(props: React.SVGProps<SVGSVGElement>) => JSX.Element>
+  emptyDataIcon?: string
   perColumnTotalCount?: number
   hoverdRowPosition?: number
   selectedPageSizeId?: ISelected

diff --git a/src/table/index.scss b/src/table/index.scss
@@ -12,8 +12,8 @@
 
 .G-data-table {
   color         : #161515;
-  overflow-y    : auto;
-  overflow-x    : auto;
+  // overflow-y    : auto;
+  // overflow-x    : auto;
   max-height    : calc(100vh - 220px);
   border-radius : 5px;
   margin        : 0;

diff --git a/src/table/index.tsx b/src/table/index.tsx
@@ -43,7 +43,7 @@ function Table<T extends Object>({
   filterColumns,
   filtersTypes,
   rowsFreezeAction,
-  EmptyDataIcon,
+  emptyDataIcon,
   perColumnTotalCount,
   selectedPageSizeId,
   hasFilters,
@@ -123,7 +123,7 @@ function Table<T extends Object>({
         />
       ) : null}
 
-      <div className='G-data-table G-data-scroll'>
+      <div className='G-data-table G-data-scroll' style={{ overflow: data.length ? 'auto' : 'hidden' }}>
         <>
           <div className='G-header' style={{ minHeight: headerHeight ? `${headerHeight}px` : 48 }}>
             <Header
@@ -180,8 +180,8 @@ function Table<T extends Object>({
             </div>
           ) : (
             <div className='G-empty-data-component'>
-              {EmptyDataIcon ? (
-                <EmptyDataIcon className='G-empty-data-icon' />
+              {emptyDataIcon ? (
+                <img className='G-empty-data-icon' src={emptyDataIcon} alt='Empty data' height={300} />
               ) : (
                 <div className='G-center' style={{ height: 500 }}>
                   {translations?.emptyData || 'Empty data'}