cx 24.4.0 → 24.4.2

package/src/widgets/form/TextArea.js

@@ -1,186 +1,186 @@
-import { Widget, VDOM, getContent } from "../../ui/Widget";
-import { TextField } from "./TextField";
-import { getFieldTooltip } from "./Field";
-import {
-   tooltipParentWillReceiveProps,
-   tooltipParentWillUnmount,
-   tooltipMouseMove,
-   tooltipMouseLeave,
-   tooltipParentDidMount,
-} from "../overlay/tooltip-ops";
-import { stopPropagation } from "../../util/eventCallbacks";
-import { KeyCode } from "../../util/KeyCode";
-import { autoFocus } from "../autoFocus";
-import { getActiveElement } from "../../util/getActiveElement";
-
-export class TextArea extends TextField {
-   declareData() {
-      super.declareData(
-         {
-            rows: undefined,
-         },
-         ...arguments
-      );
-   }
-
-   prepareData(context, instance) {
-      let { state, data, cached } = instance;
-      if (!cached.data || data.value != cached.data.value) state.empty = !data.value;
-      super.prepareData(context, instance);
-   }
-
-   renderInput(context, instance, key) {
-      return (
-         <Input
-            key={key}
-            data={instance.data}
-            instance={instance}
-            label={this.labelPlacement && getContent(this.renderLabel(context, instance, "label"))}
-            help={this.helpPlacement && getContent(this.renderHelp(context, instance, "help"))}
-         />
-      );
-   }
-
-   validateRequired(context, instance) {
-      return instance.state.empty && this.requiredText;
-   }
-}
-
-TextArea.prototype.baseClass = "textarea";
-TextArea.prototype.reactOn = "blur";
-TextArea.prototype.suppressErrorsUntilVisited = true;
-
-class Input extends VDOM.Component {
-   constructor(props) {
-      super(props);
-      this.state = {
-         focus: false,
-      };
-   }
-
-   render() {
-      let { instance, label, help } = this.props;
-      let { widget, data, state } = instance;
-      let { CSS, baseClass, suppressErrorsUntilVisited } = widget;
-
-      let empty = this.input ? !this.input.value : data.empty;
-
-      return (
-         <div
-            className={CSS.expand(
-               data.classNames,
-               CSS.state({
-                  visited: state.visited,
-                  focus: this.state.focus,
-                  empty: empty && !data.placeholder,
-                  error: data.error && (state.visited || !suppressErrorsUntilVisited || !empty),
-               })
-            )}
-            style={data.style}
-            onMouseDown={stopPropagation}
-            onTouchStart={stopPropagation}
-         >
-            <textarea
-               className={CSS.element(baseClass, "input")}
-               ref={(el) => {
-                  this.input = el;
-               }}
-               id={data.id}
-               rows={data.rows}
-               style={data.inputStyle}
-               defaultValue={data.value}
-               disabled={data.disabled}
-               readOnly={data.readOnly}
-               tabIndex={data.tabIndex}
-               placeholder={data.placeholder}
-               {...data.inputAttrs}
-               onInput={(e) => this.onChange(e.target.value, "input")}
-               onChange={(e) => this.onChange(e.target.value, "change")}
-               onBlur={(e) => {
-                  this.onChange(e.target.value, "blur");
-               }}
-               onFocus={(e) => this.onFocus()}
-               onClick={stopPropagation}
-               onKeyDown={(e) => this.onKeyDown(e)}
-               onMouseMove={(e) => tooltipMouseMove(e, ...getFieldTooltip(instance))}
-               onMouseLeave={(e) => tooltipMouseLeave(e, ...getFieldTooltip(instance))}
-            />
-            {label}
-            {help}
-         </div>
-      );
-   }
-
-   componentWillUnmount() {
-      if (this.input == getActiveElement()) {
-         this.onChange(this.input.value, "blur");
-      }
-      tooltipParentWillUnmount(this.props.instance);
-   }
-
-   componentDidMount() {
-      tooltipParentDidMount(this.input, ...getFieldTooltip(this.props.instance));
-      autoFocus(this.input, this);
-   }
-
-   componentDidUpdate() {
-      autoFocus(this.input, this);
-   }
-
-   onKeyDown(e) {
-      let { instance } = this.props;
-      if (instance.widget.handleKeyDown(e, instance) === false) return;
-
-      switch (e.keyCode) {
-         case KeyCode.down:
-         case KeyCode.up:
-         case KeyCode.left:
-         case KeyCode.right:
-            e.stopPropagation();
-            break;
-      }
-   }
-
-   UNSAFE_componentWillReceiveProps({ data, instance }) {
-      if (data.value != this.props.data.value) {
-         this.input.value = data.value || "";
-      }
-      tooltipParentWillReceiveProps(this.input, ...getFieldTooltip(instance));
-   }
-
-   onChange(inputValue, change) {
-      let { instance, data } = this.props;
-      let { widget } = instance;
-
-      if (change == "blur") {
-         instance.setState({ visited: true });
-         if (this.state.focus)
-            this.setState({
-               focus: false,
-            });
-      }
-
-      if (data.required) {
-         instance.setState({
-            empty: !inputValue,
-         });
-      }
-
-      if (instance.widget.reactOn.indexOf(change) != -1) {
-         let value = inputValue || widget.emptyValue;
-         instance.set("value", value);
-      }
-   }
-
-   onFocus() {
-      let { instance } = this.props;
-      let { widget } = instance;
-      if (widget.trackFocus) {
-         this.setState({
-            focus: true,
-         });
-      }
-   }
-}
-
-Widget.alias("textarea", TextArea);
+import { Widget, VDOM, getContent } from "../../ui/Widget";
+import { TextField } from "./TextField";
+import { getFieldTooltip } from "./Field";
+import {
+   tooltipParentWillReceiveProps,
+   tooltipParentWillUnmount,
+   tooltipMouseMove,
+   tooltipMouseLeave,
+   tooltipParentDidMount,
+} from "../overlay/tooltip-ops";
+import { stopPropagation } from "../../util/eventCallbacks";
+import { KeyCode } from "../../util/KeyCode";
+import { autoFocus } from "../autoFocus";
+import { getActiveElement } from "../../util/getActiveElement";
+
+export class TextArea extends TextField {
+   declareData() {
+      super.declareData(
+         {
+            rows: undefined,
+         },
+         ...arguments
+      );
+   }
+
+   prepareData(context, instance) {
+      let { state, data, cached } = instance;
+      if (!cached.data || data.value != cached.data.value) state.empty = !data.value;
+      super.prepareData(context, instance);
+   }
+
+   renderInput(context, instance, key) {
+      return (
+         <Input
+            key={key}
+            data={instance.data}
+            instance={instance}
+            label={this.labelPlacement && getContent(this.renderLabel(context, instance, "label"))}
+            help={this.helpPlacement && getContent(this.renderHelp(context, instance, "help"))}
+         />
+      );
+   }
+
+   validateRequired(context, instance) {
+      return instance.state.empty && this.requiredText;
+   }
+}
+
+TextArea.prototype.baseClass = "textarea";
+TextArea.prototype.reactOn = "blur";
+TextArea.prototype.suppressErrorsUntilVisited = true;
+
+class Input extends VDOM.Component {
+   constructor(props) {
+      super(props);
+      this.state = {
+         focus: false,
+      };
+   }
+
+   render() {
+      let { instance, label, help } = this.props;
+      let { widget, data, state } = instance;
+      let { CSS, baseClass, suppressErrorsUntilVisited } = widget;
+
+      let empty = this.input ? !this.input.value : data.empty;
+
+      return (
+         <div
+            className={CSS.expand(
+               data.classNames,
+               CSS.state({
+                  visited: state.visited,
+                  focus: this.state.focus,
+                  empty: empty && !data.placeholder,
+                  error: data.error && (state.visited || !suppressErrorsUntilVisited || !empty),
+               })
+            )}
+            style={data.style}
+            onMouseDown={stopPropagation}
+            onTouchStart={stopPropagation}
+         >
+            <textarea
+               className={CSS.element(baseClass, "input")}
+               ref={(el) => {
+                  this.input = el;
+               }}
+               id={data.id}
+               rows={data.rows}
+               style={data.inputStyle}
+               defaultValue={data.value}
+               disabled={data.disabled}
+               readOnly={data.readOnly}
+               tabIndex={data.tabIndex}
+               placeholder={data.placeholder}
+               {...data.inputAttrs}
+               onInput={(e) => this.onChange(e.target.value, "input")}
+               onChange={(e) => this.onChange(e.target.value, "change")}
+               onBlur={(e) => {
+                  this.onChange(e.target.value, "blur");
+               }}
+               onFocus={(e) => this.onFocus()}
+               onClick={stopPropagation}
+               onKeyDown={(e) => this.onKeyDown(e)}
+               onMouseMove={(e) => tooltipMouseMove(e, ...getFieldTooltip(instance))}
+               onMouseLeave={(e) => tooltipMouseLeave(e, ...getFieldTooltip(instance))}
+            />
+            {label}
+            {help}
+         </div>
+      );
+   }
+
+   componentWillUnmount() {
+      if (this.input == getActiveElement()) {
+         this.onChange(this.input.value, "blur");
+      }
+      tooltipParentWillUnmount(this.props.instance);
+   }
+
+   componentDidMount() {
+      tooltipParentDidMount(this.input, ...getFieldTooltip(this.props.instance));
+      autoFocus(this.input, this);
+   }
+
+   componentDidUpdate() {
+      autoFocus(this.input, this);
+   }
+
+   onKeyDown(e) {
+      let { instance } = this.props;
+      if (instance.widget.handleKeyDown(e, instance) === false) return;
+
+      switch (e.keyCode) {
+         case KeyCode.down:
+         case KeyCode.up:
+         case KeyCode.left:
+         case KeyCode.right:
+            e.stopPropagation();
+            break;
+      }
+   }
+
+   UNSAFE_componentWillReceiveProps({ data, instance }) {
+      if (data.value != this.props.data.value) {
+         this.input.value = data.value || "";
+      }
+      tooltipParentWillReceiveProps(this.input, ...getFieldTooltip(instance));
+   }
+
+   onChange(inputValue, change) {
+      let { instance, data } = this.props;
+      let { widget } = instance;
+
+      if (change == "blur") {
+         instance.setState({ visited: true });
+         if (this.state.focus)
+            this.setState({
+               focus: false,
+            });
+      }
+
+      if (data.required) {
+         instance.setState({
+            empty: !inputValue,
+         });
+      }
+
+      if (instance.widget.reactOn.indexOf(change) != -1) {
+         let value = inputValue || widget.emptyValue;
+         instance.set("value", value);
+      }
+   }
+
+   onFocus() {
+      let { instance } = this.props;
+      let { widget } = instance;
+      if (widget.trackFocus) {
+         this.setState({
+            focus: true,
+         });
+      }
+   }
+}
+
+Widget.alias("textarea", TextArea);

