@singularsystems/neo-react 1.0.17 → 1.0.19

package/dist/React/ReactModelCreator.js

@@ -66,10 +66,15 @@ var ReactModelCreator = /** @class */ (function (_super) {
         makeObservable(object, annotations, { proxy: false });
         // Setup once properties have been converted to observables.
         for (var propertyKey in observables) {
-            var property = observables[propertyKey];
-            this.addChangeTracking(object, propertyKey, property);
-            if (property.convertList) {
-                this.setupList(object, propertyKey, property.convertList);
+            try {
+                var property = observables[propertyKey];
+                this.addChangeTracking(object, propertyKey, property);
+                if (property.convertList) {
+                    this.setupList(object, propertyKey, property.convertList);
+                }
+            }
+            catch (e) {
+                throw "Error setting up property '".concat(propertyKey, "' on type '").concat(typeInfo.typeName, "': ").concat(e);
             }
         }
     };
@@ -145,7 +150,8 @@ var ReactModelCreator = /** @class */ (function (_super) {
                 currentValue.length = 0;
             }
             else {
-                if (newValue.childObjectType && newValue.setParent) {
+                var newValueAsList = newValue;
+                if (newValueAsList.createChild !== undefined && newValueAsList.addNew !== undefined) {
                     // Cannot re-assign this property, so we have to clear the array, and copy the items from the source array.
                     Utils.batchUpdate(function () {
                         currentValue.length = 0;

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

@@ -59,12 +59,14 @@ export declare class ChildRow extends ComponentBase<INeoChildRowProps> {
     lastExpandValue: boolean | null;
     expandProperty?: Model.IPropertyInstance;
     inBody?: boolean;
+    margin: number;
     containerDiv: React.RefObject<HTMLDivElement>;
     private get isExpanded();
     protected onFirstRender(): void;
     protected afterRender(isInitial: boolean): void;
     private afterTransition;
     private setHeight;
+    private fixPadding;
     render(): false | React.JSX.Element | undefined;
 }
 interface INeoRowGroupProps {

package/dist/ReactComponents/Grid/Row.js

@@ -100,6 +100,7 @@ var ChildRow = /** @class */ (function (_super) {
         var _this = _super.call(this, props) || this;
         _this.wasExpanded = false;
         _this.lastExpandValue = null;
+        _this.margin = 0;
         _this.containerDiv = React.createRef();
         _this.afterTransition = _this.afterTransition.bind(_this);
         _this.afterRender = _this.afterRender.bind(_this);
@@ -130,8 +131,12 @@ var ChildRow = /** @class */ (function (_super) {
     };
     ChildRow.prototype.afterTransition = function () {
         if (this.containerDiv.current) {
-            this.containerDiv.current.style.maxHeight = 'none';
-            this.containerDiv.current.style.overflow = "visible";
+            if (this.isExpanded) {
+                var childDiv = this.containerDiv.current;
+                childDiv.style.maxHeight = "";
+                childDiv.style.overflow = "";
+                this.fixPadding(childDiv, true);
+            }
             if (this.wasExpanded && !this.isExpanded) {
                 // When collapsing, the child element must be removed after animation.
                 this.wasExpanded = false;
@@ -142,20 +147,40 @@ var ChildRow = /** @class */ (function (_super) {
     ChildRow.prototype.setHeight = function (expand) {
         var childDiv = this.containerDiv.current;
         if (childDiv) {
+            this.fixPadding(childDiv, false);
             var transitionDuration = window.getComputedStyle(childDiv).transitionDuration;
             if (transitionDuration) {
                 // If expand / collapse has a transition, reset the max height after the transition ends.
-                // Subtract 50ms on collapse to prevent wierd chrome padding animation issue.
                 var delay = parseFloat(transitionDuration) * 1000;
-                setTimeout(this.afterTransition, delay - (expand ? 0 : 50));
+                setTimeout(this.afterTransition, delay);
             }
             else {
                 this.afterTransition();
             }
-            childDiv.style.maxHeight = (!expand ? childDiv.scrollHeight : 0) + 'px';
+            var maxHeight = childDiv.scrollHeight + (this.margin * 2);
+            childDiv.style.maxHeight = (!expand ? maxHeight : 0) + 'px';
             childDiv.style.overflow = "hidden";
             Components.AnimationHelper.triggerReflow(childDiv);
-            childDiv.style.maxHeight = (expand ? childDiv.scrollHeight : 0) + 'px';
+            childDiv.style.maxHeight = (expand ? maxHeight : 0) + 'px';
+        }
+    };
+    // Fix animation by moving child cell padding to inner div margin.
+    ChildRow.prototype.fixPadding = function (childDiv, remove) {
+        var cell = childDiv.parentElement;
+        var innerDiv = childDiv.children[0];
+        if (remove) {
+            cell.style.paddingTop = "";
+            cell.style.paddingBottom = "";
+            innerDiv.style.marginTop = "";
+            innerDiv.style.marginBottom = "";
+        }
+        else {
+            var style = window.getComputedStyle(cell);
+            this.margin = parseInt(style.paddingTop);
+            innerDiv.style.marginTop = style.paddingTop;
+            innerDiv.style.marginBottom = style.paddingBottom;
+            cell.style.paddingTop = "0";
+            cell.style.paddingBottom = "0";
         }
     };
     ChildRow.prototype.render = function () {
@@ -179,9 +204,10 @@ var ChildRow = /** @class */ (function (_super) {
         var colSpan = this.context.columnCount + (showExpandButtonColumn ? 0 : 1);
         return (this.inBody && (isExpanded || this.wasExpanded) &&
             React.createElement("tr", __assign({}, domProps),
-                showExpandButtonColumn && React.createElement("td", null),
+                showExpandButtonColumn && React.createElement("td", { className: "p-0" }),
                 React.createElement("td", __assign({}, childCellProps, { colSpan: colSpan }),
-                    React.createElement("div", { ref: this.containerDiv, className: "neo-child-row-container" }, this.props.children))));
+                    React.createElement("div", { ref: this.containerDiv, className: "neo-child-row-container" },
+                        React.createElement("div", { className: "neo-child-row-container-inner" }, this.props.children)))));
     };
     ChildRow.contextType = GridContext;
     ChildRow = __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,10 +31,10 @@
     "typescript": "5.4.2"
   },
   "dependencies": {
-    "@singularsystems/neo-core": "1.0.13",
+    "@singularsystems/neo-core": "1.0.14",
     "@types/rc-slider": "^8.6.5",
     "@types/react-color": "^3.0.1",
-    "axios": "1.6.7",
+    "axios": "1.7.4",
     "history": "4.10.1",
     "inversify": "^6.0.2",
     "memoize-one": "6.0.0",
@@ -49,7 +49,7 @@
     "tslib": "2.5.0"
   },
   "peerDependencies": {
-    "@singularsystems/neo-core": ">=1.0.13",
+    "@singularsystems/neo-core": ">=1.0.14",
     "axios": ">=1.6.2",
     "inversify": ">=5.0.1",
     "mobx": ">=6.9.0",