cx 24.0.3 → 24.2.0

package/src/ui/keyboardShortcuts.js

@@ -1,12 +1,11 @@
-import {SubscriberList} from "../util/SubscriberList";
-import {isObject} from "../util/isObject";
+import { SubscriberList } from "../util/SubscriberList";
+import { isObject } from "../util/isObject";
 
 let subscribers, eventBan = 0;
 
 export function executeKeyboardShortcuts(e) {
-   if (Date.now() < eventBan)
-      return;
-   //Avoid duplicate executions as event.stopPropagation() for React events does not stop native events
+   if (Date.now() < eventBan) return;
+   // Avoid duplicate executions as event.stopPropagation() for React events does not stop native events
    eventBan = Date.now() + 5;
    subscribers && subscribers.notify(e);
 }

package/src/ui/selection/KeySelection.d.ts

@@ -1,6 +1,6 @@
 import * as Cx from '../../core';
 
-import {Selection} from './Selection'
+import { Selection } from './Selection'
 
 interface KeySelectionConfig {
    bind?: string;

package/src/ui/selection/PropertySelection.d.ts

@@ -1,6 +1,6 @@
 import * as Cx from '../../core';
 
-import {Selection} from './Selection'
+import { Selection } from './Selection'
 
 interface PropertySelectionConfig {
    selectedField?: string

package/src/ui/selection/PropertySelection.js

@@ -1,9 +1,7 @@
-import {Selection} from './Selection';
+import { Selection } from './Selection';
 
 export class PropertySelection extends Selection {
-
-   selectMultiple(store, records, indexes, {toggle, add} = {}) {
-
+   selectMultiple(store, records, indexes, { toggle, add } = {}) {
       if (this.toggle)
          toggle = true;
 

package/src/ui/selection/Selection.d.ts

@@ -24,4 +24,4 @@ export class Selection extends Component {
    isInstanceSelected(instance: Instance): boolean;
 }
 
-export class SimpleSelection extends Selection {}
+export class SimpleSelection extends Selection { }

package/src/widgets/form/ColorField.js

@@ -21,6 +21,7 @@ import DropdownIcon from "../icons/drop-down";
 import ClearIcon from "../icons/clear";
 import { Localization } from "../../ui/Localization";
 import { isDefined } from "../../util/isDefined";
+import { getActiveElement } from "../../util/getActiveElement";
 
 export class ColorField extends Field {
    declareData() {
@@ -219,8 +220,8 @@ class ColorInput extends VDOM.Component {
                tabIndex={data.tabIndex}
                placeholder={data.placeholder}
                {...data.inputAttrs}
-               onInput={(e) => this.onChange(e, "input")}
-               onChange={(e) => this.onChange(e, "change")}
+               onInput={(e) => this.onChange(e.target.value, "input")}
+               onChange={(e) => this.onChange(e.target.value, "change")}
                onKeyDown={(e) => this.onKeyDown(e)}
                onBlur={(e) => {
                   this.onBlur(e);
@@ -274,7 +275,7 @@ class ColorInput extends VDOM.Component {
       switch (e.keyCode) {
          case KeyCode.enter:
             e.stopPropagation();
-            this.onChange(e, "enter");
+            this.onChange(e.target.value, "enter");
             break;
 
          case KeyCode.esc:
@@ -304,7 +305,7 @@ class ColorInput extends VDOM.Component {
          this.setState({
             focus: false,
          });
-      this.onChange(e, "blur");
+      this.onChange(e.target.value, "blur");
    }
 
    closeDropdown(e, callback) {
@@ -352,6 +353,9 @@ class ColorInput extends VDOM.Component {
    }
 
    componentWillUnmount() {
+      if (this.input == getActiveElement()) {
+         this.onChange(this.input.value, "blur");
+      }
       tooltipParentWillUnmount(this.props.instance);
    }
 
@@ -365,23 +369,24 @@ class ColorInput extends VDOM.Component {
       e.preventDefault();
    }
 
-   onChange(e, eventType) {
+   onChange(inputValue, eventType) {
       let { instance, data } = this.props;
       let { widget } = instance;
 
-      if (eventType == "blur") instance.setState({ visited: true });
+      if (eventType == "blur") {
+         instance.setState({ visited: true });
+      }
 
-      let text = e.target.value;
       let isValid;
       try {
-         parseColor(text);
+         parseColor(inputValue);
          isValid = true;
       } catch (e) {
          isValid = false;
       }
 
       if (eventType == "blur" || eventType == "enter") {
-         let value = text || widget.emptyValue;
+         let value = inputValue || widget.emptyValue;
          if (isValid && value !== data.value) instance.set("value", value);
 
          instance.setState({

package/src/widgets/form/ColorPicker.scss

@@ -1,275 +1,275 @@
-//@if cx-call-once("cx/widgets/checker-background") {
-//   %cx-checker-bg {
-//      background-repeat: repeat;
-//      background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuOWwzfk4AAAAfSURBVChTY9i5Y89/dAwEDOh4SCjEJohN8+BXuOc/AOttNBKJWD4sAAAAAElFTkSuQmCC");
-//   }
-//}
-
-@mixin cx-checker-background($tile-size: 4px, $color: rgba(gray, 0.5)) {
-   background-image: linear-gradient(45deg, $color 25%, transparent 25%),
-      linear-gradient(-45deg, $color 25%, transparent 25%), linear-gradient(45deg, transparent 75%, $color 75%),
-      linear-gradient(-45deg, transparent 75%, $color 75%);
-   background-size: 2 * $tile-size 2 * $tile-size;
-   background-position: 0 0, 0 $tile-size, $tile-size -#{$tile-size}, -#{$tile-size} 0px;
-}
-
-@mixin cx-colorpicker(
-   $name: "colorpicker",
-   $state-style-map: $cx-colorpicker-state-style-map,
-   $placeholder: $cx-input-placeholder,
-   $besm: $cx-besm
-) {
-   $block: map-get($besm, block);
-   $element: map-get($besm, element);
-   $state: map-get($besm, state);
-
-   $size: 220px;
-
-   .#{$block}#{$name} {
-      $styles: cx-deep-map-merge(
-         $state-style-map,
-         (
-            default: (
-               padding: 4px,
-            ),
-         )
-      );
-
-      @include cx-add-state-rules($styles, default);
-
-      display: inline-flex;
-      flex-direction: column;
-
-      @media screen and (min-width: 500px) {
-         flex-direction: row;
-      }
-
-      &:hover {
-         @include cx-add-state-rules($state-style-map, hover);
-      }
-
-      input {
-         @include cxe-field-input(
-            $besm,
-            $state-style-map,
-            $placeholder: $placeholder,
-            $input: false,
-            $overrides: (
-               default: (
-                  line-height: 14px,
-                  font-size: 11px,
-                  font-family: $cx-default-colorpicker-font-family,
-               )
-            )
-         );
-      }
-   }
-
-   .#{$element}#{$name}-picker {
-      width: $size;
-      height: $size;
-      margin: 4px;
-      //cursor: crosshair;
-      position: relative;
-      touch-action: none;
-
-      background: -webkit-linear-gradient(
-            top,
-            hsl(0, 0%, 100%) 0%,
-            hsla(0, 0%, 100%, 0) 50%,
-            hsla(0, 0%, 0%, 0) 50%,
-            hsl(0, 0%, 0%) 100%
-         ),
-         -webkit-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
-      background: -moz-linear-gradient(
-            top,
-            hsl(0, 0%, 100%) 0%,
-            hsla(0, 0%, 100%, 0) 50%,
-            hsla(0, 0%, 0%, 0) 50%,
-            hsl(0, 0%, 0%) 100%
-         ),
-         -moz-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
-      background: -ms-linear-gradient(
-            top,
-            hsl(0, 0%, 100%) 0%,
-            hsla(0, 0%, 100%, 0) 50%,
-            hsla(0, 0%, 0%, 0) 50%,
-            hsl(0, 0%, 0%) 100%
-         ),
-         -ms-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
-      background: -o-linear-gradient(
-            top,
-            hsl(0, 0%, 100%) 0%,
-            hsla(0, 0%, 100%, 0) 50%,
-            hsla(0, 0%, 0%, 0) 50%,
-            hsl(0, 0%, 0%) 100%
-         ),
-         -o-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
-   }
-
-   .#{$element}#{$name}-indicator {
-      position: absolute;
-      border: 2px solid rgba(255, 255, 255, 0.8);
-      border-radius: 50%;
-      box-sizing: border-box;
-      width: 9px;
-      height: 9px;
-      left: calc(50% - 5px);
-      top: calc(50% - 5px);
-   }
-
-   .#{$element}#{$name}-hue {
-      height: 15px;
-      position: relative;
-      background: -moz-linear-gradient(
-         left,
-         #f00 0%,
-         #ff0 16.66%,
-         #0f0 33.33%,
-         #0ff 50%,
-         #00f 66.66%,
-         #f0f 83.33%,
-         #f00 100%
-      );
-      background: -webkit-linear-gradient(
-         left,
-         #f00 0%,
-         #ff0 16.66%,
-         #0f0 33.33%,
-         #0ff 50%,
-         #00f 66.66%,
-         #f0f 83.33%,
-         #f00 100%
-      );
-      background: -ms-linear-gradient(
-         left,
-         #f00 0%,
-         #ff0 16.66%,
-         #0f0 33.33%,
-         #0ff 50%,
-         #00f 66.66%,
-         #f0f 83.33%,
-         #f00 100%
-      );
-      background: -o-linear-gradient(
-         left,
-         #f00 0%,
-         #ff0 16.66%,
-         #0f0 33.33%,
-         #0ff 50%,
-         #00f 66.66%,
-         #f0f 83.33%,
-         #f00 100%
-      );
-      touch-action: none;
-
-      .#{$element}#{$name}-indicator {
-         border-color: rgba(0, 0, 0, 0.5);
-         height: calc(100% + 4px);
-         border-radius: 2px;
-         width: 4px;
-         top: -2px;
-      }
-   }
-
-   .#{$element}#{$name}-alpha {
-      height: 16px;
-      //@extend %cx-checker-bg;
-      @include cx-checker-background();
-      position: relative;
-      touch-action: none;
-
-      & > div:first-child {
-         width: 100%;
-         height: 100%;
-      }
-
-      .#{$element}#{$name}-indicator {
-         border-color: rgba(0, 0, 0, 0.5);
-         top: -2px;
-         height: calc(100% + 4px);
-         border-radius: 2px;
-         width: 4px;
-      }
-   }
-
-   .#{$element}#{$name}-details {
-      width: $size;
-      min-height: 170px;
-      margin: 4px;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-   }
-
-   .#{$element}#{$name}-inputs {
-      label {
-         width: 25%;
-         display: inline-block;
-         text-align: right;
-
-         input {
-            margin-left: 2px;
-            width: 60%;
-            text-align: center;
-         }
-      }
-   }
-
-   .#{$element}#{$name}-pixel-picker {
-      display: flex;
-      width: 20px;
-      height: 20px;
-      flex-shrink: 0;
-      align-items: center;
-      margin-top: 4px;
-
-      svg path {
-         fill: currentColor;
-      }
-
-      &:hover {
-         cursor: pointer;
-
-         svg path {
-            fill: currentColor;
-            opacity: 0.5;
-         }
-      }
-   }
-
-   .#{$element}#{$name}-preview {
-      display: flex;
-   }
-
-   .#{$element}#{$name}-color {
-      @include cx-checker-background();
-      height: 64px;
-      width: 64px;
-      border-radius: 4px;
-      align-self: flex-end;
-
-      & > div {
-         width: 100%;
-         height: 100%;
-      }
-   }
-
-   .#{$element}#{$name}-values {
-      flex-grow: 1;
-      margin: 0 8px;
-
-      input {
-         width: 100%;
-         display: block;
-      }
-
-      input:not(:last-child) {
-         margin: 0 0 4px 0;
-      }
-   }
-}
-
-@if (cx-should-include("cx/widgets/ColorPicker")) {
-   @include cx-colorpicker();
-}
+//@if cx-call-once("cx/widgets/checker-background") {
+//   %cx-checker-bg {
+//      background-repeat: repeat;
+//      background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuOWwzfk4AAAAfSURBVChTY9i5Y89/dAwEDOh4SCjEJohN8+BXuOc/AOttNBKJWD4sAAAAAElFTkSuQmCC");
+//   }
+//}
+
+@mixin cx-checker-background($tile-size: 4px, $color: rgba(gray, 0.5)) {
+   background-image: linear-gradient(45deg, $color 25%, transparent 25%),
+      linear-gradient(-45deg, $color 25%, transparent 25%), linear-gradient(45deg, transparent 75%, $color 75%),
+      linear-gradient(-45deg, transparent 75%, $color 75%);
+   background-size: 2 * $tile-size 2 * $tile-size;
+   background-position: 0 0, 0 $tile-size, $tile-size -#{$tile-size}, -#{$tile-size} 0px;
+}
+
+@mixin cx-colorpicker(
+   $name: "colorpicker",
+   $state-style-map: $cx-colorpicker-state-style-map,
+   $placeholder: $cx-input-placeholder,
+   $besm: $cx-besm
+) {
+   $block: map-get($besm, block);
+   $element: map-get($besm, element);
+   $state: map-get($besm, state);
+
+   $size: 220px;
+
+   .#{$block}#{$name} {
+      $styles: cx-deep-map-merge(
+         $state-style-map,
+         (
+            default: (
+               padding: 4px,
+            ),
+         )
+      );
+
+      @include cx-add-state-rules($styles, default);
+
+      display: inline-flex;
+      flex-direction: column;
+
+      @media screen and (min-width: 500px) {
+         flex-direction: row;
+      }
+
+      &:hover {
+         @include cx-add-state-rules($state-style-map, hover);
+      }
+
+      input {
+         @include cxe-field-input(
+            $besm,
+            $state-style-map,
+            $placeholder: $placeholder,
+            $input: false,
+            $overrides: (
+               default: (
+                  line-height: 14px,
+                  font-size: 11px,
+                  font-family: $cx-default-colorpicker-font-family,
+               )
+            )
+         );
+      }
+   }
+
+   .#{$element}#{$name}-picker {
+      width: $size;
+      height: $size;
+      margin: 4px;
+      //cursor: crosshair;
+      position: relative;
+      touch-action: none;
+
+      background: -webkit-linear-gradient(
+            top,
+            hsl(0, 0%, 100%) 0%,
+            hsla(0, 0%, 100%, 0) 50%,
+            hsla(0, 0%, 0%, 0) 50%,
+            hsl(0, 0%, 0%) 100%
+         ),
+         -webkit-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
+      background: -moz-linear-gradient(
+            top,
+            hsl(0, 0%, 100%) 0%,
+            hsla(0, 0%, 100%, 0) 50%,
+            hsla(0, 0%, 0%, 0) 50%,
+            hsl(0, 0%, 0%) 100%
+         ),
+         -moz-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
+      background: -ms-linear-gradient(
+            top,
+            hsl(0, 0%, 100%) 0%,
+            hsla(0, 0%, 100%, 0) 50%,
+            hsla(0, 0%, 0%, 0) 50%,
+            hsl(0, 0%, 0%) 100%
+         ),
+         -ms-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
+      background: -o-linear-gradient(
+            top,
+            hsl(0, 0%, 100%) 0%,
+            hsla(0, 0%, 100%, 0) 50%,
+            hsla(0, 0%, 0%, 0) 50%,
+            hsl(0, 0%, 0%) 100%
+         ),
+         -o-linear-gradient(left, hsl(0, 0%, 50%) 0%, hsla(0, 0%, 50%, 0) 100%);
+   }
+
+   .#{$element}#{$name}-indicator {
+      position: absolute;
+      border: 2px solid rgba(255, 255, 255, 0.8);
+      border-radius: 50%;
+      box-sizing: border-box;
+      width: 9px;
+      height: 9px;
+      left: calc(50% - 5px);
+      top: calc(50% - 5px);
+   }
+
+   .#{$element}#{$name}-hue {
+      height: 15px;
+      position: relative;
+      background: -moz-linear-gradient(
+         left,
+         #f00 0%,
+         #ff0 16.66%,
+         #0f0 33.33%,
+         #0ff 50%,
+         #00f 66.66%,
+         #f0f 83.33%,
+         #f00 100%
+      );
+      background: -webkit-linear-gradient(
+         left,
+         #f00 0%,
+         #ff0 16.66%,
+         #0f0 33.33%,
+         #0ff 50%,
+         #00f 66.66%,
+         #f0f 83.33%,
+         #f00 100%
+      );
+      background: -ms-linear-gradient(
+         left,
+         #f00 0%,
+         #ff0 16.66%,
+         #0f0 33.33%,
+         #0ff 50%,
+         #00f 66.66%,
+         #f0f 83.33%,
+         #f00 100%
+      );
+      background: -o-linear-gradient(
+         left,
+         #f00 0%,
+         #ff0 16.66%,
+         #0f0 33.33%,
+         #0ff 50%,
+         #00f 66.66%,
+         #f0f 83.33%,
+         #f00 100%
+      );
+      touch-action: none;
+
+      .#{$element}#{$name}-indicator {
+         border-color: rgba(0, 0, 0, 0.5);
+         height: calc(100% + 4px);
+         border-radius: 2px;
+         width: 4px;
+         top: -2px;
+      }
+   }
+
+   .#{$element}#{$name}-alpha {
+      height: 16px;
+      //@extend %cx-checker-bg;
+      @include cx-checker-background();
+      position: relative;
+      touch-action: none;
+
+      & > div:first-child {
+         width: 100%;
+         height: 100%;
+      }
+
+      .#{$element}#{$name}-indicator {
+         border-color: rgba(0, 0, 0, 0.5);
+         top: -2px;
+         height: calc(100% + 4px);
+         border-radius: 2px;
+         width: 4px;
+      }
+   }
+
+   .#{$element}#{$name}-details {
+      width: $size;
+      min-height: 170px;
+      margin: 4px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+   }
+
+   .#{$element}#{$name}-inputs {
+      label {
+         width: 25%;
+         display: inline-block;
+         text-align: right;
+
+         input {
+            margin-left: 2px;
+            width: 60%;
+            text-align: center;
+         }
+      }
+   }
+
+   .#{$element}#{$name}-pixel-picker {
+      display: flex;
+      width: 20px;
+      height: 20px;
+      flex-shrink: 0;
+      align-items: center;
+      margin-top: 4px;
+
+      svg path {
+         fill: currentColor;
+      }
+
+      &:hover {
+         cursor: pointer;
+
+         svg path {
+            fill: currentColor;
+            opacity: 0.5;
+         }
+      }
+   }
+
+   .#{$element}#{$name}-preview {
+      display: flex;
+   }
+
+   .#{$element}#{$name}-color {
+      @include cx-checker-background();
+      height: 64px;
+      width: 64px;
+      border-radius: 4px;
+      align-self: flex-end;
+
+      & > div {
+         width: 100%;
+         height: 100%;
+      }
+   }
+
+   .#{$element}#{$name}-values {
+      flex-grow: 1;
+      margin: 0 8px;
+
+      input {
+         width: 100%;
+         display: block;
+      }
+
+      input:not(:last-child) {
+         margin: 0 0 4px 0;
+      }
+   }
+}
+
+@if (cx-should-include("cx/widgets/ColorPicker")) {
+   @include cx-colorpicker();
+}