react-orgchart-lazyload - npm Package Compare versions

Comparing version 1.0.3 to 1.0.4

dist/ChartContainer.js

@@ -62,2 +62,3 @@ "use strict";
   onClickChart: _propTypes.default.func,
+  onLoadData: _propTypes.default.func,
   expandedNodes: _propTypes.default.array
@@ -92,3 +93,4 @@ };
       loadOnDemand = _ref.loadOnDemand,
-      onLoadData = _ref.onLoadData;
+      onLoadData = _ref.onLoadData,
+      expandedNodes = _ref.expandedNodes;
   var container = (0, _react.useRef)();
@@ -163,3 +165,3 @@ var chart = (0, _react.useRef)();
 
-  var onLoadDataFinished =
+  var onLoadNode =
   /*#__PURE__*/
@@ -169,3 +171,4 @@ function () {
     /*#__PURE__*/
-    regeneratorRuntime.mark(function _callee(datasource, children) {
+    regeneratorRuntime.mark(function _callee(node) {
+      var childrens;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -176,10 +179,15 @@ while (1) {
               _context.next = 2;
-              return dsDigger.updateNode(_objectSpread({}, datasource, {
-                children: children
-              }));
+              return onLoadData(node);
 
             case 2:
-              setDS(_objectSpread({}, dsDigger.ds));
+              childrens = _context.sent;
+              childrens.map(function (ch) {
+                ch.Hierarchy = node.Hierarchy ? node.Hierarchy.concat([node.id]) : [node.id];
+              });
+              onLoadDataFinished({
+                id: node.id,
+                childrens: childrens
+              });
 
-            case 3:
+            case 5:
             case "end":
@@ -192,3 +200,3 @@ return _context.stop();
 
-    return function onLoadDataFinished(_x, _x2) {
+    return function onLoadNode(_x) {
       return _ref2.apply(this, arguments);
@@ -198,2 +206,33 @@ };
 
+  var onLoadDataFinished =
+  /*#__PURE__*/
+  function () {
+    var _ref4 = _asyncToGenerator(
+    /*#__PURE__*/
+    regeneratorRuntime.mark(function _callee2(_ref3) {
+      var id, childrens;
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              id = _ref3.id, childrens = _ref3.childrens;
+              _context2.next = 3;
+              return dsDigger.addChildren(id, childrens);
+
+            case 3:
+              setDS(_objectSpread({}, dsDigger.ds));
+
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function onLoadDataFinished(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+
   var dsDigger = new _jsonDigger.default(datasource, "id", "children");
@@ -357,14 +396,14 @@
   function () {
-    var _ref3 = _asyncToGenerator(
+    var _ref5 = _asyncToGenerator(
     /*#__PURE__*/
-    regeneratorRuntime.mark(function _callee2(draggedItemData, dropTargetId) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    regeneratorRuntime.mark(function _callee3(draggedItemData, dropTargetId) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
+              _context3.next = 2;
               return dsDigger.removeNode(draggedItemData.id);
 
             case 2:
-              _context2.next = 4;
+              _context3.next = 4;
               return dsDigger.addChildren(dropTargetId, draggedItemData);
@@ -377,10 +416,10 @@
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
 
     return function changeHierarchy(_x3, _x4) {
-      return _ref3.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
@@ -453,4 +492,3 @@ }();
     loadOnDemand: loadOnDemand,
-    onLoadData: onLoadData,
-    onLoadDataFinished: onLoadDataFinished
+    onLoadNode: onLoadNode
   }))), _react.default.createElement("a", {
@@ -457,0 +495,0 @@ className: "oc-download-btn hidden",

dist/ChartNode.js

@@ -56,4 +56,3 @@ "use strict";
   onClickNode: _propTypes.default.func,
-  onLoadData: _propTypes.default.func,
-  onLoadDataFinished: _propTypes.default.func
+  onLoadData: _propTypes.default.func
 };
@@ -75,4 +74,3 @@ var defaultProps = {
       loadOnDemand = _ref.loadOnDemand,
-      onLoadData = _ref.onLoadData,
-      onLoadDataFinished = _ref.onLoadDataFinished;
+      onLoadNode = _ref.onLoadNode;
   var node = (0, _react.useRef)();
@@ -204,8 +202,2 @@
 
-  var addChildrenHandler = function addChildrenHandler(children) {
-    onLoadDataFinished(datasource, children);
-    setIsChildrenCollapsed(false);
-    setBottomEdgeExpanded(true);
-  };
-
   var bottomEdgeClickHandler =
@@ -217,3 +209,2 @@ /*#__PURE__*/
     regeneratorRuntime.mark(function _callee(e) {
-      var children;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -225,21 +216,12 @@ while (1) {
 
-              if (!(loadOnDemand && onLoadData && isChildrenCollapsed)) {
-                _context.next = 8;
-                break;
+              if (loadOnDemand && isChildrenCollapsed && (!datasource.children || datasource.children.length === 0)) {
+                onLoadNode(datasource);
+                setIsChildrenCollapsed(false);
+                setBottomEdgeExpanded(true);
+              } else {
+                setIsChildrenCollapsed(!isChildrenCollapsed);
+                setBottomEdgeExpanded(!bottomEdgeExpanded);
               }
 
-              _context.next = 4;
-              return onLoadData(datasource);
-
-            case 4:
-              children = _context.sent;
-              addChildrenHandler(children);
-              _context.next = 10;
-              break;
-
-            case 8:
-              setIsChildrenCollapsed(!isChildrenCollapsed);
-              setBottomEdgeExpanded(!bottomEdgeExpanded);
-
-            case 10:
+            case 2:
             case "end":
@@ -363,4 +345,3 @@ return _context.stop();
     nodeData: datasource,
-    setCollapse: setCollapse,
-    addChildren: addChildrenHandler
+    setCollapse: setCollapse
   }) : _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("div", {
@@ -398,4 +379,3 @@ className: "oc-heading"
       loadOnDemand: loadOnDemand,
-      onLoadData: onLoadData,
-      onLoadDataFinished: onLoadDataFinished
+      onLoadNode: onLoadNode
     });
@@ -402,0 +382,0 @@ })));

dist/service.js

@@ -0,0 +0,0 @@ "use strict";

package.json

 {
   "name": "react-orgchart-lazyload",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "./dist/ChartContainer.js",
@@ -11,3 +11,3 @@ "files": [
     "type": "git",
-    "url": "https://github.com/arminyahya/react-orgchart.gits"
+    "url": "https://github.com/arminyahya/react-orgchart"
   },
@@ -14,0 +14,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

57112

increased by2.55%

Lines of code

1223

increased by1.49%

No dependency changes