cx 24.0.2 → 24.2.0

package/src/ui/Rescope.js

@@ -25,7 +25,7 @@ export class Rescope extends PureContainer {
    }
 }
 
-   Rescope.prototype.bind = "$page";
-   Rescope.prototype.rootName = "$root";
+Rescope.prototype.bind = "$page";
+Rescope.prototype.rootName = "$root";
 
 Widget.alias("rescope", Rescope);

package/src/ui/Text.js

@@ -1,4 +1,4 @@
-import {Widget} from './Widget';
+import { Widget } from './Widget';
 
 export class Text extends Widget {
    init() {
@@ -17,11 +17,9 @@ export class Text extends Widget {
       }, ...arguments);
    }
 
-   render(context, {data}, key) {
+   render(context, { data }, key) {
       return data.value != null ? data.value : '';
    }
-
-
 }
 
 Widget.alias('text', Text)

package/src/ui/adapter/DataAdapter.js

@@ -1,20 +1,15 @@
-import {Component} from '../../util/Component';
+import { Component } from "../../util/Component";
 
 export class DataAdapter extends Component {
-
    getRecords() {
-      throw new Error('Abstract method');
+      throw new Error("Abstract method");
    }
 
-   setFilter() {
-
-   }
+   setFilter() {}
 
-   sort() {
-
-   }
+   sort() {}
 }
 
-DataAdapter.prototype.recordName = '$record';
-DataAdapter.prototype.indexName = '$index';
-DataAdapter.prototype.immutable = false;
+DataAdapter.prototype.recordName = "$record";
+DataAdapter.prototype.indexName = "$index";
+DataAdapter.prototype.immutable = false;

package/src/ui/adapter/GroupAdapter.d.ts

@@ -1,4 +1,23 @@
-import * as Cx from '../../core';
-import {ArrayAdapter} from './ArrayAdapter';
+import { ArrayAdapter } from './ArrayAdapter';
+import { AccessorChain, Prop, CollatorOptions, StructuredProp } from "../../core";
+import { Accessor } from "../../data/getAccessor";
 
-export class GroupAdapter extends ArrayAdapter {}
+interface GroupAdapterConfig {
+    immutable?: boolean;
+    sealed?: boolean;
+    recordsBinding?: Prop<any[]>;
+    recordsAccessor?: Accessor;
+    recordName: string | AccessorChain<any>;
+    indexName: string | AccessorChain<any>;
+    keyField?: string;
+    aggregates?: StructuredProp;
+    groupRecordsAlias?: string;
+    groupRecordsName?: string;
+    groupings?: any[] | null;
+    groupName?: string;
+    sortOptions?: CollatorOptions;
+}
+
+export class GroupAdapter extends ArrayAdapter {
+    constructor(config: GroupAdapterConfig);
+}

package/src/ui/adapter/TreeAdapter.d.ts

@@ -1,4 +1,24 @@
-import * as Cx from '../../core';
-import {ArrayAdapter} from './ArrayAdapter';
+import { Prop, StringProp } from "../../core";
+import { ArrayAdapter } from "./ArrayAdapter";
 
-export class TreeAdapter extends ArrayAdapter {}
+interface TreeAdapterConfig {
+   immutable?: boolean;
+   sealed?: boolean;
+   recordsBinding?: Prop<any[]>;
+   recordName?: StringProp;
+   indexName?: StringProp;
+   keyField?: string;
+   childrenField?: string;
+   expandedField?: string;
+   leafField?: string;
+   loadingField?: string;
+   loadedField?: string;
+   onLoadError?: (response: any) => void;
+   foldersFirst?: boolean;
+   hideRootNodes?: boolean;
+   restoreExpandedNodesOnLoad?: boolean;
+}
+
+export class TreeAdapter extends ArrayAdapter {
+   constructor(config: TreeAdapterConfig);
+}

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({