@singularsystems/neo-react 0.10.13 → 0.10.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Modules/Types.d.ts +1 -1
- package/dist/ReactComponents/Button.js +12 -2
- package/dist/ReactComponents/Button.js.map +1 -1
- package/dist/ReactComponents/DropDown/AutoCompleteDropDown.d.ts +1 -1
- package/dist/ReactComponents/DropDown/AutoCompleteDropDown.js +26 -13
- package/dist/ReactComponents/DropDown/AutoCompleteDropDown.js.map +1 -1
- package/dist/ReactComponents/DropDown/DropDown.js +1 -1
- package/dist/ReactComponents/DropDown/DropDown.js.map +1 -1
- package/dist/ReactComponents/Modal/ModalContainer.d.ts +14 -2
- package/dist/ReactComponents/Modal/ModalContainer.js +17 -2
- package/dist/ReactComponents/Modal/ModalContainer.js.map +1 -1
- package/dist/ReactComponents/PropTypes.d.ts +2 -1
- package/dist/ReactComponents/PropTypes.js +2 -1
- package/dist/ReactComponents/PropTypes.js.map +1 -1
- package/dist/Routing/RouteView.d.ts +2 -0
- package/dist/Routing/RouteView.js +6 -0
- package/dist/Routing/RouteView.js.map +1 -1
- package/dist/Routing/RoutingState.d.ts +2 -1
- package/dist/Routing/RoutingState.js +11 -17
- package/dist/Routing/RoutingState.js.map +1 -1
- package/package.json +2 -2
- package/styles/Validation.scss +1 -0
- package/dist/Modules/Misc.d.ts +0 -1
- package/dist/Modules/Misc.js +0 -2
- package/dist/Modules/Misc.js.map +0 -1
- package/dist/React/AutoQueryObject.d.ts +0 -5
- package/dist/React/AutoQueryObject.js +0 -39
- package/dist/React/AutoQueryObject.js.map +0 -1
- package/dist/React/Setup.d.ts +0 -1
- package/dist/React/Setup.js +0 -7
- package/dist/React/Setup.js.map +0 -1
- package/dist/ReactComponents/AsyncDropDown.d.ts +0 -54
- package/dist/ReactComponents/AsyncDropDown.js +0 -91
- package/dist/ReactComponents/AsyncDropDown.js.map +0 -1
- package/dist/ReactComponents/BootstrapHelpers.d.ts +0 -40
- package/dist/ReactComponents/BootstrapHelpers.js +0 -31
- package/dist/ReactComponents/BootstrapHelpers.js.map +0 -1
- package/dist/ReactComponents/DropDown/AsyncDropDown.d.ts +0 -53
- package/dist/ReactComponents/DropDown/AsyncDropDown.js +0 -95
- package/dist/ReactComponents/DropDown/AsyncDropDown.js.map +0 -1
- package/dist/ReactComponents/DropDown.d.ts +0 -47
- package/dist/ReactComponents/DropDown.js +0 -193
- package/dist/ReactComponents/DropDown.js.map +0 -1
- package/dist/ReactComponents/EditorContainerContext.d.ts +0 -19
- package/dist/ReactComponents/EditorContainerContext.js +0 -14
- package/dist/ReactComponents/EditorContainerContext.js.map +0 -1
- package/dist/ReactComponents/FileManager/FileManager.d.ts +0 -11
- package/dist/ReactComponents/FileManager/FileManager.js +0 -87
- package/dist/ReactComponents/FileManager/FileManager.js.map +0 -1
- package/dist/ReactComponents/FileManager.d.ts +0 -29
- package/dist/ReactComponents/FileManager.js +0 -105
- package/dist/ReactComponents/FileManager.js.map +0 -1
- package/dist/ReactComponents/FormGroup.d.ts +0 -23
- package/dist/ReactComponents/FormGroup.js +0 -68
- package/dist/ReactComponents/FormGroup.js.map +0 -1
- package/dist/ReactComponents/FormGroupFloating.d.ts +0 -19
- package/dist/ReactComponents/FormGroupFloating.js +0 -98
- package/dist/ReactComponents/FormGroupFloating.js.map +0 -1
- package/dist/ReactComponents/FormGroupInline.d.ts +0 -11
- package/dist/ReactComponents/FormGroupInline.js +0 -44
- package/dist/ReactComponents/FormGroupInline.js.map +0 -1
- package/dist/ReactComponents/Grid/Other.d.ts +0 -10
- package/dist/ReactComponents/Grid/Other.js +0 -22
- package/dist/ReactComponents/Grid/Other.js.map +0 -1
- package/dist/ReactComponents/Helpers.d.ts +0 -5
- package/dist/ReactComponents/Helpers.js +0 -18
- package/dist/ReactComponents/Helpers.js.map +0 -1
- package/dist/ReactComponents/InputBase.d.ts +0 -9
- package/dist/ReactComponents/InputBase.js +0 -29
- package/dist/ReactComponents/InputBase.js.map +0 -1
- package/dist/ReactComponents/Modal/ModalFactory.d.ts +0 -2
- package/dist/ReactComponents/Modal/ModalFactory.js +0 -43
- package/dist/ReactComponents/Modal/ModalFactory.js.map +0 -1
- package/dist/ReactComponents/Tabs/TabController.d.ts +0 -52
- package/dist/ReactComponents/Tabs/TabController.js +0 -104
- package/dist/ReactComponents/Tabs/TabController.js.map +0 -1
- package/dist/ReactComponents/_Controllers.d.ts +0 -4
- package/dist/ReactComponents/_Controllers.js +0 -5
- package/dist/ReactComponents/_Controllers.js.map +0 -1
- package/dist/ReactComponents/_UIHelpers.d.ts +0 -3
- package/dist/ReactComponents/_UIHelpers.js +0 -4
- package/dist/ReactComponents/_UIHelpers.js.map +0 -1
- package/dist/Routing/IMenuRoute.d.ts +0 -13
- package/dist/Routing/IMenuRoute.js +0 -20
- package/dist/Routing/IMenuRoute.js.map +0 -1
- package/dist/Routing/_Exports.d.ts +0 -4
- package/dist/Routing/_Exports.js +0 -5
- package/dist/Routing/_Exports.js.map +0 -1
- package/dist/Services/ErrorHandler.d.ts +0 -5
- package/dist/Services/ErrorHandler.js +0 -23
- package/dist/Services/ErrorHandler.js.map +0 -1
package/dist/Modules/Types.d.ts
CHANGED
|
@@ -39,7 +39,7 @@ declare const NeoReactTypes: {
|
|
|
39
39
|
LocalisationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Localisation").ILocalisationService>;
|
|
40
40
|
};
|
|
41
41
|
Security: {
|
|
42
|
-
AuthenticationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security
|
|
42
|
+
AuthenticationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security").IAuthenticationService>;
|
|
43
43
|
AuthorisationService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security").IAuthorisationService>;
|
|
44
44
|
LoginErrorHandler: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security").ILoginErrorHandler>;
|
|
45
45
|
SecurityService: AppServices.ServiceIdentifier<import("@singularsystems/neo-core/dist/Security/ISecurityService").default>;
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { __extends, __rest, __spreadArrays } from "tslib";
|
|
1
|
+
import { __decorate, __extends, __metadata, __rest, __spreadArrays } from "tslib";
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import ComponentBase from './ComponentBase';
|
|
4
4
|
import { Components, Utils } from '@singularsystems/neo-core';
|
|
5
5
|
import Tooltip from './Tooltip';
|
|
6
|
+
import { observer } from 'mobx-react';
|
|
6
7
|
var Button = /** @class */ (function (_super) {
|
|
7
8
|
__extends(Button, _super);
|
|
8
9
|
function Button(props) {
|
|
@@ -47,7 +48,8 @@ var Button = /** @class */ (function (_super) {
|
|
|
47
48
|
};
|
|
48
49
|
Button.prototype.render = function () {
|
|
49
50
|
var _this = this;
|
|
50
|
-
var _a
|
|
51
|
+
var _a;
|
|
52
|
+
var _b = this.props, isSubmit = _b.isSubmit, variant = _b.variant, size = _b.size, isOutline = _b.isOutline, icon = _b.icon, iconAlignment = _b.iconAlignment, text = _b.text, menuItems = _b.menuItems, splitMenu = _b.splitMenu, buttonGroupClassName = _b.buttonGroupClassName, tooltip = _b.tooltip, task = _b.task, native = __rest(_b, ["isSubmit", "variant", "size", "isOutline", "icon", "iconAlignment", "text", "menuItems", "splitMenu", "buttonGroupClassName", "tooltip", "task"]);
|
|
51
53
|
native.type = isSubmit ? "submit" : "button";
|
|
52
54
|
var isDropDown = menuItems && menuItems.length;
|
|
53
55
|
var buttonClasses = "btn btn-" + (isOutline ? "outline-" : "") + (variant || "primary");
|
|
@@ -57,6 +59,10 @@ var Button = /** @class */ (function (_super) {
|
|
|
57
59
|
buttonClasses += " dropdown-toggle";
|
|
58
60
|
native.onClick = this.showMenu;
|
|
59
61
|
}
|
|
62
|
+
if ((_a = task) === null || _a === void 0 ? void 0 : _a.isBusy) {
|
|
63
|
+
icon = "fa-circle-notch fa-spin";
|
|
64
|
+
native.disabled = true;
|
|
65
|
+
}
|
|
60
66
|
native.className = (native.className || "") + " " + buttonClasses;
|
|
61
67
|
// Button text
|
|
62
68
|
var innerText = this.props.children;
|
|
@@ -105,6 +111,10 @@ var Button = /** @class */ (function (_super) {
|
|
|
105
111
|
}
|
|
106
112
|
return root;
|
|
107
113
|
};
|
|
114
|
+
Button = __decorate([
|
|
115
|
+
observer,
|
|
116
|
+
__metadata("design:paramtypes", [Object])
|
|
117
|
+
], Button);
|
|
108
118
|
return Button;
|
|
109
119
|
}(ComponentBase));
|
|
110
120
|
export default Button;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../src/ReactComponents/Button.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,OAAO,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../src/ReactComponents/Button.tsx"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ interface IAutoCompleteCommonProps<T> extends ICommonEditorProps, Props<IOption,
|
|
|
50
50
|
}
|
|
51
51
|
export interface IAutoCompleteProps<T> extends IAutoCompleteCommonProps<T> {
|
|
52
52
|
bind: Model.IPropertyInstance;
|
|
53
|
-
bindDisplay
|
|
53
|
+
bindDisplay?: Model.IPropertyInstance;
|
|
54
54
|
}
|
|
55
55
|
export interface IAutoCompleteMultiSelectProps<T> extends IAutoCompleteCommonProps<T> {
|
|
56
56
|
/**
|
|
@@ -87,7 +87,9 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
|
|
|
87
87
|
else if (this.props.bind) {
|
|
88
88
|
// Single select
|
|
89
89
|
this.props.bind.value = args ? args.value : null;
|
|
90
|
-
this.props.bindDisplay
|
|
90
|
+
if (this.props.bindDisplay) {
|
|
91
|
+
this.props.bindDisplay.value = args ? args.label : "";
|
|
92
|
+
}
|
|
91
93
|
if (onItemSelected) {
|
|
92
94
|
onItemSelected(args);
|
|
93
95
|
}
|
|
@@ -95,8 +97,8 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
|
|
|
95
97
|
};
|
|
96
98
|
AutoCompleteDropDown.prototype.render = function () {
|
|
97
99
|
var _this = this;
|
|
98
|
-
var _a, _b, _c, _d, _e, _f;
|
|
99
|
-
var
|
|
100
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
101
|
+
var _m = this.props, bind = _m.bind, bindDisplay = _m.bindDisplay, bindItems = _m.bindItems, bindIds = _m.bindIds, itemSource = _m.itemSource, items = _m.items, displayMember = _m.displayMember, valueMember = _m.valueMember, option = _m.option, noRecordsPrompt = _m.noRecordsPrompt, typeToSearchPrompt = _m.typeToSearchPrompt, delayMs = _m.delayMs, minCharacters = _m.minCharacters, onItemSelected = _m.onItemSelected, otherProps = __rest(_m, ["bind", "bindDisplay", "bindItems", "bindIds", "itemSource", "items", "displayMember", "valueMember", "option", "noRecordsPrompt", "typeToSearchPrompt", "delayMs", "minCharacters", "onItemSelected"]);
|
|
100
102
|
var splitProps = BindPropsHelper.splitCommonEditorProps(otherProps);
|
|
101
103
|
var nativeProps = splitProps.rest;
|
|
102
104
|
var bindItemsProperty = bindItems;
|
|
@@ -108,15 +110,30 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
|
|
|
108
110
|
displayInfo.applyToDom(nativeProps, this.context.parentType !== EditorParentType.FormGroup);
|
|
109
111
|
this.displayMember = (_b = this.props.displayMember, (_b !== null && _b !== void 0 ? _b : ""));
|
|
110
112
|
this.valueMember = (_c = this.props.valueMember, (_c !== null && _c !== void 0 ? _c : ""));
|
|
113
|
+
var defaultItems = undefined;
|
|
114
|
+
if (this.props.items) {
|
|
115
|
+
defaultItems = this.mapTArrayToOptions(this.getItems(this.props.items));
|
|
116
|
+
}
|
|
111
117
|
var value = null;
|
|
112
118
|
if (bindItems) {
|
|
113
119
|
value = itemList.map(function (c) { return ({ value: c.id, label: c.display }); });
|
|
114
120
|
}
|
|
115
|
-
else
|
|
116
|
-
|
|
117
|
-
|
|
121
|
+
else {
|
|
122
|
+
if (bindValue.value !== null) {
|
|
123
|
+
var displayValue = (_d = bindDisplayProperty) === null || _d === void 0 ? void 0 : _d.value;
|
|
124
|
+
if (!bindDisplayProperty) {
|
|
125
|
+
if (defaultItems) {
|
|
126
|
+
displayValue = (_f = (_e = defaultItems.find(function (c) { return c.value === bindValue.value; })) === null || _e === void 0 ? void 0 : _e.label, (_f !== null && _f !== void 0 ? _f : ""));
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
throw "bindDisplay is required when the items prop is not set.";
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
value = { value: bindValue.value, label: displayValue };
|
|
133
|
+
}
|
|
134
|
+
this.setFieldInfo(bindValue, (_h = (_g = value) === null || _g === void 0 ? void 0 : _g.label, (_h !== null && _h !== void 0 ? _h : "")));
|
|
118
135
|
}
|
|
119
|
-
var components = (
|
|
136
|
+
var components = (_j = nativeProps.components, (_j !== null && _j !== void 0 ? _j : {}));
|
|
120
137
|
if (this.props.option) {
|
|
121
138
|
components.Option = function (item) { return (React.createElement("div", __assign({ ref: item.innerRef }, item.innerProps, { className: "react-select-row" + (item.isFocused ? " focused" : "") }), _this.props.option(item.data))); };
|
|
122
139
|
}
|
|
@@ -124,10 +141,6 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
|
|
|
124
141
|
var originalOption_1 = components.Option;
|
|
125
142
|
components.Option = function (item) { return (React.createElement("div", __assign({ ref: item.innerRef }, item.innerProps, { className: "react-select-row" + (item.isFocused ? " focused" : "") }), originalOption_1(item))); };
|
|
126
143
|
}
|
|
127
|
-
var defaultItems = undefined;
|
|
128
|
-
if (this.props.items) {
|
|
129
|
-
defaultItems = this.mapTArrayToOptions(this.getItems(this.props.items));
|
|
130
|
-
}
|
|
131
144
|
if (nativeProps.isClearable === undefined) {
|
|
132
145
|
nativeProps.isClearable = true;
|
|
133
146
|
}
|
|
@@ -146,10 +159,10 @@ var AutoCompleteDropDown = /** @class */ (function (_super) {
|
|
|
146
159
|
}
|
|
147
160
|
};
|
|
148
161
|
if (this.props.itemSource !== undefined) {
|
|
149
|
-
return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.asyncSelectImplementation, __assign({}, nativeProps, { placeholder: (
|
|
162
|
+
return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.asyncSelectImplementation, __assign({}, nativeProps, { placeholder: (_k = this.props.placeholder, (_k !== null && _k !== void 0 ? _k : "")), classNamePrefix: "react-select-bs", defaultOptions: defaultItems, loadOptions: this.onKeyPress, isMulti: bindItems !== undefined, noOptionsMessage: function (c) { var _a, _b; return c.inputValue && c.inputValue.length >= ((minCharacters !== null && minCharacters !== void 0 ? minCharacters : 1)) ? (_a = _this.props.noRecordsPrompt, (_a !== null && _a !== void 0 ? _a : "No records found")) : (_b = _this.props.typeToSearchPrompt, (_b !== null && _b !== void 0 ? _b : "Type to search...")); }, value: value, onChange: this.onItemSelected, components: components })), splitProps.editor), nativeProps);
|
|
150
163
|
}
|
|
151
164
|
else {
|
|
152
|
-
return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.selectImplementation, __assign({}, nativeProps, { placeholder: (
|
|
165
|
+
return Tooltip.fromDataAttributes(InputHelpers.surroundWithInputGroup(React.createElement(this.selectImplementation, __assign({}, nativeProps, { placeholder: (_l = this.props.placeholder, (_l !== null && _l !== void 0 ? _l : "")), classNamePrefix: "react-select-bs", options: defaultItems, isLoading: this.isLoading, isMulti: bindItems !== undefined, noOptionsMessage: function (c) { var _a; return _a = _this.props.noRecordsPrompt, (_a !== null && _a !== void 0 ? _a : "No records found"); }, value: value, onChange: this.onItemSelected, components: components })), splitProps.editor), nativeProps);
|
|
153
166
|
}
|
|
154
167
|
};
|
|
155
168
|
AutoCompleteDropDown.contextType = FormContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutoCompleteDropDown.js","sourceRoot":"","sources":["../../../src/ReactComponents/DropDown/AutoCompleteDropDown.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AutoCompleteDropDown.js","sourceRoot":"","sources":["../../../src/ReactComponents/DropDown/AutoCompleteDropDown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -93,7 +93,7 @@ var DropDown = /** @class */ (function (_super) {
|
|
|
93
93
|
var displayInfo = this.props.bind.validator.getDisplayState(this.context.validationDisplayMode);
|
|
94
94
|
displayInfo.applyToDom(domProps, !splitProps.inGroup);
|
|
95
95
|
var items = this.items;
|
|
96
|
-
var selectedItem = this.getSelectedOption(this.props.bind.value); // This sets the sort value to allow sorting of drop downs in grids.
|
|
96
|
+
var selectedItem = this.getSelectedOption(this.props.bind.value); // This sets the sort value to allow sorting of drop downs in grids.
|
|
97
97
|
var value = this.props.bind.value;
|
|
98
98
|
var addBlankItem = (_b = (_a = splitProps.select) === null || _a === void 0 ? void 0 : _a.allowNulls, (_b !== null && _b !== void 0 ? _b : this.props.bind.propertyInfo.allowNulls)) || !value;
|
|
99
99
|
if (addBlankItem && items.find(function (item) { return item[_this.valueMember] === null; })) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DropDown.js","sourceRoot":"","sources":["../../../src/ReactComponents/DropDown/DropDown.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DropDown.js","sourceRoot":"","sources":["../../../src/ReactComponents/DropDown/DropDown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
2
|
+
import { IModalContainerOptions } from '@singularsystems/neo-core/dist/Components/Modal/ModalHelper';
|
|
3
|
+
interface IModalContainerProps extends IModalContainerOptions {
|
|
4
|
+
/**
|
|
5
|
+
* By default, the modal container will be added at the root level of the document.
|
|
6
|
+
* This prop will make it render in the current position of the ModalContainer component.
|
|
7
|
+
*/
|
|
8
|
+
renderInPlace?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export default class ModalContainer extends React.Component<IModalContainerProps> {
|
|
3
11
|
private modalStore;
|
|
4
|
-
|
|
12
|
+
private containerRef;
|
|
13
|
+
componentDidMount(): void;
|
|
14
|
+
componentDidUpdate(): void;
|
|
15
|
+
render(): JSX.Element | (0 | JSX.Element)[];
|
|
5
16
|
}
|
|
17
|
+
export {};
|
|
@@ -3,16 +3,31 @@ import React from 'react';
|
|
|
3
3
|
import { AppServices, Misc } from '@singularsystems/neo-core';
|
|
4
4
|
import Modal from './Modal';
|
|
5
5
|
import { observer } from 'mobx-react';
|
|
6
|
+
import ModalHelper from '@singularsystems/neo-core/dist/Components/Modal/ModalHelper';
|
|
6
7
|
var ModalContainer = /** @class */ (function (_super) {
|
|
7
8
|
__extends(ModalContainer, _super);
|
|
8
9
|
function ModalContainer() {
|
|
9
10
|
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
10
11
|
_this.modalStore = Misc.Globals.appService.get(AppServices.NeoTypes.UI.ModalStore);
|
|
12
|
+
_this.containerRef = React.createRef();
|
|
11
13
|
return _this;
|
|
12
14
|
}
|
|
15
|
+
ModalContainer.prototype.componentDidMount = function () {
|
|
16
|
+
var _a;
|
|
17
|
+
ModalHelper.initialise(this.props, (_a = this.containerRef.current, (_a !== null && _a !== void 0 ? _a : undefined)));
|
|
18
|
+
};
|
|
19
|
+
ModalContainer.prototype.componentDidUpdate = function () {
|
|
20
|
+
ModalHelper.appInstance.updateProps(this.props);
|
|
21
|
+
};
|
|
13
22
|
ModalContainer.prototype.render = function () {
|
|
14
|
-
|
|
15
|
-
React.createElement(Modal, __assign({ key: modal.id }, modal.options), modal.content)); })
|
|
23
|
+
var modalList = this.modalStore.modals.map(function (modal) { return (modal.refreshValue &&
|
|
24
|
+
React.createElement(Modal, __assign({ key: modal.id }, modal.options), modal.content)); });
|
|
25
|
+
if (this.props.renderInPlace) {
|
|
26
|
+
return React.createElement("div", { ref: this.containerRef }, modalList);
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
return modalList;
|
|
30
|
+
}
|
|
16
31
|
};
|
|
17
32
|
ModalContainer = __decorate([
|
|
18
33
|
observer
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalContainer.js","sourceRoot":"","sources":["../../../src/ReactComponents/Modal/ModalContainer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"ModalContainer.js","sourceRoot":"","sources":["../../../src/ReactComponents/Modal/ModalContainer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,WAAuC,MAAM,6DAA6D,CAAC;AAWlH;IAA4C,kCAAqC;IAAjF;QAAA,qEA2BC;QAzBW,gBAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC7E,kBAAY,GAAG,KAAK,CAAC,SAAS,EAAkB,CAAC;;IAwB7D,CAAC;IAtBG,0CAAiB,GAAjB;;QACI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,QAAE,IAAI,CAAC,YAAY,CAAC,OAAO,uCAAI,SAAS,GAAC,CAAC;IAC/E,CAAC;IAED,2CAAkB,GAAlB;QACI,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,+BAAM,GAAN;QACI,IAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,UAAA,KAAK,IAAI,OAAA,CAClD,KAAK,CAAC,YAAY;YAClB,oBAAC,KAAK,aAAC,GAAG,EAAE,KAAK,CAAC,EAAE,IAAM,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAS,CACnE,EAHqD,CAGrD,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;YAC1B,OAAO,6BAAK,GAAG,EAAE,IAAI,CAAC,YAAY,IAC7B,SAAS,CACR,CAAA;SACT;aAAM;YACH,OAAO,SAAS,CAAC;SACpB;IACL,CAAC;IA1BgB,cAAc;QADlC,QAAQ;OACY,cAAc,CA2BlC;IAAD,qBAAC;CAAA,AA3BD,CAA4C,KAAK,CAAC,SAAS,GA2B1D;eA3BoB,cAAc"}
|
|
@@ -10,6 +10,7 @@ import { TransformMetaType } from '@singularsystems/neo-core/dist/Model/IModelBa
|
|
|
10
10
|
import PropertyInfo from '@singularsystems/neo-core/dist/Model/PropertyInfo';
|
|
11
11
|
import { IComponentBase } from './ComponentBase';
|
|
12
12
|
import FileInput, { IFileEditorProps } from './FileManager/FileInput';
|
|
13
|
+
import { FormContextParams } from './FormContext';
|
|
13
14
|
export declare type ItemCallback<T> = (item: T, meta: TransformMetaType<T>) => React.ReactNode;
|
|
14
15
|
export declare enum ControlType {
|
|
15
16
|
Date = 0,
|
|
@@ -148,7 +149,7 @@ export declare class BindPropsHelper {
|
|
|
148
149
|
static normaliseContainerProps<T, TContainerDom = React.HTMLProps<T>>(component: IComponentBase, props: IEditorContainerProps<T, any> & TContainerDom, inGroup: boolean, isBootstrap?: boolean): IEditorContainerNormalisedProps<TContainerDom, any>;
|
|
149
150
|
static normaliseEditorProps<T, TDom = React.HTMLProps<T>>(component: IComponentBase, props: (IEditorAndSelectorProps<T, any> & TDom) | IEditorNormalisedProps<TDom, any>): IEditorNormalisedProps<TDom, any>;
|
|
150
151
|
static getPlaceholderText(placeholder: string | boolean | undefined, property: PropertyInfo): string | undefined;
|
|
151
|
-
static autoSetDomProperties<TDom extends React.HTMLProps<HTMLElement>>(props: IEditorNormalisedProps<TDom, any>, formContext:
|
|
152
|
+
static autoSetDomProperties<TDom extends React.HTMLProps<HTMLElement>>(props: IEditorNormalisedProps<TDom, any>, formContext: FormContextParams, componentBlurFn?: (e: React.FocusEvent<HTMLElement>) => void, componentFocusFn?: (e: React.FocusEvent<HTMLElement>) => void): TDom;
|
|
152
153
|
/**
|
|
153
154
|
* Intercept the user specified blur event, and run the validation onBlur logic first.
|
|
154
155
|
* @param props Props specified on component.
|
|
@@ -178,9 +178,10 @@ var BindPropsHelper = /** @class */ (function () {
|
|
|
178
178
|
return undefined;
|
|
179
179
|
};
|
|
180
180
|
BindPropsHelper.autoSetDomProperties = function (props, formContext, componentBlurFn, componentFocusFn) {
|
|
181
|
+
var _a;
|
|
181
182
|
var domProps = __assign({}, props.editorDom);
|
|
182
183
|
if (props.uniqueID) {
|
|
183
|
-
domProps.id = props.uniqueID;
|
|
184
|
+
domProps.id = (_a = formContext.uniqueId, (_a !== null && _a !== void 0 ? _a : props.uniqueID));
|
|
184
185
|
}
|
|
185
186
|
if (this.config.isTestOrDevelopment) {
|
|
186
187
|
domProps["data-field-name"] = props.bind.propertyInfo.propertyName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropTypes.js","sourceRoot":"","sources":["../../src/ReactComponents/PropTypes.ts"],"names":[],"mappings":";AAAA,OAAO,EAAS,IAAI,EAAc,WAAW,EAAa,MAAM,2BAA2B,CAAC;AAE5F,OAAO,QAAoC,MAAM,qBAAqB,CAAC;AACvE,OAAO,WAA0C,MAAM,eAAe,CAAC;AACvE,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,SAAsC,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIrE,OAAO,SAA+B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"PropTypes.js","sourceRoot":"","sources":["../../src/ReactComponents/PropTypes.ts"],"names":[],"mappings":";AAAA,OAAO,EAAS,IAAI,EAAc,WAAW,EAAa,MAAM,2BAA2B,CAAC;AAE5F,OAAO,QAAoC,MAAM,qBAAqB,CAAC;AACvE,OAAO,WAA0C,MAAM,eAAe,CAAC;AACvE,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,SAAsC,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIrE,OAAO,SAA+B,MAAM,yBAAyB,CAAC;AAKtE,MAAM,CAAN,IAAY,WAOX;AAPD,WAAY,WAAW;IACnB,6CAAI,CAAA;IACJ,iDAAM,CAAA;IACN,qDAAQ,CAAA;IACR,6CAAI,CAAA;IACJ,6CAAI,CAAA;IACJ,uDAAS,CAAA;AACb,CAAC,EAPW,WAAW,KAAX,WAAW,QAOtB;AAED,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACpB,+CAAQ,CAAA;IACR,uDAAY,CAAA;IACZ,mDAAU,CAAA;AACd,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAmID;IAAA;IA4NA,CAAC;IAxNG,sBAAmB,yBAAM;aAAzB;YACI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;aACvF;YACD,OAAO,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC;;;OAAA;IAED;;;OAGG;IACW,8BAAc,GAA5B,UAA6B,KAAuC;QAEhE,QAAQ,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YAC3C,KAAK,WAAW,CAAC,IAAI;gBACjB,OAAO,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,KAAY,CAAC,CAAC;YACzD,KAAK,WAAW,CAAC,MAAM;gBACnB,OAAO,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,KAAY,CAAC,CAAC;YAC1D,KAAK,WAAW,CAAC,QAAQ;gBACrB,OAAO,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAY,CAAC,CAAC;YACvD,KAAK,WAAW,CAAC,IAAI;gBACjB,OAAO,KAAK,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACjD,KAAK,WAAW,CAAC,IAAI;gBACjB,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,KAAY,CAAC,CAAC;YACpD,KAAK,WAAW,CAAC,SAAS;gBACtB,OAAO,KAAK,CAAC,aAAa,CAAC,SAAS,EAAE,KAAY,CAAC,CAAC;SAC3D;IACL,CAAC;IAEa,8BAAc,GAA5B,UAA6B,KAAuC;QAEhE,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC1E,OAAO,WAAW,CAAC,IAAI,CAAC;SAC3B;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE;YACrB,OAAO,WAAW,CAAC,QAAQ,CAAA;SAC9B;aAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACnJ,OAAO,WAAW,CAAC,MAAM,CAAC;SAC7B;aAAM,IAAI,KAAK,CAAC,SAAS,EAAE;YACxB,OAAO,WAAW,CAAC,IAAI,CAAC;SAC3B;aAAM,IAAI,KAAK,CAAC,SAAS,EAAE;YACxB,OAAO,WAAW,CAAC,SAAS,CAAC;SAChC;aAAM;YACH,OAAO,WAAW,CAAC,IAAI,CAAC;SAC3B;IACL,CAAC;IAEa,+BAAe,GAA7B,UAA8B,KAAuC,EAAE,QAAc;QACjF,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;YACjC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,OAAO,YAAY,CAAC,QAAQ,CAAC;YAClE,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,YAAY,CAAC,MAAM,CAAC;SACjE;QACD,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YAChC,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,KAAK,IAAI,CAAC,QAAQ,CAAC,eAAe;gBAAE,OAAO,YAAY,CAAC,QAAQ,CAAC;YACzG,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;gBAAE,OAAO,YAAY,CAAC,QAAQ,CAAC;YAChG,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,SAAS;gBAAE,OAAO,YAAY,CAAC,QAAQ,CAAC;SACrH;QACD,OAAO,YAAY,CAAC,IAAI,CAAA;IAC5B,CAAC;IAED;;OAEG;IACW,+BAAe,GAA7B,UAAiC,QAAuC;QACpE,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,WAAW,CAAE,CAAC;IACxE,CAAC;IAEa,sCAAsB,GAApC,UAAmE,KAAQ;QAEjE,IAAA,6BAAU,EAAE,yBAAQ,EAAE,6BAAU,EAAE,yBAAQ,EAAE,+BAAW,EAAE,uBAAO,EAAE,6BAAU,EAAE,qBAAM,EAAE,iCAAY,EAAE,4IAAO,CAAW;QAC5H,OAAO;YACH,MAAM,EAAE;gBACJ,UAAU,EAAE,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,WAAW,aAAA,EAAE,OAAO,SAAA,EAAE,UAAU,YAAA,EAAE,MAAM,QAAA,EAAE,YAAY,cAAA;gBAClI,aAAa,EAAG,WAAW,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS;aACzH;YACD,IAAI,EAAE,IAAI;SACb,CAAA;IACL,CAAC;IAEa,uCAAuB,GAArC,UAA6E,SAAyB,EAAE,KAAoD,EAAE,OAAgB,EAAE,WAA2B;QACvM,yCAAyC;QADmI,4BAAA,EAAA,kBAA2B;;QAGvM,IAAI,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAEpD,IAAI,oBAoBe;QAnBf,wBAAwB;QACxB,cAAI,EAAE,oBAAO,EAAE,4BAAW;QAC1B,wBAAwB;QACxB,kBAAM,EACN,gBAAK,EACL,wBAAS,EACT,sBAAQ,EACR,wBAAS,EACT,wBAAS;QACT,yBAAyB;QACzB,gBAAK,EACL,4BAAW,EACX,gCAAa,EACb,oCAAe,EACf,4BAAW,EACX,kDAAsB,EACtB,4BAAW;QACX,gBAAgB;QAChB,uPACe,CAAC;QAEpB,IAAI,aAAa,GAAG,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC3D,IAAI,aAAa,IAAI,aAAa,CAAC,YAAY,CAAC,UAAU;YAAE,UAAU,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAChG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO;YAAE,UAAU,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAEtE,IAAI,CAAC,WAAW;YAAE,WAAW,GAAG,EAAG,CAAC;QACpC,IAAI,aAAa,EAAE;YACf,WAAW,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC;SAC3C;QACD,IAAI,eAAe,EAAE;YACjB,WAAW,CAAC,SAAS,GAAG,eAAe,CAAC;SAC3C;QACD,IAAI,WAAW,EAAE;YACb,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC;SACnC;QACD,IAAI,WAAW,IAAI,sBAAsB,KAAK,SAAS,EAAE;YACpD,sBAAkC,GAAG,IAAI,CAAC;SAC9C;QAED,OAAO;YACH,IAAI,EAAE,aAAa;YACnB,MAAM,aACF,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,QAAE,aAAa,0CAAE,YAAY,CAAC,IAAK,UAAU,CAAC,MAAM,CAC5H;YACD,SAAS,EAAE,WAAW;YACtB,SAAS,EAAE,EAAE,KAAK,OAAA,EAAE,aAAa,eAAA,EAAE,eAAe,iBAAA,EAAE,WAAW,aAAA,EAAE,WAAW,aAAA,EAAE,sBAAsB,wBAAA,EAAE;YACtG,MAAM,QAAA;YACN,KAAK,OAAA;YACL,QAAQ,UAAA;YACR,SAAS,WAAA;YACT,SAAS,WAAA;YACT,SAAS,WAAA;YACT,OAAO,SAAA;YACP,QAAQ,EAAE,OAAA,aAAa,0CAAE,QAAQ,IAAG,GAAG,GAAG,SAAS,CAAC,QAAQ;YAC5D,YAAY,EAAE,YAA6B;YAC3C,WAAW,aAAA;SACd,CAAA;IACL,CAAC;IAEa,oCAAoB,GAAlC,UAAiE,SAAyB,EAAE,KAAmF;QAC3K,IAAI,MAAM,GAAuC,KAAY,CAAC;QAE9D,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAChB,2CAA2C;YAE3C,MAAM,GAAG,eAAe,CAAC,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAC1E,MAAM,CAAC,SAAS,GAAI,MAAqD,CAAC,YAAY,CAAC;SAC1F;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEa,kCAAkB,GAAhC,UAAiC,WAAyC,EAAE,QAAsB;QAC9F,IAAI,WAAW,KAAK,IAAI,EAAE;YACtB,OAAO,QAAQ,CAAC,YAAY,CAAC;SAChC;aAAM,IAAI,WAAW,KAAK,KAAK,EAAE;YAC9B,OAAO,WAAW,CAAC;SACtB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEa,oCAAoB,GAAlC,UACI,KAAwC,EACxC,WAA8B,EAC9B,eAA4D,EAC5D,gBAA6D;;QAE7D,IAAI,QAAQ,gBAAO,KAAK,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,QAAQ,CAAC,EAAE,SAAG,WAAW,CAAC,QAAQ,uCAAI,KAAK,CAAC,QAAQ,EAAA,CAAC;SACxD;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACjC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;SACtE;QAED,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,IAAI,WAAW,CAAC,WAAW,EAAE;YACpD,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ;gBAAE,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;SAClD;QACD,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,IAAI,WAAW,CAAC,WAAW,EAAE;YACpD,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;SAC5B;QACD,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE;YAC1B,QAAQ,CAAC,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;SACnD;QAED,IAAI,gBAAgB,EAAE;YAClB,IAAM,eAAa,GAAG,QAAQ,CAAC,OAAO,CAAC;YACvC,QAAQ,CAAC,OAAO,GAAG,UAAC,CAAC;gBACjB,IAAI,eAAa;oBAAE,eAAa,CAAC,CAAC,CAAC,CAAC;gBACpC,gBAAgB,CAAC,CAAC,CAAC,CAAC;YACxB,CAAC,CAAA;SACJ;QAED,QAAQ,CAAC,MAAM,GAAG,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAChG,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACY,6BAAa,GAA5B,UAA6B,KAA2B,EAAE,YAAyD,EAAE,MAAmD;QACpK,OAAO,UAAC,CAAiC;YACrC,IAAI,KAAK,CAAC,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;YACvD,IAAI,MAAM;gBAAE,MAAM,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,KAAK,CAAC,MAAM;gBAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,YAAY;gBAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CAAA;IACL,CAAC;IACL,sBAAC;AAAD,CAAC,AA5ND,IA4NC"}
|
|
@@ -34,7 +34,9 @@ export default abstract class RouteView extends React.Component<RouteComponentPr
|
|
|
34
34
|
private getMatch;
|
|
35
35
|
static isExact(route: Routing.IRoute): boolean;
|
|
36
36
|
render(): React.CElement<SwitchProps, React.Component<SwitchProps, any, any>>;
|
|
37
|
+
componentDidUpdate(): void;
|
|
37
38
|
private getRouteComponent;
|
|
39
|
+
protected getAuthorisedComponent(route: Routing.IRoute, path: string): JSX.Element;
|
|
38
40
|
/**
|
|
39
41
|
* Checks if the user is authorised to access this route.
|
|
40
42
|
* Component from getForbiddenComponent() is returned if not.
|
|
@@ -103,6 +103,9 @@ var RouteView = /** @class */ (function (_super) {
|
|
|
103
103
|
return _this.getRouteComponent(route, props.location.pathname + props.location.search);
|
|
104
104
|
} })); })]);
|
|
105
105
|
};
|
|
106
|
+
RouteView.prototype.componentDidUpdate = function () {
|
|
107
|
+
this.routingState.onRouteChanged();
|
|
108
|
+
};
|
|
106
109
|
RouteView.prototype.getRouteComponent = function (route, path) {
|
|
107
110
|
if (!route.allowAnonymous) {
|
|
108
111
|
if (this.securityService.isAuthenticated) {
|
|
@@ -117,6 +120,9 @@ var RouteView = /** @class */ (function (_super) {
|
|
|
117
120
|
return this.getSigningInComponent(route);
|
|
118
121
|
}
|
|
119
122
|
}
|
|
123
|
+
return this.getAuthorisedComponent(route, path);
|
|
124
|
+
};
|
|
125
|
+
RouteView.prototype.getAuthorisedComponent = function (route, path) {
|
|
120
126
|
return React.createElement(route.component, null);
|
|
121
127
|
};
|
|
122
128
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteView.js","sourceRoot":"","sources":["../../src/Routing/RouteView.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RouteView.js","sourceRoot":"","sources":["../../src/Routing/RouteView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,6 @@ export declare class RoutingState {
|
|
|
9
9
|
currentRouteView?: RouteView;
|
|
10
10
|
leavePromise?: Promise<boolean> | Promise<Misc.ModalResult> | Promise<void>;
|
|
11
11
|
setCurrentRoute(routeProps: RouteComponentProps, route: IProcessedRoute): void;
|
|
12
|
-
private
|
|
12
|
+
private previousRoute?;
|
|
13
|
+
onRouteChanged(): void;
|
|
13
14
|
}
|
|
@@ -5,31 +5,25 @@ var RoutingState = /** @class */ (function () {
|
|
|
5
5
|
function RoutingState() {
|
|
6
6
|
}
|
|
7
7
|
RoutingState.prototype.setCurrentRoute = function (routeProps, route) {
|
|
8
|
-
this.onRouteChanged(routeProps, route);
|
|
9
8
|
this.currentRouteProps = routeProps;
|
|
10
9
|
this.currentRoute = route;
|
|
11
10
|
};
|
|
12
|
-
RoutingState.prototype.onRouteChanged = function (
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (((_a = ViewBase.currentView) === null || _a === void 0 ? void 0 : _a.constructor) !== newRoute.component) {
|
|
20
|
-
ViewBase.currentView = null;
|
|
21
|
-
}
|
|
22
|
-
}, 0);
|
|
11
|
+
RoutingState.prototype.onRouteChanged = function () {
|
|
12
|
+
var _a;
|
|
13
|
+
if (this.previousRoute !== this.currentRoute) {
|
|
14
|
+
this.previousRoute = this.currentRoute;
|
|
15
|
+
if (((_a = ViewBase.currentView) === null || _a === void 0 ? void 0 : _a.constructor) !== this.currentRoute.component) {
|
|
16
|
+
ViewBase.currentView = null;
|
|
17
|
+
}
|
|
23
18
|
// Scroll back to top as if the browser had actually loaded a new page.
|
|
24
19
|
window.scrollTo(0, 0);
|
|
25
20
|
}
|
|
26
21
|
else {
|
|
27
22
|
// Same route, but parameters must have changed.
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}, 0);
|
|
23
|
+
if (ViewBase.currentView) {
|
|
24
|
+
console.log("has current view");
|
|
25
|
+
ViewBase.currentView.updateViewParams(this.currentRouteProps.match);
|
|
26
|
+
}
|
|
33
27
|
}
|
|
34
28
|
};
|
|
35
29
|
RoutingState = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingState.js","sourceRoot":"","sources":["../../src/Routing/RoutingState.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAKpC;IAAA;
|
|
1
|
+
{"version":3,"file":"RoutingState.js","sourceRoot":"","sources":["../../src/Routing/RoutingState.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAKpC;IAAA;IAoCA,CAAC;IA5BU,sCAAe,GAAtB,UAAuB,UAA+B,EAAE,KAAsB;QAE1E,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAE9B,CAAC;IAIM,qCAAc,GAArB;;QAEI,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,YAAY,EAAE;YAC1C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;YAEvC,IAAI,OAAA,QAAQ,CAAC,WAAW,0CAAE,WAAW,MAAK,IAAI,CAAC,YAAa,CAAC,SAAS,EAAE;gBACpE,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;aAC/B;YAED,uEAAuE;YACvE,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACzB;aAAM;YACH,gDAAgD;YAChD,IAAI,QAAQ,CAAC,WAAW,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAChC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;aACvE;SACJ;IACL,CAAC;IAnCQ,YAAY;QADxB,UAAU,EAAE;OACA,YAAY,CAoCxB;IAAD,mBAAC;CAAA,AApCD,IAoCC;SApCY,YAAY"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@singularsystems/neo-react",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.17",
|
|
4
4
|
"description": "React application logic and components for the Neo client library",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@types/rc-slider": "^8.6.5",
|
|
33
33
|
"@types/react-color": "^3.0.1",
|
|
34
34
|
"@types/react-select": "3.1.0",
|
|
35
|
-
"@singularsystems/neo-core": "^0.10.
|
|
35
|
+
"@singularsystems/neo-core": "^0.10.24",
|
|
36
36
|
"axios": "^0.21.1",
|
|
37
37
|
"history": "4.10.1",
|
|
38
38
|
"inversify": "5.0.1",
|
package/styles/Validation.scss
CHANGED
package/dist/Modules/Misc.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export { default as setupNeoReact } from '../React/Setup';
|
package/dist/Modules/Misc.js
DELETED
package/dist/Modules/Misc.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Misc.js","sourceRoot":"","sources":["../../src/Modules/Misc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { Misc, Model } from '@singularsystems/neo-core';
|
|
2
|
-
import { PlainFlatObject } from '@singularsystems/neo-core/dist/Model/IModelBase';
|
|
3
|
-
export declare function toQueryObjectAuto<T extends Model.IModelBase>(instance: T, callback: (queryObject: PlainFlatObject<T>) => void, options?: {
|
|
4
|
-
delayMs: number;
|
|
5
|
-
}): Misc.Disposer;
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import { Utils, Misc } from '@singularsystems/neo-core';
|
|
2
|
-
import { reaction } from 'mobx';
|
|
3
|
-
export function toQueryObjectAuto(instance, callback, options) {
|
|
4
|
-
if (!options)
|
|
5
|
-
options = { delayMs: 500 };
|
|
6
|
-
var disposerDelayed = reaction(function () { return accessAllValues(instance, true); }, function () { return Utils.debounce(instance, function () { return callback(instance.toQueryObject()); }, options.delayMs); });
|
|
7
|
-
var disposerImmediate = reaction(function () { return accessAllValues(instance, false); }, function () { return Utils.debounce(instance, function () { return callback(instance.toQueryObject()); }, 0); });
|
|
8
|
-
return function () {
|
|
9
|
-
disposerDelayed();
|
|
10
|
-
disposerImmediate();
|
|
11
|
-
};
|
|
12
|
-
}
|
|
13
|
-
/**
|
|
14
|
-
* Access all the property values of a model including it's value objects properties.
|
|
15
|
-
* @param instance Instance to access.
|
|
16
|
-
* @param delayed True if only delayed properties should be accessed. A delayed property is one where the user
|
|
17
|
-
* types in the value over a short period of time. E.g. numeric input or text input.
|
|
18
|
-
*/
|
|
19
|
-
function accessAllValues(instance, delayed) {
|
|
20
|
-
var info = instance.constructor.neo;
|
|
21
|
-
for (var _i = 0, _a = info.properties; _i < _a.length; _i++) {
|
|
22
|
-
var propertyInfo = _a[_i];
|
|
23
|
-
if (!propertyInfo.noTrack && instance.meta[propertyInfo.propertyName]) {
|
|
24
|
-
if (propertyInfo.relationType === Misc.RelationType.None) {
|
|
25
|
-
var useDelay = [Misc.DataType.Int, Misc.DataType.Float].indexOf(propertyInfo.propertyType) >= 0 ||
|
|
26
|
-
typeof instance.meta[propertyInfo.propertyName].peek === "string";
|
|
27
|
-
if (useDelay === delayed) {
|
|
28
|
-
var value = instance[propertyInfo.propertyName];
|
|
29
|
-
console.log("got value " + value);
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
else if (propertyInfo.relationType === Misc.RelationType.ValueObject) {
|
|
33
|
-
accessAllValues(instance[propertyInfo.propertyName], delayed);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
return {};
|
|
38
|
-
}
|
|
39
|
-
//# sourceMappingURL=AutoQueryObject.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"AutoQueryObject.js","sourceRoot":"","sources":["../../src/React/AutoQueryObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAS,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,MAAM,UAAU,iBAAiB,CAA8B,QAAW,EAAE,QAAmD,EAAE,OAA4B;IAEzJ,IAAI,CAAC,OAAO;QAAE,OAAO,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IAEzC,IAAM,eAAe,GAAG,QAAQ,CAAC,cAAM,OAAA,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,EAA/B,CAA+B,EAAE,cAAM,OAAA,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAM,OAAA,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,EAAlC,CAAkC,EAAE,OAAQ,CAAC,OAAO,CAAC,EAApF,CAAoF,CAAC,CAAC;IACpK,IAAM,iBAAiB,GAAG,QAAQ,CAAC,cAAM,OAAA,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAhC,CAAgC,EAAE,cAAM,OAAA,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAM,OAAA,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,EAAlC,CAAkC,EAAE,CAAC,CAAC,EAArE,CAAqE,CAAC,CAAC;IAExJ,OAAO;QACH,eAAe,EAAE,CAAC;QAClB,iBAAiB,EAAE,CAAC;IACxB,CAAC,CAAA;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CAAC,QAA0B,EAAE,OAAgB;IAEjE,IAAM,IAAI,GAAI,QAAQ,CAAC,WAAmC,CAAC,GAAG,CAAC;IAE/D,KAAyB,UAAe,EAAf,KAAA,IAAI,CAAC,UAAU,EAAf,cAAe,EAAf,IAAe,EAAE;QAArC,IAAI,YAAY,SAAA;QACjB,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE;YACnE,IAAI,YAAY,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;gBAEtD,IAAM,QAAQ,GACV,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC;oBAChF,OAAO,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAA;gBAErE,IAAI,QAAQ,KAAK,OAAO,EAAE;oBACtB,IAAI,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;oBAChD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC,CAAC;iBACrC;aAEJ;iBAAM,IAAI,YAAY,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE;gBACpE,eAAe,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;aACjE;SACJ;KACJ;IAED,OAAO,EAAE,CAAC;AACd,CAAC"}
|
package/dist/React/Setup.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
import './DataView';
|