@singularsystems/neo-react 1.6.0 → 1.6.2

package/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 This file details all new features and changes to functionality. If you only need to see changes that require updates to your project, see the [breaking changes](./Breaking.md) readme.
 
-## Version 1.6.0 (23 June 2026)
+## Version 1.6.2 (10 July 2026)
+
+- Routing fix
+    - Fixed static routes not being preferred to parameterised routes.
+- Grid Column
+    - Added `invertSortIcon` prop to allow the sort icon to be inverted. Can be used on a computed property that is the inverse value of the underlying sort column.
+
+## Version 1.6.1 (23 June 2026)
 
 - Routing changes
     - Routes parameters can now be defined in the route path. E.g. `/products/:id/sales`.

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

@@ -13,6 +13,8 @@ export interface INeoColumnProps<TData> extends INeoCommonColumnProps, IEditorCo
     cellTooltip?: string;
     /** Allows you to override the default allow sorting setting of the datasource, or make clicking a column heading sort a specific property. */
     sort?: Model.IPropertyInstance | boolean;
+    /** If true, will invert the sort icon. May be necessary when a different property is used as the sort value. */
+    invertSortIcon?: boolean;
     /** True if this column must have a total cell. */
     sum?: boolean;
     /** Content callback to show in the footer. The filtered list of the grid is passed into the callback. */

package/dist/ReactComponents/Grid/Column.js

