qbs-react-grid 1.0.48 → 1.0.50

package/es/qbsTable/CustomTableCell.js

@@ -80,17 +80,12 @@ export var CustomTableCell = /*#__PURE__*/React.memo(function (_ref4) {
     rowClick = _ref4.rowClick,
     link = _ref4.link,
     props = _objectWithoutPropertiesLoose(_ref4, _excluded3);
-  return (
-    /*#__PURE__*/
-    // <TooltipComponent title={renderCell ? renderCell(rowData)?.toolTip : toolTip}>
-    React.createElement(Cell, _extends({}, props, {
-      dataKey: dataKey
-    }), link ? /*#__PURE__*/React.createElement("a", {
-      onClick: function onClick() {
-        return rowClick === null || rowClick === void 0 ? void 0 : rowClick(rowData);
-      },
-      className: "qbs-table-row-link"
-    }, renderCell ? (_renderCell = renderCell(rowData)) === null || _renderCell === void 0 ? void 0 : _renderCell.cell : rowData[dataKey]) : /*#__PURE__*/React.createElement(React.Fragment, null, (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell))
-    // </TooltipComponent>
-  );
+  return /*#__PURE__*/React.createElement(Cell, _extends({}, props, {
+    dataKey: dataKey
+  }), link ? /*#__PURE__*/React.createElement("a", {
+    onClick: function onClick() {
+      return rowClick === null || rowClick === void 0 ? void 0 : rowClick(rowData);
+    },
+    className: "qbs-table-row-link"
+  }, renderCell ? (_renderCell = renderCell(rowData)) === null || _renderCell === void 0 ? void 0 : _renderCell.cell : rowData[dataKey]) : /*#__PURE__*/React.createElement(React.Fragment, null, (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell));
 });

package/es/qbsTable/QbsTable.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import Cell from '../Cell';
 import Column from '../Column';
 import ColumnGroup from '../ColumnGroup';
@@ -10,9 +10,9 @@ import { ActionCell, CheckCell, CustomTableCell, ExpandCell } from './CustomTabl
 import ToolBar from './Toolbar';
 import ColumToggle from './utilities/ColumShowHide';
 import debounce from './utilities/debounce';
+import { deepEqual } from './utilities/deepEqual';
 import { SettingsIcon } from './utilities/icons';
 import '../../dist/css/qbs-react-grid.css';
-import { deepEqual } from './utilities/deepEqual';
 var CHECKBOX_LINE_HEIGHT = '36px';
 var COLUMN_WIDTH = 250;
 var QbsTable = function QbsTable(_ref) {
@@ -258,6 +258,9 @@ var QbsTable = function QbsTable(_ref) {
     });
     setColumns(reColumns);
   }, [columns]);
+  useEffect(function () {
+    setColumns(propColumn);
+  }, [propColumn]);
   useEffect(function () {
     if (!deepEqual(columns, prevColumns.current)) {
       handleColumnsResizable();

package/es/qbsTable/commontypes.d.ts

@@ -1,9 +1,4 @@
 import React, { ReactElement, ReactNode } from 'react';
-declare enum Align {
-    Center = "center",
-    Left = "left",
-    Right = "right"
-}
 interface Content {
     cell: ReactNode | string;
     toolTip?: string;
@@ -14,7 +9,7 @@ export interface ColumnBase {
     sortable?: boolean;
     resizable?: boolean;
     fixed?: boolean;
-    align?: Align;
+    align?: 'left' | 'right' | 'center';
     colWidth?: number;
     renderCell?: (rowData: any) => Content;
     customCell?: boolean;

package/es/qbsTable/commontypes.js

@@ -1,7 +1 @@
-var Align = /*#__PURE__*/function (Align) {
-  Align["Center"] = "center";
-  Align["Left"] = "left";
-  Align["Right"] = "right";
-  return Align;
-}(Align || {});
 export {};

package/lib/qbsTable/CustomTableCell.js

@@ -88,18 +88,13 @@ var CustomTableCell = /*#__PURE__*/_react["default"].memo(function (_ref4) {
     rowClick = _ref4.rowClick,
     link = _ref4.link,
     props = (0, _objectWithoutPropertiesLoose2["default"])(_ref4, _excluded3);
-  return (
-    /*#__PURE__*/
-    // <TooltipComponent title={renderCell ? renderCell(rowData)?.toolTip : toolTip}>
-    _react["default"].createElement(_Cell["default"], (0, _extends2["default"])({}, props, {
-      dataKey: dataKey
-    }), link ? /*#__PURE__*/_react["default"].createElement("a", {
-      onClick: function onClick() {
-        return rowClick === null || rowClick === void 0 ? void 0 : rowClick(rowData);
-      },
-      className: "qbs-table-row-link"
-    }, renderCell ? (_renderCell = renderCell(rowData)) === null || _renderCell === void 0 ? void 0 : _renderCell.cell : rowData[dataKey]) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell))
-    // </TooltipComponent>
-  );
+  return /*#__PURE__*/_react["default"].createElement(_Cell["default"], (0, _extends2["default"])({}, props, {
+    dataKey: dataKey
+  }), link ? /*#__PURE__*/_react["default"].createElement("a", {
+    onClick: function onClick() {
+      return rowClick === null || rowClick === void 0 ? void 0 : rowClick(rowData);
+    },
+    className: "qbs-table-row-link"
+  }, renderCell ? (_renderCell = renderCell(rowData)) === null || _renderCell === void 0 ? void 0 : _renderCell.cell : rowData[dataKey]) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (_renderCell2 = renderCell(rowData)) === null || _renderCell2 === void 0 ? void 0 : _renderCell2.cell));
 });
 exports.CustomTableCell = CustomTableCell;

package/lib/qbsTable/QbsTable.js

@@ -15,9 +15,9 @@ var _CustomTableCell = require("./CustomTableCell");
 var _Toolbar = _interopRequireDefault(require("./Toolbar"));
 var _ColumShowHide = _interopRequireDefault(require("./utilities/ColumShowHide"));
 var _debounce = _interopRequireDefault(require("./utilities/debounce"));
+var _deepEqual = require("./utilities/deepEqual");
 var _icons = require("./utilities/icons");
 require("../../dist/css/qbs-react-grid.css");
-var _deepEqual = require("./utilities/deepEqual");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var CHECKBOX_LINE_HEIGHT = '36px';
@@ -265,6 +265,9 @@ var QbsTable = function QbsTable(_ref) {
     });
     setColumns(reColumns);
   }, [columns]);
