@singularsystems/neo-react 0.10.48 → 1.0.0-alpha.3

package/dist/Routing/RoutingState.js

@@ -1,10 +1,11 @@
 import { __decorate, __metadata } from "tslib";
 import { injectable } from 'inversify';
-import { observable } from 'mobx';
-import { ViewBase } from '../Views';
+import { makeObservable, observable } from 'mobx';
 var RoutingState = /** @class */ (function () {
     function RoutingState() {
         this.observableRoute = null;
+        this.currentView = null;
+        makeObservable(this);
     }
     RoutingState.prototype.setCurrentRoute = function (routeProps, route) {
         this.currentRouteProps = routeProps;
@@ -14,17 +15,17 @@ var RoutingState = /** @class */ (function () {
         var _a, _b;
         if (this.previousRoute !== this.currentRoute) {
             this.previousRoute = this.currentRoute;
-            this.observableRoute = (_a = this.currentRoute, (_a !== null && _a !== void 0 ? _a : null));
-            if (((_b = ViewBase.currentView) === null || _b === void 0 ? void 0 : _b.constructor) !== this.currentRoute.component) {
-                ViewBase.currentView = null;
+            this.observableRoute = (_a = this.currentRoute) !== null && _a !== void 0 ? _a : null;
+            if (((_b = this.currentView) === null || _b === void 0 ? void 0 : _b.constructor) !== this.currentRoute.component) {
+                this.currentView = null;
             }
             // Scroll back to top as if the browser had actually loaded a new page.
             window.scrollTo(0, 0);
         }
         else {
             // Same route, but parameters must have changed.
-            if (ViewBase.currentView) {
-                ViewBase.currentView.updateViewParams(this.currentRouteProps.match);
+            if (this.currentView) {
+                this.currentView.updateViewParams(this.currentRouteProps.match);
             }
         }
     };
@@ -32,8 +33,13 @@ var RoutingState = /** @class */ (function () {
         observable.ref,
         __metadata("design:type", Object)
     ], RoutingState.prototype, "observableRoute", void 0);
+    __decorate([
+        observable.ref,
+        __metadata("design:type", Object)
+    ], RoutingState.prototype, "currentView", void 0);
     RoutingState = __decorate([
-        injectable()
+        injectable(),
+        __metadata("design:paramtypes", [])
     ], RoutingState);
     return RoutingState;
 }());

package/dist/Routing/RoutingState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RoutingState.js","sourceRoot":"","sources":["../../src/Routing/RoutingState.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAKpC;IAAA;QASW,oBAAe,GAA2B,IAAI,CAAC;IA8B1D,CAAC;IA5BU,sCAAe,GAAtB,UAAuB,UAA+B,EAAE,KAAsB;QAE1E,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAE9B,CAAC;IAIM,qCAAc,GAArB;;QAEI,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,YAAY,EAAE;YAC1C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;YACvC,IAAI,CAAC,eAAe,GAAG,MAAA,IAAI,CAAC,YAAY,mCAAI,IAAI,CAAC;YAEjD,IAAI,CAAA,MAAA,QAAQ,CAAC,WAAW,0CAAE,WAAW,MAAK,IAAI,CAAC,YAAa,CAAC,SAAS,EAAE;gBACpE,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;aAC/B;YAED,uEAAuE;YACvE,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACzB;aAAM;YACH,gDAAgD;YAChD,IAAI,QAAQ,CAAC,WAAW,EAAE;gBACtB,QAAQ,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;aACvE;SACJ;IACL,CAAC;IA7BD;QADC,UAAU,CAAC,GAAG;;yDACuC;IAT7C,YAAY;QADxB,UAAU,EAAE;OACA,YAAY,CAuCxB;IAAD,mBAAC;CAAA,AAvCD,IAuCC;SAvCY,YAAY"}

package/dist/Routing/ViewParameter.js

@@ -1,5 +1,5 @@
 import { __decorate, __metadata } from "tslib";
-import { observable } from 'mobx';
+import { makeObservable, observable } from 'mobx';
 var ViewParameter = /** @class */ (function () {
     function ViewParameter(parent, name, routeParameter) {
         this.parent = parent;
@@ -9,6 +9,7 @@ var ViewParameter = /** @class */ (function () {
         this.pendingValue = null;
         this._value = null;
         this.description = "";
+        makeObservable(this);
     }
     ViewParameter.prototype.bindTo = function (propertyOrCallback) {
         var _this = this;
@@ -32,7 +33,7 @@ var ViewParameter = /** @class */ (function () {
                 this.parent.setUrl(this);
             }
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     ViewParameter.prototype.reset = function () {
@@ -83,7 +84,7 @@ var ViewParameter = /** @class */ (function () {
         get: function () {
             return this.hasPendingValue ? this.pendingValue : this._value;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     __decorate([

package/dist/Routing/ViewParameter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewParameter.js","sourceRoot":"","sources":["../../src/Routing/ViewParameter.ts"],"names":[],"mappings":"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"}

package/dist/Routing/ViewParameterList.js

@@ -29,7 +29,7 @@ var ViewParameterList = /** @class */ (function () {
             var viewParam = _b[_i];
             if (!viewParam.routeParameter.isQuery && (viewParam.description || upTo) && viewParam.latestValue !== null) {
                 paramPath += viewParam.getParamString(state);
-                if ((_a = viewParam.routeParameter.selection, (_a !== null && _a !== void 0 ? _a : BreadCrumbSelectMode.Default)) === BreadCrumbSelectMode.Default) {
+                if (((_a = viewParam.routeParameter.selection) !== null && _a !== void 0 ? _a : BreadCrumbSelectMode.Default) === BreadCrumbSelectMode.Default) {
                     selectablePath = paramPath;
                 }
                 breadCrumbs.push(new BreadCrumbItem(viewParam.description, (!upTo && viewParam.routeParameter.selection === BreadCrumbSelectMode.None) ? "" : (selectablePath + queryPath)));
@@ -52,12 +52,12 @@ var ViewParameterList = /** @class */ (function () {
         return queryPath;
     };
     ViewParameterList.prototype.setValues = function (values, force) {
-        if (force === void 0) { force = false; }
         var _a;
+        if (force === void 0) { force = false; }
         this.suppressNavigation = true;
         this.hasSuppressedNavigation = false;
         for (var paramName in values) {
-            this[paramName].value = (_a = values[paramName], (_a !== null && _a !== void 0 ? _a : null));
+            this[paramName].value = (_a = values[paramName]) !== null && _a !== void 0 ? _a : null;
         }
         this.suppressNavigation = false;
         if (this.hasSuppressedNavigation || force) {

package/dist/Routing/ViewParameterList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewParameterList.js","sourceRoot":"","sources":["../../src/Routing/ViewParameterList.ts"],"names":[],"mappings":"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"}

package/dist/Routing/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Routing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAc,SAAS,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EAAE,oBAAoB,EAAoC,MAAM,mBAAmB,CAAC"}

package/dist/Services/DisposeHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DisposeHelper.js","sourceRoot":"","sources":["../../src/Services/DisposeHelper.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAqB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAInD;IAAA;QAEY,wBAAmB,GAAwB,EAAE,CAAC;QAC9C,0BAAqB,GAAuB,EAAE,CAAC;IA6B3D,CAAC;IA3BG;;;;OAIG;IACK,wCAAgB,GAAvB,UAA2B,UAA2B,EAAE,MAA0B;QAAlF,iBAIA;QAHG,IAAM,QAAQ,GAAG,QAAQ,CAAC,cAAM,OAAA,UAAU,CAAC,KAAI,CAAC,EAAhB,CAAgB,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,mCAAW,GAAlB,UAA+C,UAAa;QACxD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,+BAAO,GAAd;QACI,KAAqB,UAAwB,EAAxB,KAAA,IAAI,CAAC,mBAAmB,EAAxB,cAAwB,EAAxB,IAAwB,EAAE;YAA1C,IAAI,QAAQ,SAAA;YACb,QAAQ,EAAE,CAAC;SACd;QACD,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAE9B,KAAuB,UAA0B,EAA1B,KAAA,IAAI,CAAC,qBAAqB,EAA1B,cAA0B,EAA1B,IAA0B,EAAE;YAA9C,IAAI,UAAU,SAAA;YACf,UAAU,CAAC,OAAO,EAAE,CAAC;SACxB;QACD,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;IACpC,CAAC;IA/BQ,aAAa;QADzB,UAAU,EAAE;OACA,aAAa,CAgCzB;IAAD,oBAAC;CAAA,AAhCD,IAgCC;SAhCY,aAAa"}

package/dist/Services/IDisposeHelper.js

@@ -0,0 +1 @@
+export {};

package/dist/Services/IDisposeHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IDisposeHelper.js","sourceRoot":"","sources":["../../src/Services/IDisposeHelper.ts"],"names":[],"mappings":""}

package/dist/Views/EmptyViewModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmptyViewModel.js","sourceRoot":"","sources":["../../src/Views/EmptyViewModel.ts"],"names":[],"mappings":";AAAA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE9D;IAA4C,kCAAa;IAErD,wBAAY,UAAyE;QAAzE,2BAAA,EAAA,aAAa,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC;eACjF,kBAAM,UAAU,CAAC;IACrB,CAAC;IAEM,mCAAU,GAAjB;IAEA,CAAC;IACL,qBAAC;AAAD,CAAC,AATD,CAA4C,aAAa,GASxD"}

package/dist/Views/IViewModel.js

@@ -0,0 +1 @@
+export {};

package/dist/Views/IViewModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IViewModel.js","sourceRoot":"","sources":["../../src/Views/IViewModel.ts"],"names":[],"mappings":""}

package/dist/Views/PersistentViewBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PersistentViewBase.js","sourceRoot":"","sources":["../../src/Views/PersistentViewBase.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAKlC;IACY,sCAA6B;IAIrC,4BAAY,QAAgB,EAAE,eAA4D,EAAE,KAAU;eAClG,kBAAM,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC;IAE3C,CAAC;IAES,6CAAgB,GAA1B;IAEA,CAAC;IAED,+CAAkB,GAAlB,UAAmB,SAAsD;QACrE,IAAI,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,WAAW,EAAE;YACd,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAC9C,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC;SACvE;QACD,OAAO,WAA6C,CAAC;IACzD,CAAC;IAlBc,8BAAW,GAAqC,EAAE,CAAC;IAmBtE,yBAAC;CAAA,AAtBD,CACY,QAAQ,GAqBnB;eAtB6B,kBAAkB"}

package/dist/Views/ViewBase.d.ts

@@ -21,9 +21,8 @@ export interface IViewBaseConstructor {
     params?: RouteParameterObject<any>;
 }
 export default abstract class ViewBase<TViewModel extends IViewModel = EmptyViewModel, TParams extends RouteParameterObject<TParams> = {}> extends React.Component implements IViewBase {
-    /** Represents the view that is currently being displayed */
-    static currentView: IViewBase | null;
     viewName: string;
+    static get currentView(): IViewBase | null;
     private routingState;
     navigation: import("../Routing").INavigationHelper;
     private breadCrumbStartItems?;

package/dist/Views/ViewBase.js

@@ -25,28 +25,36 @@ var ViewBase = /** @class */ (function (_super) {
         }
         _this.viewName = viewName;
         _this.viewState = _this.getStoredViewState(viewModel);
-        ViewBase.currentView = _this;
+        _this.routingState.currentView = _this;
         return _this;
     }
+    Object.defineProperty(ViewBase, "currentView", {
+        // For backwards compatibility
+        get: function () {
+            return Misc.Globals.appService.get(NeoReactTypes.Routing.GlobalRoutingState).currentView;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(ViewBase.prototype, "viewModel", {
         get: function () {
             return this.viewState.viewModel;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ViewBase.prototype, "taskRunner", {
         get: function () {
             return this.viewModel.taskRunner;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ViewBase.prototype, "viewParams", {
         get: function () {
             return this.viewState.viewParams;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     ViewBase.prototype.getStoredViewState = function (viewModel) {
@@ -91,7 +99,6 @@ var ViewBase = /** @class */ (function (_super) {
     /** Gets the parent breadcrumbs, and the breadcrumb for this view. */
     ViewBase.prototype.getBreadCrumbStart = function () {
         var _this = this;
-        var _a;
         var items = [];
         // Get parent items
         var menuRoute = this.routingState.currentRoute;
@@ -102,7 +109,7 @@ var ViewBase = /** @class */ (function (_super) {
         }
         // Add view name
         var firstParam = this.viewState.viewParams.params[0];
-        items.push(new BreadCrumbItem(function () { return _this.viewName; }, ((_a = firstParam) === null || _a === void 0 ? void 0 : _a.routeParameter.required) ? "" : this.navigation.getCurrentViewPath()));
+        items.push(new BreadCrumbItem(function () { return _this.viewName; }, (firstParam === null || firstParam === void 0 ? void 0 : firstParam.routeParameter.required) ? "" : this.navigation.getCurrentViewPath()));
         return items;
     };
     /**
@@ -139,16 +146,10 @@ var ViewBase = /** @class */ (function (_super) {
      */
     ViewBase.prototype.beforeRouteChanged = function (props) {
     };
-    /** Represents the view that is currently being displayed */
-    ViewBase.currentView = null;
     __decorate([
         observable.ref,
         __metadata("design:type", String)
     ], ViewBase.prototype, "viewName", void 0);
-    __decorate([
-        observable.ref,
-        __metadata("design:type", Object)
-    ], ViewBase, "currentView", void 0);
     return ViewBase;
 }(React.Component));
 export default ViewBase;

package/dist/Views/ViewBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewBase.js","sourceRoot":"","sources":["../../src/Views/ViewBase.ts"],"names":[],"mappings":"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"}

package/dist/Views/ViewComponentBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewComponentBase.js","sourceRoot":"","sources":["../../src/Views/ViewComponentBase.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B;IAA8G,qCAAuB;IAEjI,2BAAY,KAAa,EAAE,aAAmC;QAA9D,YACI,kBAAM,KAAK,CAAC,SAMf;QAJG,KAAI,CAAC,SAAS,GAAG,IAAI,aAAa,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,UAAU,EAAE;YAClB,KAAI,CAAC,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;SAChD;;IACL,CAAC;IAID,6CAAiB,GAAjB;QACI,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IAChC,CAAC;IAED,gDAAoB,GAApB;QACI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACL,wBAAC;AAAD,CAAC,AApBD,CAA8G,KAAK,CAAC,SAAS,GAoB5H"}

package/dist/Views/ViewModelBase.js

@@ -23,9 +23,8 @@ var ViewModelBase = /** @class */ (function (_super) {
         return this.disposeHelper.registerReaction(expression, effect);
     };
     ViewModelBase.prototype.registerViewModel = function (viewModel, options) {
-        var _a;
         var viewModelInstance = ViewModelBase.create(viewModel, this.taskRunner);
-        if ((_a = options) === null || _a === void 0 ? void 0 : _a.initialise) {
+        if (options === null || options === void 0 ? void 0 : options.initialise) {
             viewModelInstance.initialise();
         }
         this.trackedViewModels.push(viewModelInstance);

package/dist/Views/ViewModelBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewModelBase.js","sourceRoot":"","sources":["../../src/Views/ViewModelBase.ts"],"names":[],"mappings":"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"}

package/dist/Views/ViewState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ViewState.js","sourceRoot":"","sources":["../../src/Views/ViewState.ts"],"names":[],"mappings":"AASA;IAGI,mBACW,UAAsC,EACtC,SAAqB;QADrB,eAAU,GAAV,UAAU,CAA4B;QACtC,cAAS,GAAT,SAAS,CAAY;QAJhC,aAAQ,GAAG,KAAK,CAAC;IAMjB,CAAC;IACL,gBAAC;AAAD,CAAC,AARD,IAQC"}

package/dist/Views/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Views/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/index.d.ts

@@ -6,6 +6,5 @@ import * as Routing from './Routing';
 import * as Views from './Views/';
 import * as Managers from './ReactComponents/_Managers';
 import { TooltipHelper } from './ReactComponents/TooltipHelper';
-export * from './React/Decorators';
 export { Managers, NeoReactModule, NeoReactTypes, Neo, NeoGrid, Routing, Views, TooltipHelper, };
 export { ICancellableEvent } from './ReactComponents/Misc';

package/dist/index.js

@@ -6,5 +6,4 @@ import * as Routing from './Routing';
 import * as Views from './Views/';
 import * as Managers from './ReactComponents/_Managers';
 import { TooltipHelper } from './ReactComponents/TooltipHelper';
-export * from './React/Decorators';
 export { Managers, NeoReactModule, NeoReactTypes, Neo, NeoGrid, Routing, Views, TooltipHelper, };

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,0BAA0B,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAA;AACjD,OAAO,KAAK,OAAO,MAAM,iCAAiC,CAAA;AAC1D,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,QAAQ,MAAM,6BAA6B,CAAC;AAExD,cAAc,oBAAoB,CAAA;AAElC,OAAO,EACH,QAAQ,EACR,cAAc,EACd,aAAa,EACb,GAAG,EACH,OAAO,EACP,OAAO,EACP,KAAK,EACR,CAAA"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "0.10.48",
+  "version": "1.0.0-alpha.3",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "test": "react-scripts test"
+    "test": "react-scripts test --watchAll=false --runInBand"
   },
   "files": [
     "dist",
@@ -15,35 +15,53 @@
   "author": "Singular Systems",
   "license": "ISC",
   "devDependencies": {
-    "@types/jest": "^24.0.15",
-    "@types/memoize-one": "4.1.1",
-    "@types/node": "12.0.8",
-    "@types/prop-types": "15.7.0",
-    "@types/react": "^16.9.51",
+    "@testing-library/react": "12.1.2",
+    "@types/history": "4.7.4",
+    "@types/jest": "^28.1.1",
+    "@types/memoize-one": "5.1.2",
+    "@types/node": "17.0.15",
+    "@types/react": "18.0.15",
     "@types/react-custom-scrollbars": "^4.0.6",
-    "@types/react-dom": "^16.9.8",
-    "@types/react-router-dom": "5.1.0",
-    "react-scripts": "3.3.0",
-    "react-testing-library": "^7.0.1",
-    "ts-jest": "26.5.3",
-    "typescript": "3.7.5",
-    "tslib": "2.3.1"
+    "@types/react-dom": "18.0.6",
+    "@types/react-router": "5.1.18",
+    "@types/react-router-dom": "5.3.3",
+    "jest": "28.1.1",
+    "react-scripts": "5.0.1",
+    "ts-jest": "28.0.4",
+    "typescript": "4.7.3"
   },
   "dependencies": {
+    "@singularsystems/neo-core": "^1.0.0-alpha.2",
     "@types/rc-slider": "^8.6.5",
     "@types/react-color": "^3.0.1",
-    "@types/react-select": "3.1.0",
-    "@singularsystems/neo-core": "^0.10.50",
-    "axios": "^0.21.1",
-    "decimal.js-light": "2.5.1",
+    "axios": "^0.27.2",
+    "decimal.js-light": "^2.5.1",
     "history": "4.10.1",
-    "inversify": "5.0.1",
-    "memoize-one": "5.0.4",
-    "mobx": "4.9.2",
-    "mobx-react": "5.4.3",
-    "react": "^16.13.1",
+    "inversify": "^6.0.1",
+    "memoize-one": "6.0.0",
+    "mobx": "6.6.1",
+    "mobx-react": "7.5.2",
+    "react": "18.2.0",
     "react-custom-scrollbars": "^4.2.1",
-    "react-dom": "^16.13.1",
-    "react-router-dom": "5.1.0"
+    "react-dom": "18.2.0",
+    "react-router": "5.3.3",
+    "react-router-dom": "5.3.3",
+    "react-select": "5.4.0",
+    "tslib": "2.3.1"
+  },
+  "peerDependencies": {
+    "@singularsystems/neo-core": ">=1.0.0",
+    "axios": ">=0.21.1",
+    "inversify": ">=5.0.1",
+    "mobx": ">=6.6.1",
+    "mobx-react": ">=7.5.2",
+    "react": ">=18.2.0",
+    "react-dom": ">=18.2.0",
+    "react-router": "^5.0.0",
+    "react-router-dom": "^5.0.0"
+  },
+  "packageManager": "yarn@3.2.1",
+  "resolutions": {
+    "@singularsystems/neo-core": "portal:../core"
   }
 }

package/dist/ReactComponents/DropDown/LookupHelper.d.ts

@@ -1,13 +0,0 @@
-export interface ILookupMembers {
-    valueMember: string;
-    displayMember: string;
-}
-export default class LookupHelper {
-    /**
-     * Finds the value and display member of a class by convention.
-     * Also uses the displayMember attribute if defined on any of the properties.
-     * @param item An object instance
-     * @param booleanValuesAllowed True if boolean values are allowed in the value member.
-     */
-    static findMembers(item: any, valueMember: string, displayMember: string, booleanValuesAllowed?: boolean): ILookupMembers;
-}

package/dist/ReactComponents/DropDown/LookupHelper.js

@@ -1,45 +0,0 @@
-import { EnumHelper } from "@singularsystems/neo-core";
-var LookupHelper = /** @class */ (function () {
-    function LookupHelper() {
-    }
-    /**
-     * Finds the value and display member of a class by convention.
-     * Also uses the displayMember attribute if defined on any of the properties.
-     * @param item An object instance
-     * @param booleanValuesAllowed True if boolean values are allowed in the value member.
-     */
-    LookupHelper.findMembers = function (item, valueMember, displayMember, booleanValuesAllowed) {
-        if (booleanValuesAllowed === void 0) { booleanValuesAllowed = false; }
-        if (!displayMember || !valueMember) {
-            if (EnumHelper.isEnumItem(item)) {
-                valueMember = "id";
-                displayMember = "name";
-            }
-            if (!displayMember) {
-                var neoTypeInfo = item.constructor.neo;
-                if (neoTypeInfo && neoTypeInfo.displayMember) {
-                    displayMember = neoTypeInfo.displayMember.propertyName;
-                }
-            }
-            for (var propName in item) {
-                if (valueMember && displayMember)
-                    break;
-                var value = item[propName];
-                if (value !== undefined && value !== null) {
-                    if ((typeof (value) === "number" || (booleanValuesAllowed && typeof (value) === "boolean")) && !valueMember) {
-                        valueMember = propName;
-                    }
-                    if (typeof (value) === "string" && !displayMember && !propName.toLowerCase().endsWith("id") && propName !== "entityIdentifier") {
-                        displayMember = propName;
-                    }
-                }
-            }
-            if (!valueMember || !displayMember) {
-                console.error("Could not find value and display member. Try specifying them explicitly.", item);
-            }
-        }
-        return { valueMember: valueMember, displayMember: displayMember };
-    };
-    return LookupHelper;
-}());
-export default LookupHelper;