@michalrakus/x-react-web-lib 1.35.1 → 1.35.2

package/lib/components/XAutoCompleteBase.js

@@ -531,7 +531,12 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                     if (_this.state.inputChanged) {
                         initValues[_this.getFirstField()] = _this.state.inputValueState;
                     }
-                    var formDialogState = { opened: true, id: undefined, initValues: initValues };
+                    var formDialogState = {
+                        opened: true,
+                        id: undefined,
+                        initValues: initValues,
+                        onSaveOrCancel: _this.formDialogOnSaveOrCancel
+                    };
                     _this.setState({ formDialogState: formDialogState });
                 }
             }
@@ -608,7 +613,12 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         if (this.props.idField === undefined) {
             throw "XAutoCompleteBase: property valueForm is defined but property idField is also needed for form editation.";
         }
-        var formDialogState = { opened: true, id: this.props.value[this.props.idField], initValues: undefined };
+        var formDialogState = {
+            opened: true,
+            id: this.props.value[this.props.idField],
+            initValues: undefined,
+            onSaveOrCancel: this.formDialogOnSaveOrCancel
+        };
         this.setState({ formDialogState: formDialogState });
     };
     // vracia objekt (ak inputChanged === false) alebo string (ak inputChanged === true)
@@ -735,7 +745,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         }
         // formgroup-inline lepi SplitButton na autocomplete a zarovna jeho vysku
         return (react_1.default.createElement.apply(react_1.default, __spreadArray(__spreadArray(["div", { className: "x-auto-complete-base", style: { width: this.props.width, maxWidth: this.props.maxWidth } }, react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, inputRef: this.autoCompleteInputRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName, showEmptyMessage: true }))], __read(buttons), false), [this.props.valueForm != undefined ?
-                react_1.default.createElement(XFormDialog_1.XFormDialog, { key: "dialog-form", dialogState: this.state.formDialogState, form: this.props.valueForm, onSaveOrCancel: this.formDialogOnSaveOrCancel })
+                react_1.default.createElement(XFormDialog_1.XFormDialog, { key: "dialog-form", dialogState: this.state.formDialogState, form: this.props.valueForm })
                 : undefined, this.props.searchBrowse != undefined && !readOnly ?
                 react_1.default.createElement(dialog_1.Dialog, { key: "dialog-browse", className: "x-dialog-without-header", visible: this.state.searchDialogOpened, onHide: this.searchDialogOnHide }, react_1.default.cloneElement(this.props.searchBrowse, { searchBrowseParams: this.createSearchBrowseParams() } /*, props.searchBrowse.children*/))
                 : undefined], false)));

package/lib/components/XFormBase.d.ts