package/src/widgets/form/TextArea.scss

@@ -1,60 +1,60 @@
-
-@mixin cx-textarea(
-   $name: 'textarea',
-   $state-style-map: $cx-textarea-state-style-map,
-   $placeholder: $cx-input-placeholder,
-   $empty-text: $cx-empty-text,
-   $tool-state-style-map: $cx-input-right-icon-state-style-map,
-   $icon-size: $cx-default-input-icon-size,
-   $width: $cx-default-textarea-width,
-   $besm: $cx-besm
-) {
-   $block: map-get($besm, block);
-   $element: map-get($besm, element);
-   $state: map-get($besm, state);
-   $mod: map-get($besm, mod);
-
-
-   .#{$block}#{$name} {
-      @include cxb-field(
-         $besm,
-         $state-style-map,
-         $input: false
-      );
-      line-height: 0;
-      width: $width;
-   }
-
-   .#{$element}#{$name}-input {
-      @include cxe-field-input(
-         $besm,
-         $state-style-map,
-         $placeholder: $placeholder,
-         $input: false
-      );
-
-      width: 100%;
-      height: 100%;
-   }
-
-   .#{$element}#{$name}-tool {
-      @include cxe-field-button($besm, $tool-state-style-map);
-   }
-
-   .#{$element}#{$name}-icon {
-      @include cxe-field-button-icon($besm, $icon-size);
-   }
-
-   .#{$element}#{$name}-empty-text {
-      @include cxe-field-empty-text($empty-text);
-   }
-}
-
-@if (cx-should-include('cx/widgets/TextArea')) {
-   @include cx-textarea;
-}
-
-
-
-
-
+
+@mixin cx-textarea(
+   $name: 'textarea',
+   $state-style-map: $cx-textarea-state-style-map,
+   $placeholder: $cx-input-placeholder,
+   $empty-text: $cx-empty-text,
+   $tool-state-style-map: $cx-input-right-icon-state-style-map,
+   $icon-size: $cx-default-input-icon-size,
+   $width: $cx-default-textarea-width,
+   $besm: $cx-besm
+) {
+   $block: map-get($besm, block);
+   $element: map-get($besm, element);
+   $state: map-get($besm, state);
+   $mod: map-get($besm, mod);
+
+
+   .#{$block}#{$name} {
+      @include cxb-field(
+         $besm,
+         $state-style-map,
+         $input: false
+      );
+      line-height: 0;
+      width: $width;
+   }
+
+   .#{$element}#{$name}-input {
+      @include cxe-field-input(
+         $besm,
+         $state-style-map,
+         $placeholder: $placeholder,
+         $input: false
+      );
+
+      width: 100%;
+      height: 100%;
+   }
+
+   .#{$element}#{$name}-tool {
+      @include cxe-field-button($besm, $tool-state-style-map);
+   }
+
+   .#{$element}#{$name}-icon {
+      @include cxe-field-button-icon($besm, $icon-size);
+   }
+
+   .#{$element}#{$name}-empty-text {
+      @include cxe-field-empty-text($empty-text);
+   }
+}
+
+@if (cx-should-include('cx/widgets/TextArea')) {
+   @include cx-textarea;
+}
+
+
+
+
+

