@singularsystems/neo-react 0.10.51 → 0.10.53

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

@@ -13,7 +13,7 @@ interface IDeleteButtonOptions extends IButtonOptions {
      */
     onDeleteExisting?: (item: any) => Promise<boolean>;
 }
-interface IButtonColumnProps extends INeoCommonColumnProps, React.HTMLProps<HTMLTableCellElement> {
+export interface IButtonColumnProps extends INeoCommonColumnProps, React.HTMLProps<HTMLTableCellElement> {
     /** Item to pass to edit and delete callbacks. Defaults to the current rows item */
     item?: any;
     /** Text to show in the header. */

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/PropTypes.d.ts

@@ -68,7 +68,7 @@ interface IEditorSelectorProps<T> {
     /** Date props if this editor is a date editor */
     dateProps?: Components.IPartialDateProps;
     /** Radio list props if this is a radio button list. */
-    radioList?: IRadioListSpecificProps;
+    radioList?: IRadioListSpecificProps<T>;
     /** File props if this editor is a file editor */
     fileProps?: IFileEditorProps;
 }
@@ -127,7 +127,7 @@ export declare class BindPropsHelper {
      * Gets the correct input control type based on the props. E.g. Input / DatePicker / Select
      * @param props Props passed to a multi type input container. E.g. FormGroup / Column
      */
-    static getFormControl(props: IEditorNormalisedProps<any, any>): React.CElement<import("./DatePicker").INeoDatePickerProps, DatePicker> | React.CElement<import("./NumberInput").INumberInputProps, NumberInput> | React.CElement<import("./DropDown/DropDown").IDropDownProps<unknown>, DropDown<unknown>> | React.CElement<IFileEditorProps, FileInput> | React.CElement<import("./Input").IInputProps, Input> | React.CElement<import("./RadioList").IRadioListProps, RadioList>;
+    static getFormControl(props: IEditorNormalisedProps<any, any>): React.CElement<import("./DatePicker").INeoDatePickerProps, DatePicker> | React.CElement<import("./NumberInput").INumberInputProps, NumberInput> | React.CElement<import("./DropDown/DropDown").IDropDownProps<unknown>, DropDown<unknown>> | React.CElement<IFileEditorProps, FileInput> | React.CElement<import("./Input").IInputProps, Input> | React.CElement<import("./RadioList").IRadioListProps<unknown>, RadioList<unknown>>;
     static getControlType(props: IEditorNormalisedProps<any, any>): ControlType;
     static getCheckBoxType(props: IEditorNormalisedProps<any, any>, instance?: any): CheckboxType;
     /**

package/dist/ReactComponents/RadioList.d.ts

@@ -2,22 +2,22 @@ import React from 'react';
 import { IBindableEditorProps } from './PropTypes';
 import ComponentBase from './ComponentBase';
 import { FormContext } from './FormContext';
-export interface IRadioListSpecificProps {
+export interface IRadioListSpecificProps<T> {
     /** List of items to show. */
-    items?: any[];
+    items?: T[];
     /** Enum to show as a radio button list. */
     enumType?: any;
     /** True if the radio buttons should be displayed inline (horizontally). */
     inline?: boolean;
     /** Property name to use for the id. Only applies when using items. */
-    valueMember?: string | undefined;
+    valueMember?: keyof T;
     /** Property name to use for the radio button text. Only applies when using items. */
-    displayMember?: string | undefined;
+    displayMember?: keyof T;
 }
-export interface IRadioListProps extends IBindableEditorProps<HTMLSelectElement> {
-    radioList: IRadioListSpecificProps;
+export interface IRadioListProps<T> extends IBindableEditorProps<HTMLSelectElement> {
+    radioList: IRadioListSpecificProps<T>;
 }
-export default class RadioList extends ComponentBase<IRadioListProps> {
+export default class RadioList<T> extends ComponentBase<IRadioListProps<T>> {
     static contextType: React.Context<import("./FormContext").FormContextParams>;
     context: React.ContextType<typeof FormContext>;
     private previousList?;

package/dist/Routing/MenuRoute.d.ts

@@ -1,8 +1,9 @@
 import ViewBase from '../Views/ViewBase';
 import { Routing } from '@singularsystems/neo-core';
+import { RouteParameterObject } from './IRouteParameter';
 export interface IMenuRoute extends Routing.IMenuRoute {
 }
-export declare class MenuRoute<TParams> implements IMenuRoute {
+export declare class MenuRoute<TParams extends RouteParameterObject<TParams>> implements IMenuRoute {
     /**
      * Creates a menu route with view parameters specified.
      * @param baseRoute Path and component

package/dist/Routing/NavigationHelper.d.ts

@@ -2,7 +2,8 @@ import ViewBase from '../Views/ViewBase';
 import { RouteComponentProps } from 'react-router';
 import { RoutingState } from './RoutingState';
 import { INavigationHelper as INeoNavigationHelper } from '@singularsystems/neo-core/dist/Routing/INavigationHelper';
-export declare type ViewConstructor<TParams> = new (...args: any) => ViewBase<any, TParams>;
+import { RouteParameterObject } from './IRouteParameter';
+export declare type ViewConstructor<TParams extends RouteParameterObject<TParams>> = new (...args: any) => ViewBase<any, TParams>;
 export declare type ParamValues<TParams> = {
     [P in keyof TParams]?: number | string | null;
 };
@@ -13,13 +14,13 @@ export interface INavigationHelper extends INeoNavigationHelper {
      * @param view View component which inherits from view base.
      * @param paramValues View params to include in the url to pass to the view.
      */
-    navigateToView<TParams>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): void;
+    navigateToView<TParams extends RouteParameterObject<TParams>>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): void;
     /**
      * Gets the full path for a view including view parameter values.
      * @param view View component which inherits from view base.
      * @param paramValues View params to include in the url to pass to the view.
      */
-    getPathForView<TParams>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): string;
+    getPathForView<TParams extends RouteParameterObject<TParams>>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): string;
     /**
      * Gets the path of the currently rendered view, without parameter components.
      */
@@ -33,8 +34,8 @@ export default class NavigationHelper implements INavigationHelper {
     private routingState;
     constructor(routingState: RoutingState);
     navigateInternal(url: string, replace?: boolean): void;
-    navigateToView<TParams>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): void;
-    getPathForView<TParams>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): string;
+    navigateToView<TParams extends RouteParameterObject<TParams>>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): void;
+    getPathForView<TParams extends RouteParameterObject<TParams>>(view: ViewConstructor<TParams>, paramValues?: ParamValues<TParams>): string;
     getCurrentViewPath(): string;
     get currentRouteProps(): RouteComponentProps<{}, import("react-router").StaticContext, import("history").History.PoorMansUnknown>;
 }

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.51",
+  "version": "0.10.53",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",