@@ -61,6 +61,7 @@ export declare abstract class XFormBase extends Component<XFormProps> {
     formReadOnlyBase(field: string): boolean;
     onClickSave(): Promise<void>;
     onClickCancel(): void;
+    openFormNull(): void;
     validateSave(): Promise<boolean>;
     validateForm(): Promise<XErrorMap>;
     fieldValidation(): XErrorMap;

package/lib/components/XFormBase.js

@@ -449,7 +449,7 @@ var XFormBase = /** @class */ (function (_super) {
                             this.props.onSaveOrCancel(object, isAddRow ? XUtils_1.OperationType.Insert : XUtils_1.OperationType.Update);
                         }
                         else {
-                            this.props.openForm(null); // standardny rezim; save zbehol, ideme naspet do browsu
+                            this.openFormNull();
                         }
                         return [2 /*return*/];
                 }
@@ -461,11 +461,21 @@ var XFormBase = /** @class */ (function (_super) {
             this.props.onSaveOrCancel(null, XUtils_1.OperationType.None); // formular je zobrazeny v dialogu
         }
         else {
-            // standardny rezim
-            // openForm pridavame automaticky v XFormNavigator2 pri renderovani komponentu
-            // null - vrati sa do predchadzajuceho formularu, z ktoreho bol otvoreny
+            this.openFormNull();
+        }
+    };
+    XFormBase.prototype.openFormNull = function () {
+        // deprecated functionality used when XFormNavigator (deprecated) used
+        // standardny rezim
+        // openForm pridavame automaticky v XFormNavigator pri renderovani komponentu
+        // null - vrati sa do predchadzajuceho formularu, z ktoreho bol otvoreny
+        if (typeof this.props.openForm === 'function') {
             this.props.openForm(null);
         }
+        else {
+            // warning
+            console.log("Form has no onSaveOrCancel method declared.");
+        }
     };
     XFormBase.prototype.validateSave = function () {
         return __awaiter(this, void 0, void 0, function () {

package/lib/components/XFormDialog.d.ts

@@ -4,9 +4,10 @@ export interface XFormDialogState {
     opened: boolean;
     id?: number;
     initValues?: object;
+    onSaveOrCancel?: XOnSaveOrCancelProp;
+    form?: JSX.Element;
 }
 export declare const XFormDialog: (props: {
     dialogState: XFormDialogState;
-    form: JSX.Element;
-    onSaveOrCancel: XOnSaveOrCancelProp;
+    form?: JSX.Element | undefined;
 }) => React.JSX.Element;

package/lib/components/XFormDialog.js

@@ -8,13 +8,15 @@ var react_1 = __importDefault(require("react"));
 var dialog_1 = require("primereact/dialog");
 var XUtils_1 = require("./XUtils");
 var XFormDialog = function (props) {
+    var _a;
     var onHide = function () {
-        if (props.onSaveOrCancel) {
-            props.onSaveOrCancel(null, XUtils_1.OperationType.None);
+        if (props.dialogState.onSaveOrCancel) {
+            props.dialogState.onSaveOrCancel(null, XUtils_1.OperationType.None);
         }
     };
-    return (react_1.default.createElement(dialog_1.Dialog, { key: "dialog-form", className: "x-dialog-without-header", visible: props.dialogState.opened, onHide: onHide }, react_1.default.cloneElement(props.form, {
-        id: props.dialogState.id, initValues: props.dialogState.initValues, onSaveOrCancel: props.onSaveOrCancel
-    } /*, this.props.valueForm.children*/)));
+    var form = (_a = props.dialogState.form) !== null && _a !== void 0 ? _a : props.form;
+    return (react_1.default.createElement(dialog_1.Dialog, { key: "dialog-form", className: "x-dialog-without-header", visible: props.dialogState.opened, onHide: onHide }, form ? react_1.default.cloneElement(form, {
+        id: props.dialogState.id, initValues: props.dialogState.initValues, onSaveOrCancel: props.dialogState.onSaveOrCancel
+    } /*, props.form.children*/) : null));
 };
 exports.XFormDialog = XFormDialog;

package/lib/components/XFormNavigator3.d.ts

@@ -2,6 +2,9 @@ import React, { Component } from "react";
 export interface XFormNavigator3Props {
     rootFormElement?: JSX.Element;
 }
+/**
+ * @deprecated use opening form in dialogs instead
+ */
 export declare class XFormNavigator3 extends Component<XFormNavigator3Props> {
     state: {
         formElements: JSX.Element[];

package/lib/components/XFormNavigator3.js

@@ -65,6 +65,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XFormNavigator3 = void 0;
 var react_1 = __importStar(require("react"));
+/**
+ * @deprecated use opening form in dialogs instead
+ */
 var XFormNavigator3 = /** @class */ (function (_super) {
     __extends(XFormNavigator3, _super);
     function XFormNavigator3(props) {

package/lib/components/XLazyDataTable/XLazyDataTable.d.ts

@@ -10,6 +10,8 @@ import { ButtonProps } from "primereact/button";
 import { XtDocTemplate } from "../../modules/docTemplates/xt-doc-template";
 export type XBetweenFilterProp = "row" | "column" | undefined;
 export type XMultilineRenderType = "singleLine" | "fewLines" | "allLines";
+export type XOpenFormForInsert = (initValues?: object, onSaveOrCancel?: XOnSaveOrCancelProp, form?: JSX.Element) => void;
+export type XOpenFormForUpdate = (id: number, onSaveOrCancel?: XOnSaveOrCancelProp, form?: JSX.Element) => void;
 export interface XAppButtonForRow {
     key?: string;
     icon?: IconType<ButtonProps>;
@@ -31,6 +33,9 @@ export interface XEditModeHandlers {
     onMoveColumnLeft: (field: string) => void;
     onMoveColumnRight: (field: string) => void;
 }
+/**
+ * @deprecated was used to send props displayed and openForm to *Browse when using XFormNavigator (deprecated)
+ */
 export interface XBrowseProps {
     displayed?: boolean;
     openForm?: (newFormElement: JSX.Element | null) => void;
@@ -73,8 +78,8 @@ export interface XLazyDataTableProps {
     shrinkWidth?: boolean;
     onResetTable?: () => void;
     editForm?: JSX.Element;
-    onAddRow?: ((filters: DataTableFilterMeta) => void) | false;
-    onEdit?: ((selectedRow: any) => void) | false;
+    onAddRow?: ((filters: DataTableFilterMeta, openFormForInsert: XOpenFormForInsert) => void) | false;
+    onEdit?: ((selectedRow: any, openFormForUpdate: XOpenFormForUpdate) => void) | false;
     removeRow?: ((selectedRow: any) => Promise<boolean>) | boolean;
     onRemoveRow?: XOnSaveOrCancelProp;
     docTemplates?: true | ((entity: string) => Promise<XtDocTemplate[]>);
@@ -94,10 +99,13 @@ export interface XLazyDataTableProps {
     searchBrowseParams?: XSearchBrowseParams;
     width?: string;
     rowClassName?: (data: any) => object | string | undefined;
-    dataLoadedState?: [boolean, React.Dispatch<React.SetStateAction<boolean>>];
     exportFieldsToDuplicateValues?: string[];
     editMode?: boolean;
     editModeHandlers?: XEditModeHandlers;
+    /**
+     * @deprecated was used to reread data after save/cancel of the form when using XFormNavigator (deprecated),
+     * now method reread() is exposed and supposed to be called in onSaveOrCancel of the form
+     */
     displayed?: boolean;
     children: ReactChild[];
 }

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -161,12 +161,12 @@ var XStateKeySuffix;
     XStateKeySuffix["multilineSwitchValue"] = "multiline-switch-value";
 })(XStateKeySuffix = exports.XStateKeySuffix || (exports.XStateKeySuffix = {}));
 exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
-    var _b, _c;
-    var _d = _a.paginator, paginator = _d === void 0 ? true : _d, _e = _a.rows, rows = _e === void 0 ? 10 : _e, _f = _a.filterDisplay, filterDisplay = _f === void 0 ? "row" : _f, _g = _a.autoFilter, autoFilter = _g === void 0 ? false : _g, _h = _a.showFilterButtons, showFilterButtons = _h === void 0 ? true : _h, _j = _a.fullTextSearch, fullTextSearch = _j === void 0 ? true : _j, _k = _a.multilineSwitch, multilineSwitch = _k === void 0 ? false : _k, _l = _a.multilineSwitchInitValue, multilineSwitchInitValue = _l === void 0 ? "allLines" : _l, _m = _a.multilineSwitchFewLinesCount, multilineSwitchFewLinesCount = _m === void 0 ? 2 : _m, _o = _a.scrollable, scrollable = _o === void 0 ? true : _o, _p = _a.scrollWidth, scrollWidth = _p === void 0 ? 'viewport' : _p, // nastavi sirku tabulky na (100vw - nieco) (ak bude obsah sirsi, zapne horizontalny scrollbar)
-    _q = _a.scrollHeight, // nastavi sirku tabulky na (100vw - nieco) (ak bude obsah sirsi, zapne horizontalny scrollbar)
-    scrollHeight = _q === void 0 ? 'viewport' : _q, // nastavi vysku tabulky na (100vh - nieco) (ak bude obsah vecsi, zapne vertikalny scrollbar)
-    _r = _a.shrinkWidth, // nastavi vysku tabulky na (100vh - nieco) (ak bude obsah vecsi, zapne vertikalny scrollbar)
-    shrinkWidth = _r === void 0 ? true : _r, propsRest = __rest(_a, ["paginator", "rows", "filterDisplay", "autoFilter", "showFilterButtons", "fullTextSearch", "multilineSwitch", "multilineSwitchInitValue", "multilineSwitchFewLinesCount", "scrollable", "scrollWidth", "scrollHeight", "shrinkWidth"]);
+    var _b;
+    var _c = _a.paginator, paginator = _c === void 0 ? true : _c, _d = _a.rows, rows = _d === void 0 ? 30 : _d, _e = _a.filterDisplay, filterDisplay = _e === void 0 ? "row" : _e, _f = _a.autoFilter, autoFilter = _f === void 0 ? false : _f, _g = _a.showFilterButtons, showFilterButtons = _g === void 0 ? true : _g, _h = _a.fullTextSearch, fullTextSearch = _h === void 0 ? true : _h, _j = _a.multilineSwitch, multilineSwitch = _j === void 0 ? false : _j, _k = _a.multilineSwitchInitValue, multilineSwitchInitValue = _k === void 0 ? "allLines" : _k, _l = _a.multilineSwitchFewLinesCount, multilineSwitchFewLinesCount = _l === void 0 ? 2 : _l, _m = _a.scrollable, scrollable = _m === void 0 ? true : _m, _o = _a.scrollWidth, scrollWidth = _o === void 0 ? 'viewport' : _o, // nastavi sirku tabulky na (100vw - nieco) (ak bude obsah sirsi, zapne horizontalny scrollbar)
+    _p = _a.scrollHeight, // nastavi sirku tabulky na (100vw - nieco) (ak bude obsah sirsi, zapne horizontalny scrollbar)
+    scrollHeight = _p === void 0 ? 'viewport' : _p, // nastavi vysku tabulky na (100vh - nieco) (ak bude obsah vecsi, zapne vertikalny scrollbar)
+    _q = _a.shrinkWidth, // nastavi vysku tabulky na (100vh - nieco) (ak bude obsah vecsi, zapne vertikalny scrollbar)
+    shrinkWidth = _q === void 0 ? true : _q, propsRest = __rest(_a, ["paginator", "rows", "filterDisplay", "autoFilter", "showFilterButtons", "fullTextSearch", "multilineSwitch", "multilineSwitchInitValue", "multilineSwitchFewLinesCount", "scrollable", "scrollWidth", "scrollHeight", "shrinkWidth"]);
     var props = __assign({ paginator: paginator, rows: rows, filterDisplay: filterDisplay, autoFilter: autoFilter, showFilterButtons: showFilterButtons, fullTextSearch: fullTextSearch, multilineSwitch: multilineSwitch, multilineSwitchInitValue: multilineSwitchInitValue, multilineSwitchFewLinesCount: multilineSwitchFewLinesCount, scrollable: scrollable, scrollWidth: scrollWidth, scrollHeight: scrollHeight, shrinkWidth: shrinkWidth }, propsRest);
     // must be here, is used in createFiltersInit()
     var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity);
@@ -338,12 +338,12 @@ exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
     // ak mame fieldSet stlpce (stlpce ktore maju zadany fieldSetId a zobrazuju hodnoty podla fieldSet-u),
     // tak sem nacitame mapy umoznujuce ziskanie labelov zakliknutych field-ov
     // poznamka: uz by sa zislo mat vytvorene objekty (instancie) pre stlpce a do nich zapisovat pripadny XFieldSetMap, filter (teraz je vo "filters")
-    var _s = __read((0, react_1.useState)({}), 2), xFieldSetMaps = _s[0], setXFieldSetMaps = _s[1];
-    var _t = __read((0, react_1.useState)({ rowList: [], totalRecords: 0, aggregateValues: [] }), 2), value = _t[0], setValue = _t[1];
-    var _u = __read((0, react_1.useState)(undefined), 2), expandedRows = _u[0], setExpandedRows = _u[1];
-    var _v = __read((0, react_1.useState)(false), 2), loading = _v[0], setLoading = _v[1];
-    var _w = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.pagingFirst), 0), 2), first = _w[0], setFirst = _w[1];
-    var _x = __read((0, react_1.useState)(props.paginator ? props.rows : undefined), 2), rowsLocal = _x[0], setRowsLocal = _x[1];
+    var _r = __read((0, react_1.useState)({}), 2), xFieldSetMaps = _r[0], setXFieldSetMaps = _r[1];
+    var _s = __read((0, react_1.useState)({ rowList: [], totalRecords: 0, aggregateValues: [] }), 2), value = _s[0], setValue = _s[1];
+    var _t = __read((0, react_1.useState)(undefined), 2), expandedRows = _t[0], setExpandedRows = _t[1];
+    var _u = __read((0, react_1.useState)(false), 2), loading = _u[0], setLoading = _u[1];
+    var _v = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.pagingFirst), 0), 2), first = _v[0], setFirst = _v[1];
+    var _w = __read((0, react_1.useState)(props.paginator ? props.rows : undefined), 2), rowsLocal = _w[0], setRowsLocal = _w[1];
     // "filters" have special initialState function different from that used in useXStateSession
     var filtersInitialStateFunction = function () {
         var filtersInit = XUtils_1.XUtils.getValueFromStorage(getStateKey(XStateKeySuffix.filters), null);
@@ -357,20 +357,23 @@ exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
         }
         return filtersInit;
     };
-    var _y = __read((0, useXStateSessionBase_1.useXStateSessionBase)(getStateKey(XStateKeySuffix.filters), filtersInitialStateFunction), 2), filters = _y[0], setFilters = _y[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
+    var _x = __read((0, useXStateSessionBase_1.useXStateSessionBase)(getStateKey(XStateKeySuffix.filters), filtersInitialStateFunction), 2), filters = _x[0], setFilters = _x[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
     var initFtsInputValue = props.fullTextSearch ? createInitFtsInputValue() : undefined;
-    var _z = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.ftsInputValue), initFtsInputValue), 2), ftsInputValue = _z[0], setFtsInputValue = _z[1];
-    var _0 = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.optionalCustomFilter), undefined), 2), optionalCustomFilter = _0[0], setOptionalCustomFilter = _0[1];
-    var _1 = __read((_b = props.multilineSwitchValue) !== null && _b !== void 0 ? _b : (0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.multilineSwitchValue), props.multilineSwitchInitValue), 2), multilineSwitchValue = _1[0], setMultilineSwitchValue = _1[1];
-    var _2 = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.multiSortMeta), XUtilsCommon_1.XUtilsCommon.createMultiSortMeta(props.sortField)), 2), multiSortMeta = _2[0], setMultiSortMeta = _2[1];
-    var _3 = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.selectedRow), null), 2), selectedRow = _3[0], setSelectedRow = _3[1];
-    var _4 = __read((_c = props.dataLoadedState) !== null && _c !== void 0 ? _c : (0, react_1.useState)(false), 2), dataLoaded = _4[0], setDataLoaded = _4[1]; // priznak kde si zapiseme, ci uz sme nacitali data
-    var _5 = __read((0, react_1.useState)({ dialogOpened: false }), 2), exportRowsDialogState = _5[0], setExportRowsDialogState = _5[1];
+    var _y = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.ftsInputValue), initFtsInputValue), 2), ftsInputValue = _y[0], setFtsInputValue = _y[1];
+    var _z = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.optionalCustomFilter), undefined), 2), optionalCustomFilter = _z[0], setOptionalCustomFilter = _z[1];
+    var _0 = __read((_b = props.multilineSwitchValue) !== null && _b !== void 0 ? _b : (0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.multilineSwitchValue), props.multilineSwitchInitValue), 2), multilineSwitchValue = _0[0], setMultilineSwitchValue = _0[1];
+    var _1 = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.multiSortMeta), XUtilsCommon_1.XUtilsCommon.createMultiSortMeta(props.sortField)), 2), multiSortMeta = _1[0], setMultiSortMeta = _1[1];
+    var _2 = __read((0, useXStateSession_1.useXStateSession)(getStateKey(XStateKeySuffix.selectedRow), null), 2), selectedRow = _2[0], setSelectedRow = _2[1];
+    /**
+     * @deprecated was used to reread data after save/cancel of the form when using XFormNavigator (deprecated)
+     */
+    var _3 = __read((0, react_1.useState)(false), 2), dataLoaded = _3[0], setDataLoaded = _3[1]; // priznak kde si zapiseme, ci uz sme nacitali data
+    var _4 = __read((0, react_1.useState)({ dialogOpened: false }), 2), exportRowsDialogState = _4[0], setExportRowsDialogState = _4[1];
     //const [exportRowsDialogRowCount, setExportRowsDialogRowCount] = useState<number>(); // param pre dialog
