@michalrakus/x-react-web-lib 1.36.1 → 1.37.1

package/XCheckboxBase.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/components/XCheckboxBase';

package/XCheckboxBase.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/components/XCheckboxBase.js');

package/gulpfile.js

@@ -43,6 +43,7 @@ function generateApi(cb) {
         "./lib/components/XCalendar",
         "./lib/components/XChangePasswordForm",
         "./lib/components/XCheckbox",
+        "./lib/components/XCheckboxBase",
         "./lib/components/XDropdown",
         "./lib/components/XDropdownForEntity",
         "./lib/components/XEditBrowse",

package/lib/components/XCheckbox.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="react" />
 import { XInput, XInputProps } from "./XInput";
-import { CheckboxChangeEvent } from "primereact/checkbox";
 export interface XCheckboxProps extends XInputProps<boolean> {
     isNotNull?: boolean;
 }
@@ -8,7 +7,6 @@ export declare class XCheckbox extends XInput<boolean, XCheckboxProps> {
     constructor(props: XCheckboxProps);
     isNotNull(): boolean;
     getValue(): boolean | null;
-    checkboxOnValueChange(e: CheckboxChangeEvent): void;
-    triStateCheckboxOnValueChange(e: any): void;
+    onValueChange(value: boolean | null): void;
     render(): JSX.Element;
 }

package/lib/components/XCheckbox.js

@@ -20,47 +20,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XCheckbox = void 0;
 var react_1 = __importDefault(require("react"));
-var tristatecheckbox_1 = require("primereact/tristatecheckbox");
 var XInput_1 = require("./XInput");
-var checkbox_1 = require("primereact/checkbox");
+var XCheckboxBase_1 = require("./XCheckboxBase");
 var XCheckbox = /** @class */ (function (_super) {
     __extends(XCheckbox, _super);
     function XCheckbox(props) {
         var _this = _super.call(this, props) || this;
-        _this.checkboxOnValueChange = _this.checkboxOnValueChange.bind(_this);
-        _this.triStateCheckboxOnValueChange = _this.triStateCheckboxOnValueChange.bind(_this);
+        _this.onValueChange = _this.onValueChange.bind(_this);
         return _this;
     }
     XCheckbox.prototype.isNotNull = function () {
         return this.props.isNotNull || _super.prototype.isNotNull.call(this);
     };
     XCheckbox.prototype.getValue = function () {
-        // konvertovat null hodnotu na "" (vo funkcii stringAsUI) je dolezite aby sa prejavila zmena na null v modeli
-        var value = this.getValueFromObject();
-        return value;
+        return this.getValueFromObject();
     };
-    XCheckbox.prototype.checkboxOnValueChange = function (e) {
-        this.onValueChangeBase(e.checked, this.props.onChange);
-    };
-    XCheckbox.prototype.triStateCheckboxOnValueChange = function (e) {
-        var newValue = e.value;
-        // pri klikani na TriStateCheckbox prichadza v newValue cyklicky: true -> false -> null
-        // ak mame not null atribut, tak pri null hodnote skocime rovno na true
-        if (this.isNotNull()) {
-            if (newValue === null) {
-                newValue = true;
-            }
-        }
-        // zmenime hodnotu v modeli (odtial sa hodnota cita)
-        this.onValueChangeBase(newValue, this.props.onChange);
+    XCheckbox.prototype.onValueChange = function (value) {
+        this.onValueChangeBase(value, this.props.onChange);
     };
     XCheckbox.prototype.render = function () {
-        var _a;
-        // note: style overrides size (width of the input according to character count)
-        // pre not null atributy pouzijeme standardny checkbox aby sme pre false mali prazdny biely checkbox - TODO - pomenit ikonky na TriStateCheckbox aby to pekne sedelo
-        var element = this.isNotNull()
-            ? react_1.default.createElement(checkbox_1.Checkbox, { id: this.props.field, checked: (_a = this.getValue()) !== null && _a !== void 0 ? _a : false, onChange: this.checkboxOnValueChange, disabled: this.isReadOnly(), style: this.props.inputStyle, tooltip: this.props.tooltip })
-            : react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { id: this.props.field, value: this.getValue(), onChange: this.triStateCheckboxOnValueChange, disabled: this.isReadOnly(), style: this.props.inputStyle, tooltip: this.props.tooltip });
+        var element = react_1.default.createElement(XCheckboxBase_1.XCheckboxBase, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), isNotNull: this.isNotNull(), tooltip: this.props.tooltip, error: this.getError(), style: this.props.inputStyle });
         if (!this.props.onlyInput) {
             var label = this.props.label; // nepridavame * ani ak je atribut not null (kedze sa pouziva jednoduchy checkbox, nie je mozne zadat null hodnotu)
             element = react_1.default.createElement("div", { className: "field grid" },

package/lib/components/XCheckboxBase.d.ts

@@ -0,0 +1,11 @@
+import React, { CSSProperties } from "react";
+export declare const XCheckboxBase: (props: {
+    id?: string | undefined;
+    value: boolean | null;
+    onChange: (value: boolean | null) => void;
+    readOnly?: boolean | undefined;
+    isNotNull?: boolean | undefined;
+    tooltip?: string | undefined;
+    error?: string | undefined;
+    style?: CSSProperties | undefined;
+}) => React.JSX.Element;

package/lib/components/XCheckboxBase.js

@@ -0,0 +1,52 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XCheckboxBase = void 0;
+var react_1 = __importDefault(require("react"));
+var tristatecheckbox_1 = require("primereact/tristatecheckbox");
+var checkbox_1 = require("primereact/checkbox");
+var XUtils_1 = require("./XUtils");
+var XCheckboxBase = function (props) {
+    var _a;
+    var checkboxOnChange = function (e) {
+        var _a;
+        props.onChange((_a = e.checked) !== null && _a !== void 0 ? _a : false);
+    };
+    var triStateCheckboxChange = function (e) {
+        var _a;
+        // for blank value comes empty string "" (bug in primereact?)
+        var newValue = null;
+        if (typeof e.value !== 'string') {
+            newValue = (_a = e.value) !== null && _a !== void 0 ? _a : null;
+        }
+        // pri klikani na TriStateCheckbox prichadza v newValue cyklicky: true -> false -> null
+        // ak mame not null atribut, tak pri null hodnote skocime rovno na true
+        // TODO - pouzijeme, ked zrusime Checkbox a nechame len TriStateCheckbox
+        // if (props.isNotNull) {
+        //     if (newValue === null) {
+        //         newValue = true;
+        //     }
+        // }
+        props.onChange(newValue);
+    };
+    return (
+    // pre not null atributy pouzijeme standardny checkbox aby sme pre false mali prazdny biely checkbox
+    // TODO - pomenit ikonky na TriStateCheckbox aby to pekne sedelo, potom mozme zrusit Checkbox
+    props.isNotNull ?
+        react_1.default.createElement(checkbox_1.Checkbox, __assign({ id: props.id, checked: (_a = props.value) !== null && _a !== void 0 ? _a : false, onChange: checkboxOnChange, disabled: props.readOnly, style: props.style }, XUtils_1.XUtils.createTooltipOrErrorProps(props.error, props.tooltip)))
+        : react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, __assign({ id: props.id, value: props.value, onChange: triStateCheckboxChange, disabled: props.readOnly, style: props.style }, XUtils_1.XUtils.createTooltipOrErrorProps(props.error, props.tooltip))));
+};
+exports.XCheckboxBase = XCheckboxBase;

package/lib/components/XCheckboxDT.d.ts

@@ -1,11 +1,10 @@
-import { XFormBase } from "./XFormBase";
 import React from "react";
-import { XField } from "../serverApi/XEntityMetadata";
-import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
-export declare const XCheckboxDT: (props: {
-    form: XFormBase;
-    xField: XField;
-    field: string;
-    rowData: any;
-    readOnly?: XTableFieldReadOnlyProp | undefined;
-}) => React.JSX.Element;
+import { XInputDT, XInputDTProps } from "./XInputDT";
+export interface XCheckboxDTProps extends XInputDTProps {
+}
+export declare class XCheckboxDT extends XInputDT<XCheckboxDTProps> {
+    constructor(props: XCheckboxDTProps);
+    getValue(): boolean | null;
+    onValueChange(value: boolean | null): void;
+    render(): React.JSX.Element;
+}

package/lib/components/XCheckboxDT.js

@@ -1,39 +1,43 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XCheckboxDT = void 0;
 var react_1 = __importDefault(require("react"));
-var tristatecheckbox_1 = require("primereact/tristatecheckbox");
-var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
-var XUtils_1 = require("./XUtils");
-var XCheckboxDT = function (props) {
-    var onValueChange = function (field, rowData, newValue) {
-        // pri klikani na TriStateCheckbox prichadza v newValue cyklicky: true -> false -> null
-        // ak mame not null atribut, tak pri null hodnote skocime rovno na true
-        if (!props.xField.isNullable) {
-            if (newValue === null) {
-                newValue = true;
-            }
-        }
-        // zmenime hodnotu v modeli (odtial sa hodnota cita)
-        rowData[field] = newValue;
-        // kedze "rowData" je sucastou "props.form.state.object", tak nam staci zavolat setState({object: object}), aby sa zmena prejavila
-        props.form.onObjectDataChange();
-    };
-    var fieldValue = null;
-    // test na undefined je tu koli insertu noveho riadku
-    if (props.rowData !== undefined && props.rowData !== null) {
-        var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueByPath(props.rowData, props.field);
-        //  pri inserte noveho riadku su (zatial) vsetky fieldy undefined, dame na null, null je standard
-        if (rowDataValue === undefined) {
-            rowDataValue = null;
-        }
-        // konvertovat null hodnotu na "" (vo funkcii stringAsUI) je dolezite aby sa prejavila zmena na null v modeli (a tiez aby korektne pridal novy riadok)
-        fieldValue = rowDataValue;
+var XInputDT_1 = require("./XInputDT");
+var XCheckboxBase_1 = require("./XCheckboxBase");
+var XCheckboxDT = /** @class */ (function (_super) {
+    __extends(XCheckboxDT, _super);
+    function XCheckboxDT(props) {
+        var _this = _super.call(this, props) || this;
+        _this.onValueChange = _this.onValueChange.bind(_this);
+        return _this;
     }
-    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(props.field, props.readOnly, props.form.state.object, props.rowData);
-    return (react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { id: props.field, value: fieldValue, onChange: function (e) { return onValueChange(props.field, props.rowData, e.value); }, disabled: readOnly }));
-};
+    XCheckboxDT.prototype.getValue = function () {
+        return this.getValueFromRowData();
+    };
+    XCheckboxDT.prototype.onValueChange = function (value) {
+        this.onValueChangeBase(value, this.props.onChange);
+    };
+    XCheckboxDT.prototype.render = function () {
+        return (react_1.default.createElement(XCheckboxBase_1.XCheckboxBase, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), isNotNull: this.isNotNull(), error: this.getError(), style: this.props.inputStyle }));
+    };
+    return XCheckboxDT;
+}(XInputDT_1.XInputDT));
 exports.XCheckboxDT = XCheckboxDT;

package/lib/components/XFormDataTable2.js

@@ -394,7 +394,7 @@ var XFormDataTable2 = exports.XFormDataTable2 = /** @class */ (function (_super)
                 body = react_1.default.createElement(XInputIntervalDT_1.XInputIntervalDT, { form: this.props.form, entity: this.getEntity(), field: columnPropsInputSimple.field, rowData: rowData, readOnly: readOnly, onChange: columnPropsInputSimple.onChange });
             }
             else if (xField.type === "boolean") {
-                body = react_1.default.createElement(XCheckboxDT_1.XCheckboxDT, { form: this.props.form, xField: xField, field: columnPropsInputSimple.field, rowData: rowData, readOnly: readOnly });
+                body = react_1.default.createElement(XCheckboxDT_1.XCheckboxDT, { form: this.props.form, entity: this.getEntity(), field: columnPropsInputSimple.field, rowData: rowData, readOnly: readOnly, onChange: columnPropsInputSimple.onChange });
             }
             else {
                 // xField.type === "string", pripadne ine jednoduche typy

package/lib/components/XInput.d.ts

@@ -4,6 +4,7 @@ import { XField } from "../serverApi/XEntityMetadata";
 export interface XInputProps<T> extends XFormComponentProps<T> {
     field: string;
     inputStyle?: React.CSSProperties;
+    inputClassName?: string;
 }
 export declare abstract class XInput<T, P extends XInputProps<T>> extends XFormComponent<T, P> {
     protected xField: XField;

package/lib/components/XInputTextarea.js

@@ -99,7 +99,7 @@ var XInputTextarea = exports.XInputTextarea = /** @class */ (function (_super) {
             react_1.default.createElement("label", { id: labelElemId, htmlFor: this.props.field, className: !this.labelOnTop ? 'col-fixed' : undefined, style: labelStyle }, this.getLabel()),
             labelTooltip ? react_1.default.createElement(tooltip_1.Tooltip, { target: "#".concat(labelElemId), content: labelTooltip }) : null,
             this.props.form.state.object ?
-                react_1.default.createElement(XInputTextareaBase_1.XInputTextareaBase, { ref: this.xInputTextareaBaseRef, id: this.props.field, value: value, onChange: this.onValueChange, readOnly: this.isReadOnly(), maxLength: this.xField.length, style: inputStyle, rows: this.props.rows, cols: cols, autoResize: this.props.autoResize, error: this.getError(), tooltip: this.props.tooltip, placeholder: (_b = this.props.placeholder) !== null && _b !== void 0 ? _b : this.props.desc })
+                react_1.default.createElement(XInputTextareaBase_1.XInputTextareaBase, { ref: this.xInputTextareaBaseRef, id: this.props.field, value: value, onChange: this.onValueChange, readOnly: this.isReadOnly(), maxLength: this.xField.length, style: inputStyle, className: this.props.inputClassName, rows: this.props.rows, cols: cols, autoResize: this.props.autoResize, error: this.getError(), tooltip: this.props.tooltip, placeholder: (_b = this.props.placeholder) !== null && _b !== void 0 ? _b : this.props.desc })
                 : null));
     };
     XInputTextarea.defaultProps = {

package/lib/components/XInputTextareaBase.d.ts

@@ -9,6 +9,7 @@ export interface XInputTextareaBaseProps {
     readOnly?: boolean;
     error?: string;
     style?: React.CSSProperties;
+    className?: string;
     maxLength?: number;
     tooltip?: string;
     placeholder?: string;

package/lib/components/XInputTextareaBase.js

@@ -99,7 +99,7 @@ var XInputTextareaBase = /** @class */ (function (_super) {
         }
     };
     XInputTextareaBase.prototype.render = function () {
-        return (react_1.default.createElement(inputtextarea_1.InputTextarea, __assign({ ref: this.inputTextareaRef, id: this.props.id, value: this.getInputValue(), onChange: this.onChange, onBlur: this.onBlur, readOnly: this.props.readOnly, maxLength: this.props.maxLength, style: this.props.style, rows: this.props.rows, cols: this.props.cols, autoResize: this.props.autoResize }, XUtils_1.XUtils.createTooltipOrErrorProps(this.props.error, this.props.tooltip), { placeholder: this.props.placeholder })));
+        return (react_1.default.createElement(inputtextarea_1.InputTextarea, __assign({ ref: this.inputTextareaRef, id: this.props.id, value: this.getInputValue(), onChange: this.onChange, onBlur: this.onBlur, readOnly: this.props.readOnly, maxLength: this.props.maxLength, style: this.props.style, rows: this.props.rows, cols: this.props.cols, autoResize: this.props.autoResize }, XUtils_1.XUtils.addClassName(XUtils_1.XUtils.createTooltipOrErrorProps(this.props.error, this.props.tooltip), this.props.className), { placeholder: this.props.placeholder })));
     };
     return XInputTextareaBase;
 }(react_1.Component));

package/lib/components/XUtils.d.ts

@@ -101,7 +101,7 @@ export declare class XUtils {
     static createTooltipOrErrorProps(error: string | undefined, tooltip?: string | undefined): object;
     static addClassName(props: {
         [key: string]: any;
-    }, className: string): {
+    }, className: string | undefined): {
         [key: string]: any;
     };
     static getErrorMessages(xErrorMap: XErrorMap): string;

package/lib/components/XUtils.js

@@ -617,11 +617,13 @@ var XUtils = exports.XUtils = /** @class */ (function () {
     // pouzivame ju, lebo XUtils.createErrorProps nam prebijal className
     XUtils.addClassName = function (props, className) {
         var propsClassName = props.className;
-        if (propsClassName !== undefined) {
-            propsClassName += " " + className;
-        }
-        else {
-            propsClassName = className;
+        if (className !== undefined) {
+            if (propsClassName !== undefined) {
+                propsClassName += " " + className;
+            }
+            else {
+                propsClassName = className;
+            }
         }
         props.className = propsClassName;
         return props;

package/lib/serverApi/XUtilsCommon.d.ts

@@ -48,10 +48,14 @@ export declare class XUtilsCommon {
     static dateAddDays(date: Date | null, days: number): Date | null;
     static dateAddMonths(date: Date | null, months: number): Date | null;
     static dateEquals(date1: Date | null, date2: Date | null): boolean;
+    static dateIntersect(date1From: Date, date1To: Date, date2From: Date, date2To: Date): boolean;
+    static dateCompare(date1: Date, date2: Date): number;
     static dateDiffInYears(dateOld: Date | null, dateNew: Date | null): number | null;
     static monthDiff(monthOld: Date | null, monthNew: Date | null): number | null;
     static findFirstMatch(pattern: RegExp, value: string): string | null;
     static sqlMaxDateIfNull(sqlExp: string): string;
     static today(): Date;
+    static currentMonth(): Date;
+    static dateAsMonth(date: Date | null): Date | null;
     static isInt(stringValue: string): boolean;
 }

package/lib/serverApi/XUtilsCommon.js

@@ -486,7 +486,8 @@ var XUtilsCommon = exports.XUtilsCommon = /** @class */ (function () {
             result = true;
         }
         else if (date1 !== null && date2 !== null) {
-            result = (date1.getTime() === date2.getTime());
+            // to avoid problems with time part, we use dateCompare
+            result = (XUtilsCommon.dateCompare(date1, date2) === 0);
             // mali sme problem - funkcia dateFromModel() konvertovala string "2025-02-04" na Tue Feb 04 2025 01:00:00 GMT+0100 (Central European Standard Time)
             // a XCalendar pri vykliknuti datumu vracal Tue Feb 04 2025 00:00:00 GMT+0100 (Central European Standard Time) -> opravili sme XCalendar
             //result = date1.getFullYear() === date2.getFullYear()
@@ -495,6 +496,24 @@ var XUtilsCommon = exports.XUtilsCommon = /** @class */ (function () {
         }
         return result;
     };
+    XUtilsCommon.dateIntersect = function (date1From, date1To, date2From, date2To) {
+        return XUtilsCommon.dateCompare(date1From, date2To) <= 0 && XUtilsCommon.dateCompare(date2From, date1To) <= 0;
+    };
+    // because of time part, the usual compare (using <=) sometimes does not work correct
+    XUtilsCommon.dateCompare = function (date1, date2) {
+        var dateOnly1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+        var dateOnly2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+        if (dateOnly1.getTime() < dateOnly2.getTime()) {
+            return -1;
+        }
+        else if (dateOnly1.getTime() === dateOnly2.getTime()) {
+            return 0;
+        }
+        else {
+            // dateOnly1 > dateOnly2
+            return 1;
+        }
+    };
     // solution from internet
     XUtilsCommon.dateDiffInYears = function (dateOld, dateNew) {
         var diff = null;
@@ -553,6 +572,17 @@ var XUtilsCommon = exports.XUtilsCommon = /** @class */ (function () {
     XUtilsCommon.today = function () {
         return new Date((0, XUtilsConversions_1.dateAsYYYY_MM_DD)(new Date()));
     };
+    XUtilsCommon.currentMonth = function () {
+        return XUtilsCommon.dateAsMonth(XUtilsCommon.today());
+    };
+    XUtilsCommon.dateAsMonth = function (date) {
+        var month = null;
+        if (date !== null) {
+            month = new Date(date); // create copy not to change "date"
+            month.setUTCDate(1); // first day of month
+        }
+        return month;
+    };
     // vrati true ak sa string sklada iba z cislic, moze mat + alebo - na zaciatku
     XUtilsCommon.isInt = function (stringValue) {
         return /^[-+]?\d+$/.test(stringValue);

package/package.json

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