d2coreui 23.0.25 → 23.0.27

package/components/grid/cell/bigNumberCellEditor.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { CustomCellEditorProps } from "ag-grid-react";
+declare const _default: (props: CustomCellEditorProps) => React.JSX.Element;
+export default _default;

package/components/grid/cell/bigNumberCellEditor.js

@@ -0,0 +1,82 @@
+import React from 'react';
+import { InputNumber } from "antd";
+import { Key } from "ts-key-enum";
+import KeyboardUtils from "d2coreui/components/keyboard/keyboardUtils";
+import { CellEditorUtils } from "./cellEditorUtils";
+import { DataGridCellEditorComponent, withAgGridHooks } from "./dataGridCellEditorComponent";
+import { MAX_SIGNED_64_BIT_INT, MIN_SIGNED_64_BIT_INT } from "d2api/constants";
+class BigNumberCellEditor extends DataGridCellEditorComponent {
+    constructor(props) {
+        super(props);
+        this.inputComponent = null;
+        this.state = this.getInitialState(props);
+    }
+    getInitialState(props) {
+        let value;
+        if (props.eventKey === Key.Backspace || props.eventKey === Key.Delete) {
+            value = null;
+            props.onValueChange(null);
+        }
+        else if (props.eventKey && props.eventKey.length === 1) {
+            const parsedValue = Number.parseInt(props.eventKey);
+            value = isNaN(parsedValue) ? props.value : parsedValue;
+            props.onValueChange(value);
+        }
+        else {
+            value = props.value;
+        }
+        return {
+            value: value,
+        };
+    }
+    focus() {
+        var _a;
+        (_a = this.inputComponent) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+    select() {
+        var _a;
+        (_a = this.inputComponent) === null || _a === void 0 ? void 0 : _a.select();
+    }
+    placeCursorToEnd() {
+        var _a, _b, _c;
+        const length = ((_a = this.inputComponent) === null || _a === void 0 ? void 0 : _a.value) ? (_b = this.inputComponent) === null || _b === void 0 ? void 0 : _b.value.length : 0;
+        if (length > 0) {
+            (_c = this.inputComponent) === null || _c === void 0 ? void 0 : _c.setSelectionRange(length, length);
+        }
+    }
+    isCancelBeforeStart() {
+        return !!this.props.eventKey && this.props.eventKey.length === 1 && '1234567890'.indexOf(this.props.eventKey) < 0;
+    }
+    render() {
+        return (React.createElement(InputNumber, { ref: (component) => {
+                this.inputComponent = component;
+            }, size: "small", autoFocus: true, stringMode: true, decimalSeparator: this.props.decimalSeparator, precision: this.props.precision, min: this.props.min ? String(this.props.min) : MIN_SIGNED_64_BIT_INT.toString(), max: this.props.max ? String(this.props.max) : MAX_SIGNED_64_BIT_INT.toString(), placeholder: this.state.value === null ? "NULL" : "", value: this.state.value !== null ? this.state.value : undefined, onChange: value => {
+                if (KeyboardUtils.isKeyPressed(Key.Alt)) {
+                    return;
+                }
+                if (typeof value === "string" && value !== "") {
+                    this.setState({ value: value });
+                    if (value !== null && /^(?:-?\d+)?$/.test(value)) {
+                        if (BigInt(value) > Number.MAX_SAFE_INTEGER || BigInt(value) < Number.MIN_SAFE_INTEGER) {
+                            this.props.onValueChange(value);
+                        }
+                        else {
+                            this.props.onValueChange(parseInt(value, 10));
+                        }
+                    }
+                }
+                else if (value === null || value === "") {
+                    this.setState({ value: null });
+                    this.props.onValueChange(null);
+                }
+            }, onKeyDown: (e) => {
+                if (CellEditorUtils.shouldIgnoreKeyEvent(e)) {
+                    e.preventDefault();
+                    e.nativeEvent.stopImmediatePropagation();
+                    e.nativeEvent.preventDefault();
+                }
+            }, style: { width: '100%' } }));
+    }
+}
+export default withAgGridHooks(BigNumberCellEditor);
+//# sourceMappingURL=bigNumberCellEditor.js.map

package/components/grid/cell/bigNumberCellEditor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bigNumberCellEditor.js","sourceRoot":"","sources":["../../../../../components/grid/cell/bigNumberCellEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,WAAW,EAAC,MAAM,MAAM,CAAC;AACjC,OAAO,EAAC,GAAG,EAAC,MAAM,aAAa,CAAC;AAChC,OAAO,aAAa,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,2BAA2B,EAAE,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAC,qBAAqB,EAAE,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAe7E,MAAM,mBAAoB,SAAQ,2BAAkF;IAGhH,YAAY,KAA8C;QACtD,KAAK,CAAC,KAAK,CAAC,CAAC;QAHT,mBAAc,GAA4B,IAAI,CAAC;QAInD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAED,eAAe,CAAC,KAA8C;QAC1D,IAAI,KAAoB,CAAC;QAEzB,IAAI,KAAK,CAAC,QAAQ,KAAK,GAAG,CAAC,SAAS,IAAI,KAAK,CAAC,QAAQ,KAAK,GAAG,CAAC,MAAM,EAAE,CAAC;YAEpE,KAAK,GAAG,IAAI,CAAC;YACb,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;aAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAEvD,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACpD,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC;YACvD,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YAEJ,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACxB,CAAC;QACD,OAAO;YACH,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;IAED,KAAK;;QACD,MAAA,IAAI,CAAC,cAAc,0CAAE,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,MAAM;;QACF,MAAA,IAAI,CAAC,cAAc,0CAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,gBAAgB;;QAKZ,MAAM,MAAM,GAAG,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,KAAK,EAAC,CAAC,CAAC,MAAA,IAAI,CAAC,cAAc,0CAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YACb,MAAA,IAAI,CAAC,cAAc,0CAAE,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;IAED,mBAAmB;QACf,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtH,CAAC;IAGD,MAAM;QACF,OAAO,CACH,oBAAC,WAAW,IACR,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE;gBACf,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;YACpC,CAAC,EACD,IAAI,EAAC,OAAO,EACZ,SAAS,QACT,UAAU,QACV,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAC7C,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAC/E,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAC/E,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EACpD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAC/D,QAAQ,EAAE,KAAK,CAAC,EAAE;gBACd,IAAI,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAEtC,OAAO;gBACX,CAAC;gBACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;oBAC5C,IAAI,CAAC,QAAQ,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;oBAC9B,IAAI,KAAK,KAAK,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC/C,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;4BACrF,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;wBACpC,CAAC;6BAAM,CAAC;4BACJ,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;wBAClD,CAAC;oBACL,CAAC;gBACL,CAAC;qBAAM,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;oBACxC,IAAI,CAAC,QAAQ,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC7B,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACnC,CAAC;YACL,CAAC,EACD,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;gBACb,IAAI,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;oBAE1C,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,CAAC,CAAC,WAAW,CAAC,wBAAwB,EAAE,CAAC;oBACzC,CAAC,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;gBACnC,CAAC;YACL,CAAC,EACD,KAAK,EAAE,EAAC,KAAK,EAAE,MAAM,EAAC,GACxB,CACL,CAAC;IACN,CAAC;CACJ;AAED,eAAe,eAAe,CAAC,mBAAmB,CAAC,CAAA","sourcesContent":["import React from 'react';\r\nimport {InputNumber} from \"antd\";\r\nimport {Key} from \"ts-key-enum\";\r\nimport KeyboardUtils from \"d2coreui/components/keyboard/keyboardUtils\";\r\nimport {CellEditorUtils} from \"./cellEditorUtils\";\r\nimport {DataGridCellEditorComponent, withAgGridHooks} from \"./dataGridCellEditorComponent\";\r\nimport {MAX_SIGNED_64_BIT_INT, MIN_SIGNED_64_BIT_INT} from \"d2api/constants\";\r\nimport {CustomCellEditorProps} from \"ag-grid-react\";\r\n\r\ninterface BigNumberCellEditorProperties extends CustomCellEditorProps {\r\n    decimalSeparator?: string\r\n    precision?: number\r\n    min?: number\r\n    max?: number\r\n}\r\n\r\ninterface NumericCellEditorState {\r\n    value: string | null\r\n}\r\n\r\n// same as NumberCellEditor, but values that are not in range of safe integer values are returned as string\r\nclass BigNumberCellEditor extends DataGridCellEditorComponent<BigNumberCellEditorProperties, NumericCellEditorState> {\r\n    private inputComponent: HTMLInputElement | null = null;\r\n\r\n    constructor(props: Readonly<BigNumberCellEditorProperties>) {\r\n        super(props);\r\n        this.state = this.getInitialState(props);\r\n    }\r\n\r\n    getInitialState(props: Readonly<BigNumberCellEditorProperties>): NumericCellEditorState {\r\n        let value: string | null;\r\n\r\n        if (props.eventKey === Key.Backspace || props.eventKey === Key.Delete) {\r\n            // if backspace or delete pressed, we clear the cell\r\n            value = null;\r\n            props.onValueChange(null);\r\n        } else if (props.eventKey && props.eventKey.length === 1) {\r\n            // if a letter was pressed, we start with the letter\r\n            const parsedValue = Number.parseInt(props.eventKey);\r\n            value = isNaN(parsedValue) ? props.value : parsedValue;\r\n            props.onValueChange(value);\r\n        } else {\r\n            // otherwise we start with the current value\r\n            value = props.value;\r\n        }\r\n        return {\r\n            value: value,\r\n        };\r\n    }\r\n\r\n    focus() {\r\n        this.inputComponent?.focus();\r\n    }\r\n\r\n    select() {\r\n        this.inputComponent?.select();\r\n    }\r\n\r\n    placeCursorToEnd() {\r\n        // when we started editing, we want the carot at the end, not the start.\r\n        // this comes into play in two scenarios: a) when user hits F2 and b)\r\n        // when user hits a printable character, then on IE (and only IE) the carot\r\n        // was placed after the first character, thus 'apply' would end up as 'pplea'\r\n        const length = this.inputComponent?.value ? this.inputComponent?.value.length : 0;\r\n        if (length > 0) {\r\n            this.inputComponent?.setSelectionRange(length, length);\r\n        }\r\n    }\r\n\r\n    isCancelBeforeStart(): boolean {\r\n        return !!this.props.eventKey && this.props.eventKey.length === 1 && '1234567890'.indexOf(this.props.eventKey) < 0;\r\n    }\r\n\r\n\r\n    render() {\r\n        return (\r\n            <InputNumber<string>\r\n                ref={(component) => {\r\n                    this.inputComponent = component;\r\n                }}\r\n                size=\"small\"\r\n                autoFocus\r\n                stringMode\r\n                decimalSeparator={this.props.decimalSeparator}\r\n                precision={this.props.precision}\r\n                min={this.props.min ? String(this.props.min) : MIN_SIGNED_64_BIT_INT.toString()}\r\n                max={this.props.max ? String(this.props.max) : MAX_SIGNED_64_BIT_INT.toString()}\r\n                placeholder={this.state.value === null ? \"NULL\" : \"\"}\r\n                value={this.state.value !== null ? this.state.value : undefined}\r\n                onChange={value => {\r\n                    if (KeyboardUtils.isKeyPressed(Key.Alt)) {\r\n                        // ignore navigational keystrokes ALT+cursor arrow\r\n                        return;\r\n                    }\r\n                    if (typeof value === \"string\" && value !== \"\") {\r\n                        this.setState({value: value});\r\n                        if (value !== null && /^(?:-?\\d+)?$/.test(value)) {\r\n                            if (BigInt(value) > Number.MAX_SAFE_INTEGER || BigInt(value) < Number.MIN_SAFE_INTEGER) {\r\n                                this.props.onValueChange(value);\r\n                            } else {\r\n                                this.props.onValueChange(parseInt(value, 10));\r\n                            }\r\n                        }\r\n                    } else if (value === null || value === \"\") {\r\n                        this.setState({value: null});\r\n                        this.props.onValueChange(null);\r\n                    }\r\n                }}\r\n                onKeyDown={(e) => {\r\n                    if (CellEditorUtils.shouldIgnoreKeyEvent(e)) {\r\n                        // this.props.onKeyDown(e.nativeEvent);\r\n                        e.preventDefault();\r\n                        e.nativeEvent.stopImmediatePropagation();\r\n                        e.nativeEvent.preventDefault();\r\n                    }\r\n                }}\r\n                style={{width: '100%'}}\r\n            />\r\n        );\r\n    }\r\n}\r\n\r\nexport default withAgGridHooks(BigNumberCellEditor)"]}

