qbs-react-grid 1.1.38 → 1.1.40

package/es/qbsTable/QbsTable.js

@@ -80,7 +80,8 @@ var QbsTable = function QbsTable(_ref) {
     _ref$headerHeight = _ref.headerHeight,
     headerHeight = _ref$headerHeight === void 0 ? 40 : _ref$headerHeight,
     tableBodyHeight = _ref.tableBodyHeight,
-    customRowStatus = _ref.customRowStatus;
+    customRowStatus = _ref.customRowStatus,
+    searchPlaceholder = _ref.searchPlaceholder;
   var _useState = useState(false),
     loading = _useState[0],
     setLoading = _useState[1];
@@ -153,7 +154,7 @@ var QbsTable = function QbsTable(_ref) {
     if (visibleCount > 0 && lastVisibleColumn) {
       updatedColumns.forEach(function (col) {
         var _lastVisibleColumn;
-        if (col.field === ((_lastVisibleColumn = lastVisibleColumn) === null || _lastVisibleColumn === void 0 ? void 0 : _lastVisibleColumn.field)) {
+        if (col.field === ((_lastVisibleColumn = lastVisibleColumn) === null || _lastVisibleColumn === void 0 ? void 0 : _lastVisibleColumn.field) && col.title === lastVisibleColumn.title) {
           col.resizable = false;
         } else {
           col.resizable = true;
@@ -215,7 +216,8 @@ var QbsTable = function QbsTable(_ref) {
     selectedRowActions: selectedRowActions,
     onSelect: handleClear,
     handleColumnToggle: handleColumnToggle,
-    dataLength: data === null || data === void 0 ? void 0 : data.length
+    dataLength: data === null || data === void 0 ? void 0 : data.length,
+    searchPlaceholder: searchPlaceholder
   };
   var themeToggle = useMemo(function () {
     return document.getElementById('themeToggle');

package/es/qbsTable/Toolbar.js

@@ -19,7 +19,8 @@ var ToolBar = function ToolBar(_ref) {
     selectedRowActions = _ref.selectedRowActions,
     checkedKeys = _ref.checkedKeys,
     onSelect = _ref.onSelect,
-    dataLength = _ref.dataLength;
+    dataLength = _ref.dataLength,
+    searchPlaceholder = _ref.searchPlaceholder;
   var debouncedOnSearch = useCallback(debounce(onSearch != null ? onSearch : function () {}, 1000), [onSearch]);
   var _useState = useState(searchValue),
     searchParam = _useState[0],
@@ -59,7 +60,7 @@ var ToolBar = function ToolBar(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "qbs-table-primary-filter"
   }, search && /*#__PURE__*/React.createElement(SearchInput, {
-    placeholder: "Search",
+    placeholder: searchPlaceholder != null ? searchPlaceholder : 'Search',
     handleChange: handleChange,
     handleSearch: handleSearch,
     searchValue: searchParam

package/es/qbsTable/commontypes.d.ts

@@ -82,6 +82,7 @@ export interface QbsTableProps {
     primaryFilter?: ReactElement | ReactNode;
     advancefilter?: ReactElement | ReactNode;
     tableHeaderActions?: ReactElement | ReactNode;
+    searchPlaceholder?: string;
     selectedRowActions?: {
         actionTitle?: string;
         action: (checked: (number | string)[]) => void;
@@ -131,6 +132,7 @@ export interface QbsTableToolbarProps {
     handleColumnToggle?: (columns: QbsColumnProps[]) => void;
     dataLength: number;
     headerHeight?: number;
+    searchPlaceholder?: string;
     selectedRowActions?: {
         actionTitle?: string;
         action: (checked: (number | string)[]) => void;

package/lib/qbsTable/QbsTable.js

@@ -86,7 +86,8 @@ var QbsTable = function QbsTable(_ref) {
     _ref$headerHeight = _ref.headerHeight,
     headerHeight = _ref$headerHeight === void 0 ? 40 : _ref$headerHeight,
     tableBodyHeight = _ref.tableBodyHeight,
-    customRowStatus = _ref.customRowStatus;
+    customRowStatus = _ref.customRowStatus,
+    searchPlaceholder = _ref.searchPlaceholder;
   var _useState = (0, _react.useState)(false),
     loading = _useState[0],
     setLoading = _useState[1];
@@ -159,7 +160,7 @@ var QbsTable = function QbsTable(_ref) {
     if (visibleCount > 0 && lastVisibleColumn) {
       updatedColumns.forEach(function (col) {
         var _lastVisibleColumn;
-        if (col.field === ((_lastVisibleColumn = lastVisibleColumn) === null || _lastVisibleColumn === void 0 ? void 0 : _lastVisibleColumn.field)) {
+        if (col.field === ((_lastVisibleColumn = lastVisibleColumn) === null || _lastVisibleColumn === void 0 ? void 0 : _lastVisibleColumn.field) && col.title === lastVisibleColumn.title) {
           col.resizable = false;
         } else {
           col.resizable = true;
@@ -221,7 +222,8 @@ var QbsTable = function QbsTable(_ref) {
     selectedRowActions: selectedRowActions,
     onSelect: handleClear,
     handleColumnToggle: handleColumnToggle,
-    dataLength: data === null || data === void 0 ? void 0 : data.length
+    dataLength: data === null || data === void 0 ? void 0 : data.length,
+    searchPlaceholder: searchPlaceholder
   };
   var themeToggle = (0, _react.useMemo)(function () {
     return document.getElementById('themeToggle');

package/lib/qbsTable/Toolbar.js

@@ -26,7 +26,8 @@ var ToolBar = function ToolBar(_ref) {
     selectedRowActions = _ref.selectedRowActions,
     checkedKeys = _ref.checkedKeys,
     onSelect = _ref.onSelect,
-    dataLength = _ref.dataLength;
+    dataLength = _ref.dataLength,
+    searchPlaceholder = _ref.searchPlaceholder;
   var debouncedOnSearch = (0, _react.useCallback)((0, _debounce["default"])(onSearch != null ? onSearch : function () {}, 1000), [onSearch]);
   var _useState = (0, _react.useState)(searchValue),
     searchParam = _useState[0],
@@ -66,7 +67,7 @@ var ToolBar = function ToolBar(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "qbs-table-primary-filter"
   }, search && /*#__PURE__*/_react["default"].createElement(_SearchInput["default"], {
-    placeholder: "Search",
+    placeholder: searchPlaceholder != null ? searchPlaceholder : 'Search',
     handleChange: handleChange,
     handleSearch: handleSearch,
     searchValue: searchParam

package/lib/qbsTable/commontypes.d.ts

@@ -82,6 +82,7 @@ export interface QbsTableProps {
     primaryFilter?: ReactElement | ReactNode;
     advancefilter?: ReactElement | ReactNode;
     tableHeaderActions?: ReactElement | ReactNode;
+    searchPlaceholder?: string;
     selectedRowActions?: {
         actionTitle?: string;
         action: (checked: (number | string)[]) => void;
@@ -131,6 +132,7 @@ export interface QbsTableToolbarProps {
     handleColumnToggle?: (columns: QbsColumnProps[]) => void;
     dataLength: number;
     headerHeight?: number;
+    searchPlaceholder?: string;
     selectedRowActions?: {
         actionTitle?: string;
         action: (checked: (number | string)[]) => void;

package/package.json

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

package/src/qbsTable/QbsTable.tsx

@@ -66,7 +66,8 @@ const QbsTable: React.FC<QbsTableProps> = ({
   selectedRows,
   headerHeight = 40,
   tableBodyHeight,
-  customRowStatus
+  customRowStatus,
+  searchPlaceholder
 }) => {
   const [loading, setLoading] = useState(false);
   const [columns, setColumns] = useState(propColumn);
@@ -143,7 +144,7 @@ const QbsTable: React.FC<QbsTableProps> = ({
 
       if (visibleCount > 0 && lastVisibleColumn) {
         updatedColumns.forEach(col => {
-          if (col.field === lastVisibleColumn?.field) {
+          if (col.field === lastVisibleColumn?.field && col.title === lastVisibleColumn.title) {
             col.resizable = false;
           } else {
             col.resizable = true;
@@ -207,7 +208,8 @@ const QbsTable: React.FC<QbsTableProps> = ({
     selectedRowActions: selectedRowActions,
     onSelect: handleClear,
     handleColumnToggle: handleColumnToggle,
-    dataLength: data?.length
+    dataLength: data?.length,
+    searchPlaceholder: searchPlaceholder
   };
   const themeToggle = useMemo(() => document.getElementById('themeToggle') as HTMLInputElement, []);
 

package/src/qbsTable/Toolbar.tsx

@@ -20,7 +20,8 @@ const ToolBar: React.FC<QbsTableToolbarProps> = ({
   selectedRowActions,
   checkedKeys,
   onSelect,
-  dataLength
+  dataLength,
+  searchPlaceholder
 }) => {
   const debouncedOnSearch = useCallback(debounce(onSearch ?? (() => {}), 1000), [onSearch]);
   const [searchParam, setSearchParam] = useState<string | undefined>(searchValue);
@@ -60,7 +61,7 @@ const ToolBar: React.FC<QbsTableToolbarProps> = ({
           <div className="qbs-table-primary-filter">
             {search && (
               <SearchInput
-                placeholder="Search"
+                placeholder={searchPlaceholder ?? 'Search'}
                 handleChange={handleChange}
                 handleSearch={handleSearch}
                 searchValue={searchParam}

package/src/qbsTable/commontypes.ts

@@ -20,7 +20,7 @@ export interface ColumnBase {
   sortKey?: string;
   type?: string;
   getPath?: (data: any) => string;
-  hideLink?:(data:any)=>boolean
+  hideLink?: (data: any) => boolean;
 }
 
 export interface QbsColumnProps extends ColumnBase {
@@ -87,6 +87,7 @@ export interface QbsTableProps {
   primaryFilter?: ReactElement | ReactNode;
   advancefilter?: ReactElement | ReactNode;
   tableHeaderActions?: ReactElement | ReactNode;
+  searchPlaceholder?:string
   selectedRowActions?: {
     actionTitle?: string;
     action: (checked: (number | string)[]) => void;
@@ -135,6 +136,7 @@ export interface QbsTableToolbarProps {
   handleColumnToggle?: (columns: QbsColumnProps[]) => void;
   dataLength: number;
   headerHeight?: number;
+  searchPlaceholder?: string;
   selectedRowActions?: {
     actionTitle?: string;
     action: (checked: (number | string)[]) => void;