@@ -143,7 +143,8 @@ var Column = /** @class */ (function (_super) {
         if (sortProperty && !this.suppressSort) {
             var sortInfo = this.context.dataView.sortInfo.find(function (c) { return c.column === sortProperty.propertyInfo; });
             if (sortInfo) {
-                sortIcon = sortInfo.sortAscending ? Misc.Settings.icons.sortAsc : Misc.Settings.icons.sortDesc;
+                var sortAscending = this.props.invertSortIcon ? !sortInfo.sortAscending : sortInfo.sortAscending;
+                sortIcon = sortAscending ? Misc.Settings.icons.sortAsc : Misc.Settings.icons.sortDesc;
                 domProps.className = Utils.joinWithSpaces(domProps.className, "column-is-sorted");
             }
             domProps.className = Utils.joinWithSpaces(domProps.className, "column-sortable");

package/dist/Routing/MenuRoute.d.ts

@@ -26,4 +26,5 @@ export declare class MenuRoute<TParams extends RouteParameterObject<TParams>> im
     get path(): string;
     /** Name to show in the menu item. */
     name: string;
+    clone(): IMenuRoute;
 }

package/dist/Routing/MenuRoute.js

@@ -1,6 +1,6 @@
-import { Misc } from '@singularsystems/neo-core';
-import { NeoReactTypes } from "../Modules/Types";
+import { __assign } from "tslib";
 import { RouteHelper } from "./RouteHelper";
+import RouteProvider from "./RouteProvider";
 var MenuRoute = /** @class */ (function () {
     /**
      * Creates a menu route with view parameters specified.
@@ -29,8 +29,7 @@ var MenuRoute = /** @class */ (function () {
         /** Path including view param values. */
         get: function () {
             if (!this._path) {
-                var routeProvider = Misc.Globals.appService.get(NeoReactTypes.Routing.GlobalRoutingState).appRouteProvider;
-                var processedRoute = routeProvider.getProcessedRoute(this.baseRoute);
+                var processedRoute = RouteProvider.getProcessedRoute(this.baseRoute);
                 this._path = RouteHelper.hydrateRoute(processedRoute, this.viewParamValues);
             }
             return this._path;
@@ -38,6 +37,11 @@ var MenuRoute = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    MenuRoute.prototype.clone = function () {
+        var clone = __assign({}, this);
+        clone.path = this.path;
+        return clone;
+    };
     return MenuRoute;
 }());
 export { MenuRoute };

package/dist/Routing/RouteProvider.d.ts

@@ -37,7 +37,6 @@ export default class RouteProvider {
     pureRoutes?: Routing.IRoute[] | undefined;
     notFoundComponent?: React.ComponentType | undefined;
     private basePaths;
-    private rawRoutes;
     readonly allRoutes: IProcessedRoute[];
     /**
      * Creates a route provider which provides a list of flattened routes.

package/dist/Routing/RouteProvider.js

@@ -1,5 +1,6 @@
 import { __assign, __spreadArray } from "tslib";
 import { RouteHelper } from "./RouteHelper";
+var processedRouteSymbol = Symbol("processedRoute");
 var RouteProvider = /** @class */ (function () {
     /**
      * Creates a route provider which provides a list of flattened routes.
@@ -12,7 +13,6 @@ var RouteProvider = /** @class */ (function () {
         this.pureRoutes = pureRoutes;
         this.notFoundComponent = notFoundComponent;
         this.basePaths = new Set();
-        this.rawRoutes = new Map();
         this.allRoutes = [];
         if (pureRoutes)
             this.flatten(pureRoutes);
@@ -28,11 +28,12 @@ var RouteProvider = /** @class */ (function () {
         return this.allRoutes.find(function (c) { return c.component === component; });
     };
     /** @internal */
-    RouteProvider.prototype.getProcessedRoute = function (route) {
+    RouteProvider.getProcessedRoute = function (route) {
         var _a;
-        var processed = this.rawRoutes.get(route);
+        // @ts-ignore
+        var processed = route[processedRouteSymbol];
         if (!processed) {
-            throw new Error("Route not found: ".concat((_a = route.basePath) !== null && _a !== void 0 ? _a : route.path));
+            throw new Error("Route has not been processed: ".concat((_a = route.basePath) !== null && _a !== void 0 ? _a : route.path));
         }
         return processed;
     };
@@ -48,21 +49,22 @@ var RouteProvider = /** @class */ (function () {
         var params = [];
         for (var i = 0; i < providedSegments.length; i++) {
             var segmentValue = providedSegments[i];
-            var matchedRoutes = [];
+            var staticMatches = [];
+            var paramMatches = [];
             for (var _i = 0, currentRoutes_1 = currentRoutes; _i < currentRoutes_1.length; _i++) {
                 var route = currentRoutes_1[_i];
                 var routeSegment = route.segments.length > i ? route.segments[i] : undefined;
                 if (segmentValue.toLowerCase() === ((_a = routeSegment === null || routeSegment === void 0 ? void 0 : routeSegment.value) !== null && _a !== void 0 ? _a : "")) {
-                    matchedRoutes.push(route);
+                    staticMatches.push(route);
                 }
                 else if (routeSegment && routeSegment.param) {
                     params.push({ param: routeSegment.param, value: segmentValue, index: i });
                     if (!routeSegment.param.required || segmentValue) {
-                        matchedRoutes.push(route);
+                        paramMatches.push(route);
                     }
                 }
             }
-            currentRoutes = matchedRoutes;
+            currentRoutes = __spreadArray(__spreadArray([], staticMatches, true), paramMatches, true);
         }
         if (currentRoutes.length > 0) {
             var route = currentRoutes[0];
@@ -105,11 +107,13 @@ var RouteProvider = /** @class */ (function () {
      */
     RouteProvider.prototype.processRoute = function (route) {
         var _a;
-        var processed = this.rawRoutes.get(route);
-        if (processed) {
+        // @ts-ignore
+        if (route[processedRouteSymbol]) {
             return;
         }
-        processed = __assign(__assign({}, route), { defaultPath: ((_a = route.basePath) !== null && _a !== void 0 ? _a : route.path), routeParams: [], queryParams: [], segments: [], requiredSegments: 0 });
+        var processed = __assign(__assign({}, route), { defaultPath: ((_a = route.basePath) !== null && _a !== void 0 ? _a : route.path), routeParams: [], queryParams: [], segments: [], requiredSegments: 0 });
+        // @ts-ignore
+        route[processedRouteSymbol] = processed;
         var normalizedPath = processed.defaultPath.toLowerCase();
         var fullPath = normalizedPath;
         var hasParamIdentifier = false;
@@ -166,7 +170,6 @@ var RouteProvider = /** @class */ (function () {
         if (hasParamIdentifier) {
             processed.defaultPath = RouteHelper.hydrateRoute(processed, {});
         }
-        this.rawRoutes.set(route, processed);
         if (!this.basePaths.has(fullPath)) {
             this.basePaths.add(fullPath);
             this.allRoutes.push(processed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "typescript": "5.9.3"
   },
   "dependencies": {
-    "@singularsystems/neo-core": "1.6.0",
+    "@singularsystems/neo-core": "1.6.1",
     "@types/react-color": "3.0.13",
     "axios": "1.13.5",
     "inversify": "6.0.2",