@singularsystems/neo-react 0.10.38 → 0.10.41

package/dist/Modules/NeoReactModule.js

@@ -10,9 +10,11 @@ import { AutoRunnerFactory } from '../React/AutoRunner';
 import { RoutingState } from '../Routing/RoutingState';
 import { ContextMenuState } from '../ReactComponents/ContextMenu/ContextMenuState';
 import { DisposeHelper } from '../Services/DisposeHelper';
+import Decimal from 'decimal.js-light';
 var neoReactModule = new AppServices.Module("neo-react", function (container) {
     container.bind(AppServices.NeoTypes.Core.AutoRunnerFactory).to(AutoRunnerFactory).inSingletonScope();
     container.bind(AppServices.NeoTypes.Core.ModelCreator).to(ReactModelCreator).inTransientScope();
+    container.bind(AppServices.NeoTypes.Misc.DecimalType).toConstantValue(Decimal);
     container.bind(AppServices.NeoTypes.UI.ErrorHandler).to(ErrorHandler).inSingletonScope();
     container.bind(AppServices.NeoTypes.UI.GlobalContextMenuState).toConstantValue(new ContextMenuState());
     container.bind(AppServices.NeoTypes.Routing.PageLeaveHandler).to(PageLeaveHandler).inSingletonScope();

package/dist/Modules/Types.d.ts

@@ -5,6 +5,7 @@ import Slider, { Range } from 'rc-slider';
 import { SketchPicker } from 'react-color';
 import AsyncSelect from 'react-select/async';
 import { AxiosStatic } from 'axios';
+import Decimal from 'decimal.js-light';
 import Select from 'react-select';
 import { IDisposeHelper } from '../Services/IDisposeHelper';
 declare const NeoReactTypes: {
@@ -38,6 +39,9 @@ declare const NeoReactTypes: {
     Localisation: {
         LocalisationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Localisation").ILocalisationService>;
     };
+    Misc: {
+        DecimalType: AppServices.ServiceIdentifier<typeof Decimal>;
+    };
     Security: {
         AuthenticationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security").IAuthenticationService>;
         AuthorisationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security").IAuthorisationService>;

package/dist/ReactComponents/DropDown/DropDown.js

@@ -80,7 +80,7 @@ var DropDown = /** @class */ (function (_super) {
     };
     DropDown.prototype.render = function () {
         var _this = this;
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         var splitProps = BindPropsHelper.normaliseEditorProps(this, this.props);
         var domProps = BindPropsHelper.autoSetDomProperties(splitProps, this.context);
         domProps.className = Utils.joinWithSpaces(domProps.className, splitProps.isBootstrap ? "form-control" : "neo-forms-editor");
@@ -116,9 +116,10 @@ var DropDown = /** @class */ (function (_super) {
                 domProps.disabled = true;
             }
             var valueIsBlank = value === undefined || value === null;
+            var nullText = (valueIsBlank || ((_d = splitProps.select) === null || _d === void 0 ? void 0 : _d.deSelectText) === undefined) ? (_e = splitProps.select) === null || _e === void 0 ? void 0 : _e.nullText : (_f = splitProps.select) === null || _f === void 0 ? void 0 : _f.deSelectText;
             control =
                 React.createElement("select", __assign({ value: valueIsBlank ? "" : value, onChange: this.onItemSelected, ref: splitProps.editor.inputElement }, domProps),
-                    addBlankItem && React.createElement("option", null, valueIsBlank ? (_d = splitProps.select) === null || _d === void 0 ? void 0 : _d.nullText : (_e = splitProps.select) === null || _e === void 0 ? void 0 : _e.deSelectText),
+                    addBlankItem && React.createElement("option", null, nullText),
                     items.map(function (item) { return (React.createElement("option", { value: item[_this.valueMember], key: item[_this.valueMember] }, item[_this.displayMember])); }));
         }
         return (InputHelpers.surroundWithInputGroup(control, splitProps.editor));

package/dist/ReactComponents/FileManager/FileUploadButton.js

@@ -32,8 +32,11 @@ var FileUploadButton = /** @class */ (function (_super) {
             buttonProps = {};
         if (!buttonProps.variant)
             buttonProps.variant = "light";
+        if (this.fileManager.isUploading && !this.fileManager.options.allowConcurrent) {
+            buttonProps.disabled = true;
+        }
         return (React.createElement(React.Fragment, null,
-            React.createElement(Button, __assign({}, buttonProps, { disabled: !this.fileManager.options.allowConcurrent && this.fileManager.isUploading, onClick: this.browseButtonClicked }), this.props.children),
+            React.createElement(Button, __assign({}, buttonProps, { onClick: this.browseButtonClicked }), this.props.children),
             React.createElement(FileBasicInput, { fileManager: this.fileManager, isHidden: true, inputRef: this.fileInputRef })));
     };
     FileUploadButton.contextType = FileContext;

package/dist/ReactComponents/Modal/Modal.js

@@ -41,13 +41,16 @@ var Modal = /** @class */ (function (_super) {
                 }
             }
             show = !!propertyInstance.value;
-            onClose = function () {
+            onClose = function (event) {
                 if (propertyInstance.value === true) {
                     propertyInstance.value = false;
                 }
                 else {
                     propertyInstance.value = null;
                 }
+                if (_this.props.onClose) {
+                    _this.props.onClose(event);
+                }
             };
         }
         else {
@@ -85,6 +88,9 @@ var Modal = /** @class */ (function (_super) {
                     acceptButton.isSubmit = true;
                 }
             }
+            else {
+                suppressForm = true;
+            }
             if (closeButton === undefined) {
                 closeButton = {};
             }

package/dist/ReactComponents/NumberInput.js

@@ -45,7 +45,7 @@ var FormatState = /** @class */ (function () {
             return this.zeroText;
         }
         if (value !== undefined && value !== null) {
-            if (value instanceof Decimal) {
+            if (value instanceof Misc.Globals.decimalType) {
                 value = value.toNumber();
             }
             if (typeof value === "number") {
@@ -65,6 +65,8 @@ var FormatState = /** @class */ (function () {
     return FormatState;
 }());
 export { FormatState };
+// Taken from https://github.com/MikeMcl/decimal.js-light/blob/master/decimal.js since it is not exported.
+var validDecimalRegex = /^(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i;
 var NumberInput = /** @class */ (function (_super) {
     __extends(NumberInput, _super);
     function NumberInput(props) {
@@ -85,6 +87,9 @@ var NumberInput = /** @class */ (function (_super) {
         if (e.target.value !== "" && isNaN(parseFloat(e.target.value))) {
             return;
         }
+        else if (!validDecimalRegex.test(e.target.value)) {
+            return;
+        }
         if (e.target.value == "") {
             newValue = this.props.bind.propertyInfo.allowNulls ? null : new Decimal(0);
         }
@@ -122,7 +127,7 @@ var NumberInput = /** @class */ (function (_super) {
     };
     NumberInput.prototype.getBindValueAsNumber = function () {
         var propertyValue = this.props.bind.value;
-        if (propertyValue instanceof Decimal) {
+        if (propertyValue instanceof Misc.Globals.decimalType) {
             return propertyValue.toNumber();
         }
         else {

package/dist/Views/ViewModelBase.d.ts

@@ -19,6 +19,7 @@ export default abstract class ViewModelBase extends ModelBase implements IViewMo
     registerReaction<T>(expression: () => T, effect: (value: T) => void): IReactionDisposer;
     /**
      * Instantiates, and registers a child view model that will be disposed when this view model is disposed.
+     * The task runner will be passed to the new vm from this one.
      * @param viewModel View model type.
      */
     registerViewModel<TViewModel extends IViewModel>(viewModel: new () => TViewModel, options?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "0.10.38",
+  "version": "0.10.41",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,7 +33,7 @@
     "@types/rc-slider": "^8.6.5",
     "@types/react-color": "^3.0.1",
     "@types/react-select": "3.1.0",
-    "@singularsystems/neo-core": "^0.10.44",
+    "@singularsystems/neo-core": "^0.10.49",
     "axios": "^0.21.1",
     "decimal.js-light": "2.5.1",
     "history": "4.10.1",

package/styles/Modal.scss

@@ -14,16 +14,12 @@ body.has-modal-scroll-fix {
     .modal-container {
         position: relative;
         outline: none;
+        transition: opacity .3s linear;
      
         &.modal-container-additional {
-            transition: transform .3s ease-out, opacity .3s linear;
-            transform: translate(0, -50%);
+            transition: transform .3s ease-out, opacity .3s linear, margin .3s ease;
             opacity: 0;
-        
-            &.show {
-                transform: translate(0, 0);
-               
-            }
+
             &.show:not(.inactive) {
                 opacity: 1;
             }