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

package/lib/administration/XBrowseMetaForm.js

@@ -31,7 +31,7 @@ var XInputText_1 = require("../components/XInputText");
 var react_1 = __importDefault(require("react"));
 var XFormDataTable2_1 = require("../components/XFormDataTable2");
 var XFormFooter_1 = require("../components/XFormFooter");
-var XBrowseMetaForm = /** @class */ (function (_super) {
+var XBrowseMetaForm = exports.XBrowseMetaForm = /** @class */ (function (_super) {
     __extends(XBrowseMetaForm, _super);
     function XBrowseMetaForm() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -60,4 +60,3 @@ var XBrowseMetaForm = /** @class */ (function (_super) {
     ], XBrowseMetaForm);
     return XBrowseMetaForm;
 }(XFormBase_1.XFormBase));
-exports.XBrowseMetaForm = XBrowseMetaForm;

package/lib/administration/XParamForm.js

@@ -33,7 +33,7 @@ var XInputDate_1 = require("../components/XInputDate");
 var XInputText_1 = require("../components/XInputText");
 var XFormFooter_1 = require("../components/XFormFooter");
 var XFormHeader_1 = require("../components/XFormHeader");
-var XParamForm = /** @class */ (function (_super) {
+var XParamForm = exports.XParamForm = /** @class */ (function (_super) {
     __extends(XParamForm, _super);
     function XParamForm() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -59,4 +59,3 @@ var XParamForm = /** @class */ (function (_super) {
     ], XParamForm);
     return XParamForm;
 }(XFormBaseModif_1.XFormBaseModif));
-exports.XParamForm = XParamForm;

package/lib/administration/XUserForm.js

@@ -76,7 +76,7 @@ var XEnvVars_1 = require("../components/XEnvVars");
 var XFormBaseModif_1 = require("../components/XFormBaseModif");
 var XInputDate_1 = require("../components/XInputDate");
 var XFormHeader_1 = require("../components/XFormHeader");
-var XUserForm = /** @class */ (function (_super) {
+var XUserForm = exports.XUserForm = /** @class */ (function (_super) {
     __extends(XUserForm, _super);
     function XUserForm(props) {
         var _this = _super.call(this, props) || this;
@@ -188,4 +188,3 @@ var XUserForm = /** @class */ (function (_super) {
     ], XUserForm);
     return XUserForm;
 }(XFormBaseModif_1.XFormBaseModif));
-exports.XUserForm = XUserForm;

package/lib/components/XAutoCompleteBase.js

@@ -131,7 +131,7 @@ var button_1 = require("primereact/button");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XFormDialog_1 = require("./XFormDialog");
-var XAutoCompleteBase = /** @class */ (function (_super) {
+var XAutoCompleteBase = exports.XAutoCompleteBase = /** @class */ (function (_super) {
     __extends(XAutoCompleteBase, _super);
     function XAutoCompleteBase(props) {
         var _this = _super.call(this, props) || this;
@@ -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)));
@@ -752,4 +762,3 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
     };
     return XAutoCompleteBase;
 }(react_1.Component));
-exports.XAutoCompleteBase = XAutoCompleteBase;

package/lib/components/XEditor.js

@@ -23,7 +23,7 @@ var react_1 = __importDefault(require("react"));
 var XInput_1 = require("./XInput");
 var XUtils_1 = require("./XUtils");
 var XEditorBase_1 = require("./XEditorBase");
-var XEditor = /** @class */ (function (_super) {
+var XEditor = exports.XEditor = /** @class */ (function (_super) {
     __extends(XEditor, _super);
     function XEditor(props) {
         var _this = _super.call(this, props) || this;
@@ -61,4 +61,3 @@ var XEditor = /** @class */ (function (_super) {
     };
     return XEditor;
 }(XInput_1.XInput));
-exports.XEditor = XEditor;

package/lib/components/XEnvVars.js

@@ -14,7 +14,7 @@ var XEnvVar;
     XEnvVar["REACT_APP_MS_ENTRA_ID_TENANT_ID"] = "REACT_APP_MS_ENTRA_ID_TENANT_ID";
     XEnvVar["REACT_APP_MS_ENTRA_ID_CLIENT_ID"] = "REACT_APP_MS_ENTRA_ID_CLIENT_ID";
     XEnvVar["REACT_APP_MS_ENTRA_ID_BACKEND_SCOPE"] = "REACT_APP_MS_ENTRA_ID_BACKEND_SCOPE";
-})(XEnvVar = exports.XEnvVar || (exports.XEnvVar = {}));
+})(XEnvVar || (exports.XEnvVar = XEnvVar = {}));
 // enum for values of the environment variable REACT_APP_AUTH
 var XReactAppAuth;
 (function (XReactAppAuth) {
@@ -22,4 +22,4 @@ var XReactAppAuth;
     XReactAppAuth["LOCAL"] = "LOCAL";
     XReactAppAuth["AUTH0"] = "AUTH0";
     XReactAppAuth["MS_ENTRA_ID"] = "MS_ENTRA_ID";
-})(XReactAppAuth = exports.XReactAppAuth || (exports.XReactAppAuth = {}));
+})(XReactAppAuth || (exports.XReactAppAuth = XReactAppAuth = {}));

package/lib/components/XFieldSet/XFieldSetBase.js

@@ -38,7 +38,7 @@ var XFieldType;
     XFieldType["checkboxNullable"] = "checkboxNullable";
     XFieldType["inputText"] = "inputText";
     XFieldType["inputDecimal"] = "inputDecimal";
-})(XFieldType = exports.XFieldType || (exports.XFieldType = {}));
+})(XFieldType || (exports.XFieldType = XFieldType = {}));
 // children layout sa da nastavit len na type, ktory ma children - rootField, fieldGroup
 var XChildrenLayout;
 (function (XChildrenLayout) {
@@ -46,7 +46,7 @@ var XChildrenLayout;
     XChildrenLayout["row"] = "row";
     XChildrenLayout["tabView"] = "tabView";
     XChildrenLayout["tabViewWithHeaderGroup"] = "tabViewWithHeaderGroup"; // to iste co tabView ale prvy fieldGroup (0-ty tab) zobrazi nad tabView (aby bol vzdy pristupny)
-})(XChildrenLayout = exports.XChildrenLayout || (exports.XChildrenLayout = {}));
+})(XChildrenLayout || (exports.XChildrenLayout = XChildrenLayout = {}));
 // poznamka - tabView a tabViewWithHeaderGroup odignoruju bezne simple children - ak take budu existovat, zobrazi sa uzivatelovi warning pri nastaveni tabView
 // pouzijeme len checkbox supressFieldGroupPanel
 // pouziva sa len pre typ fieldGroup a len v pripade ak dany fieldGroup nie je vyrenderovany v nejakej tab-ke (jeho parent ma nastaveny layout tabView*)
