@michalrakus/x-react-web-lib 1.24.1 → 1.25.0

package/lib/components/XInputDate.d.ts

@@ -1,8 +1,10 @@
 import React from "react";
 import { XFormComponentProps } from "./XFormComponent";
 import { XInput } from "./XInput";
+import { XDateScale } from "../serverApi/XUtilsConversions";
 export interface XInputDateProps extends XFormComponentProps<number> {
     field: string;
+    scale?: XDateScale;
 }
 export declare class XInputDate extends XInput<Date, XInputDateProps> {
     constructor(props: XInputDateProps);

package/lib/components/XInputDate.js

@@ -39,10 +39,11 @@ var XInputDate = /** @class */ (function (_super) {
         this.onValueChangeBase(value, this.props.onChange);
     };
     XInputDate.prototype.render = function () {
+        var _a;
         // note: style overrides size (width of the input according to character count)
         return (react_1.default.createElement("div", { className: "field grid" },
             react_1.default.createElement("label", { htmlFor: this.props.field, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
-            react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError(), scale: this.xField.scale, datetime: this.xField.type === 'datetime' })));
+            react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError(), scale: (_a = this.props.scale) !== null && _a !== void 0 ? _a : this.xField.scale, datetime: this.xField.type === 'datetime' })));
     };
     return XInputDate;
 }(XInput_1.XInput));

package/lib/components/XInputText.js

@@ -60,21 +60,30 @@ var XInputText = /** @class */ (function (_super) {
     };
     XInputText.prototype.render = function () {
         var _a, _b;
+        var label = this.getLabel();
         var value = this.getValue();
         var labelTooltip = undefined;
         var labelElemId = undefined;
+        var inputTooltip = this.props.tooltip;
         if (value) {
-            // nevidno placeholder, tak zobrazime desc ako label tooltip
-            labelTooltip = this.props.desc;
-            labelElemId = "".concat(this.props.field, "_label_id");
+            // nevidno placeholder, tak zobrazime desc ako label tooltip (ak mam label)
+            if (label !== undefined) {
+                labelTooltip = this.props.desc;
+                labelElemId = "".concat(this.props.field, "_label_id");
+            }
+            else {
+                // nemame label, dame pripadny desc ako tooltip na input
+                if (inputTooltip === undefined) {
+                    inputTooltip = this.props.desc;
+                }
+            }
         }
         var size = (_a = this.props.size) !== null && _a !== void 0 ? _a : this.xField.length;
         // note: style overrides size (width of the input according to character count)
-        var label = this.getLabel();
         return (react_1.default.createElement("div", { className: "field grid" },
             label !== undefined ? react_1.default.createElement("label", { id: labelElemId, htmlFor: this.props.field, className: "col-fixed", style: this.getLabelStyle() }, label) : null,
             labelTooltip ? react_1.default.createElement(tooltip_1.Tooltip, { target: "#".concat(labelElemId), content: labelTooltip }) : null,
-            react_1.default.createElement(inputtext_1.InputText, __assign({ id: this.props.field, value: value, onChange: this.onValueChange, onBlur: this.onBlur, readOnly: this.isReadOnly(), maxLength: this.xField.length, size: size, style: this.props.inputStyle }, XUtils_1.XUtils.createTooltipOrErrorProps(this.getError(), this.props.tooltip), { placeholder: (_b = this.props.placeholder) !== null && _b !== void 0 ? _b : this.props.desc }))));
+            react_1.default.createElement(inputtext_1.InputText, __assign({ id: this.props.field, value: value, onChange: this.onValueChange, onBlur: this.onBlur, readOnly: this.isReadOnly(), maxLength: this.xField.length, size: size, style: this.props.inputStyle }, XUtils_1.XUtils.createTooltipOrErrorProps(this.getError(), inputTooltip), { placeholder: (_b = this.props.placeholder) !== null && _b !== void 0 ? _b : this.props.desc }))));
     };
     return XInputText;
 }(XInput_1.XInput));

package/lib/components/XInputTextarea.d.ts

@@ -5,6 +5,7 @@ export interface XInputTextareaProps extends XInputProps<string> {
     cols?: number | "full";
     labelOnTop?: boolean;
     autoResize?: boolean;
+    fieldStyle?: React.CSSProperties;
 }
 export declare class XInputTextarea extends XInput<string, XInputTextareaProps> {
     static defaultProps: {

package/lib/components/XInputTextarea.js

@@ -43,7 +43,7 @@ var XInputTextarea = /** @class */ (function (_super) {
     };
     XInputTextarea.prototype.render = function () {
         var _a, _b;
-        var fieldStyle = undefined;
+        var fieldStyle = this.props.fieldStyle;
         var labelStyle = this.getLabelStyle();
         var inputStyle = (_a = this.props.inputStyle) !== null && _a !== void 0 ? _a : {};
         var cols;

package/package.json

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