@zajno/common 1.3.1 → 1.3.2

package/src/viewModels/MultiSelectModel.ts

@@ -2,10 +2,12 @@ import { createLazy } from '../lazy.light';
 import { action, computed, makeObservable, observable, reaction } from 'mobx';
 import { FlagModel, ILabeledFlagModel } from './FlagModel';
 import { ValidatableModel } from './Validatable';
-import { IValueModel } from './ValuesCollector';
+import { IValueModel } from './types';
 import { withLabel } from './wrappers';
+import { ICountableModel, IResetableModel } from 'viewModels';
+import { arraysCompareDistinct } from '../math';
 
-export class MultiSelect<T = any> extends ValidatableModel<ReadonlyArray<T>> implements IValueModel<readonly string[]> {
+export class MultiSelect<T = any> extends ValidatableModel<ReadonlyArray<T>> implements IValueModel<readonly string[]>, IResetableModel, ICountableModel {
 
     @observable
     private readonly _indexes = new Set<number>();
@@ -56,7 +58,12 @@ export class MultiSelect<T = any> extends ValidatableModel<ReadonlyArray<T>> imp
     isIndexSelected(index: number) { return this._indexes.has(index); }
     isValueSelected(value: string) { return this.values.includes(value); }
 
-    get isEmpty() { return this._indexes.size === 0; }
+    get count() { return this._items.length; }
+    get selectedCount() { return this._indexes.size; }
+    get isEmpty() { return this.selectedCount === 0; }
+
+    @computed
+    get isDefault() { return arraysCompareDistinct(this.selectedIndexes, this._initial)?.diff === 0; }
 
     protected get valueToValidate() { return this.selectedItems; }
 

package/src/viewModels/NumberModel.ts

@@ -1,7 +1,8 @@
 import { action, makeObservable, observable } from 'mobx';
-import { IValueModel } from './ValuesCollector';
+import { IResetableModel } from 'viewModels';
+import { IValueModel } from './types';
 
-export interface INumberModel {
+export interface INumberModel extends IResetableModel {
     value: number;
 }
 
@@ -21,6 +22,8 @@ export class NumberModel implements INumberModel, IValueModel<number> {
     get value() { return this._value; }
     set value(v: number) { this._value = v; }
 
+    get isDefault() { return this._value === this._initial; }
+
     @action
     reset = () => {
         this._value = this._initial;

package/src/viewModels/SelectModel.ts

@@ -2,10 +2,11 @@ import { createLazy } from '../lazy.light';
 import { observable, computed, makeObservable, reaction } from 'mobx';
 import { FlagModel, ILabeledFlagModel } from './FlagModel';
 import { ValidatableModel } from './Validatable';
-import { IValueModel } from './ValuesCollector';
+import { IValueModel } from './types';
 import { withLabel } from './wrappers';
+import { IResetableModel } from 'viewModels';
 
-export class Select<T = any> extends ValidatableModel<T> implements IValueModel<string> {
+export class Select<T = any> extends ValidatableModel<T> implements IValueModel<string>, IResetableModel {
     @observable
     private _index: number = undefined;
 
@@ -67,6 +68,8 @@ export class Select<T = any> extends ValidatableModel<T> implements IValueModel<
         }
     }
 
+    get isDefault() { return this._index === this._initialIndex; }
+
     get index() {
         return this._index;
     }

package/src/viewModels/TextModel.ts

@@ -1,8 +1,9 @@
 import { observable, computed, makeObservable, reaction } from 'mobx';
 import { Getter } from '../types';
+import { IValueModel } from './types';
 import logger from '../logger';
 import { ValidatableModel, ValidationConfig } from './Validatable';
-import { IValueModel } from './ValuesCollector';
+import { IResetableModel } from 'viewModels';
 
 export type TextInputConfig = {
     name?: Getter<string>;
@@ -39,7 +40,7 @@ export class Text {
     get value() { return this._value; }
 }
 
-export class TextInputVM extends ValidatableModel implements IValueModel<string> {
+export class TextInputVM extends ValidatableModel implements IValueModel<string>, IResetableModel {
     @observable
     private _value = '';
 
@@ -103,10 +104,10 @@ export class TextInputVM extends ValidatableModel implements IValueModel<string>
         this.validate();
     }
 
-    reset() {
+    reset = () => {
         this._value = '';
         this._focused = false;
         super.reset();
-    }
+    };
 
 }

package/src/viewModels/ValuesCollector.ts

@@ -1,7 +1,4 @@
-
-export interface IValueModel<TValue> {
-    value: TValue;
-}
+import { IValueModel } from './types';
 
 export interface IValueCollector<TSource, TValue> {
     getValue(source: TSource): TValue;

package/src/viewModels/index.ts

@@ -1,3 +1,4 @@
+export * from './types';
 export * from './Validatable';
 export * from './TextModel';
 export * from './FlagModel';

package/src/viewModels/types.ts

@@ -0,0 +1,19 @@
+
+export interface IValueModel<TValue> {
+    value: TValue;
+}
+
+export interface ILabel<T> {
+    readonly label: T;
+}
+
+export interface IResetableModel {
+    readonly reset: () => void;
+    readonly isDefault?: boolean;
+}
+
+export interface ICountableModel {
+    readonly count: number;
+    readonly selectedCount?: number;
+    readonly isEmpty: boolean;
+}

package/src/viewModels/wrappers.ts

@@ -1,9 +1,5 @@
 import { Getter } from '../types';
-import { IValueModel } from './ValuesCollector';
-
-export interface ILabel<T> {
-    readonly label: T;
-}
+import { ILabel, IValueModel } from './types';
 
 export function withLabel<T, TModel extends IValueModel<T>, TLabel = string>(model: TModel, label: Getter<TLabel>) {
     const _label = label;