cx 25.5.2 → 25.6.1

package/src/widgets/form/LookupField.scss

@@ -1,219 +1,219 @@
-@mixin cx-lookupfield(
-   $name: "lookupfield",
-   $state-style-map: $cx-std-field-state-style-map,
-   $placeholder: $cx-input-placeholder,
-   $empty-text: $cx-empty-text,
-   $left-icon-state-style-map: $cx-input-left-icon-state-style-map,
-   $clear-state-style-map: $cx-clear-state-style-map,
-   $tool-state-style-map: $cx-input-right-icon-state-style-map,
-   $icon-size: $cx-default-input-icon-size,
-   $width: $cx-default-input-width,
-   $tag-state-style-map: $cx-input-tag-state-style-map,
-   $tag-clear-state-style-map: $cx-input-tag-clear-state-style-map,
-   $besm: $cx-besm
-) {
-   $block: map-get($besm, block);
-   $element: map-get($besm, element);
-   $state: map-get($besm, state);
-
-   $padding: cx-get-state-rule($state-style-map, default, padding);
-   $border-radius-offset: round(cx-get-state-rule($tag-state-style-map, default, border-radius) * 0.25);
-
-   .#{$block}#{$name} {
-      cursor: pointer;
-      width: $width;
-      font: cx-get-state-rule($state-style-map, default, "font");
-      font-size: cx-get-state-rule($state-style-map, default, "font-size");
-
-      @include cxb-field($besm, $state-style-map, $input: false);
-
-      &.#{$state}multiple {
-         min-width: $cx-default-input-width;
-         width: auto;
-      }
-
-      &.#{$state}readonly {
-         pointer-events: none;
-
-         & > .#{$element}#{$name}-input {
-            padding-right: cx-right($padding);
-         }
-      }
-   }
-
-   .#{$element}#{$name}-input {
-      @include cxe-field-input(
-         $besm,
-         $state-style-map,
-         $placeholder: $placeholder,
-         $input: false,
-         $overrides: (
-            default: (
-               height: 100%,
-               text-overflow: null,
-               padding: cx-top($padding)
-                  cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-input-tag-spacing) cx-bottom($padding)
-                  cx-left($padding),
-            )
-         )
-      );
-
-      .#{$state}multiple > & {
-         padding: 0 cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-input-tag-spacing)
-            $cx-default-input-tag-spacing 0;
-         align-items: center;
-         flex-wrap: wrap;
-         display: flex;
-      }
-
-      .#{$state}single > & {
-         overflow: hidden;
-         text-overflow: ellipsis;
-         white-space: nowrap;
-         display: block;
-         flex-basis: 0%;
-         flex-grow: 1;
-      }
-
-      .#{$state}icon > & {
-         padding-left: cx-calc(2 * cx-left($padding), $icon-size);
-      }
-   }
-
-   .#{$element}#{$name}-tag {
-      display: inline-block;
-      position: relative;
-      box-sizing: border-box;
-
-      @include cx-add-state-rules($tag-state-style-map, default);
-
-      &:hover {
-         @include cx-add-state-rules($tag-state-style-map, hover);
-      }
-
-      &.#{$state}readonly {
-         padding-right: cx-right($padding);
-         pointer-events: none;
-      }
-   }
-
-   .#{$element}#{$name}-placeholder {
-      color: $cx-default-input-placeholder-color;
-
-      .#{$block}#{$name}.#{$state}multiple & {
-         display: inline-block;
-         margin: $cx-default-input-tag-spacing 0 0 $cx-default-input-tag-spacing;
-         box-sizing: border-box;
-         padding: cx-calc(cx-top($cx-default-input-padding), -$cx-default-input-tag-spacing)
-            cx-calc(cx-right($cx-default-input-padding), -$cx-default-input-tag-spacing)
-            cx-calc(cx-bottom($cx-default-input-padding), -$cx-default-input-tag-spacing)
-            cx-calc(cx-left($cx-default-input-padding), -$cx-default-input-tag-spacing);
-      }
-   }
-
-   .#{$element}#{$name}-tag-value {
-      padding: 0 cx-calc($cx-default-input-tag-spacing, $border-radius-offset);
-      display: inline-block;
-   }
-
-   .#{$element}#{$name}-tag-clear {
-      @include cxe-field-button($besm, $tag-clear-state-style-map);
-   }
-
-   .#{$element}#{$name}-lookup-options {
-      padding: 0;
-      margin: 0;
-      min-width: 100%;
-      width: 100%;
-   }
-
-   .#{$element}#{$name}-query {
-      @include cxe-field-input(
-         $besm,
-         $state-style-map,
-         $placeholder: $placeholder,
-         $width: calc(100% - 10px),
-         $overrides: (
-            default: (
-               margin: 5px,
-               flex: 0 0 auto,
-               height: auto,
-            )
-         )
-      );
-      //put query field down when placed up
-      .#{$state}place-up-right &,
-      .#{$state}place-up &,
-      .#{$state}place-up-left & {
-         order: 1;
-      }
-   }
-
-   .#{$element}#{$name}-dropdown {
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-
-      &:focus {
-         outline: none;
-      }
-   }
-
-   .#{$element}#{$name}-message {
-      font-size: smaller;
-      padding: 10px;
-      color: gray;
-      font-style: italic;
-
-      &.#{$state}error {
-         color: #9e2f2d;
-      }
-   }
-
-   .#{$element}#{$name}-scroll-container {
-      overflow: auto;
-      flex: 1 1 auto;
-   }
-
-   .#{$element}#{$name}-clear {
-      @include cxe-field-button($besm, $clear-state-style-map);
-
-      .#{$state}focus > & {
-         @include cx-add-state-rules($clear-state-style-map, focus);
-      }
-      .#{$state}error > & {
-         @include cx-add-state-rules($clear-state-style-map, error);
-      }
-   }
-
-   .#{$element}#{$name}-tool {
-      @include cxe-field-button($besm, $tool-state-style-map);
-
-      .#{$state}disabled > & {
-         border-width: 0;
-         @include cx-add-state-rules($state-style-map, disabled);
-      }
-      .#{$state}focus > & {
-         @include cx-add-state-rules($tool-state-style-map, focus);
-      }
-      .#{$state}error > & {
-         @include cx-add-state-rules($tool-state-style-map, error);
-      }
-   }
-
-   .#{$element}#{$name}-left-icon {
-      @include cxe-field-button($besm, $left-icon-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/LookupField")) {
-   @include cx-lookupfield();
-}
+@mixin cx-lookupfield(
+   $name: "lookupfield",
+   $state-style-map: $cx-std-field-state-style-map,
+   $placeholder: $cx-input-placeholder,
+   $empty-text: $cx-empty-text,
+   $left-icon-state-style-map: $cx-input-left-icon-state-style-map,
+   $clear-state-style-map: $cx-clear-state-style-map,
+   $tool-state-style-map: $cx-input-right-icon-state-style-map,
+   $icon-size: $cx-default-input-icon-size,
+   $width: $cx-default-input-width,
+   $tag-state-style-map: $cx-input-tag-state-style-map,
+   $tag-clear-state-style-map: $cx-input-tag-clear-state-style-map,
+   $besm: $cx-besm
+) {
+   $block: map-get($besm, block);
+   $element: map-get($besm, element);
+   $state: map-get($besm, state);
+
+   $padding: cx-get-state-rule($state-style-map, default, padding);
+   $border-radius-offset: round(cx-get-state-rule($tag-state-style-map, default, border-radius) * 0.25);
+
+   .#{$block}#{$name} {
+      cursor: pointer;
+      width: $width;
+      font: cx-get-state-rule($state-style-map, default, "font");
+      font-size: cx-get-state-rule($state-style-map, default, "font-size");
+
+      @include cxb-field($besm, $state-style-map, $input: false);
+
+      &.#{$state}multiple {
+         min-width: $cx-default-input-width;
+         width: auto;
+      }
+
+      &.#{$state}readonly {
+         pointer-events: none;
+
+         & > .#{$element}#{$name}-input {
+            padding-right: cx-right($padding);
+         }
+      }
+   }
+
+   .#{$element}#{$name}-input {
+      @include cxe-field-input(
+         $besm,
+         $state-style-map,
+         $placeholder: $placeholder,
+         $input: false,
+         $overrides: (
+            default: (
+               height: 100%,
+               text-overflow: null,
+               padding: cx-top($padding)
+                  cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-input-tag-spacing) cx-bottom($padding)
+                  cx-left($padding),
+            )
+         )
+      );
+
+      .#{$state}multiple > & {
+         padding: 0 cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-input-tag-spacing)
+            $cx-default-input-tag-spacing 0;
+         align-items: center;
+         flex-wrap: wrap;
+         display: flex;
+      }
+
+      .#{$state}single > & {
+         overflow: hidden;
+         text-overflow: ellipsis;
+         white-space: nowrap;
+         display: block;
+         flex-basis: 0%;
+         flex-grow: 1;
+      }
+
+      .#{$state}icon > & {
+         padding-left: cx-calc(2 * cx-left($padding), $icon-size);
+      }
+   }
+
+   .#{$element}#{$name}-tag {
+      display: inline-block;
+      position: relative;
+      box-sizing: border-box;
+
+      @include cx-add-state-rules($tag-state-style-map, default);
+
+      &:hover {
+         @include cx-add-state-rules($tag-state-style-map, hover);
+      }
+
+      &.#{$state}readonly {
+         padding-right: cx-right($padding);
+         pointer-events: none;
+      }
+   }
+
+   .#{$element}#{$name}-placeholder {
+      color: $cx-default-input-placeholder-color;
+
+      .#{$block}#{$name}.#{$state}multiple & {
+         display: inline-block;
+         margin: $cx-default-input-tag-spacing 0 0 $cx-default-input-tag-spacing;
+         box-sizing: border-box;
+         padding: cx-calc(cx-top($cx-default-input-padding), -$cx-default-input-tag-spacing)
+            cx-calc(cx-right($cx-default-input-padding), -$cx-default-input-tag-spacing)
+            cx-calc(cx-bottom($cx-default-input-padding), -$cx-default-input-tag-spacing)
+            cx-calc(cx-left($cx-default-input-padding), -$cx-default-input-tag-spacing);
+      }
+   }
+
+   .#{$element}#{$name}-tag-value {
+      padding: 0 cx-calc($cx-default-input-tag-spacing, $border-radius-offset);
+      display: inline-block;
+   }
+
+   .#{$element}#{$name}-tag-clear {
+      @include cxe-field-button($besm, $tag-clear-state-style-map);
+   }
+
+   .#{$element}#{$name}-lookup-options {
+      padding: 0;
+      margin: 0;
+      min-width: 100%;
+      width: 100%;
+   }
+
+   .#{$element}#{$name}-query {
+      @include cxe-field-input(
+         $besm,
+         $state-style-map,
+         $placeholder: $placeholder,
+         $width: calc(100% - 10px),
+         $overrides: (
+            default: (
+               margin: 5px,
+               flex: 0 0 auto,
+               height: auto,
+            )
+         )
+      );
+      //put query field down when placed up
+      .#{$state}place-up-right &,
+      .#{$state}place-up &,
+      .#{$state}place-up-left & {
+         order: 1;
+      }
+   }
+
+   .#{$element}#{$name}-dropdown {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+
+      &:focus {
+         outline: none;
+      }
+   }
+
+   .#{$element}#{$name}-message {
+      font-size: smaller;
+      padding: 10px;
+      color: gray;
+      font-style: italic;
+
+      &.#{$state}error {
+         color: #9e2f2d;
+      }
+   }
+
+   .#{$element}#{$name}-scroll-container {
+      overflow: auto;
+      flex: 1 1 auto;
+   }
+
+   .#{$element}#{$name}-clear {
+      @include cxe-field-button($besm, $clear-state-style-map);
+
+      .#{$state}focus > & {
+         @include cx-add-state-rules($clear-state-style-map, focus);
+      }
+      .#{$state}error > & {
+         @include cx-add-state-rules($clear-state-style-map, error);
+      }
+   }
+
+   .#{$element}#{$name}-tool {
+      @include cxe-field-button($besm, $tool-state-style-map);
+
+      .#{$state}disabled > & {
+         border-width: 0;
+         @include cx-add-state-rules($state-style-map, disabled);
+      }
+      .#{$state}focus > & {
+         @include cx-add-state-rules($tool-state-style-map, focus);
+      }
+      .#{$state}error > & {
+         @include cx-add-state-rules($tool-state-style-map, error);
+      }
+   }
+
+   .#{$element}#{$name}-left-icon {
+      @include cxe-field-button($besm, $left-icon-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/LookupField")) {
+   @include cx-lookupfield();
+}

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

