@singularsystems/neo-react 1.0.18 → 1.0.20

package/dist/React/ReactModelCreator.js

@@ -150,7 +150,8 @@ var ReactModelCreator = /** @class */ (function (_super) {
                 currentValue.length = 0;
             }
             else {
-                if (newValue.childObjectType && newValue.setParent) {
+                var newValueAsList = newValue;
+                if (newValueAsList.createChild !== undefined && newValueAsList.addNew !== undefined) {
                     // Cannot re-assign this property, so we have to clear the array, and copy the items from the source array.
                     Utils.batchUpdate(function () {
                         currentValue.length = 0;

package/dist/ReactComponents/Card.d.ts

@@ -15,6 +15,8 @@ interface ICardProps {
     initiallyCollapsed?: boolean;
     /** Allows the collapse state to be set externally. Sets the collapsible prop to true. */
     isExpanded?: Model.IObservableValue<boolean>;
+    /** Indicates whether the icon should be on the right of the header (default), or left of the icon/title. */
+    expandIconPosition?: "none" | "left" | "right";
 }
 export default class Card extends React.Component<ICardProps & React.HTMLProps<HTMLDivElement>> {
     private iconFactory;

package/dist/ReactComponents/Card.js

@@ -14,19 +14,23 @@ var Card = /** @class */ (function (_super) {
         return _this;
     }
     Card.prototype.render = function () {
-        var _a = this.props, icon = _a.icon, title = _a.title, children = _a.children, headerElements = _a.headerElements, useCustomScrollbar = _a.useCustomScrollbar, collapsible = _a.collapsible, initiallyCollapsed = _a.initiallyCollapsed, isExpanded = _a.isExpanded, domProps = __rest(_a, ["icon", "title", "children", "headerElements", "useCustomScrollbar", "collapsible", "initiallyCollapsed", "isExpanded"]);
+        var _a = this.props, icon = _a.icon, title = _a.title, children = _a.children, headerElements = _a.headerElements, useCustomScrollbar = _a.useCustomScrollbar, collapsible = _a.collapsible, initiallyCollapsed = _a.initiallyCollapsed, isExpanded = _a.isExpanded, expandIconPosition = _a.expandIconPosition, domProps = __rest(_a, ["icon", "title", "children", "headerElements", "useCustomScrollbar", "collapsible", "initiallyCollapsed", "isExpanded", "expandIconPosition"]);
         var className = Utils.joinWithSpaces("neo-card card", domProps.className);
+        expandIconPosition !== null && expandIconPosition !== void 0 ? expandIconPosition : (expandIconPosition = "right");
         var isCollapsible = collapsible || isExpanded !== undefined || initiallyCollapsed !== undefined;
         var expandState = isExpanded !== null && isExpanded !== void 0 ? isExpanded : this.expandState;
+        var expandIndicator = undefined;
         if (isCollapsible) {
-            var expandIndicator = React.createElement("i", { onClick: function (e) { return expandState.value = !expandState.value; }, className: "card-expand-indicator fa fa-fw fa-angle-".concat(expandState.value ? "up" : "down") });
-            if (headerElements) {
-                headerElements = React.createElement(React.Fragment, null,
-                    headerElements,
-                    expandIndicator);
-            }
-            else {
-                headerElements = expandIndicator;
+            expandIndicator = React.createElement("i", { onClick: function (e) { return expandState.value = !expandState.value; }, className: "card-expand-indicator fa fa-fw fa-angle-".concat(expandState.value ? "up" : "down") });
+            if (expandIconPosition === "right") {
+                if (headerElements) {
+                    headerElements = React.createElement(React.Fragment, null,
+                        headerElements,
+                        expandIndicator);
+                }
+                else {
+                    headerElements = expandIndicator;
+                }
             }
             if (!expandState.value) {
                 className += " collapsed";
@@ -44,6 +48,7 @@ var Card = /** @class */ (function (_super) {
             (icon || title) &&
                 React.createElement("div", { className: "card-header", onClick: function (e) { return expandState.value = !expandState.value; } },
                     React.createElement("div", { className: "card-header-title" },
+                        expandIconPosition === "left" && expandIndicator,
                         this.iconFactory.getIconComponent(icon),
                         React.createElement("span", null, title)),
                     headerElements && React.createElement("div", { className: "card-header-right-section", onClick: function (e) { return e.stopPropagation(); } }, headerElements)),

package/dist/ReactComponents/DropDown/AutoCompleteDropDown.js

@@ -72,7 +72,11 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
         if (items.length) {
             this.findMembers(items[0]);
         }
-        return items.map(function (item) { return (__assign(__assign({}, item), { item: item, value: item[_this.valueMember], label: item[_this.displayMember] })); });
+        return items.map(function (item) { return ({
+            item: item,
+            value: item[_this.valueMember],
+            label: item[_this.displayMember]
+        }); });
     };
     AutoCompleteDropDown.prototype.onItemSelected = function (args, action) {
         var _a;
@@ -205,7 +209,7 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
                 React.createElement("div", { className: "react-select-description" }, item[descriptionMember])); }, "with-description");
         }
         if (nativeProps.isClearable === undefined) {
-            nativeProps.isClearable = true;
+            nativeProps.isClearable = !bindValue || bindValue.propertyInfo.allowNulls;
         }
         if (BindPropsHelper.isReadOnly(splitProps.editor, this.context) || BindPropsHelper.isDisabled(splitProps.editor, this.context)) {
             nativeProps.isDisabled = true;

package/dist/Views/ViewBase.d.ts

@@ -25,6 +25,8 @@ export default abstract class ViewBase<TViewModel extends IViewModel = EmptyView
     viewName: string;
     /** Indicates that the view requests to be displayed full screen. Up to the main layout to accommodate this. */
     fullScreen: boolean;
+    /** Indicates that the VM has initialised, and viewParamsUpdated() has been called. */
+    hasInitialised: boolean;
     static get currentView(): IViewBase | null;
     private routingState;
     navigation: import("../Routing").INavigationHelper;
@@ -42,7 +44,7 @@ export default abstract class ViewBase<TViewModel extends IViewModel = EmptyView
     get viewParams(): IViewParameterListOfT<TParams> & TransformParamsType<TParams>;
     protected getStoredViewState(viewModel: valueOrLazy<TViewModel>): ViewState<TViewModel, TParams>;
     protected createViewState(viewModel: valueOrLazy<TViewModel>): ViewState<TViewModel, TParams>;
-    componentDidMount(): void;
+    componentDidMount(): Promise<void>;
     componentWillUnmount(): void;
     updateViewParams(match: match): void;
     /**

package/dist/Views/ViewBase.js

@@ -20,6 +20,8 @@ var ViewBase = /** @class */ (function (_super) {
         _this.viewName = "";
         /** Indicates that the view requests to be displayed full screen. Up to the main layout to accommodate this. */
         _this.fullScreen = false;
+        /** Indicates that the VM has initialised, and viewParamsUpdated() has been called. */
+        _this.hasInitialised = false;
         _this.routingState = Misc.Globals.appService.get(NeoReactTypes.Routing.GlobalRoutingState);
         _this.navigation = Misc.Globals.appService.get(NeoReactTypes.Routing.NavigationHelper);
         if (typeof viewName !== "string") {
@@ -70,21 +72,30 @@ var ViewBase = /** @class */ (function (_super) {
         return new ViewState(paramsList, viewModelInstance);
     };
     ViewBase.prototype.componentDidMount = function () {
-        var _this = this;
-        var paramsUpdated = this.navigation.currentRouteProps ? this.viewState.viewParams.update(this.navigation.currentRouteProps.match) : false;
-        var initPromise = undefined;
-        if (!this.viewState.hasSetup) {
-            this.viewState.hasSetup = true;
-            initPromise = this.initialise();
-        }
-        if (paramsUpdated) {
-            if (initPromise) {
-                initPromise.then(function () { return _this.viewParamsUpdated(); });
-            }
-            else {
-                this.viewParamsUpdated();
-            }
-        }
+        return __awaiter(this, void 0, void 0, function () {
+            var paramsUpdated;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        paramsUpdated = this.navigation.currentRouteProps ? this.viewState.viewParams.update(this.navigation.currentRouteProps.match) : false;
+                        if (!!this.viewState.hasSetup) return [3 /*break*/, 2];
+                        this.viewState.hasSetup = true;
+                        return [4 /*yield*/, this.initialise()];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        if (!paramsUpdated) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.viewParamsUpdated()];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4:
+                        this.hasInitialised = true;
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     ViewBase.prototype.componentWillUnmount = function () {
         this.disposeViewModel();
@@ -168,6 +179,10 @@ var ViewBase = /** @class */ (function (_super) {
         observable.ref,
         __metadata("design:type", Boolean)
     ], ViewBase.prototype, "fullScreen", void 0);
+    __decorate([
+        observable.ref,
+        __metadata("design:type", Boolean)
+    ], ViewBase.prototype, "hasInitialised", void 0);
     return ViewBase;
 }(React.Component));
 export default ViewBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,7 @@
     "@singularsystems/neo-core": "1.0.14",
     "@types/rc-slider": "^8.6.5",
     "@types/react-color": "^3.0.1",
-    "axios": "1.7.4",
+    "axios": "1.7.5",
     "history": "4.10.1",
     "inversify": "^6.0.2",
     "memoize-one": "6.0.0",