@@ -58,7 +58,7 @@ var XFieldPropValuesFrom;
 (function (XFieldPropValuesFrom) {
     XFieldPropValuesFrom["parent"] = "parent";
     XFieldPropValuesFrom["this"] = "this"; // field prop values preberame z current fieldu
-})(XFieldPropValuesFrom = exports.XFieldPropValuesFrom || (exports.XFieldPropValuesFrom = {}));
+})(XFieldPropValuesFrom || (exports.XFieldPropValuesFrom = XFieldPropValuesFrom = {}));
 // zatial provizorne len na staticke metody
 var XFieldSetBase = /** @class */ (function () {
     function XFieldSetBase() {

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/XFormDataTable2.js

@@ -84,7 +84,7 @@ var XLocale_1 = require("./XLocale");
 var XInputIntervalDT_1 = require("./XInputIntervalDT");
 var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XInputTextareaDT_1 = require("./XInputTextareaDT");
-var XFormDataTable2 = /** @class */ (function (_super) {
+var XFormDataTable2 = exports.XFormDataTable2 = /** @class */ (function (_super) {
     __extends(XFormDataTable2, _super);
     function XFormDataTable2(props) {
         var e_1, _a;
@@ -728,7 +728,6 @@ var XFormDataTable2 = /** @class */ (function (_super) {
     };
     return XFormDataTable2;
 }(react_1.Component));
-exports.XFormDataTable2 = XFormDataTable2;
 // default props for XFormColumnBaseProps
 var XFormColumnBase_defaultProps = {
     columnViewStatus: true

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/XInputFileList.js

@@ -76,7 +76,7 @@ var XUtilsConversions_1 = require("../serverApi/XUtilsConversions");
 var XLocale_1 = require("./XLocale");
 var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 // notice: in skch there is new version XInputFileList2 and that version don´t use fetch api because fetch api does not support progress bar
-var XInputFileList = /** @class */ (function (_super) {
+var XInputFileList = exports.XInputFileList = /** @class */ (function (_super) {
     __extends(XInputFileList, _super);
     function XInputFileList(props) {
         var _this = _super.call(this, props) || this;
@@ -227,4 +227,3 @@ var XInputFileList = /** @class */ (function (_super) {
     };
     return XInputFileList;
 }(react_2.Component));
-exports.XInputFileList = XInputFileList;

package/lib/components/XInputTextarea.js

@@ -24,7 +24,7 @@ var XInput_1 = require("./XInput");
 var XUtils_1 = require("./XUtils");
 var XInputTextareaBase_1 = require("./XInputTextareaBase");
 var tooltip_1 = require("primereact/tooltip");
-var XInputTextarea = /** @class */ (function (_super) {
+var XInputTextarea = exports.XInputTextarea = /** @class */ (function (_super) {
     __extends(XInputTextarea, _super);
     function XInputTextarea(props) {
         var _this = _super.call(this, props) || this;
@@ -107,4 +107,3 @@ var XInputTextarea = /** @class */ (function (_super) {
     };
     return XInputTextarea;
 }(XInput_1.XInput));
-exports.XInputTextarea = XInputTextarea;

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

@@ -159,14 +159,14 @@ var XStateKeySuffix;
     XStateKeySuffix["pagingFirst"] = "paging-first";
     XStateKeySuffix["selectedRow"] = "selected-row";
     XStateKeySuffix["multilineSwitchValue"] = "multiline-switch-value";
-})(XStateKeySuffix = exports.XStateKeySuffix || (exports.XStateKeySuffix = {}));
+})(XStateKeySuffix || (exports.XStateKeySuffix = 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/XMultiSelectBase.js

@@ -90,7 +90,7 @@ var react_1 = __importStar(require("react"));
 var XUtils_1 = require("./XUtils");
 var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var multiselect_1 = require("primereact/multiselect");
-var XMultiSelectBase = /** @class */ (function (_super) {
+var XMultiSelectBase = exports.XMultiSelectBase = /** @class */ (function (_super) {
     __extends(XMultiSelectBase, _super);
     function XMultiSelectBase(props) {
         var _this = _super.call(this, props) || this;
@@ -142,4 +142,3 @@ var XMultiSelectBase = /** @class */ (function (_super) {
     };
     return XMultiSelectBase;
 }(react_1.Component));
-exports.XMultiSelectBase = XMultiSelectBase;

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

@@ -88,14 +88,14 @@ var OperationType;
     OperationType[OperationType["Insert"] = 1] = "Insert";
     OperationType[OperationType["Update"] = 2] = "Update";
     OperationType[OperationType["Remove"] = 3] = "Remove";
-})(OperationType = exports.OperationType || (exports.OperationType = {}));
+})(OperationType || (exports.OperationType = OperationType = {}));
 var XViewStatus;
 (function (XViewStatus) {
     XViewStatus["ReadWrite"] = "readWrite";
     XViewStatus["ReadOnly"] = "readOnly";
     XViewStatus["Hidden"] = "hidden";
-})(XViewStatus = exports.XViewStatus || (exports.XViewStatus = {}));
-var XUtils = /** @class */ (function () {
+})(XViewStatus || (exports.XViewStatus = XViewStatus = {}));
+var XUtils = exports.XUtils = /** @class */ (function () {
     function XUtils() {
     }
     XUtils.demo = function () {
@@ -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
@@ -889,4 +903,3 @@ var XUtils = /** @class */ (function () {
     XUtils.VERSION_CHECK_PERIOD = 10 * 60 * 1000; // 10 minutes in milliseconds
     return XUtils;
 }());
-exports.XUtils = XUtils;

package/lib/components/XUtilsMetadata.js

@@ -42,7 +42,7 @@ var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 // idelany nazov: UtilsEntityMetadata - ale strasne dlhy
 // tato funkcionalita by mala ist bud do tried XEntity, XField alebo lepsie do nejakeho servisu
 // ekvivalentna funkcionalita sa nachadza aj na servri v servise XEntityMetadataService.ts (TODO - v buducnosti spravit spolocnu triedu/servis)
-var XUtilsMetadata = /** @class */ (function () {
+var XUtilsMetadata = exports.XUtilsMetadata = /** @class */ (function () {
     function XUtilsMetadata() {
     }
     XUtilsMetadata.fetchAndSetXEntityMap = function () {
@@ -275,4 +275,3 @@ var XUtilsMetadata = /** @class */ (function () {
     XUtilsMetadata.CHAR_SIZE = 0.5; // 0.5rem (7px) - skusime
     return XUtilsMetadata;
 }());
-exports.XUtilsMetadata = XUtilsMetadata;

package/lib/serverApi/ExportImportParam.js

@@ -7,27 +7,27 @@ var ExportType;
     ExportType["Excel"] = "excel";
     ExportType["Csv"] = "csv";
     ExportType["Json"] = "json";
-})(ExportType = exports.ExportType || (exports.ExportType = {}));
+})(ExportType || (exports.ExportType = ExportType = {}));
 // exportovanie hodnot z toMany asociacii, pripadne viacriadkovych textov
 var XMultilineExportType;
 (function (XMultilineExportType) {
     XMultilineExportType["Singleline"] = "singleline";
     XMultilineExportType["Multiline"] = "multiline";
     XMultilineExportType["Off"] = "off"; // stlpce obsahujuce viac hodnot/riadkov sa vynechaju z exportu
-})(XMultilineExportType = exports.XMultilineExportType || (exports.XMultilineExportType = {}));
+})(XMultilineExportType || (exports.XMultilineExportType = XMultilineExportType = {}));
 // vo windowse zavisi od regionalnych nastaveni, default nastavenie je ";" a preto vecsinou aj excel produkuje csv s ";" (menej sa to bije s decimalmi)
 // takze primarne pouzivame ";" a sekundarne "," napr. pri generickom exporte do csv davame uzivatelovi na vyber
 var CsvSeparator;
 (function (CsvSeparator) {
     CsvSeparator["Semicolon"] = ";";
     CsvSeparator["Comma"] = ",";
-})(CsvSeparator = exports.CsvSeparator || (exports.CsvSeparator = {}));
+})(CsvSeparator || (exports.CsvSeparator = CsvSeparator = {}));
 // decimal format pouzivany pri exporte do csv
 var CsvDecimalFormat;
 (function (CsvDecimalFormat) {
     CsvDecimalFormat["Comma"] = "123456,78";
     CsvDecimalFormat["Dot"] = "123456.78";
-})(CsvDecimalFormat = exports.CsvDecimalFormat || (exports.CsvDecimalFormat = {}));
+})(CsvDecimalFormat || (exports.CsvDecimalFormat = CsvDecimalFormat = {}));
 // zatial len tieto 2, ak bude treba, tak pridat napr. win1252 (Western Europe)
 // win1250 pouzivame ako default, lebo Excel automaticky predpoklada kodovanie win1250
 // konstanty sa pouzivaju priamo v kniznici iconv-lite
@@ -35,10 +35,10 @@ var CsvEncoding;
 (function (CsvEncoding) {
     CsvEncoding["Utf8"] = "utf-8";
     CsvEncoding["Win1250"] = "win1250";
-})(CsvEncoding = exports.CsvEncoding || (exports.CsvEncoding = {}));
+})(CsvEncoding || (exports.CsvEncoding = CsvEncoding = {}));
 // ************** import ***************
 var ImportType;
 (function (ImportType) {
     ImportType["Csv"] = "csv";
     ImportType["Json"] = "json";
-})(ImportType = exports.ImportType || (exports.ImportType = {}));
+})(ImportType || (exports.ImportType = ImportType = {}));

package/lib/serverApi/FindParam.js

@@ -7,17 +7,17 @@ var ResultType;
     ResultType[ResultType["OnlyPagedRows"] = 1] = "OnlyPagedRows";
     ResultType[ResultType["RowCountAndPagedRows"] = 2] = "RowCountAndPagedRows";
     ResultType[ResultType["AllRows"] = 3] = "AllRows";
-})(ResultType = exports.ResultType || (exports.ResultType = {}));
+})(ResultType || (exports.ResultType = ResultType = {}));
 // additional match modes (extension to primereact enum FilterMatchMode)
 var XFilterMatchMode;
 (function (XFilterMatchMode) {
     XFilterMatchMode["X_AUTO_COMPLETE"] = "xAutoComplete";
     XFilterMatchMode["X_FILTER_ELEMENT"] = "xFilterElement"; // custom filter element (defined in filterElement property)
-})(XFilterMatchMode = exports.XFilterMatchMode || (exports.XFilterMatchMode = {}));
+})(XFilterMatchMode || (exports.XFilterMatchMode = XFilterMatchMode = {}));
 var XAggregateFunction;
 (function (XAggregateFunction) {
     XAggregateFunction["Min"] = "MIN";
     XAggregateFunction["Max"] = "MAX";
     XAggregateFunction["Sum"] = "SUM";
     XAggregateFunction["Avg"] = "AVG";
-})(XAggregateFunction = exports.XAggregateFunction || (exports.XAggregateFunction = {}));
+})(XAggregateFunction || (exports.XAggregateFunction = XAggregateFunction = {}));

