@singularsystems/neo-react 0.10.27 → 0.10.31

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.
@@ -46,8 +46,8 @@ var ReactModelCreator = /** @class */ (function (_super) {
46
46
  model.validator.addProperty(propertyInstance);
47
47
  }
48
48
  }
49
- if (propertyInfo.isComputed) {
50
- if (propertyInfo.descriptor) {
49
+ if (propertyInfo.isComputed !== null) {
50
+ if (propertyInfo.descriptor && propertyInfo.isComputed) {
51
51
  computed({ keepAlive: true })(object, propertyName, propertyInfo.descriptor, true);
52
52
  }
53
53
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ReactModelCreator.js","sourceRoot":"","sources":["../../src/React/ReactModelCreator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ReactModelCreator.js","sourceRoot":"","sources":["../../src/React/ReactModelCreator.ts"],"names":[],"mappings":"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"}
@@ -43,16 +43,17 @@ var Button = /** @class */ (function (_super) {
43
43
  };
44
44
  Button.prototype.afterRender = function () {
45
45
  if (this.btnGroupDom.current && this.menuDom.current) {
46
- Components.PositionHelper.checkScreenBounds(this.btnGroupDom.current, this.menuDom.current);
46
+ Components.PositionHelper.checkScreenBounds(this.btnGroupDom.current, this.menuDom.current, undefined, this.props.menuAlignment === "right");
47
47
  }
48
48
  };
49
49
  Button.prototype.render = function () {
50
50
  var _this = this;
51
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"]);
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, menuAlignment = _b.menuAlignment, buttonGroupClassName = _b.buttonGroupClassName, tooltip = _b.tooltip, task = _b.task, pulse = _b.pulse, native = __rest(_b, ["isSubmit", "variant", "size", "isOutline", "icon", "iconAlignment", "text", "menuItems", "splitMenu", "menuAlignment", "buttonGroupClassName", "tooltip", "task", "pulse"]);
53
53
  native.type = isSubmit ? "submit" : "button";
54
+ variant = (variant !== null && variant !== void 0 ? variant : "primary");
54
55
  var isDropDown = menuItems && menuItems.length;
55
- var buttonClasses = "btn btn-" + (isOutline ? "outline-" : "") + (variant || "primary");
56
+ var buttonClasses = "btn btn-" + (isOutline ? "outline-" : "") + variant;
56
57
  if (size)
57
58
  buttonClasses += " btn-" + size;
58
59
  if (isDropDown && !splitMenu) {
@@ -63,6 +64,9 @@ var Button = /** @class */ (function (_super) {
63
64
  icon = "fa-circle-notch fa-spin";
64
65
  native.disabled = true;
65
66
  }
67
+ if (pulse) {
68
+ buttonClasses += " " + variant + "-color-pulse";
69
+ }
66
70
  native.className = (native.className || "") + " " + buttonClasses;
67
71
  // Button text
68
72
  var innerText = this.props.children;
@@ -1 +1 @@
1
- {"version":3,"file":"Button.js","sourceRoot":"","sources":["../../src/ReactComponents/Button.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Button.js","sourceRoot":"","sources":["../../src/ReactComponents/Button.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import { Model } from '@singularsystems/neo-core';
2
3
  interface ICardProps {
3
4
  /** Icon to show next to title in header. */
4
5
  icon?: string;
@@ -8,8 +9,15 @@ interface ICardProps {
8
9
  headerElements?: JSX.Element;
9
10
  /** Use a custom scrollbar instead of the browser scrollbar. */
10
11
  useCustomScrollbar?: boolean;
12
+ /** Causes the card to be collapsible. Adds a collapse icon to the header. */
13
+ collapsible?: boolean;
14
+ /** Causes the card to be collapsed on first render. Sets the collapsible prop to true. */
15
+ initiallyCollapsed?: boolean;
16
+ /** Allows the collapse state to be set externally. Sets the collapsible prop to true. */
17
+ isExpanded?: Model.IObservableValue<boolean>;
11
18
  }
12
19
  export default class Card extends React.Component<ICardProps & React.HTMLProps<HTMLDivElement>> {
20
+ private expandState;
13
21
  render(): JSX.Element;
14
22
  }
15
23
  export {};
@@ -1,25 +1,50 @@
1
1
  import { __assign, __decorate, __extends, __rest } from "tslib";
2
2
  import React from 'react';
3
- import { Utils } from '@singularsystems/neo-core';
3
+ import { Model, Utils } from '@singularsystems/neo-core';
4
4
  import { observer } from 'mobx-react';
5
5
  import Scrollbar from 'react-custom-scrollbars';
6
+ import Collapsable from './Collapsable';
6
7
  var Card = /** @class */ (function (_super) {
7
8
  __extends(Card, _super);
8
9
  function Card() {
9
- return _super !== null && _super.apply(this, arguments) || this;
10
+ var _this = _super !== null && _super.apply(this, arguments) || this;
11
+ _this.expandState = new Model.ObservableValue(_this.props.initiallyCollapsed === undefined ? true : !_this.props.initiallyCollapsed);
12
+ return _this;
10
13
  }
11
14
  Card.prototype.render = function () {
12
- var _a = this.props, icon = _a.icon, title = _a.title, children = _a.children, headerElements = _a.headerElements, useCustomScrollbar = _a.useCustomScrollbar, domProps = __rest(_a, ["icon", "title", "children", "headerElements", "useCustomScrollbar"]);
15
+ var _a = this.props, icon = _a.icon, title = _a.title, children = _a.children, headerElements = _a.headerElements, useCustomScrollbar = _a.useCustomScrollbar, collapsible = _a.collapsible, initiallyCollapsed = _a.initiallyCollapsed, isExpanded = _a.isExpanded, domProps = __rest(_a, ["icon", "title", "children", "headerElements", "useCustomScrollbar", "collapsible", "initiallyCollapsed", "isExpanded"]);
13
16
  var className = Utils.joinWithSpaces("neo-card card", domProps.className);
17
+ var isCollapsible = collapsible || isExpanded !== undefined || initiallyCollapsed !== undefined;
18
+ var expandState = (isExpanded !== null && isExpanded !== void 0 ? isExpanded : this.expandState);
19
+ if (isCollapsible) {
20
+ var expandIndicator = React.createElement("i", { onClick: function () { return expandState.value = !expandState.value; }, className: "card-expand-indicator fa fa-fw fa-angle-" + (expandState.value ? "up" : "down") });
21
+ if (headerElements) {
22
+ headerElements = React.createElement(React.Fragment, null,
23
+ headerElements,
24
+ expandIndicator);
25
+ }
26
+ else {
27
+ headerElements = expandIndicator;
28
+ }
29
+ if (!expandState.value) {
30
+ className += " collapsed";
31
+ }
32
+ }
33
+ var body = React.createElement("div", { className: "card-body" },
34
+ useCustomScrollbar && React.createElement(Scrollbar, null, children),
35
+ !useCustomScrollbar && children);
36
+ if (isCollapsible) {
37
+ body =
38
+ React.createElement(Collapsable, { show: expandState.value }, body);
39
+ }
14
40
  return (React.createElement("div", __assign({}, domProps, { className: className }),
15
41
  (icon || title) &&
16
42
  React.createElement("div", { className: "card-header" },
17
- icon && React.createElement("i", { className: Utils.getFontAwesomeClass(icon) }),
18
- React.createElement("span", null, title),
43
+ React.createElement("div", { className: "card-header-title" },
44
+ icon && React.createElement("i", { className: Utils.getFontAwesomeClass(icon) }),
45
+ React.createElement("span", null, title)),
19
46
  headerElements && React.createElement("div", { className: "card-header-right-section" }, headerElements)),
20
- React.createElement("div", { className: "card-body" },
21
- useCustomScrollbar && React.createElement(Scrollbar, null, children),
22
- !useCustomScrollbar && children)));
47
+ body));
23
48
  };
24
49
  Card = __decorate([
25
50
  observer
@@ -1 +1 @@
1
- {"version":3,"file":"Card.js","sourceRoot":"","sources":["../../src/ReactComponents/Card.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAiBhD;IAAkC,wBAA6D;IAA/F;;IAwBA,CAAC;IAvBG,qBAAM,GAAN;QACI,IAAM,eAAuF,EAArF,cAAI,EAAE,gBAAK,EAAE,sBAAQ,EAAE,kCAAc,EAAE,0CAAkB,EAAE,4FAA0B,CAAC;QAE9F,IAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE5E,OAAO,CACH,wCAAS,QAAQ,IAAE,SAAS,EAAE,SAAS;YAElC,CAAC,IAAI,IAAI,KAAK,CAAC;gBAChB,6BAAK,SAAS,EAAC,aAAa;oBACvB,IAAI,IAAI,2BAAG,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAI;oBAC1D,kCAAO,KAAK,CAAQ;oBAEnB,cAAc,IAAI,6BAAK,SAAS,EAAC,2BAA2B,IAAE,cAAc,CAAO,CAClF;YAEN,6BAAK,SAAS,EAAC,WAAW;gBACrB,kBAAkB,IAAI,oBAAC,SAAS,QAAE,QAAQ,CAAa;gBACvD,CAAC,kBAAkB,IAAI,QAAQ,CAC9B,CACJ,CACT,CAAA;IACL,CAAC;IAvBgB,IAAI;QADxB,QAAQ;OACY,IAAI,CAwBxB;IAAD,WAAC;CAAA,AAxBD,CAAkC,KAAK,CAAC,SAAS,GAwBhD;eAxBoB,IAAI"}
1
+ {"version":3,"file":"Card.js","sourceRoot":"","sources":["../../src/ReactComponents/Card.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,WAAW,MAAM,eAAe,CAAC;AA0BxC;IAAkC,wBAA6D;IAA/F;QAAA,qEAsDC;QApDW,iBAAW,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;;IAoDzI,CAAC;IAlDG,qBAAM,GAAN;QACI,IAAI,eAAoI,EAAlI,cAAI,EAAE,gBAAK,EAAE,sBAAQ,EAAE,kCAAc,EAAE,0CAAkB,EAAE,4BAAW,EAAE,0CAAkB,EAAE,0BAAU,EAAE,+IAA0B,CAAC;QAEzI,IAAI,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE1E,IAAM,aAAa,GAAG,WAAW,IAAI,UAAU,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS,CAAC;QAClG,IAAM,WAAW,IAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,CAAC,WAAW,CAAA,CAAC;QAEnD,IAAI,aAAa,EAAE;YACf,IAAM,eAAe,GAAG,2BAAG,OAAO,EAAE,cAAM,OAAA,WAAW,CAAC,KAAK,GAAG,CAAC,WAAW,CAAC,KAAK,EAAtC,CAAsC,EAAE,SAAS,EAAE,8CAA2C,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAE,GAAI,CAAA;YAC/K,IAAI,cAAc,EAAE;gBAChB,cAAc,GAAG;oBAAG,cAAc;oBAAE,eAAe,CAAI,CAAA;aAC1D;iBAAM;gBACH,cAAc,GAAG,eAAe,CAAC;aACpC;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;gBACpB,SAAS,IAAI,YAAY,CAAA;aAC5B;SACJ;QAED,IAAI,IAAI,GACJ,6BAAK,SAAS,EAAC,WAAW;YACrB,kBAAkB,IAAI,oBAAC,SAAS,QAAE,QAAQ,CAAa;YACvD,CAAC,kBAAkB,IAAI,QAAQ,CAC9B,CAAA;QAEV,IAAI,aAAa,EAAE;YACf,IAAI;gBACJ,oBAAC,WAAW,IAAC,IAAI,EAAE,WAAW,CAAC,KAAK,IAC/B,IAAI,CACK,CAAA;SACjB;QAED,OAAO,CACH,wCAAS,QAAQ,IAAE,SAAS,EAAE,SAAS;YAElC,CAAC,IAAI,IAAI,KAAK,CAAC;gBAChB,6BAAK,SAAS,EAAC,aAAa;oBACxB,6BAAK,SAAS,EAAC,mBAAmB;wBAC7B,IAAI,IAAI,2BAAG,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAI;wBAC1D,kCAAO,KAAK,CAAQ,CAClB;oBAEL,cAAc,IAAI,6BAAK,SAAS,EAAC,2BAA2B,IAAE,cAAc,CAAO,CAClF;YAEL,IAAI,CACH,CACT,CAAA;IACL,CAAC;IArDgB,IAAI;QADxB,QAAQ;OACY,IAAI,CAsDxB;IAAD,WAAC;CAAA,AAtDD,CAAkC,KAAK,CAAC,SAAS,GAsDhD;eAtDoB,IAAI"}
@@ -1,6 +1,8 @@
1
1
  import { Components } from '@singularsystems/neo-core';
2
2
  export declare class ErrorHandler extends Components.ErrorHandler {
3
- private modalShowCount;
3
+ private errorList;
4
+ private hidingErrorList;
4
5
  protected displayError(displayType: Components.ErrorDisplayType, error: any, errorDisplay: Components.IErrorDisplay): void;
5
6
  protected displayModal(error: any, errorDisplay: Components.IErrorDisplay): void;
7
+ private getIcon;
6
8
  }
@@ -1,11 +1,25 @@
1
- import { __extends } from "tslib";
1
+ import { __decorate, __extends, __metadata } from "tslib";
2
2
  import React from 'react';
3
3
  import { Components, ModalUtils } from '@singularsystems/neo-core';
4
+ import { Observer } from 'mobx-react';
5
+ import { observable } from 'mobx';
6
+ var ErrorGroup = /** @class */ (function () {
7
+ function ErrorGroup(errorDisplay) {
8
+ this.errorDisplay = errorDisplay;
9
+ this.count = 1;
10
+ }
11
+ __decorate([
12
+ observable,
13
+ __metadata("design:type", Object)
14
+ ], ErrorGroup.prototype, "count", void 0);
15
+ return ErrorGroup;
16
+ }());
4
17
  var ErrorHandler = /** @class */ (function (_super) {
5
18
  __extends(ErrorHandler, _super);
6
19
  function ErrorHandler() {
7
20
  var _this = _super !== null && _super.apply(this, arguments) || this;
8
- _this.modalShowCount = 0;
21
+ _this.errorList = [];
22
+ _this.hidingErrorList = null;
9
23
  return _this;
10
24
  }
11
25
  ErrorHandler.prototype.displayError = function (displayType, error, errorDisplay) {
@@ -21,38 +35,57 @@ var ErrorHandler = /** @class */ (function (_super) {
21
35
  };
22
36
  ErrorHandler.prototype.displayModal = function (error, errorDisplay) {
23
37
  var _this = this;
24
- var _a;
25
- var icon = "fa fa-exclamation-triangle";
26
- var repeatingError = [401, 403, 500].indexOf((_a = errorDisplay.statusCode, (_a !== null && _a !== void 0 ? _a : 0))) >= 0;
27
- if (repeatingError && this.modalShowCount > 0) {
28
- // Prevent showing a generic error message more than once.
29
- return;
38
+ if (errorDisplay.statusCode) {
39
+ var existing = this.errorList.find(function (c) { return c.errorDisplay.statusCode === errorDisplay.statusCode; });
40
+ if (existing) {
41
+ existing.count += 1;
42
+ return;
43
+ }
30
44
  }
45
+ var errorGroup = new ErrorGroup(errorDisplay);
46
+ if (this.errorList.length === 0) {
47
+ this.hidingErrorList = null;
48
+ var modalOptions = errorDisplay.isServerError ? {
49
+ footerContent: React.createElement("div", { className: "neo-error-modal-info" },
50
+ "Timestamp: ",
51
+ new Date().toISOString())
52
+ } : {};
53
+ modalOptions.onClose = function () {
54
+ _this.hidingErrorList = _this.errorList;
55
+ _this.errorList = [];
56
+ };
57
+ ModalUtils.showModal(errorDisplay.header, React.createElement(Observer, null, function () {
58
+ var _a;
59
+ return (_a = _this.hidingErrorList, (_a !== null && _a !== void 0 ? _a : _this.errorList)).map(function (errorGroup, index) { return (React.createElement("div", { key: index, className: "neo-error-modal-body" },
60
+ React.createElement("div", { className: "neo-error-modal-body-icon" }, errorGroup.count === 1 ?
61
+ React.createElement("i", { className: _this.getIcon(errorGroup.errorDisplay) }) :
62
+ React.createElement("span", { className: "badge badge-danger" }, errorGroup.count)),
63
+ React.createElement("div", null, errorGroup.errorDisplay.body))); });
64
+ }), modalOptions);
65
+ }
66
+ if (this.errorList.length < 5) {
67
+ this.errorList.push(errorGroup);
68
+ }
69
+ };
70
+ ErrorHandler.prototype.getIcon = function (errorDisplay) {
31
71
  if (errorDisplay.statusCode) {
32
72
  if (errorDisplay.statusCode === 401) {
33
- icon = "fa fa-lock";
73
+ return "fa fa-lock";
34
74
  }
35
75
  if (errorDisplay.statusCode === 403) {
36
- icon = "fa fa-user-lock";
76
+ return "fa fa-user-lock";
37
77
  }
38
78
  }
39
- errorDisplay.body =
40
- React.createElement("div", null,
41
- React.createElement("div", { className: "neo-error-modal-body" },
42
- React.createElement("div", null,
43
- React.createElement("i", { className: icon })),
44
- React.createElement("div", null, errorDisplay.body)));
45
- var modalOptions = errorDisplay.isServerError ? {
46
- footerContent: React.createElement("div", { className: "neo-error-modal-info" },
47
- "Timestamp: ",
48
- new Date().toISOString())
49
- } : {};
50
- modalOptions.onClose = function () {
51
- _this.modalShowCount -= 1;
52
- };
53
- ModalUtils.showModal(errorDisplay.header, errorDisplay.body, modalOptions);
54
- this.modalShowCount += 1;
79
+ return "fa fa-exclamation-triangle";
55
80
  };
81
+ __decorate([
82
+ observable.shallow,
83
+ __metadata("design:type", Array)
84
+ ], ErrorHandler.prototype, "errorList", void 0);
85
+ __decorate([
86
+ observable.ref,
87
+ __metadata("design:type", Object)
88
+ ], ErrorHandler.prototype, "hidingErrorList", void 0);
56
89
  return ErrorHandler;
57
90
  }(Components.ErrorHandler));
58
91
  export { ErrorHandler };
@@ -1 +1 @@
1
- {"version":3,"file":"ErrorHandler.js","sourceRoot":"","sources":["../../src/ReactComponents/ErrorHandler.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGnE;IAAkC,gCAAuB;IAAzD;QAAA,qEA+DC;QA7DW,oBAAc,GAAG,CAAC,CAAC;;IA6D/B,CAAC;IA3Da,mCAAY,GAAtB,UAAuB,WAAwC,EAAE,KAAU,EAAE,YAAsC;QAE/G,IAAI,YAAY,CAAC,IAAI,EAAE;YAEnB,YAAY,CAAC,IAAI,GAAG;gBAAG,YAAY,CAAC,IAAI;gBAAC;oBACpC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,CACjC,gCAAK,GAAG,CAAM,CACjB,EAFoC,CAEpC,CAAC;oBACD,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAA,QAAQ,IAAI,OAAA,CAC1C;wBAAI,0CAAgB,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAG,QAAQ,CAAC,MAAM,CAAQ,CAAK,CACjF,EAF6C,CAE7C,CAAC,CACD,CAAG,CAAA;SAEX;QAED,iBAAM,YAAY,YAAC,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC;IAES,mCAAY,GAAtB,UAAuB,KAAU,EAAE,YAAsC;QAAzE,iBAwCC;;QAtCG,IAAI,IAAI,GAAG,4BAA4B,CAAC;QACxC,IAAI,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,OAAC,YAAY,CAAC,UAAU,uCAAI,CAAC,GAAC,IAAI,CAAC,CAAC;QAEhF,IAAI,cAAc,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE;YAC3C,0DAA0D;YAC1D,OAAO;SACV;QAED,IAAI,YAAY,CAAC,UAAU,EAAE;YACzB,IAAI,YAAY,CAAC,UAAU,KAAK,GAAG,EAAE;gBACjC,IAAI,GAAG,YAAY,CAAC;aACvB;YACD,IAAI,YAAY,CAAC,UAAU,KAAK,GAAG,EAAE;gBACjC,IAAI,GAAG,iBAAiB,CAAC;aAC5B;SACJ;QAED,YAAY,CAAC,IAAI;YACb;gBACI,6BAAK,SAAS,EAAC,sBAAsB;oBACjC;wBAAK,2BAAG,SAAS,EAAE,IAAI,GAAI,CAAM;oBACjC,iCAAM,YAAY,CAAC,IAAI,CAAO,CAC5B,CACJ,CAAA;QAEV,IAAM,YAAY,GAA2B,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;YACtE,aAAa,EACT,6BAAK,SAAS,EAAC,sBAAsB;;gBACrB,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAClC;SACb,CAAC,CAAC,CAAC,EAAE,CAAC;QAEP,YAAY,CAAC,OAAO,GAAG;YACnB,KAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAA;QAED,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;IAC7B,CAAC;IACL,mBAAC;AAAD,CAAC,AA/DD,CAAkC,UAAU,CAAC,YAAY,GA+DxD"}
1
+ {"version":3,"file":"ErrorHandler.js","sourceRoot":"","sources":["../../src/ReactComponents/ErrorHandler.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC;IACI,oBAAoB,YAAsC;QAAtC,iBAAY,GAAZ,YAAY,CAA0B;QAKnD,UAAK,GAAG,CAAC,CAAC;IAHjB,CAAC;IAGD;QADC,UAAU;;6CACM;IACrB,iBAAC;CAAA,AAPD,IAOC;AAED;IAAkC,gCAAuB;IAAzD;QAAA,qEAoFC;QAjFW,eAAS,GAAiB,EAAE,CAAC;QAG7B,qBAAe,GAAwB,IAAI,CAAC;;IA8ExD,CAAC;IA5Ea,mCAAY,GAAtB,UAAuB,WAAwC,EAAE,KAAU,EAAE,YAAsC;QAE/G,IAAI,YAAY,CAAC,IAAI,EAAE;YAEnB,YAAY,CAAC,IAAI,GAAG;gBAAG,YAAY,CAAC,IAAI;gBAAC;oBACpC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,CACjC,gCAAK,GAAG,CAAM,CACjB,EAFoC,CAEpC,CAAC;oBACD,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAA,QAAQ,IAAI,OAAA,CAC1C;wBAAI,0CAAgB,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAG,QAAQ,CAAC,MAAM,CAAQ,CAAK,CACjF,EAF6C,CAE7C,CAAC,CACD,CAAG,CAAA;SAEX;QAED,iBAAM,YAAY,YAAC,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC;IAES,mCAAY,GAAtB,UAAuB,KAAU,EAAE,YAAsC;QAAzE,iBA6CC;QA3CG,IAAI,YAAY,CAAC,UAAU,EAAE;YACzB,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,YAAY,CAAC,UAAU,KAAK,YAAY,CAAC,UAAU,EAArD,CAAqD,CAAC,CAAC;YAC/F,IAAI,QAAQ,EAAE;gBACV,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC;gBACpB,OAAO;aACV;SACJ;QAED,IAAM,UAAU,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC;QAEhD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAE5B,IAAM,YAAY,GAA2B,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;gBACtE,aAAa,EACT,6BAAK,SAAS,EAAC,sBAAsB;;oBACrB,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAClC;aACb,CAAC,CAAC,CAAC,EAAE,CAAC;YAEP,YAAY,CAAC,OAAO,GAAG;gBACnB,KAAI,CAAC,eAAe,GAAG,KAAI,CAAC,SAAS,CAAC;gBACtC,KAAI,CAAC,SAAS,GAAG,EAAE,CAAC;YACxB,CAAC,CAAA;YAED,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EACpC,oBAAC,QAAQ,QACJ;;gBAAM,OAAA,MAAC,KAAI,CAAC,eAAe,uCAAI,KAAI,CAAC,SAAS,EAAC,CAAC,GAAG,CAAC,UAAC,UAAU,EAAE,KAAK,IAAK,OAAA,CACvE,6BAAK,GAAG,EAAE,KAAK,EAAE,SAAS,EAAC,sBAAsB;oBAC7C,6BAAK,SAAS,EAAC,2BAA2B,IACrC,UAAU,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC;wBACrB,2BAAG,SAAS,EAAE,KAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,GAAI,CAAC,CAAC;wBACzD,8BAAM,SAAS,EAAC,oBAAoB,IAAE,UAAU,CAAC,KAAK,CAAQ,CAChE;oBACN,iCAAM,UAAU,CAAC,YAAY,CAAC,IAAI,CAAO,CACvC,CACT,EAT0E,CAS1E,CAAC,CAAA;aAAA,CACK,EAAE,YAAY,CAAC,CAAC;SAClC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACnC;IACL,CAAC;IAEO,8BAAO,GAAf,UAAgB,YAAsC;QAClD,IAAI,YAAY,CAAC,UAAU,EAAE;YACzB,IAAI,YAAY,CAAC,UAAU,KAAK,GAAG,EAAE;gBACjC,OAAO,YAAY,CAAC;aACvB;YACD,IAAI,YAAY,CAAC,UAAU,KAAK,GAAG,EAAE;gBACjC,OAAO,iBAAiB,CAAC;aAC5B;SACJ;QACD,OAAO,4BAA4B,CAAC;IACxC,CAAC;IAhFD;QADC,UAAU,CAAC,OAAO;;mDACkB;IAGrC;QADC,UAAU,CAAC,GAAG;;yDACqC;IA8ExD,mBAAC;CAAA,AApFD,CAAkC,UAAU,CAAC,YAAY,GAoFxD;SApFY,YAAY"}
@@ -39,14 +39,6 @@ var Row = /** @class */ (function (_super) {
39
39
  return { isExpanded: _this.expandProperty.value };
40
40
  });
41
41
  }
42
- React.Children.forEach(this.props.children, function (child) {
43
- if (child) {
44
- var type = child.type;
45
- if (!type || typeof type === "string" || !type.isColumnComponent) {
46
- throw Error("Only column elements are allowed in a Neo.Row component.");
47
- }
48
- }
49
- });
50
42
  };
51
43
  Row.prototype.componentWillUnmount = function () {
52
44
  if (this.stateObserver)
@@ -1 +1 @@
1
- {"version":3,"file":"Row.js","sourceRoot":"","sources":["../../../src/ReactComponents/Grid/Row.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAe,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAS,IAAI,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAsB7C;IAAwC,uBAAwB;IAI5D,aAAY,KAAgB;QAA5B,YACI,kBAAM,KAAK,CAAC,SAGf;QADG,KAAI,CAAC,aAAa,GAAG,KAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAI,CAAC,CAAC;;IACvD,CAAC;IAMO,4BAAc,GAAtB;QAAA,iBAeC;QAdG,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,KAAK,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;YAEpC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAC,KAAwC;gBACjF,IAAI,KAAK,EAAE;oBACP,KAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzE,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;wBAC/D,KAAI,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;qBACpC;iBACJ;YAEL,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAOD,2BAAa,GAAb;QAAA,iBAmBC;QAlBG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/F,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACtD,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,KAAK,MAAM,EAAE;YAChD,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC,IAAI,EAAE;gBACzC,OAAO,EAAE,UAAU,EAAE,KAAI,CAAC,cAAe,CAAC,KAAK,EAAE,CAAA;YACrD,CAAC,CAAC,CAAC;SACN;QAED,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAC,KAAK;YAC9C,IAAI,KAAK,EAAE;gBACP,IAAM,IAAI,GAAI,KAA4B,CAAC,IAAI,CAAC;gBAEhD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAE,IAAY,CAAC,iBAAiB,EAAE;oBACvE,MAAM,KAAK,CAAC,0DAA0D,CAAC,CAAC;iBAC3E;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,kCAAoB,GAApB;QACI,IAAI,IAAI,CAAC,aAAa;YAAE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;IACzD,CAAC;IAED,2BAAa,GAAb;QACI,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;SAC1D;IACL,CAAC;IAED,oBAAM,GAAN;QAAA,iBA4CC;QA3CG,iBAAM,QAAQ,WAAE,CAAC;QAEjB,IAAM,eAAyD,EAAvD,8BAAY,EAAE,gCAAa,EAAE,wDAA0B,CAAA;QAC/D,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,KAAK,MAAM,CAAC;QAEvC,IAAI,IAAI,CAAC,aAAa;YAAE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACxB,MAAM,kDAAkD,CAAC;SAC5D;QAED,IAAI,mBAAmB,gBAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,IAAI,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE;YAC/B,mBAAmB,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC;YACjD,mBAAmB,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;SAChK;QAED,IAAI,CAAC,MAAM,EAAE;YACT,IAAI,aAAa,EAAE;gBACf,QAAQ,CAAC,OAAO,GAAG,UAAA,CAAC,IAAI,OAAA,aAAa,CAAC,KAAI,CAAC,OAAO,EAAE,CAAC,CAAC,EAA9B,CAA8B,CAAC;aAC1D;iBAAM;gBACH,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAC;aAChC;SACJ;QAED,IAAI,MAAM,GAAG,CACT,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC;YACnC,uCAAQ,QAAQ;gBACX,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS;oBAC5D,oBAAC,MAAM,IAAC,SAAS,EAAC,wBAAwB,IACrC,IAAI,CAAC,eAAe,IAAI,MAAM,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,IAAI;wBACjE,oBAAC,SAAS,eAAK,mBAAmB,EAEtB,CAEX;gBAER,IAAI,CAAC,KAAK,CAAC,QAAQ,CACnB,CACR,CAAA;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,OAAO,MAAM,CAAC;IAClB,CAAC;IA9GM,eAAW,GAAG,WAAW,CAAC;IAS1B,gBAAY,GAAG;QAClB,YAAY,EAAE,IAAI;KACrB,CAAA;IAoGL,UAAC;CAAA,AAhHD,CAAwC,aAAa,GAgHpD;eAhHoB,GAAG;AA2HxB;IAA8B,4BAAgC;IAI1D,kBAAY,KAAwB;QAApC,YACI,kBAAM,KAAK,CAAC,SAIf;QAED,iBAAW,GAAG,KAAK,CAAC;QACpB,qBAAe,GAAmB,IAAI,CAAC;QAIvC,kBAAY,GAAG,KAAK,CAAC,SAAS,EAAkB,CAAC;QAT7C,KAAI,CAAC,eAAe,GAAG,KAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAI,CAAC,CAAC;QACvD,KAAI,CAAC,WAAW,GAAG,KAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAI,CAAC,CAAC;;IACnD,CAAC;IASD,sBAAY,gCAAU;aAAtB;YACI,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE;gBACrC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;aAChC;YACD,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QAC7D,CAAC;;;OAAA;IAES,gCAAa,GAAvB;QACI,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IACtC,CAAC;IAES,8BAAW,GAArB,UAAsB,SAAkB;QACpC,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;YAE/B,IAAI,CAAC,SAAS,IAAI,MAAM,KAAK,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE;gBACvF,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aAC1B;YACD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;SACjC;IACL,CAAC;IAEO,kCAAe,GAAvB;QACI,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;YAC3B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC;YACnD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAErD,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACtC,sEAAsE;gBACtE,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;gBACzB,IAAI,CAAC,WAAW,EAAE,CAAC;aACtB;SACJ;IACL,CAAC;IAEO,4BAAS,GAAjB,UAAkB,MAAe;QAC7B,IAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QAC3C,IAAI,QAAQ,EAAE;YAEV,IAAM,kBAAkB,GAAG,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC;YAEhF,IAAI,kBAAkB,EAAE;gBACpB,yFAAyF;gBACzF,6EAA6E;gBAC7E,IAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;gBACpD,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAC/D;iBAAM;gBACH,IAAI,CAAC,eAAe,EAAE,CAAC;aAC1B;YAED,QAAQ,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACxE,QAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACnC,UAAU,CAAC,eAAe,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACnD,QAAQ,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;SAC1E;IACL,CAAC;IAED,yBAAM,GAAN;;QACI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,IAAI,MAAC,IAAI,CAAC,OAAO,CAAC,SAAS,uCAAI,IAAI,CAAC,UAAU,EAAC,CAAC;QAC5E,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE;YACtC,kDAAkD;YAClD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;SAC5B;aAAM,IAAI,UAAU,EAAE;YACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;SAC3B;QAED,IAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC;QACnG,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE1E,OAAO,CACH,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,CAAC;YAC/C,4BAAI,SAAS,EAAC,eAAe;gBACxB,sBAAsB,IAAI,+BAAS;gBACpC,4BAAI,OAAO,EAAE,OAAO,EAAE,SAAS,EAAC,oBAAoB;oBAChD,6BAAK,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAC,yBAAyB,IAC3D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAClB,CAEL,CAEJ,CACR,CAAA;IACL,CAAC;IAtGM,oBAAW,GAAG,WAAW,CAAC;IADxB,QAAQ;QADpB,QAAQ;;OACI,QAAQ,CAwGpB;IAAD,eAAC;CAAA,AAxGD,CAA8B,aAAa,GAwG1C;SAxGY,QAAQ;AAmHrB;IAA8B,4BAAkC;IAAhE;;IAUA,CAAC;IANG,yBAAM,GAAN;QACI,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAEtC,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC/B,CAAC;IARM,oBAAW,GAAG,WAAW,CAAC;IASrC,eAAC;CAAA,AAVD,CAA8B,KAAK,CAAC,SAAS,GAU5C;SAVY,QAAQ"}
1
+ {"version":3,"file":"Row.js","sourceRoot":"","sources":["../../../src/ReactComponents/Grid/Row.tsx"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { IModalOptionsBase } from '../../../../core/dist/Components/Modal/ModalOptions';
2
+ import { IModalOptionsBase } from '@singularsystems/neo-core/dist/Components/Modal/ModalOptions';
3
3
  export interface IModalPortalProps {
4
4
  show: boolean;
5
5
  onDismiss: (e: any) => void;
@@ -8,7 +8,7 @@ import { BreadCrumbItem } from '../Routing/BreadCrumbItem';
8
8
  import { IViewModel } from './IViewModel';
9
9
  import EmptyViewModel from './EmptyViewModel';
10
10
  import { IRouteChangedProps } from '../Routing/IRouteChangedProps';
11
- declare type valueOrLazy<T> = T | (() => T) | (new () => T);
11
+ import { valueOrLazy } from './ViewModelBase';
12
12
  export interface IViewBase extends Views.IViewBase {
13
13
  viewParams: IViewParameterList;
14
14
  updateViewParams(match: match): void;
@@ -69,4 +69,3 @@ export default abstract class ViewBase<TViewModel extends IViewModel = EmptyView
69
69
  */
70
70
  beforeRouteChanged(props: IRouteChangedProps): void;
71
71
  }
72
- export {};
@@ -6,6 +6,7 @@ import { ViewParameterList } from '../Routing/ViewParameterList';
6
6
  import { ViewState } from './ViewState';
7
7
  import { BreadCrumbItem } from '../Routing/BreadCrumbItem';
8
8
  import { NeoReactTypes } from '../Modules/Types';
9
+ import ViewModelBase from './ViewModelBase';
9
10
  var ViewBase = /** @class */ (function (_super) {
10
11
  __extends(ViewBase, _super);
11
12
  /**
@@ -54,19 +55,7 @@ var ViewBase = /** @class */ (function (_super) {
54
55
  ViewBase.prototype.createViewState = function (viewModel) {
55
56
  var params = this.constructor.params;
56
57
  var paramsList = new ViewParameterList(params, this);
57
- var viewModelInstance;
58
- if (viewModel.taskRunner) {
59
- // Already instantiated
60
- viewModelInstance = viewModel;
61
- }
62
- else if (viewModel.neo) {
63
- // Constructor
64
- viewModelInstance = new viewModel();
65
- }
66
- else {
67
- // Callback
68
- viewModelInstance = viewModel();
69
- }
58
+ var viewModelInstance = ViewModelBase.create(viewModel);
70
59
  return new ViewState(paramsList, viewModelInstance);
71
60
  };
72
61
  ViewBase.prototype.componentDidMount = function () {
@@ -1 +1 @@
1
- {"version":3,"file":"ViewBase.js","sourceRoot":"","sources":["../../src/Views/ViewBase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ViewBase.js","sourceRoot":"","sources":["../../src/Views/ViewBase.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ import React from 'react';
2
+ import { ITaskRunner } from '@singularsystems/neo-core';
3
+ import { IViewModel } from './IViewModel';
4
+ interface IComponentProps {
5
+ taskRunner?: ITaskRunner;
6
+ }
7
+ export default class ViewComponentBase<TProps extends IComponentProps, TViewModel extends IViewModel> extends React.Component<TProps> {
8
+ constructor(props: TProps, viewModelType: new () => TViewModel);
9
+ viewModel: TViewModel;
10
+ componentDidMount(): void;
11
+ componentWillUnmount(): void;
12
+ }
13
+ export {};
@@ -0,0 +1,22 @@
1
+ import { __extends } from "tslib";
2
+ import React from 'react';
3
+ var ViewComponentBase = /** @class */ (function (_super) {
4
+ __extends(ViewComponentBase, _super);
5
+ function ViewComponentBase(props, viewModelType) {
6
+ var _this = _super.call(this, props) || this;
7
+ _this.viewModel = new viewModelType();
8
+ if (props.taskRunner) {
9
+ _this.viewModel.taskRunner = props.taskRunner;
10
+ }
11
+ return _this;
12
+ }
13
+ ViewComponentBase.prototype.componentDidMount = function () {
14
+ this.viewModel.initialise();
15
+ };
16
+ ViewComponentBase.prototype.componentWillUnmount = function () {
17
+ this.viewModel.dispose();
18
+ };
19
+ return ViewComponentBase;
20
+ }(React.Component));
21
+ export default ViewComponentBase;
22
+ //# sourceMappingURL=ViewComponentBase.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ViewComponentBase.js","sourceRoot":"","sources":["../../src/Views/ViewComponentBase.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B;IAA8G,qCAAuB;IAEjI,2BAAY,KAAa,EAAE,aAAmC;QAA9D,YACI,kBAAM,KAAK,CAAC,SAMf;QAJG,KAAI,CAAC,SAAS,GAAG,IAAI,aAAa,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,UAAU,EAAE;YAClB,KAAI,CAAC,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;SAChD;;IACL,CAAC;IAID,6CAAiB,GAAjB;QACI,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IAChC,CAAC;IAED,gDAAoB,GAApB;QACI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACL,wBAAC;AAAD,CAAC,AApBD,CAA8G,KAAK,CAAC,SAAS,GAoB5H"}
@@ -1,13 +1,15 @@
1
- import { ModelBase, Misc, Model } from '@singularsystems/neo-core';
1
+ import { ModelBase, Misc, Model, ITaskRunner } from '@singularsystems/neo-core';
2
2
  import { IViewModel } from './IViewModel';
3
3
  import { IReactionDisposer } from 'mobx';
4
4
  import { BindableBase } from '@singularsystems/neo-core/dist/Model/BindableBase';
5
5
  import { AxiosPromise } from 'axios';
6
6
  import { WaitForTaskRunnerOptions } from '@singularsystems/neo-core/dist/Components/TaskRunner/TaskRunner';
7
+ export declare type valueOrLazy<T> = T | (() => T) | (new () => T);
7
8
  export default abstract class ViewModelBase extends ModelBase implements IViewModel {
8
- taskRunner: import("@singularsystems/neo-core").ITaskRunner;
9
+ taskRunner: ITaskRunner;
9
10
  private disposeHelper;
10
- constructor(taskRunner?: import("@singularsystems/neo-core").ITaskRunner, disposeHelper?: import("../Services/IDisposeHelper").IDisposeHelper);
11
+ private trackedViewModels;
12
+ constructor(taskRunner?: ITaskRunner, disposeHelper?: import("../Services/IDisposeHelper").IDisposeHelper);
11
13
  initialise(): void;
12
14
  /**
13
15
  * Registers a mobx reaction, which will be disposed in the dispose() method when the view is unmounted.
@@ -15,10 +17,32 @@ export default abstract class ViewModelBase extends ModelBase implements IViewMo
15
17
  * @param effect Callback to run when the result of the expression changes.
16
18
  */
17
19
  registerReaction<T>(expression: () => T, effect: (value: T) => void): IReactionDisposer;
20
+ /**
21
+ * Instantiates, and registers a child view model that will be disposed when this view model is disposed.
22
+ * @param viewModel View model type.
23
+ */
24
+ registerViewModel<TViewModel extends IViewModel>(viewModel: new () => TViewModel, options?: {
25
+ initialise: boolean;
26
+ }): TViewModel;
27
+ /**
28
+ * Registers a child view model that will be disposed when this view model is disposed.
29
+ */
30
+ registerViewModel<TViewModel extends IViewModel>(viewModel: TViewModel): TViewModel;
31
+ /**
32
+ * Disposes a child view model and sets the property value to null.
33
+ * Note: you will need to pass in the VM property like this: (this as MyVM).meta.vmProperty
34
+ */
35
+ protected disposeViewModel(vmProperty: Model.IPropertyInstance<IViewModel | null>): void;
18
36
  /**
19
37
  * Uses the task runner to call an api endpoint. The returned data is deserialised into an instance of the provided model type.
20
38
  */
21
39
  waitForModel<T extends BindableBase>(modelType: typeof BindableBase, task: AxiosPromise<Model.PlainTrackedObject<T>>, options?: Partial<WaitForTaskRunnerOptions<Model.PlainTrackedObject<T>>>): Promise<T>;
22
40
  autoDispose<T extends Misc.IDisposable>(disposable: T): T;
23
41
  dispose(): void;
42
+ /**
43
+ * Creates a view model instance.
44
+ * @param viewModel ViewModel instance, callback which returns a ViewModel or ViewModel constructor.
45
+ * @param taskRunner TaskRunner to set if a constructor is passed in.
46
+ */
47
+ static create<TViewModel extends IViewModel>(viewModel: valueOrLazy<TViewModel>, taskRunner?: ITaskRunner): TViewModel;
24
48
  }
@@ -9,6 +9,7 @@ var ViewModelBase = /** @class */ (function (_super) {
9
9
  var _this = _super.call(this) || this;
10
10
  _this.taskRunner = taskRunner;
11
11
  _this.disposeHelper = disposeHelper;
12
+ _this.trackedViewModels = [];
12
13
  return _this;
13
14
  }
14
15
  ViewModelBase.prototype.initialise = function () {
@@ -21,6 +22,27 @@ var ViewModelBase = /** @class */ (function (_super) {
21
22
  ViewModelBase.prototype.registerReaction = function (expression, effect) {
22
23
  return this.disposeHelper.registerReaction(expression, effect);
23
24
  };
25
+ ViewModelBase.prototype.registerViewModel = function (viewModel, options) {
26
+ var _a;
27
+ var viewModelInstance = ViewModelBase.create(viewModel, this.taskRunner);
28
+ if ((_a = options) === null || _a === void 0 ? void 0 : _a.initialise) {
29
+ viewModelInstance.initialise();
30
+ }
31
+ this.trackedViewModels.push(viewModelInstance);
32
+ return viewModelInstance;
33
+ };
34
+ /**
35
+ * Disposes a child view model and sets the property value to null.
36
+ * Note: you will need to pass in the VM property like this: (this as MyVM).meta.vmProperty
37
+ */
38
+ ViewModelBase.prototype.disposeViewModel = function (vmProperty) {
39
+ var viewModel = vmProperty.value;
40
+ vmProperty.value = null;
41
+ if (viewModel) {
42
+ this.trackedViewModels.remove(viewModel);
43
+ viewModel.dispose();
44
+ }
45
+ };
24
46
  /**
25
47
  * Uses the task runner to call an api endpoint. The returned data is deserialised into an instance of the provided model type.
26
48
  */
@@ -42,6 +64,34 @@ var ViewModelBase = /** @class */ (function (_super) {
42
64
  };
43
65
  ViewModelBase.prototype.dispose = function () {
44
66
  this.disposeHelper.dispose();
67
+ for (var _i = 0, _a = this.trackedViewModels; _i < _a.length; _i++) {
68
+ var viewModel = _a[_i];
69
+ viewModel.dispose();
70
+ }
71
+ this.trackedViewModels = [];
72
+ };
73
+ /**
74
+ * Creates a view model instance.
75
+ * @param viewModel ViewModel instance, callback which returns a ViewModel or ViewModel constructor.
76
+ * @param taskRunner TaskRunner to set if a constructor is passed in.
77
+ */
78
+ ViewModelBase.create = function (viewModel, taskRunner) {
79
+ if (viewModel.taskRunner) {
80
+ // Already instantiated
81
+ return viewModel;
82
+ }
83
+ else if (viewModel.neo) {
84
+ // Constructor
85
+ var viewModelInstance = new viewModel();
86
+ if (taskRunner) {
87
+ viewModelInstance.taskRunner = taskRunner;
88
+ }
89
+ return viewModelInstance;
90
+ }
91
+ else {
92
+ // Callback
93
+ return viewModel();
94
+ }
45
95
  };
46
96
  return ViewModelBase;
47
97
  }(ModelBase));
@@ -1 +1 @@
1
- {"version":3,"file":"ViewModelBase.js","sourceRoot":"","sources":["../../src/Views/ViewModelBase.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAS,MAAM,2BAA2B,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD;IAAoD,iCAAS;IAEzD,uBAAmB,UAAkE,EACzE,aAAiF;QAD1E,2BAAA,EAAA,aAAa,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC;QACzE,8BAAA,EAAA,gBAAgB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC;QAD7F,YAEI,iBAAO,SACV;QAHkB,gBAAU,GAAV,UAAU,CAAwD;QACzE,mBAAa,GAAb,aAAa,CAAoE;;IAE7F,CAAC;IAEM,kCAAU,GAAjB;IAEA,CAAC;IAED;;;;OAIG;IACI,wCAAgB,GAAvB,UAA2B,UAAmB,EAAE,MAA0B;QACtE,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAED;;OAEG;IACU,oCAAY,GAAzB,UACI,SAA8B,EAC9B,IAA+C,EAC/C,OAAwE;;;;;4BAE3D,qBAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;wBAAvD,IAAI,GAAG,SAAgD;wBAC7D,sBAAO,SAAS,CAAC,YAAY,CAAI,IAAI,CAAC,EAAC;;;;KAC1C;IAEM,mCAAW,GAAlB,UAA+C,UAAa;QACxD,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC;IAEM,+BAAO,GAAd;QACI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IACL,oBAAC;AAAD,CAAC,AAvCD,CAAoD,SAAS,GAuC5D"}
1
+ {"version":3,"file":"ViewModelBase.js","sourceRoot":"","sources":["../../src/Views/ViewModelBase.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ export { default as ViewComponentBase } from './ViewComponentBase';
1
2
  export { default as ViewBase } from './ViewBase';
2
3
  export { default as PersistentViewBase } from './PersistentViewBase';
3
4
  export { default as EmptyViewModel } from './EmptyViewModel';
@@ -1,3 +1,4 @@
1
+ export { default as ViewComponentBase } from './ViewComponentBase';
1
2
  export { default as ViewBase } from './ViewBase';
2
3
  export { default as PersistentViewBase } from './PersistentViewBase';
3
4
  export { default as EmptyViewModel } from './EmptyViewModel';
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Views/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Views/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@singularsystems/neo-react",
3
- "version": "0.10.27",
3
+ "version": "0.10.31",
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.33",
35
+ "@singularsystems/neo-core": "^0.10.38",
36
36
  "axios": "^0.21.1",
37
37
  "history": "4.10.1",
38
38
  "inversify": "5.0.1",
@@ -0,0 +1,27 @@
1
+ @each $color, $value in $theme-colors {
2
+ @keyframes #{$color}-color-pulse {
3
+ from {
4
+ box-shadow: 0 0 3px 1px #fff;
5
+ }
6
+
7
+ to {
8
+ box-shadow: 0 0 12px 2px transparentize($color: $value, $amount: 0.25);
9
+ }
10
+ }
11
+
12
+ .btn.#{$color}-color-pulse {
13
+ animation-name: #{$color}-color-pulse;
14
+ animation-duration: 0.75s;
15
+ animation-iteration-count: infinite;
16
+ animation-direction: alternate;
17
+ }
18
+ }
19
+
20
+ // Button menu
21
+ div.dropdown-menu {
22
+ margin-bottom: 0.125rem;
23
+
24
+ div.dropdown-item {
25
+ cursor: pointer;
26
+ }
27
+ }
@@ -0,0 +1,24 @@
1
+ .neo-card.card {
2
+ .card-header {
3
+ display: flex;
4
+ justify-content: space-between;
5
+ align-items: center;
6
+
7
+ .card-header-title i {
8
+ margin-right: 10px;
9
+ }
10
+
11
+ .card-header-right-section {
12
+ display: inline-flex;
13
+ align-items: center;
14
+ margin: -10px 0;
15
+
16
+ .card-expand-indicator {
17
+ cursor: pointer;
18
+ margin-left: 0.5rem;
19
+ padding-top: 0.5rem;
20
+ padding-bottom: 0.5rem;
21
+ }
22
+ }
23
+ }
24
+ }
package/styles/Misc.scss CHANGED
@@ -27,7 +27,6 @@ div.toast-container {
27
27
 
28
28
  div.collapsable {
29
29
  opacity: 1;
30
- overflow: hidden;
31
30
  transition: all ease 0.3s;
32
31
 
33
32
  &.collapsed {
@@ -39,15 +38,6 @@ div.collapsable {
39
38
  }
40
39
  }
41
40
 
42
- // Button menu
43
- div.dropdown-menu {
44
- margin-bottom: 0.125rem;
45
-
46
- div.dropdown-item {
47
- cursor: pointer;
48
- }
49
- }
50
-
51
41
  // Tooltips
52
42
  .neo-tooltip {
53
43
  padding: 5px 10px;
package/styles/Neo.scss CHANGED
@@ -1,3 +1,5 @@
1
+ @import './Button.scss';
2
+ @import './Card.scss';
1
3
  @import './ColorPicker.scss';
2
4
  @import './ContextMenu.scss';
3
5
  @import './DatePicker.scss';
@@ -128,9 +128,13 @@
128
128
  white-space: pre-wrap;
129
129
  overflow-wrap: anywhere;
130
130
 
131
+ .neo-error-modal-body-icon {
132
+ padding-right: 10px;
133
+ display: flex;
134
+ align-items: center;
135
+ }
131
136
  i {
132
137
  color: $bs-danger;
133
- padding-right: 10px;
134
138
  }
135
139
  ul {
136
140
  padding-left: 0;