+  (0, _react.useEffect)(function () {
+    setColumns(propColumn);
+  }, [propColumn]);
   (0, _react.useEffect)(function () {
     if (!(0, _deepEqual.deepEqual)(columns, prevColumns.current)) {
       handleColumnsResizable();

package/lib/qbsTable/commontypes.d.ts

@@ -1,9 +1,4 @@
 import React, { ReactElement, ReactNode } from 'react';
-declare enum Align {
-    Center = "center",
-    Left = "left",
-    Right = "right"
-}
 interface Content {
     cell: ReactNode | string;
     toolTip?: string;
@@ -14,7 +9,7 @@ export interface ColumnBase {
     sortable?: boolean;
     resizable?: boolean;
     fixed?: boolean;
-    align?: Align;
+    align?: 'left' | 'right' | 'center';
     colWidth?: number;
     renderCell?: (rowData: any) => Content;
     customCell?: boolean;

package/lib/qbsTable/commontypes.js

@@ -1,9 +1,3 @@
 "use strict";
 
-exports.__esModule = true;
-var Align = /*#__PURE__*/function (Align) {
-  Align["Center"] = "center";
-  Align["Left"] = "left";
-  Align["Right"] = "right";
-  return Align;
-}(Align || {});
+exports.__esModule = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qbs-react-grid",
-  "version": "1.0.48",
+  "version": "1.0.50",
   "description": "A React table component",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

package/src/qbsTable/CustomTableCell.tsx

@@ -63,7 +63,6 @@ export const ExpandCell: React.FC<any> = React.memo(
 export const CustomTableCell: React.FC<any> = React.memo(
   ({ rowData, renderCell, toolTip, dataKey, onChange, rowClick, link, ...props }) => {
     return (
-      // <TooltipComponent title={renderCell ? renderCell(rowData)?.toolTip : toolTip}>
       <Cell {...props} dataKey={dataKey}>
         {link ? (
           <a onClick={() => rowClick?.(rowData)} className="qbs-table-row-link">
@@ -73,7 +72,6 @@ export const CustomTableCell: React.FC<any> = React.memo(
           <>{renderCell(rowData)?.cell}</>
         )}
       </Cell>
-      // </TooltipComponent>
     );
   }
 );

package/src/qbsTable/QbsTable.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import Cell from '../Cell';
 import Column from '../Column';
@@ -11,10 +11,10 @@ import { ActionCell, CheckCell, CustomTableCell, ExpandCell } from './CustomTabl
 import ToolBar from './Toolbar';
 import ColumToggle from './utilities/ColumShowHide';
 import debounce from './utilities/debounce';
+import { deepEqual } from './utilities/deepEqual';
 import { SettingsIcon } from './utilities/icons';
 
 import '../../dist/css/qbs-react-grid.css';
-import { deepEqual } from './utilities/deepEqual';
 
 const CHECKBOX_LINE_HEIGHT = '36px';
 const COLUMN_WIDTH = 250;
@@ -246,6 +246,10 @@ const QbsTable: React.FC<QbsTableProps> = ({
     setColumns(reColumns);
   }, [columns]);
 
+  useEffect(() => {
+    setColumns(propColumn);
+  }, [propColumn]);
+
   useEffect(() => {
     if (!deepEqual(columns, prevColumns.current)) {
       handleColumnsResizable();

package/src/qbsTable/commontypes.ts

@@ -1,10 +1,5 @@
 import React, { ReactElement, ReactNode } from 'react';
 
-enum Align {
-  Center = 'center',
-  Left = 'left',
-  Right = 'right'
-}
 interface Content {
   cell: ReactNode | string;
   toolTip?: string;
@@ -15,7 +10,7 @@ export interface ColumnBase {
   sortable?: boolean;
   resizable?: boolean;
   fixed?: boolean;
-  align?: Align;
+  align?: 'left' | 'right' | 'center';
   colWidth?: number;
   renderCell?: (rowData: any) => Content;
   customCell?: boolean;
@@ -128,6 +123,6 @@ export interface QbsTableToolbarProps {
     action: (checked: (number | string)[]) => void;
     disabled?: boolean;
     hidden?: boolean;
-    customHide?:string
+    customHide?: string;
   }[];
 }