package/src/widgets/form/TextField.d.ts

@@ -1,78 +1,78 @@
-import * as Cx from "../../core";
-import { Instance } from "../../ui/Instance";
-import { FieldProps } from "./Field";
-
-export interface TextFieldProps extends FieldProps {
-   /**
-    * Set to `true` to hide the clear button. It can be used interchangeably with the `showClear` property.
-    * Default value is `true`.
-    */
-   hideClear?: boolean;
-
-   /**
-    * Set to `false` to hide the clear button. It can be used interchangeably with the `hideClear` property.
-    * Default value is `false`.
-    */
-   showClear?: boolean;
-
-   /**
-    * Set to `true` to display the clear button even if `required` is set. Default is `false`.
-    */
-   alwaysShowClear?: boolean;
-
-   /** Textual value of the input. */
-   value?: Cx.StringProp;
-
-   /** Defaults to `false`. Used to make the field read-only. */
-   readOnly?: Cx.BooleanProp;
-
-   /** The opposite of `disabled`. */
-   enabled?: Cx.BooleanProp;
-
-   /** Default text displayed when the field is empty. */
-   placeholder?: Cx.StringProp;
-
-   /** Minimal length of the input text. */
-   minLength?: Cx.NumberProp;
-
-   /** Maximal length of the input text. */
-   maxLength?: Cx.NumberProp;
-
-   /** Base CSS class to be applied to the field. Defaults to `textfield`. */
-   baseClass?: string;
-
-   /**
-    * Event used to report a new value. Defaults to `input`, which means that entered value will be written to the store on each keystroke.
-    * Other permitted values are `enter` (Enter key pressed) and `blur` (field looses focus).
-    * Multiple values should be separated by space, e.g. `enter blur`.
-    */
-   reactOn?: string;
-
-   /** Defaults to `text`. Other permitted value is `password`. */
-   inputType?: "text" | "password";
-
-   /** Message to be shown to the user if validation fails. */
-   validationErrorText?: string;
-
-   /** Message to be shown to the user if input text is too short. */
-   minLengthValidationErrorText?: string;
-
-   /** Message to be shown to the user if input text is too long. */
-   maxLengthValidationErrorText?: string;
-
-   /** Regular expression used to validate the user's input. */
-   validationRegExp?: RegExp;
-
-   /** Name or configuration of the icon to be put on the left side of the input.  */
-   icon?: Cx.StringProp | Cx.Record;
-
-   /** If trackFocus is set, this value will be set when the field receives or loses focus. */
-   focused?: Cx.BooleanProp;
-
-   /** Trim text to remove whitespace. Default is false. */
-   trim?: Cx.BooleanProp;
-
-   onKeyDown?: string | ((event: KeyboardEvent, instance: Instance) => boolean | void);
-}
-
-export class TextField extends Cx.Widget<TextFieldProps> {}
+import * as Cx from "../../core";
+import { Instance } from "../../ui/Instance";
+import { FieldProps } from "./Field";
+
+export interface TextFieldProps extends FieldProps {
+   /**
+    * Set to `true` to hide the clear button. It can be used interchangeably with the `showClear` property.
+    * Default value is `true`.
+    */
+   hideClear?: boolean;
+
+   /**
+    * Set to `false` to hide the clear button. It can be used interchangeably with the `hideClear` property.
+    * Default value is `false`.
+    */
+   showClear?: boolean;
+
+   /**
+    * Set to `true` to display the clear button even if `required` is set. Default is `false`.
+    */
+   alwaysShowClear?: boolean;
+
+   /** Textual value of the input. */
+   value?: Cx.StringProp;
+
+   /** Defaults to `false`. Used to make the field read-only. */
+   readOnly?: Cx.BooleanProp;
+
+   /** The opposite of `disabled`. */
+   enabled?: Cx.BooleanProp;
+
+   /** Default text displayed when the field is empty. */
+   placeholder?: Cx.StringProp;
+
+   /** Minimal length of the input text. */
+   minLength?: Cx.NumberProp;
+
+   /** Maximal length of the input text. */
+   maxLength?: Cx.NumberProp;
+
+   /** Base CSS class to be applied to the field. Defaults to `textfield`. */
+   baseClass?: string;
+
+   /**
+    * Event used to report a new value. Defaults to `input`, which means that entered value will be written to the store on each keystroke.
+    * Other permitted values are `enter` (Enter key pressed) and `blur` (field looses focus).
+    * Multiple values should be separated by space, e.g. `enter blur`.
+    */
+   reactOn?: string;
+
+   /** Defaults to `text`. Other permitted value is `password`. */
+   inputType?: "text" | "password";
+
+   /** Message to be shown to the user if validation fails. */
+   validationErrorText?: string;
+
+   /** Message to be shown to the user if input text is too short. */
+   minLengthValidationErrorText?: string;
+
+   /** Message to be shown to the user if input text is too long. */
+   maxLengthValidationErrorText?: string;
+
+   /** Regular expression used to validate the user's input. */
+   validationRegExp?: RegExp;
+
+   /** Name or configuration of the icon to be put on the left side of the input.  */
+   icon?: Cx.StringProp | Cx.Record;
+
+   /** If trackFocus is set, this value will be set when the field receives or loses focus. */
+   focused?: Cx.BooleanProp;
+
+   /** Trim text to remove whitespace. Default is false. */
+   trim?: Cx.BooleanProp;
+
+   onKeyDown?: string | ((event: KeyboardEvent, instance: Instance) => boolean | void);
+}
+
+export class TextField extends Cx.Widget<TextFieldProps> {}