-    var _6 = __read((0, react_1.useState)(filters), 2), filtersAfterFiltering = _6[0], setFiltersAfterFiltering = _6[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
-    var _7 = __read((0, react_1.useState)(ftsInputValue), 2), ftsInputValueAfterFiltering = _7[0], setFtsInputValueAfterFiltering = _7[1]; // tak isto ako filtersAfterFiltering
-    var _8 = __read((0, react_1.useState)(optionalCustomFilter), 2), optionalCustomFilterAfterFiltering = _8[0], setOptionalCustomFilterAfterFiltering = _8[1]; // tak isto ako filtersAfterFiltering
-    var _9 = __read((0, react_1.useState)({ opened: false }), 2), formDialogState = _9[0], setFormDialogState = _9[1];
+    var _5 = __read((0, react_1.useState)(filters), 2), filtersAfterFiltering = _5[0], setFiltersAfterFiltering = _5[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
+    var _6 = __read((0, react_1.useState)(ftsInputValue), 2), ftsInputValueAfterFiltering = _6[0], setFtsInputValueAfterFiltering = _6[1]; // tak isto ako filtersAfterFiltering
+    var _7 = __read((0, react_1.useState)(optionalCustomFilter), 2), optionalCustomFilterAfterFiltering = _7[0], setOptionalCustomFilterAfterFiltering = _7[1]; // tak isto ako filtersAfterFiltering
+    var _8 = __read((0, react_1.useState)({ opened: false }), 2), formDialogState = _8[0], setFormDialogState = _8[1];
     // parameter [] zabezpeci ze sa metoda zavola len po prvom renderingu (a nie po kazdej zmene stavu (zavolani setNieco()))
     (0, react_1.useEffect)(function () {
         // jednoduchy sposob - nepouzivame parameter props.displayed a priznak dataLoaded
@@ -761,16 +764,24 @@ exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
     var onClickAddRow = function () {
         //console.log("zavolany onClickAddRow");
         if (typeof props.onAddRow === 'function') {
-            props.onAddRow(filters);
+            props.onAddRow(filters, openFormForInsert);
         }
         else if (props.editForm !== undefined && props.onAddRow !== false) {
-            setFormDialogState({
-                opened: true,
-                id: undefined,
-                initValues: {}
-            });
+            openFormForInsert();
         }
     };
+    var openFormForInsert = function (initValues, onSaveOrCancel, form) {
+        if (props.editForm === undefined && form === undefined) {
+            throw "No form declared. XLazyDataTable.editForm is undefined and also form in call of the method openFormForInsert is undefined.";
+        }
+        setFormDialogState({
+            opened: true,
+            id: undefined,
+            initValues: initValues,
+            onSaveOrCancel: onSaveOrCancel !== null && onSaveOrCancel !== void 0 ? onSaveOrCancel : editRowOnSaveOrCancel,
+            form: form !== null && form !== void 0 ? form : props.editForm
+        });
+    };
     var onClickEditRow = function () {
         //console.log("zavolany onClickEditRow");
         if (selectedRow !== null) {
@@ -782,16 +793,24 @@ exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
     };
     var editRow = function (row) {
         if (typeof props.onEdit === 'function') {
-            props.onEdit(row);
+            props.onEdit(row, openFormForUpdate);
         }
         else if (props.editForm !== undefined && props.onEdit !== false) {
-            setFormDialogState({
-                opened: true,
-                id: row[dataKey],
-                initValues: undefined
-            });
+            openFormForUpdate(row[dataKey]);
         }
     };
+    var openFormForUpdate = function (id, onSaveOrCancel, form) {
+        if (props.editForm === undefined && form === undefined) {
+            throw "No form declared. XLazyDataTable.editForm is undefined and also form in call of the method openFormForUpdate is undefined.";
+        }
+        setFormDialogState({
+            opened: true,
+            id: id,
+            initValues: undefined,
+            onSaveOrCancel: onSaveOrCancel !== null && onSaveOrCancel !== void 0 ? onSaveOrCancel : editRowOnSaveOrCancel,
+            form: form !== null && form !== void 0 ? form : props.editForm
+        });
+    };
     var editRowOnSaveOrCancel = function (object, objectChange) {
         if (object !== null) {
             // save was pressed, reread from DB
@@ -1453,7 +1472,7 @@ exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
             props.appButtonsForRow && props.searchBrowseParams === undefined ? props.appButtonsForRow.map(function (xAppButton) { return react_1.default.createElement(XButton_1.XButton, { key: xAppButton.key, icon: xAppButton.icon, label: xAppButton.label, onClick: function () { return onClickAppButtonForRow(xAppButton.onClick); }, style: xAppButton.style }); }) : null,
             props.appButtons && props.searchBrowseParams === undefined,
             props.searchBrowseParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "choose", label: (0, XLocale_1.xLocaleOption)('chooseRow'), onClick: onClickChoose }) : null,
-            props.editForm != undefined ? react_1.default.createElement(XFormDialog_1.XFormDialog, { key: "formDialog", dialogState: formDialogState, form: props.editForm, onSaveOrCancel: editRowOnSaveOrCancel }) : null,
+            props.editForm != undefined ? react_1.default.createElement(XFormDialog_1.XFormDialog, { key: "formDialog", dialogState: formDialogState }) : null,
             exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { key: "exportRowsDialog", dialogState: exportRowsDialogState, hideDialog: function () { return setExportRowsDialogState({ dialogOpened: false }); } }) : null),
         hasContentTypeHtml() ? react_1.default.createElement(editor_1.Editor, { style: { display: 'none' }, showHeader: false }) : null /* we want to import css if needed (<style type="text/css" data-primereact-style-id="editor">) */));
 });

