Merge branch 'master' of https://github.com/material-table-core/core

material-table-core · Jun 6, 2021 · 5e9ec31 · 5e9ec31
2 parents 3718162 + d31df8b
commit 5e9ec31
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+#### 3.0.2 (2021-06-03)
+
 #### 3.0.1 (2021-06-01)
 
 ##### Bug Fixes

diff --git a/__tests__/demo/demo-components/index.js b/__tests__/demo/demo-components/index.js
@@ -268,6 +268,19 @@ export function Basic() {
   );
 }
 
+export function BasicRef() {
+  const tableref = React.useRef();
+  console.log(tableref);
+  return (
+    <MaterialTable
+      tableRef={tableref}
+      title="Basic"
+      columns={global_cols}
+      data={global_data}
+    />
+  );
+}
+
 /*
 export function CustomExport() {
   return (

diff --git a/__tests__/demo/demo.js b/__tests__/demo/demo.js
@@ -25,6 +25,7 @@ import {
   DefaultOrderIssue,
   TestingNewActionHandlersProp,
   BulkEdit,
+  BasicRef,
   BulkEditWithDetailPanel,
   ExportData,
   CustomExport,
@@ -43,6 +44,9 @@ render(
     <h1>Basic</h1>
     <Basic />
 
+    <h1>Basic Ref</h1>
+    <BasicRef />
+
     {/*
     <h1>Export Data</h1>
     <ExportData />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Datatable for React based on https://material-ui.com/api/table/ with additional features",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -3,20 +3,6 @@ import { IconProps } from '@material-ui/core/Icon';
 import SvgIcon from '@material-ui/core/SvgIcon';
 import { OnHandlers } from './helper';
 
-declare module '@material-table/core/exporters' {
-  export function ExportCsv(
-    columns: Array<any>,
-    data: Array<any>,
-    filename: string,
-    delimeter?: string
-  ): void;
-  export function ExportPdf(
-    columns: Array<any>,
-    data: Array<any>,
-    filename: string
-  ): void;
-}
-
 type SvgIconComponent = typeof SvgIcon;
 
 export interface MaterialTableProps<RowData extends object> {
@@ -99,7 +85,7 @@ export interface MaterialTableProps<RowData extends object> {
     currentData: RowData[];
   }) => { value: unknown; style: React.CSSProperties } | unknown;
   style?: React.CSSProperties;
-  tableRef?: any;
+  tableRef?: React.RefObject<any> | React.MutableRefObject<undefined>;
   page?: number;
   totalCount?: number;
 }