cx 26.1.0 → 26.1.2

package/src/widgets/form/LabeledContainer.ts

@@ -1,77 +1,77 @@
-import { isSelector } from "../../data/isSelector";
-import type { Instance } from "../../ui/Instance";
-import type { CxChild, RenderingContext } from "../../ui/RenderingContext";
-import { Widget } from "../../ui/Widget";
-import { FieldGroup, FieldGroupConfig } from "./FieldGroup";
-import { Label, LabelConfig } from "./Label";
-import { StringProp, Config, BooleanProp, ModProp } from "../../ui/Prop";
-import { Create } from "../../util/Component";
-
-export interface LabeledContainerConfig extends FieldGroupConfig {
-   /** The label. */
-   label?: StringProp | Create<typeof Widget> | LabelConfig;
-
-   /** Set to true to disable the field. */
-   disabled?: BooleanProp;
-
-   /** CSS modifier classes. */
-   mod?: ModProp;
-
-   /** Set to true to display an asterisk next to the label. */
-   asterisk?: BooleanProp;
-}
-
-export class LabeledContainer extends FieldGroup<LabeledContainerConfig> {
-   declare label?: string | Record<string, unknown> | Label | Widget; // Can be string, selector, Label widget config, or Widget
-   declare disabled?: boolean;
-   declare mod?: Record<string, unknown>;
-   declare asterisk?: boolean;
-
-   declareData(...args: Record<string, unknown>[]): void {
-      super.declareData(...args, {
-         label: undefined,
-      });
-   }
-
-   init(): void {
-      if (this.label != null) {
-         let labelConfig: any = {
-            type: Label,
-            disabled: this.disabled,
-            mod: this.mod,
-            asterisk: this.asterisk,
-            required: true,
-         };
-
-         if ((this.label as any).isComponentType) labelConfig = this.label as Record<string, unknown>;
-         else if (isSelector(this.label)) labelConfig.text = this.label;
-         else Object.assign(labelConfig, this.label);
-
-         this.label = Widget.create(labelConfig);
-      }
-
-      super.init();
-   }
-
-   initComponents(context: RenderingContext, instance: Instance, ...args: Record<string, unknown>[]): void {
-      return super.initComponents(context, instance, ...args, {
-         label: this.label,
-      });
-   }
-
-   renderLabel(context: RenderingContext, instance: Instance, key?: string): CxChild {
-      if (instance.components && instance.components.label) return instance.components.label.render(context);
-      return null;
-   }
-
-   render(context: RenderingContext, instance: Instance, key: string): { label: CxChild; content: CxChild } {
-      return {
-         label: this.renderLabel(context, instance),
-         content: this.renderChildren(context, instance),
-      };
-   }
-}
-
-LabeledContainer.prototype.styled = true;
-
-Widget.alias("labeled-container", LabeledContainer);
+import { isSelector } from "../../data/isSelector";
+import type { Instance } from "../../ui/Instance";
+import type { CxChild, RenderingContext } from "../../ui/RenderingContext";
+import { Widget } from "../../ui/Widget";
+import { FieldGroup, FieldGroupConfig } from "./FieldGroup";
+import { Label, LabelConfig } from "./Label";
+import { StringProp, Config, BooleanProp, ModProp } from "../../ui/Prop";
+import { Create } from "../../util/Component";
+
+export interface LabeledContainerConfig extends FieldGroupConfig {
+   /** The label. */
+   label?: StringProp | Create<typeof Widget> | LabelConfig;
+
+   /** Set to true to disable the field. */
+   disabled?: BooleanProp;
+
+   /** CSS modifier classes. */
+   mod?: ModProp;
+
+   /** Set to true to display an asterisk next to the label. */
+   asterisk?: BooleanProp;
+}
+
+export class LabeledContainer extends FieldGroup<LabeledContainerConfig> {
+   declare label?: string | Record<string, unknown> | Label | Widget; // Can be string, selector, Label widget config, or Widget
+   declare disabled?: boolean;
+   declare mod?: Record<string, unknown>;
+   declare asterisk?: boolean;
+
+   declareData(...args: Record<string, unknown>[]): void {
+      super.declareData(...args, {
+         label: undefined,
+      });
+   }
+
+   init(): void {
+      if (this.label != null) {
+         let labelConfig: any = {
+            type: Label,
+            disabled: this.disabled,
+            mod: this.mod,
+            asterisk: this.asterisk,
+            required: true,
+         };
+
+         if ((this.label as any).isComponentType) labelConfig = this.label as Record<string, unknown>;
+         else if (isSelector(this.label)) labelConfig.text = this.label;
+         else Object.assign(labelConfig, this.label);
+
+         this.label = Widget.create(labelConfig);
+      }
+
+      super.init();
+   }
+
+   initComponents(context: RenderingContext, instance: Instance, ...args: Record<string, unknown>[]): void {
+      return super.initComponents(context, instance, ...args, {
+         label: this.label,
+      });
+   }
+
+   renderLabel(context: RenderingContext, instance: Instance, key?: string): CxChild {
+      if (instance.components && instance.components.label) return instance.components.label.render(context);
+      return null;
+   }
+
+   render(context: RenderingContext, instance: Instance, key: string): { label: CxChild; content: CxChild } {
+      return {
+         label: this.renderLabel(context, instance),
+         content: this.renderChildren(context, instance),
+      };
+   }
+}
+
+LabeledContainer.prototype.styled = true;
+
+Widget.alias("labeled-container", LabeledContainer);

package/src/widgets/form/LookupField.scss

@@ -1,221 +1,221 @@
-@use "sass:map";
-
-@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();
-}
+@use "sass:map";
+
+@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();
+}