package/lib/components/XUtils.d.ts

@@ -8,6 +8,8 @@ import { DataTableSortMeta } from "primereact/datatable";
 import { XObject } from "./XObject";
 import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 import { SelectItem } from "primereact/selectitem";
+import { XLazyDataTableRef } from "./XLazyDataTable/XLazyDataTable";
+import { XOnSaveOrCancelProp } from "./XFormBase";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -117,4 +119,8 @@ export declare class XUtils {
     static isLocalhost(): boolean;
     static isNewVersion(): Promise<boolean>;
     static reload(): void;
+    /**
+     * @deprecated returns onSaveOrCancel method used when opening form from browse when using XFormNavigator (deprecated)
+     */
+    static onSaveOrCancelNavigator(openForm: (newFormElement: JSX.Element | null) => void, xLazyDataTableRef: React.RefObject<XLazyDataTableRef>): XOnSaveOrCancelProp;
 }

package/lib/components/XUtils.js

@@ -868,6 +868,20 @@ var XUtils = /** @class */ (function () {
         // warning - if user has typed some data in form, the data will be lost
         window.location.reload();
     };
+    /**
+     * @deprecated returns onSaveOrCancel method used when opening form from browse when using XFormNavigator (deprecated)
+     */
+    XUtils.onSaveOrCancelNavigator = function (openForm, xLazyDataTableRef) {
+        return function (object, objectChange) {
+            var _a;
+            // close form and display the previous form (it should be browse)
+            openForm(null);
+            if (object !== null) {
+                // save was pressed, reread from DB
+                (_a = xLazyDataTableRef.current) === null || _a === void 0 ? void 0 : _a.reread();
+            }
+        };
+    };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.35.1",
+  "version": "1.35.2",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",