@singularsystems/neo-react 1.3.4 → 1.3.5

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 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.3.5
+
+- Fixed drop down to not add a blank item if the bound value is zero, and the items contains an item with id of zero.
+- Minor changes to `IRoute` to allow `basePath` property.
+
 ## Version 1.3.4
 
 - Added `PopupHost` component

package/dist/ReactComponents/DropDown/DropDown.js

@@ -105,9 +105,10 @@ var DropDown = /** @class */ (function (_super) {
         var items = this.items;
         var selectedItem = this.getSelectedOption(this.props.bind.value); // This sets the sort value to allow sorting of drop downs in grids. 
         var value = this.props.bind.value;
-        var notFound = items.length > 0 && value && selectedItem[this.valueMember] !== value;
-        var addBlankItem = ((_c = (_b = splitProps.select) === null || _b === void 0 ? void 0 : _b.allowNulls) !== null && _c !== void 0 ? _c : this.props.bind.propertyInfo.allowNulls) || !value || notFound;
-        if (addBlankItem && items.find(function (item) { return item[_this.valueMember] === null || item[_this.valueMember] === ""; })) {
+        var valueIsEmpty = !value;
+        var notFound = items.length > 0 && !valueIsEmpty && selectedItem[this.valueMember] !== value;
+        var addBlankItem = ((_c = (_b = splitProps.select) === null || _b === void 0 ? void 0 : _b.allowNulls) !== null && _c !== void 0 ? _c : this.props.bind.propertyInfo.allowNulls) || valueIsEmpty || notFound;
+        if (addBlankItem && items.find(function (item) { return item[_this.valueMember] === null || item[_this.valueMember] === "" || (valueIsEmpty && item[_this.valueMember] === value); })) {
             // If there is an item with a null value, don't add a blank drop down item.
             addBlankItem = false;
         }
@@ -126,13 +127,13 @@ var DropDown = /** @class */ (function (_super) {
             if (domProps.readOnly) {
                 domProps.disabled = true;
             }
-            var valueIsBlank = value === undefined || value === null;
-            var nullText = (valueIsBlank || ((_e = splitProps.select) === null || _e === void 0 ? void 0 : _e.deSelectText) === undefined) ? (_f = splitProps.select) === null || _f === void 0 ? void 0 : _f.nullText : (_g = splitProps.select) === null || _g === void 0 ? void 0 : _g.deSelectText;
-            if (valueIsBlank) {
+            var valueIsNull = value === undefined || value === null;
+            var nullText = (valueIsNull || ((_e = splitProps.select) === null || _e === void 0 ? void 0 : _e.deSelectText) === undefined) ? (_f = splitProps.select) === null || _f === void 0 ? void 0 : _f.nullText : (_g = splitProps.select) === null || _g === void 0 ? void 0 : _g.deSelectText;
+            if (valueIsNull) {
                 domProps.className = Utils.joinWithSpaces(domProps.className, "select-no-value");
             }
             control =
-                React.createElement("select", __assign({ value: valueIsBlank ? "" : value, onChange: this.onItemSelected, ref: splitProps.editor.inputElement }, domProps),
+                React.createElement("select", __assign({ value: valueIsNull ? "" : value, onChange: this.onItemSelected, ref: splitProps.editor.inputElement }, domProps),
                     addBlankItem && React.createElement("option", { className: "option-default" }, notFound ? "(Not found): ".concat(value) : nullText),
                     items.map(function (item) { return (React.createElement("option", { value: item[_this.valueMember], key: item[_this.valueMember] }, item[_this.displayMember])); }));
         }

package/dist/Routing/RouteProvider.js

@@ -1,5 +1,4 @@
 import { __assign, __spreadArray } from "tslib";
-import { MenuRoute } from './MenuRoute';
 var RouteProvider = /** @class */ (function () {
     /**
      * Creates a route provider which provides a list of flattened routes.
@@ -106,10 +105,9 @@ var RouteProvider = /** @class */ (function () {
      * Adds a unique key, and adds route parameters extracted from the component static params object.
      */
     RouteProvider.prototype.processRoute = function (into, route) {
+        var _a;
         var processed = __assign(__assign({}, route), { path: route.path, params: [], key: this.key++, order: 0 });
-        if (route instanceof MenuRoute) {
-            processed.path = route.basePath;
-        }
+        processed.path = (_a = route.basePath) !== null && _a !== void 0 ? _a : route.path;
         processed.path = processed.path.toLowerCase();
         if (processed.path.length > 1 && processed.path.endsWith("/")) {
             processed.path = processed.path.substring(0, processed.path.length - 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",