package/components/grid/dataGrid.d.ts

@@ -49,6 +49,8 @@ export interface DataGridSearchProps {
     searchButtonClassName?: string;
     searchButtonDisabled?: boolean;
     searchButtonHidden?: boolean;
+    searchButtonIcon?: React.ReactNode;
+    searchButtonDanger?: boolean;
     hidden?: boolean;
     searchRenderer?(): React.ReactNode;
     stringFormatter?(rawString: string): string;
@@ -103,6 +105,7 @@ export interface DataGridProps extends Omit<GridOptions, "columnDefs" | "paginat
     exportMenu?: {
         renderer?(menuElements: MenuElement[]): MenuElement[];
         onClick?(key: string): void;
+        onExported?(rowCount: number, destination: string): void;
     };
     settingsMenu?: {
         renderer?(menuElements: MenuElement[]): MenuElement[];

package/components/grid/dataGrid.js

@@ -41,6 +41,7 @@ import { ClipboardUtils } from "d2coreui/components/clipboard/clipboardUtils";
 import TimeUtils from "d2core/utils/timeUtils";
 import KeyboardUtils from "d2coreui/components/keyboard/keyboardUtils";
 import NumberCellEditor from "d2coreui/components/grid/cell/numberCellEditor";
+import BigNumberCellEditor from "d2coreui/components/grid/cell/bigNumberCellEditor";
 import TextCellEditor from "d2coreui/components/grid/cell/textCellEditor";
 import StatusTextCellEditor from "d2coreui/components/grid/cell/statusTextCellEditor";
 import DateCellEditor from "d2coreui/components/grid/cell/dateCellEditor";
@@ -61,6 +62,7 @@ const gridFrameworkComponents = {
     customColumnFilter: CustomColumnFilter,
     textColumnFilter: TextColumnFilter,
     numberCellEditor: NumberCellEditor,
+    bigNumberCellEditor: BigNumberCellEditor,
     textCellEditor: TextCellEditor,
     simpleStatusTextCellEditor: SimpleStatusTextCellEditor,
     statusTextCellEditor: StatusTextCellEditor,
@@ -199,6 +201,16 @@ class DataGrid extends React.Component {
                         return "";
                     }
                 },
+                valueFormatter: (params) => {
+                    var _a, _b;
+                    const value = DataGrid.getCellValue(params);
+                    if (value !== undefined && value !== null) {
+                        return LocaleHolder.formatNumber(value, (_b = (_a = params.colDef) === null || _a === void 0 ? void 0 : _a.cellRendererParams) === null || _b === void 0 ? void 0 : _b.fractionDigits);
+                    }
+                    else {
+                        return "";
+                    }
+                },
                 filterParams: {
                     textCustomComparator: this.textCustomComparator
                 },
@@ -1102,7 +1114,7 @@ class DataGrid extends React.Component {
         var _a, _b;
         let formattedValue = (_a = this.gridApi) === null || _a === void 0 ? void 0 : _a.getCellValue({ rowNode: row, colKey: column });
         if (formattedValue && typeof formattedValue === "string" && formattedValue.indexOf(EXPORT_SEPARATOR) > 0 && !doNotReplaceNewline) {
-            formattedValue = formattedValue.replace(/[\n\r]+/, ' ');
+            formattedValue = formattedValue.replace(/[\n\r]+/g, ' ');
         }
         const valueFormatter = column.getColDef().valueFormatter;
         if (valueFormatter) {
@@ -1434,7 +1446,7 @@ class DataGrid extends React.Component {
             _c.extraContent));
     }
     renderToolBarWithSearch() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         return (React.createElement(Space.Compact, { key: "filter-panel", className: "datagrid-autocomplete-input-group", style: { whiteSpace: "nowrap", flexGrow: 1, display: "flex" } }, (_a = this.props.toolbar) === null || _a === void 0 ? void 0 :
             _a.toolbarButtons,
             React.createElement(Dropdown, { trigger: ["click"], menu: getContextMenu({
@@ -1442,6 +1454,7 @@ class DataGrid extends React.Component {
                     showYear: !this.props.hideYear,
                     renderer: (_b = this.props.exportMenu) === null || _b === void 0 ? void 0 : _b.renderer,
                     onClick: (_c = this.props.exportMenu) === null || _c === void 0 ? void 0 : _c.onClick,
+                    onExported: (_d = this.props.exportMenu) === null || _d === void 0 ? void 0 : _d.onExported,
                     getExportContent: this.getExportContent,
                     pageOrientation: this.state.pageOrientation,
                     exporting: this.state.exporting,
@@ -1453,15 +1466,15 @@ class DataGrid extends React.Component {
             React.createElement(Dropdown, { trigger: ["click"], menu: this.getSettingsMenu() },
                 React.createElement(Button, { title: i18n("Extended table features"), disabled: this.state.loading },
                     React.createElement(TableOutlined, null))),
-            !((_d = this.props.search) === null || _d === void 0 ? void 0 : _d.hidden) && !((_e = this.props.search) === null || _e === void 0 ? void 0 : _e.searchRenderer) && React.createElement(AutoCompleteInput, { style: { minWidth: 100, flexGrow: 1 }, placeholder: this.props.search ? this.props.search.placeholder : undefined, stringFormatter: this.props.search ? this.props.search.stringFormatter : undefined, value: this.props.search ? this.props.search.searchString : undefined, options: this.props.search ? this.props.search.searchHistory : undefined, onChange: this.props.search ? this.props.search.onChange : undefined, onSearch: this.props.search ? this.props.search.onSearch : undefined, disabled: this.state.loading || (this.props.filter && this.props.filter.columnSearchVisible) }), (_g = (_f = this.props.search) === null || _f === void 0 ? void 0 : _f.searchRenderer) === null || _g === void 0 ? void 0 :
-            _g.call(_f),
-            !((_h = this.props.search) === null || _h === void 0 ? void 0 : _h.searchButtonHidden) &&
-                React.createElement(Button, { title: ((_j = this.props.search) === null || _j === void 0 ? void 0 : _j.hidden) ? i18n("Refresh") : i18n("Search"), className: "search-btn " + (this.props.search && this.props.search.searchButtonClassName ? this.props.search.searchButtonClassName : ""), disabled: (_k = this.props.search) === null || _k === void 0 ? void 0 : _k.searchButtonDisabled, type: "primary", onClick: () => {
+            !((_e = this.props.search) === null || _e === void 0 ? void 0 : _e.hidden) && !((_f = this.props.search) === null || _f === void 0 ? void 0 : _f.searchRenderer) && React.createElement(AutoCompleteInput, { style: { minWidth: 100, flexGrow: 1 }, placeholder: this.props.search ? this.props.search.placeholder : undefined, stringFormatter: this.props.search ? this.props.search.stringFormatter : undefined, value: this.props.search ? this.props.search.searchString : undefined, options: this.props.search ? this.props.search.searchHistory : undefined, onChange: this.props.search ? this.props.search.onChange : undefined, onSearch: this.props.search ? this.props.search.onSearch : undefined, disabled: this.state.loading || (this.props.filter && this.props.filter.columnSearchVisible) }), (_h = (_g = this.props.search) === null || _g === void 0 ? void 0 : _g.searchRenderer) === null || _h === void 0 ? void 0 :
+            _h.call(_g),
+            !((_j = this.props.search) === null || _j === void 0 ? void 0 : _j.searchButtonHidden) &&
+                React.createElement(Button, { title: ((_k = this.props.search) === null || _k === void 0 ? void 0 : _k.hidden) ? i18n("Refresh") : i18n("Search"), className: "search-btn " + (this.props.search && this.props.search.searchButtonClassName ? this.props.search.searchButtonClassName : ""), disabled: (_l = this.props.search) === null || _l === void 0 ? void 0 : _l.searchButtonDisabled, type: "primary", danger: (_m = this.props.search) === null || _m === void 0 ? void 0 : _m.searchButtonDanger, onClick: () => {
                         if (this.props.search && this.props.search.onSearch) {
                             this.props.search.onSearch();
                         }
-                    } }, this.state.loading ? React.createElement(LoadingOutlined, null) : (((_l = this.props.search) === null || _l === void 0 ? void 0 : _l.hidden) ? React.createElement(ReloadOutlined, null) :
-                    React.createElement(SearchOutlined, null)))));
+                    } }, this.state.loading ? React.createElement(LoadingOutlined, null) : ((_p = (_o = this.props.search) === null || _o === void 0 ? void 0 : _o.searchButtonIcon) !== null && _p !== void 0 ? _p : (((_q = this.props.search) === null || _q === void 0 ? void 0 : _q.hidden) ? React.createElement(ReloadOutlined, null) :
+                    React.createElement(SearchOutlined, null))))));
     }
     getSettingsMenu() {
         var _a;