@singularsystems/neo-react 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/Modules/NeoReactModule.js

@@ -10,12 +10,10 @@ import { AutoRunnerFactory } from '../React/AutoRunner';
 import { RoutingState } from '../Routing/RoutingState';
 import { ContextMenuState } from '../ReactComponents/ContextMenu/ContextMenuState';
 import { DisposeHelper } from '../Services/DisposeHelper';
-import Decimal from 'decimal.js-light';
 import { IconFactory } from '../ReactComponents/Icons/IconFactory';
 var neoReactModule = new AppServices.Module("neo-react", function (container) {
     container.bind(AppServices.NeoTypes.Core.AutoRunnerFactory).to(AutoRunnerFactory).inSingletonScope();
     container.bind(AppServices.NeoTypes.Core.ModelCreator).to(ReactModelCreator).inTransientScope();
-    container.bind(AppServices.NeoTypes.Misc.DecimalType).toConstantValue(Decimal);
     container.bind(AppServices.NeoTypes.UI.ErrorHandler).to(ErrorHandler).inSingletonScope();
     container.bind(AppServices.NeoTypes.UI.GlobalContextMenuState).toConstantValue(new ContextMenuState());
     container.bind(AppServices.NeoTypes.Routing.PageLeaveHandler).to(PageLeaveHandler).inSingletonScope();

package/dist/Modules/ReactSetup.js

@@ -1,5 +1,5 @@
 import { AppServices, Utils } from '@singularsystems/neo-core';
-import { configure, runInAction, untracked } from 'mobx';
+import { configure, isObservableArray, runInAction, untracked } from 'mobx';
 import React from 'react';
 import { NeoReactTypes } from './Types';
 export function runReactSetup(container) {
@@ -10,6 +10,12 @@ export function runReactSetup(container) {
         return React.createElement("div", { dangerouslySetInnerHTML: { __html: html } });
     };
     Utils.batchUpdate = runInAction;
+    Utils.sortableArray = function (array) {
+        if (isObservableArray(array)) {
+            return array.slice();
+        }
+        return array;
+    };
     window.addEventListener("beforeunload", function (e) {
         container.get(AppServices.NeoTypes.Routing.PageLeaveHandler).onWindowUnload(container.get(NeoReactTypes.Routing.GlobalRoutingState).currentView, e);
     });

package/dist/Modules/Types.d.ts

@@ -5,7 +5,6 @@ import Slider, { Range } from 'rc-slider';
 import { SketchPicker } from 'react-color';
 import AsyncSelect from 'react-select/async';
 import { AxiosStatic } from 'axios';
-import Decimal from 'decimal.js-light';
 import Select from 'react-select';
 import { IDisposeHelper } from '../Services/IDisposeHelper';
 import { IIconFactory } from '../ReactComponents/Icons/IIconFactory';
@@ -36,14 +35,12 @@ declare const NeoReactTypes: {
     Core: {
         AutoRunnerFactory: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Model/IAutoRunner").IAutoRunnerFactory>;
         ConnectionManager: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/ConnectionManager").IConnectionManager>;
+        DecimalService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Numeric").IDecimalService<import("@singularsystems/neo-core/dist/Numeric").IDecimal>>;
         ModelCreator: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Model/IModelCreatorBase").default>;
     };
     Localisation: {
         LocalisationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Localisation").ILocalisationService>;
     };
-    Misc: {
-        DecimalType: AppServices.ServiceIdentifier<typeof Decimal>;
-    };
     Security: {
         AuthenticationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security").IAuthenticationService>;
         AuthorisationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security").IAuthorisationService>;

package/dist/React/ReactModelCreator.js

@@ -27,11 +27,11 @@ var ReactModelCreator = /** @class */ (function (_super) {
         model.isSuspended = false;
     };
     ReactModelCreator.prototype.setupObject = function (typeInfo, object, options) {
-        var _a, _b, _c;
+        var _a, _b;
         var annotations = {};
         var observables = {};
-        for (var _i = 0, _d = typeInfo.properties; _i < _d.length; _i++) {
-            var propertyInfo = _d[_i];
+        for (var _i = 0, _c = typeInfo.properties; _i < _c.length; _i++) {
+            var propertyInfo = _c[_i];
             if (propertyInfo.isObservable !== false) {
                 var propertyName = propertyInfo.propertyName, makeObservable_1 = (_a = propertyInfo.isObservable) !== null && _a !== void 0 ? _a : options.makeObservable;
                 var propertyInstance = void 0;
@@ -56,9 +56,9 @@ var ReactModelCreator = /** @class */ (function (_super) {
                 }
             }
         }
-        for (var _e = 0, _f = Array.from(typeInfo.methods.values()); _e < _f.length; _e++) {
-            var methodInfo = _f[_e];
-            if ((_c = (_b = methodInfo.isAction) !== null && _b !== void 0 ? _b : options.autoActions) !== null && _c !== void 0 ? _c : options.makeObservable) {
+        for (var _d = 0, _e = Array.from(typeInfo.methods.values()); _d < _e.length; _d++) {
+            var methodInfo = _e[_d];
+            if ((_b = methodInfo.isAction) !== null && _b !== void 0 ? _b : options.autoActions) {
                 annotations[methodInfo.name] = action;
             }
         }

package/dist/ReactComponents/DropDown/DropDown.js

@@ -101,7 +101,8 @@ var DropDown = /** @class */ (function (_super) {
         var items = this.items;
         var selectedItem = this.getSelectedOption(this.props.bind.value); // This sets the sort value to allow sorting of drop downs in grids. 
         var value = this.props.bind.value;
-        var addBlankItem = ((_c = (_b = splitProps.select) === null || _b === void 0 ? void 0 : _b.allowNulls) !== null && _c !== void 0 ? _c : this.props.bind.propertyInfo.allowNulls) || !value;
+        var notFound = items.length > 0 && value && selectedItem[this.valueMember] !== value;
+        var addBlankItem = ((_c = (_b = splitProps.select) === null || _b === void 0 ? void 0 : _b.allowNulls) !== null && _c !== void 0 ? _c : this.props.bind.propertyInfo.allowNulls) || !value || notFound;
         if (addBlankItem && items.find(function (item) { return item[_this.valueMember] === null || item[_this.valueMember] === ""; })) {
             // If there is an item with a null value, don't add a blank drop down item.
             addBlankItem = false;
@@ -128,7 +129,7 @@ var DropDown = /** @class */ (function (_super) {
             }
             control =
                 React.createElement("select", __assign({ value: valueIsBlank ? "" : value, onChange: this.onItemSelected, ref: splitProps.editor.inputElement }, domProps),
-                    addBlankItem && React.createElement("option", { className: "option-default" }, nullText),
+                    addBlankItem && React.createElement("option", { className: "option-default" }, notFound ? "(Not found): ".concat(value) : nullText),
                     items.map(function (item) { return (React.createElement("option", { value: item[_this.valueMember], key: item[_this.valueMember] }, item[_this.displayMember])); }));
         }
         return (InputHelpers.surroundWithInputGroup(control, splitProps.editor));

package/dist/ReactComponents/Grid/Column.d.ts

@@ -22,6 +22,7 @@ export interface INeoColumnProps<TData> extends INeoCommonColumnProps, IEditorCo
     /** Class name to apply to body cells. */
     cellClassName?: string;
     onHeaderClick?: (e: React.MouseEvent) => void;
+    children?: React.ReactNode | (() => React.ReactNode);
 }
 export default class Column<TData> extends ComponentBase<INeoColumnProps<TData>> {
     static isColumnComponent: boolean;

package/dist/ReactComponents/Grid/Column.js

@@ -186,9 +186,9 @@ var Column = /** @class */ (function (_super) {
             !containerProps.suppressDefaultContent && (editor !== undefined ?
                 editor :
                 editorProps.bind ? displayValue : undefined),
-            !containerProps.bindContext && this.props.children,
+            !containerProps.bindContext && (this.props.children instanceof Function ? this.props.children() : this.props.children),
             containerProps.bindContext &&
-                React.createElement(FormContext.Consumer, null, function (value) { return (React.createElement(FormContext.Provider, { value: __assign(__assign({}, value), { parentType: EditorParentType.Column, bindProperty: containerProps.bindContext }) }, _this.props.children)); })));
+                React.createElement(FormContext.Consumer, null, function (value) { return (React.createElement(FormContext.Provider, { value: __assign(__assign({}, value), { parentType: EditorParentType.Column, bindProperty: containerProps.bindContext }) }, _this.props.children instanceof Function ? _this.props.children() : _this.props.children)); })));
     };
     Column.prototype.renderFooter = function (props, domProps) {
         var _this = this;

package/dist/ReactComponents/NumberInput.d.ts

@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { IBindableEditorProps } from './PropTypes';
 import { FormContext } from './FormContext';
-import { Misc, Model } from '@singularsystems/neo-core';
-import Decimal from 'decimal.js-light';
+import { Misc, Model, Numeric } from '@singularsystems/neo-core';
 import ComponentBase from './ComponentBase';
 export interface INumberInputSpecificProps {
     /** Format string of number */
@@ -33,7 +32,7 @@ export declare class FormatState {
     /** How many decimals the value is allowed. */
     allowedDecimals: number, zeroText?: string | undefined, useNative?: boolean | undefined);
     static create(propertyInfo: Model.PropertyInfo, numericType: Misc.DataType, numProps?: INumberInputSpecificProps, appendText?: string): FormatState;
-    getFormattedValue(value?: number | Decimal | null): string;
+    getFormattedValue(value?: number | Numeric.IDecimal | null): string;
 }
 export default class NumberInput extends ComponentBase<INumberInputProps> {
     static contextType: React.Context<import("./FormContext").FormContextParams>;

package/dist/ReactComponents/NumberInput.js

@@ -3,7 +3,6 @@ import * as React from 'react';
 import { BindPropsHelper } from './PropTypes';
 import { FormContext } from './FormContext';
 import { Misc, NumberUtils, Utils } from '@singularsystems/neo-core';
-import Decimal from 'decimal.js-light';
 import { InputHelpers } from './InputHelpers';
 import { observer } from 'mobx-react';
 import memoize from 'memoize-one';
@@ -57,9 +56,7 @@ var FormatState = /** @class */ (function () {
             return this.zeroText;
         }
         if (value !== undefined && value !== null) {
-            if (value instanceof Misc.Globals.decimalType) {
-                value = value.toNumber();
-            }
+            value = NumberUtils.decimalService.toNumber(value);
             if (typeof value === "number") {
                 if (this.hasExternalPercentSymbol) {
                     value *= 100;
@@ -112,18 +109,18 @@ var NumberInput = /** @class */ (function (_super) {
                 return;
             }
         }
+        var decimal = NumberUtils.decimalService;
         if (stringValue == "") {
-            newValue = this.props.bind.propertyInfo.allowNulls ? null : new Decimal(0);
+            newValue = this.props.bind.propertyInfo.allowNulls ? null : decimal.createDecimal(0);
         }
         else if (this.formatState.isPercent && NumberUtils.transformPercent) {
-            newValue = new Decimal(stringValue).dividedBy(100);
+            newValue = decimal.divideBy(decimal.createDecimal(stringValue), 100);
         }
         else if (this.numericType === Misc.DataType.Float || this.numericType === Misc.DataType.Decimal) {
-            newValue = new Decimal(stringValue);
+            newValue = decimal.createDecimal(stringValue);
         }
         else {
-            // Rounds to zero.
-            newValue = new Decimal(stringValue).toDecimalPlaces(0, Decimal.ROUND_DOWN);
+            newValue = decimal.truncate(decimal.createDecimal(stringValue));
         }
         if (newValue === null) {
             this.props.bind.value = newValue;
@@ -136,7 +133,7 @@ var NumberInput = /** @class */ (function (_super) {
                 this.props.bind.value = newValue;
             }
             else {
-                this.props.bind.value = newValue.toNumber();
+                this.props.bind.value = decimal.toNumber(newValue);
             }
         }
     };
@@ -148,13 +145,7 @@ var NumberInput = /** @class */ (function (_super) {
         }
     };
     NumberInput.prototype.getBindValueAsNumber = function () {
-        var propertyValue = this.props.bind.value;
-        if (propertyValue instanceof Misc.Globals.decimalType) {
-            return propertyValue.toNumber();
-        }
-        else {
-            return propertyValue;
-        }
+        return NumberUtils.decimalService.toNumber(this.props.bind.value);
     };
     NumberInput.prototype.setFocusedText = function (element) {
         this.hasFocus = true;
@@ -208,7 +199,7 @@ var NumberInput = /** @class */ (function (_super) {
                     value -= deltaValue;
                 }
                 if (this.numericType === Misc.DataType.Decimal) {
-                    this.props.bind.value = new Decimal(value);
+                    this.props.bind.value = NumberUtils.decimalService.createDecimal(value);
                 }
                 else {
                     this.props.bind.value = value;

package/dist/ReactComponents/PropTypes.d.ts

@@ -57,6 +57,7 @@ export interface IBindableEditorProps<T = HTMLElement> extends IBindableEditorPr
      * Value of true results in the readable property name being used.
      */
     placeholder?: any;
+    children?: any;
 }
 interface IEditorSelectorProps<T> {
     /** Drop down props if this editor must be a drop down */

package/dist/Routing/ViewParameter.d.ts

@@ -6,7 +6,7 @@ export interface IViewParameter {
     /**
      * Gets or sets the current parameter value.
      */
-    value: number | string | null;
+    value: number | string | string[] | null;
     /**
      * Clears the value, replacing the url instead of adding to the history.
      * This prevents the back button returning the params to the current state.
@@ -31,6 +31,10 @@ export interface IViewParameter {
      * Returns the value as a string. String will be empty if the underlying value is null.
      */
     asString(): string;
+    /**
+     * Returns the value as a list of string.
+     */
+    asStringList(): string[];
     /**
      * Allows this view parameter to automatically update when the provided properties value changes.
      * This is one way, you will still need to set the property value in viewParamsUpdated()
@@ -51,8 +55,8 @@ export declare class ViewParameter implements IViewParameter {
     prefixes: IViewParameterPrefix[];
     constructor(parent: IViewParameterListInternal, name: string, routeParameter: IRouteParameter);
     bindTo(propertyOrCallback: Model.IPropertyInstance | (() => (string | number | null | undefined))): void;
-    get value(): number | string | null;
-    set value(value: number | string | null);
+    get value(): number | string | string[] | null;
+    set value(value: number | string | string[] | null);
     reset(): void;
     _description: string;
     get description(): string;
@@ -60,6 +64,7 @@ export declare class ViewParameter implements IViewParameter {
     setDescription(description: string, getPrefixes?: (currentPrefixes: IViewParameterPrefix[]) => IViewParameterPrefix[]): void;
     asNullableInt(): number | null;
     asString(): string;
+    asStringList(): string[];
     /** Updates the current value, and returns true if the value changed. */
     update(value: string | null): boolean;
     getParamString(state: {

package/dist/Routing/ViewParameter.js

@@ -26,7 +26,13 @@ export var ViewParameter = /** @class */ (function () {
             return this._value;
         },
         set: function (value) {
-            var stringValue = value ? value.toString() : null;
+            var stringValue;
+            if (value instanceof Array) {
+                stringValue = value.join(",");
+            }
+            else {
+                stringValue = value ? value.toString() : null;
+            }
             if (stringValue !== this._value) {
                 this.hasPendingValue = true;
                 this.pendingValue = stringValue;
@@ -69,6 +75,14 @@ export var ViewParameter = /** @class */ (function () {
     ViewParameter.prototype.asString = function () {
         return this._value || "";
     };
+    ViewParameter.prototype.asStringList = function () {
+        if (this._value) {
+            return this._value.split(",");
+        }
+        else {
+            return [];
+        }
+    };
     /** Updates the current value, and returns true if the value changed. */
     ViewParameter.prototype.update = function (value) {
         if (value) {

package/dist/Routing/ViewParameterList.d.ts

@@ -24,7 +24,7 @@ export interface IViewParameterListOfT<TParams extends RouteParameterObject<TPar
      * @param values New values.
      */
     setValues(values: {
-        [P in keyof TParams]?: number | string | null;
+        [P in keyof TParams]?: number | string | string[] | null;
     }, options?: ISetValuesOptions | boolean): void;
 }
 export interface IViewParameterListInternal extends IViewParameterList {
@@ -42,7 +42,7 @@ export declare class ViewParameterList<TParams extends RouteParameterObject<TPar
     getBreadCrumbList(upTo?: ViewParameter): BreadCrumbItem[];
     private getQueryString;
     setValues(values: {
-        [P in keyof TParams]?: number | string | null;
+        [P in keyof TParams]?: number | string | string[] | null;
     }, options?: ISetValuesOptions | boolean): void;
     setUrl(viewParameter: ViewParameter | null, replace?: boolean): void;
     /**

package/dist/Routing/ViewParameterList.js

@@ -22,7 +22,7 @@ var ViewParameterList = /** @class */ (function () {
         var basePath = Misc.Globals.appService.get(NeoReactTypes.Routing.NavigationHelper).getCurrentViewPath();
         var breadCrumbs = [];
         var state = { hasQuery: false };
-        var queryPath = this.getQueryString();
+        var queryPath = this.getQueryString(state);
         var paramPath = basePath;
         var selectablePath = basePath;
         for (var _i = 0, _b = this.params; _i < _b.length; _i++) {
@@ -56,10 +56,12 @@ var ViewParameterList = /** @class */ (function () {
                 break;
             }
         }
+        if (breadCrumbs.length === 0 && state.hasQuery) {
+            breadCrumbs.push(new BreadCrumbItem("", queryPath));
+        }
         return breadCrumbs;
     };
-    ViewParameterList.prototype.getQueryString = function () {
-        var state = { hasQuery: false };
+    ViewParameterList.prototype.getQueryString = function (state) {
         var queryPath = "";
         for (var _i = 0, _a = this.params; _i < _a.length; _i++) {
             var viewParam = _a[_i];
@@ -159,7 +161,7 @@ var ViewParameterList = /** @class */ (function () {
         while (paramPath.endsWith("/")) {
             paramPath = paramPath.substring(0, paramPath.length - 1);
         }
-        return paramPath + viewParameterList.getQueryString();
+        return paramPath + viewParameterList.getQueryString(state);
     };
     return ViewParameterList;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,11 +29,10 @@
     "typescript": "5.0.4"
   },
   "dependencies": {
-    "@singularsystems/neo-core": "1.0.0-beta.5",
+    "@singularsystems/neo-core": "1.0.0-beta.6",
     "@types/rc-slider": "^8.6.5",
     "@types/react-color": "^3.0.1",
     "axios": "1.4.0",
-    "decimal.js-light": "^2.5.1",
     "history": "4.10.1",
     "inversify": "^6.0.1",
     "memoize-one": "6.0.0",
@@ -48,7 +47,7 @@
     "tslib": "2.5.0"
   },
   "peerDependencies": {
-    "@singularsystems/neo-core": ">=1.0.0-beta.5",
+    "@singularsystems/neo-core": ">=1.0.0-beta.6",
     "axios": "1.4.0",
     "inversify": ">=5.0.1",
     "mobx": ">=6.9.0",