@singularsystems/neo-react 0.10.50 → 0.10.52

package/dist/ReactComponents/Grid/Row.js

@@ -62,7 +62,7 @@ var Row = /** @class */ (function (_super) {
         var expandButtonOptions = __assign({}, Misc.Settings.grid.expandButton);
         if (inBody && this.expandProperty) {
             expandButtonOptions.onClick = this.onExpandClick;
-            expandButtonOptions.icon = expandButtonOptions.icon.replace("plus", "$").replace("minus", "$").replace("$", (this.expandProperty.value ? "minus" : "plus"));
+            expandButtonOptions.icon = this.expandProperty.value ? Misc.Settings.icons.expanded : Misc.Settings.icons.collapsed;
         }
         if (!inBody) {
             if (onHeaderClick) {

package/dist/ReactComponents/Icons/FontAwesomeIconFactory.d.ts

@@ -2,10 +2,22 @@ import React from "react";
 import { IconFactory } from "./IconFactory";
 import { IconStyle } from "./IIconFactory";
 interface IconDefinition {
-    icon: string;
+    iconName: string;
 }
+interface FontAwesomeIconComponentProps {
+    icon: any;
+    fixedWidth?: boolean;
+    spin?: boolean;
+}
+declare type FontAwesomeComponent = (props: FontAwesomeIconComponentProps) => JSX.Element;
 /** Icon factory supporting font-awesome string, as well as the font-awesome icon definition and component. */
 export declare class FontAwesomeIconFactory extends IconFactory {
+    private fontAwesomeComponentType;
+    /**
+     * Creates a font awesome factory, allowing the use of IconDefinition on any neo icon prop.
+     * @param fontAwesomeComponentType import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+     */
+    constructor(fontAwesomeComponentType: FontAwesomeComponent);
     protected createIconComponent(iconComponent: IconDefinition | JSX.Element, iconStyle?: IconStyle): React.ReactNode;
 }
 export {};

package/dist/ReactComponents/Icons/FontAwesomeIconFactory.js

@@ -1,19 +1,28 @@
-import { __assign, __decorate, __extends } from "tslib";
+import { __assign, __decorate, __extends, __metadata } from "tslib";
 import React from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { injectable } from "inversify";
 import { IconFactory } from "./IconFactory";
 /** Icon factory supporting font-awesome string, as well as the font-awesome icon definition and component. */
 var FontAwesomeIconFactory = /** @class */ (function (_super) {
     __extends(FontAwesomeIconFactory, _super);
-    function FontAwesomeIconFactory() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    /**
+     * Creates a font awesome factory, allowing the use of IconDefinition on any neo icon prop.
+     * @param fontAwesomeComponentType import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+     */
+    function FontAwesomeIconFactory(fontAwesomeComponentType) {
+        var _this = _super.call(this) || this;
+        _this.fontAwesomeComponentType = fontAwesomeComponentType;
+        return _this;
     }
     FontAwesomeIconFactory.prototype.createIconComponent = function (iconComponent, iconStyle) {
         var _a, _b, _c, _d;
-        if (iconComponent.icon) {
+        if (iconComponent.iconName) {
             // Icon was specified using a font-awesome icon descriptor, return the font-awesome icon component.
-            return React.createElement(FontAwesomeIcon, { icon: iconComponent, fixedWidth: (_a = iconStyle) === null || _a === void 0 ? void 0 : _a.fixedWidth, spin: (_b = iconStyle) === null || _b === void 0 ? void 0 : _b.spin });
+            return React.createElement(this.fontAwesomeComponentType, {
+                icon: iconComponent,
+                fixedWidth: (_a = iconStyle) === null || _a === void 0 ? void 0 : _a.fixedWidth,
+                spin: (_b = iconStyle) === null || _b === void 0 ? void 0 : _b.spin
+            });
         }
         else {
             // Icon was specified as a font-awesome component. Extract the props, and override using the requested style.
@@ -28,7 +37,8 @@ var FontAwesomeIconFactory = /** @class */ (function (_super) {
         }
     };
     FontAwesomeIconFactory = __decorate([
-        injectable()
+        injectable(),
+        __metadata("design:paramtypes", [Function])
     ], FontAwesomeIconFactory);
     return FontAwesomeIconFactory;
 }(IconFactory));

package/dist/Routing/ViewParameter.d.ts

@@ -46,7 +46,9 @@ export declare class ViewParameter implements IViewParameter {
     get value(): number | string | null;
     set value(value: number | string | null);
     reset(): void;
-    description: string;
+    _description: string;
+    get description(): string;
+    set description(value: string);
     asNullableInt(): number | null;
     asString(): string;
     /** Updates the current value, and returns true if the value changed. */

package/dist/Routing/ViewParameter.js

@@ -8,7 +8,7 @@ var ViewParameter = /** @class */ (function () {
         this.hasPendingValue = false;
         this.pendingValue = null;
         this._value = null;
-        this.description = "";
+        this._description = "";
     }
     ViewParameter.prototype.bindTo = function (propertyOrCallback) {
         var _this = this;
@@ -28,7 +28,7 @@ var ViewParameter = /** @class */ (function () {
             if (stringValue !== this._value) {
                 this.hasPendingValue = true;
                 this.pendingValue = stringValue;
-                this.description = "";
+                this._description = "";
                 this.parent.setUrl(this);
             }
         },
@@ -42,6 +42,19 @@ var ViewParameter = /** @class */ (function () {
             this.parent.setUrl(this, true);
         }
     };
+    Object.defineProperty(ViewParameter.prototype, "description", {
+        get: function () {
+            return this._description;
+        },
+        set: function (value) {
+            if (this.hasPendingValue) {
+                console.warn("Do not set view parameter description directly after setting value. Description should be set in the viewParamsUpdated() method.");
+            }
+            this._description = value;
+        },
+        enumerable: true,
+        configurable: true
+    });
     ViewParameter.prototype.asNullableInt = function () {
         if (this._value) {
             return parseInt(this._value, 10);
@@ -58,6 +71,7 @@ var ViewParameter = /** @class */ (function () {
         if (value != this._value) {
             this.hasPendingValue = false;
             this.pendingValue = value;
+            this._description = "";
             this._value = value;
             return true;
         }
@@ -88,7 +102,7 @@ var ViewParameter = /** @class */ (function () {
     __decorate([
         observable.ref,
         __metadata("design:type", String)
-    ], ViewParameter.prototype, "description", void 0);
+    ], ViewParameter.prototype, "_description", void 0);
     return ViewParameter;
 }());
 export { ViewParameter };

package/dist/Routing/ViewParameterList.js

@@ -27,12 +27,14 @@ var ViewParameterList = /** @class */ (function () {
         var selectablePath = basePath;
         for (var _i = 0, _b = this.params; _i < _b.length; _i++) {
             var viewParam = _b[_i];
-            if (!viewParam.routeParameter.isQuery && (viewParam.description || upTo) && viewParam.latestValue !== null) {
+            if (!viewParam.routeParameter.isQuery) {
                 paramPath += viewParam.getParamString(state);
                 if ((_a = viewParam.routeParameter.selection, (_a !== 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)));
+                if (viewParam.description || (upTo && viewParam.latestValue !== null)) {
+                    breadCrumbs.push(new BreadCrumbItem(viewParam.description, (!upTo && viewParam.routeParameter.selection === BreadCrumbSelectMode.None) ? "" : (selectablePath + queryPath)));
+                }
             }
             if (upTo && upTo === viewParam) {
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "0.10.50",
+  "version": "0.10.52",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,6 @@
     "tslib": "2.3.1"
   },
   "dependencies": {
-    "@fortawesome/react-fontawesome": "0.2.0",
     "@types/rc-slider": "^8.6.5",
     "@types/react-color": "^3.0.1",
     "@types/react-select": "3.1.0",