@@ -94,6 +94,11 @@ interface MonthFieldProps extends FieldProps {
    /** A boolean flag that determines whether the `to` date is included in the range.
     * When set to true the value stored in the to field would be the last day of the month, i.e. `2024-12-31`. */
    inclusiveTo?: boolean;
+
+   /** Optional configuration options for the MonthPicker component rendered within the dropdown.
+    * You can pass any valid additional MonthPicker props here, such as `startYear`, `endYear`, etc.
+    * Refer to the MonthPicker component documentation for a full list of supported options. */
+   monthPickerOptions?: Cx.Config;
 }
 
 export class MonthField extends Cx.Widget<MonthFieldProps> {}

package/src/widgets/form/MonthField.js

@@ -149,6 +149,7 @@ export class MonthField extends Field {
             data={instance.data}
             instance={instance}
             monthPicker={{
+               ...this.monthPickerOptions,
                value: this.value,
                from: this.from,
                to: this.to,

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

@@ -1,4 +1,5 @@
 import * as Cx from "../../core";
+import { Instance } from "../../ui";
 import { FieldProps } from "./Field";
 
 interface MonthPickerProps extends FieldProps {
@@ -71,6 +72,18 @@ interface MonthPickerProps extends FieldProps {
    /** A boolean flag that determines whether the `to` date is included in the range.
     * When set to true the value stored in the to field would be the last day of the month, i.e. `2024-12-31`. */
    inclusiveTo?: boolean;
+
+   /** Callback function that is called before writing data to the store. Return false to short-circuit updating the state. */
+   onBeforeSelect: (e: Event, instance: Instance, dateFrom?: Date, dateTo?: Date) => boolean;
+
+   /** Callback function that is called after value or date range has changed */
+   onSelect: (instance: Instance, dateFrom?: Date, dateTo?: Date) => void;
+
+   /**
+    * Optional parameter to hide the quarters period section on the picker.
+    * When true, the quarters section will not render.
+    */
+   hideQuarters?: boolean;
 }
 
 export class MonthPicker extends Cx.Widget<MonthPickerProps> {}

package/src/widgets/form/MonthPicker.js

@@ -154,6 +154,7 @@ MonthPicker.prototype.range = false;
 MonthPicker.prototype.startYear = 1980;
 MonthPicker.prototype.endYear = 2030;
 MonthPicker.prototype.bufferSize = 15;
+MonthPicker.prototype.hideQuarters = false;
 
 // Localization
 MonthPicker.prototype.maxValueErrorText = "Select {0:d} or before.";
@@ -193,7 +194,7 @@ export class MonthPickerComponent extends VDOM.Component {
          cursorQuarter: cursor.getMonth() / 3,
          column: "M",
          start: widget.startYear,
-         end: widget.startYear + widget.bufferSize,
+         end: Math.min(widget.startYear + widget.bufferSize, widget.endYear),
       };
 
       this.handleMouseDown = this.handleMouseDown.bind(this);
@@ -427,8 +428,9 @@ export class MonthPickerComponent extends VDOM.Component {
    }
 
    render() {
-      let { data, widget } = this.props.instance;
-      let { CSS, baseClass, startYear, endYear } = widget;
+      let { instance } = this.props;
+      let { data, widget } = instance;
+      let { CSS, baseClass, startYear, endYear, hideQuarters } = widget;
 
       let years = [];
 
@@ -512,24 +514,26 @@ export class MonthPickerComponent extends VDOM.Component {
                   </td>,
                );
             }
-            row.push(
-               <th
-                  key={`q${q}`}
-                  className={CSS.state({
-                     cursor:
-                        showCursor &&
-                        this.state.column == "Q" &&
-                        y == this.state.cursorYear &&
-                        q == this.state.cursorQuarter,
-                  })}
-                  data-point={`Y-${y}-Q-${q}`}
-                  onMouseEnter={this.handleMouseEnter}
-                  onMouseDown={this.handleMouseDown}
-                  onMouseUp={this.handleMouseUp}
-               >
-                  {`Q${q + 1}`}
-               </th>,
-            );
+
+            if (!hideQuarters)
+               row.push(
+                  <th
+                     key={`q${q}`}
+                     className={CSS.state({
+                        cursor:
+                           showCursor &&
+                           this.state.column == "Q" &&
+                           y == this.state.cursorYear &&
+                           q == this.state.cursorQuarter,
+                     })}
+                     data-point={`Y-${y}-Q-${q}`}
+                     onMouseEnter={this.handleMouseEnter}
+                     onMouseDown={this.handleMouseDown}
+                     onMouseUp={this.handleMouseUp}
+                  >
+                     {`Q${q + 1}`}
+                  </th>,
+               );
             rows.push(row);
          }
          years.push(rows);