package/lib/serverApi/XUtilsCommon.d.ts

@@ -55,4 +55,3 @@ export declare class XUtilsCommon {
     static today(): Date;
     static isInt(stringValue: string): boolean;
 }
-export declare const dateFormat: any;

package/lib/serverApi/XUtilsCommon.js

@@ -36,16 +36,17 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dateFormat = exports.XUtilsCommon = void 0;
+exports.XUtilsCommon = void 0;
 var XUtilsMetadataCommon_1 = require("./XUtilsMetadataCommon");
 var XUtilsConversions_1 = require("./XUtilsConversions");
-// funkcie spolocne pre Web i pre Server
-var XUtilsCommon = /** @class */ (function () {
+// common functions for frontend and backend
+var XUtilsCommon = exports.XUtilsCommon = /** @class */ (function () {
     function XUtilsCommon() {
     }
     // TODO - toto by sme mohli doplnit o kontrolu ak programator urobil preklep
     XUtilsCommon.getValueByPath = function (object, path) {
-        var _a = __read(XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
+        var _a;
+        var field = (_a = __read(XUtilsCommon.getFieldAndRestPath(path), 2), _a[0]), restPath = _a[1];
         if (restPath === null) {
             return object[field];
         }
@@ -63,8 +64,8 @@ var XUtilsCommon = /** @class */ (function () {
     // vseobecnejsia verzia, ktora funguje aj pre *toMany asociacie
     // TODO - toto by sme mohli doplnit o kontrolu ak programator urobil preklep
     XUtilsCommon.getValueOrValueListByPath = function (object, path) {
-        var e_1, _a;
-        var _b = __read(XUtilsCommon.getFieldAndRestPath(path), 2), field = _b[0], restPath = _b[1];
+        var _a, e_1, _b;
+        var field = (_a = __read(XUtilsCommon.getFieldAndRestPath(path), 2), _a[0]), restPath = _a[1];
         if (restPath === null) {
             return object[field];
         }
@@ -93,7 +94,7 @@ var XUtilsCommon = /** @class */ (function () {
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (assocObject_1_1 && !assocObject_1_1.done && (_a = assocObject_1.return)) _a.call(assocObject_1);
+                        if (assocObject_1_1 && !assocObject_1_1.done && (_b = assocObject_1.return)) _b.call(assocObject_1);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -111,7 +112,8 @@ var XUtilsCommon = /** @class */ (function () {
         }
     };
     XUtilsCommon.setValueByPath = function (object, path, value) {
-        var _a = __read(XUtilsCommon.getPathToAssocAndField(path), 2), pathToAssoc = _a[0], field = _a[1];
+        var _a;
+        var pathToAssoc = (_a = __read(XUtilsCommon.getPathToAssocAndField(path), 2), _a[0]), field = _a[1];
         if (pathToAssoc !== null) {
             var assocObject = XUtilsCommon.getValueByPath(object, pathToAssoc);
             // if null or undefined or is not object, then error
@@ -195,10 +197,10 @@ var XUtilsCommon = /** @class */ (function () {
         return displayValue;
     };
     XUtilsCommon.createDisplayValueForField = function (object, xEntity, field) {
-        var e_3, _a;
+        var _a, e_3, _b;
         // pouziva sa podobny algoritmus ako v XLazyDataTable - metoda bodyTemplate
         // (ale nie je to take komplexne ako v XLazyDataTable - nevie renderovat napr. html (rich text))
-        var _b = __read(XUtilsCommon.getPrefixAndField(field), 2), prefix = _b[0], fieldOnly = _b[1];
+        var prefix = (_a = __read(XUtilsCommon.getPrefixAndField(field), 2), _a[0]), fieldOnly = _a[1];
         var xField = undefined;
         if (xEntity) {
             xField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXFieldByPath(xEntity, fieldOnly);
@@ -223,7 +225,7 @@ var XUtilsCommon = /** @class */ (function () {
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (valueOrValueList_1_1 && !valueOrValueList_1_1.done && (_a = valueOrValueList_1.return)) _a.call(valueOrValueList_1);
+                    if (valueOrValueList_1_1 && !valueOrValueList_1_1.done && (_b = valueOrValueList_1.return)) _b.call(valueOrValueList_1);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -259,11 +261,11 @@ var XUtilsCommon = /** @class */ (function () {
             // TODO - ak pre datetime nastavime vsetky zlozky casu na 00:00:00, tak sformatuje hodnotu ako datum a spravi chybu pri zapise do DB - zapise  1:00:00
             var dateStr;
             if (this.getHours() === 0 && this.getMinutes() === 0 && this.getSeconds() === 0) {
-                dateStr = (0, exports.dateFormat)(this, 'yyyy-mm-dd');
+                dateStr = (0, XUtilsConversions_1.dateFormat)(this, 'yyyy-MM-dd');
             }
             else {
                 // jedna sa o datetime
-                dateStr = (0, exports.dateFormat)(this, 'yyyy-mm-dd HH:MM:ss');
+                dateStr = (0, XUtilsConversions_1.datetimeFormat)(this, 'yyyy-MM-dd HH:mm:ss');
             }
             return dateStr;
         };
@@ -558,6 +560,3 @@ var XUtilsCommon = /** @class */ (function () {
     XUtilsCommon.newLine = '\n';
     return XUtilsCommon;
 }());
-exports.XUtilsCommon = XUtilsCommon;
-// nevedel som importnut dateFormat, tak som to dal sem aby som nemusel vsade pouzivat require("dateformat")
-exports.dateFormat = require("dateformat");

package/lib/serverApi/XUtilsConversions.d.ts

@@ -17,7 +17,9 @@ export declare function dateFromUI(valueString: string, dateScale?: XDateScale):
 export declare function dateAsUI(value: Date | null, dateScale?: XDateScale): string;
 export declare function dateAsYYYY_MM_DD(date: Date): string;
 export declare function dateAsDB(date: Date | null): string;
+export declare function dateFormat(date: Date, format: string): string;
 export declare function datetimeAsUI(value: Date | null): string;
+export declare function datetimeFormat(date: Date, format: string): string;
 export declare function timeFromModel(value: any): Date | null;
 export declare function dateFormatUI(dateScale?: XDateScale): string;
 export declare function dateFormatCalendar(dateScale?: XDateScale): string;

package/lib/serverApi/XUtilsConversions.js

@@ -27,7 +27,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertValueBase = exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsDB = exports.dateAsYYYY_MM_DD = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.XDateScale = exports.numberFromString = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
+exports.convertValueBase = exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeFormat = exports.datetimeAsUI = exports.dateFormat = exports.dateAsDB = exports.dateAsYYYY_MM_DD = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.XDateScale = exports.numberFromString = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
 var XUtilsCommon_1 = require("./XUtilsCommon");
 var XLocale_1 = require("../components/XLocale");
 var XUtilsMetadataCommon_1 = require("./XUtilsMetadataCommon");
@@ -110,7 +110,7 @@ var XDateScale;
     XDateScale[XDateScale["Date"] = 1] = "Date";
     XDateScale[XDateScale["Month"] = 2] = "Month";
     XDateScale[XDateScale["Year"] = 3] = "Year"; // yyyy
-})(XDateScale = exports.XDateScale || (exports.XDateScale = {}));
+})(XDateScale || (exports.XDateScale = XDateScale = {}));
 //export type XDateType = "month" | "year" | "date";
 // v modeli na klientovi by mal byt vzdy Date, teraz je tam niekedy string (z json-u zo servera) a niekedy Date (z komponentu)
 // provizorne zatial takato konverzia
@@ -208,7 +208,7 @@ exports.dateFromUI = dateFromUI;
 function dateAsUI(value, dateScale) {
     if (dateScale === void 0) { dateScale = XDateScale.Date; }
     if (value !== null) {
-        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI(dateScale));
+        return dateFormat(value, dateFormatUI(dateScale));
     }
     else {
         return "";
@@ -217,30 +217,54 @@ function dateAsUI(value, dateScale) {
 exports.dateAsUI = dateAsUI;
 // specialna funkcia - konvertuje Date na string YYYY-MM-DD
 function dateAsYYYY_MM_DD(date) {
-    var monthStr = (date.getMonth() + 1).toString();
-    if (monthStr.length < 2) {
-        monthStr = "0" + monthStr;
-    }
-    var dayStr = date.getDate().toString();
-    if (dayStr.length < 2) {
-        dayStr = "0" + dayStr;
-    }
-    return "".concat(date.getFullYear(), "-").concat(monthStr, "-").concat(dayStr);
+    return dateFormat(date, 'yyyy-MM-dd');
 }
 exports.dateAsYYYY_MM_DD = dateAsYYYY_MM_DD;
 function dateAsDB(date) {
     return date !== null ? "'".concat(dateAsYYYY_MM_DD(date), "'::DATE") : "NULL::DATE";
 }
 exports.dateAsDB = dateAsDB;
+// the same like function format(this, 'yyyy-MM-dd');
+function dateFormat(date, format) {
+    var pad = function (num) { return num.toString().padStart(2, '0'); };
+    var year = date.getFullYear();
+    var month = pad(date.getMonth() + 1); // Months are zero-based
+    var day = pad(date.getDate());
+    var value = format;
+    value = value.replace('yyyy', "".concat(year));
+    value = value.replace('MM', month);
+    value = value.replace('dd', day);
+    return value;
+}
+exports.dateFormat = dateFormat;
 function datetimeAsUI(value) {
     if (value !== null) {
-        return (0, XUtilsCommon_1.dateFormat)(value, datetimeFormatUI());
+        return datetimeFormat(value, datetimeFormatUI());
     }
     else {
         return "";
     }
 }
 exports.datetimeAsUI = datetimeAsUI;
+// the same like function format(this, 'yyyy-MM-dd HH:mm:ss');
+function datetimeFormat(date, format) {
+    var pad = function (num) { return num.toString().padStart(2, '0'); };
+    var year = date.getFullYear();
+    var month = pad(date.getMonth() + 1); // Months are zero-based
+    var day = pad(date.getDate());
+    var hours = pad(date.getHours());
+    var minutes = pad(date.getMinutes());
+    var seconds = pad(date.getSeconds());
+    var value = format;
+    value = value.replace('yyyy', "".concat(year));
+    value = value.replace('MM', month);
+    value = value.replace('dd', day);
+    value = value.replace('HH', hours);
+    value = value.replace('mm', minutes);
+    value = value.replace('ss', seconds);
+    return value;
+}
+exports.datetimeFormat = datetimeFormat;
 // provizorne zatial takato konverzia
 function timeFromModel(value) {
     var timeValue = null;
@@ -272,10 +296,10 @@ function dateFormatUI(dateScale) {
     if (dateScale === void 0) { dateScale = XDateScale.Date; }
     var format;
     if (dateScale === XDateScale.Date) {
-        format = "dd.mm.yyyy";
+        format = "dd.MM.yyyy";
     }
     else if (dateScale === XDateScale.Month) {
-        format = "mm.yyyy";
+        format = "MM.yyyy";
     }
     else if (dateScale === XDateScale.Year) {
         format = "yyyy";
@@ -305,7 +329,7 @@ function dateFormatCalendar(dateScale) {
 }
 exports.dateFormatCalendar = dateFormatCalendar;
 function datetimeFormatUI() {
-    return "dd.mm.yyyy HH:MM:ss";
+    return "dd.MM.yyyy HH:mm:ss";
 }
 exports.datetimeFormatUI = datetimeFormatUI;
 function intervalFromUI(valueString) {
@@ -374,7 +398,7 @@ var AsUIType;
     AsUIType[AsUIType["Form"] = 1] = "Form";
     AsUIType[AsUIType["Text"] = 2] = "Text";
     AsUIType[AsUIType["Excel"] = 3] = "Excel"; // excel - nie vsetko konvertujeme do string-u, vecsinou zostavame pri typoch number, Date
-})(AsUIType = exports.AsUIType || (exports.AsUIType = {}));
+})(AsUIType || (exports.AsUIType = AsUIType = {}));
 /**
  * converts values of object
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.35.1",
+  "version": "1.36.0",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",
@@ -19,28 +19,29 @@
   },
   "author": "Michal Rakus",
   "license": "MIT",
+  "engines": {
+    "node": ">=20"
+  },
   "dependencies": {
-    "dateformat": "^4.6.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^29.5.0",
-    "@types/lodash": "^4.14.202",
-    "@types/node": "^18.15.3",
-    "@types/react": "^18.3.1",
-    "@types/react-dom": "^18.3.1",
-    "@types/react-transition-group": "^4.4.5",
-    "gulp": "^4.0.2",
-    "rimraf": "^4.4.0",
-    "typescript": "^4.9.5"
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^14.1.2",
+    "@testing-library/user-event": "^14.5.2",
+    "@types/lodash": "^4.17.16",
+    "@types/node": "^22.7.4",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.0",
+    "@types/react-transition-group": "^4.4.11",
+    "gulp": "^5.0.0",
+    "rimraf": "^6.0.1",
+    "typescript": "5.1.6"
   },
   "peerDependencies": {
     "primeflex": "^3.3.1",
     "primeicons": "^7.0.0",
-    "primereact": "10.8.5",
+    "primereact": "10.9.4",
     "quill": "^2.0.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",