react-orgchart-lazyload - npm Package Compare versions

Comparing version 1.0.4 to 1.0.5

dist/ChartContainer.js

@@ -62,4 +62,3 @@ "use strict";
   onClickChart: _propTypes.default.func,
-  onLoadData: _propTypes.default.func,
-  expandedNodes: _propTypes.default.array
+  loadData: _propTypes.default.func
 };
@@ -75,4 +74,3 @@ var defaultProps = {
   collapsible: true,
-  multipleSelect: false,
-  loadOnDemand: false
+  multipleSelect: false
 };
@@ -93,5 +91,3 @@ var ChartContainer = (0, _react.forwardRef)(function (_ref, ref) {
       onClickChart = _ref.onClickChart,
-      loadOnDemand = _ref.loadOnDemand,
-      onLoadData = _ref.onLoadData,
-      expandedNodes = _ref.expandedNodes;
+      loadData = _ref.loadData;
   var container = (0, _react.useRef)();
@@ -166,3 +162,3 @@ var chart = (0, _react.useRef)();
 
-  var onLoadNode =
+  var onLoadData =
   /*#__PURE__*/
@@ -172,4 +168,3 @@ function () {
     /*#__PURE__*/
-    regeneratorRuntime.mark(function _callee(node) {
-      var childrens;
+    regeneratorRuntime.mark(function _callee(datasource, children) {
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -180,15 +175,10 @@ while (1) {
               _context.next = 2;
-              return onLoadData(node);
+              return dsDigger.updateNode(_objectSpread({}, datasource, {
+                children: children
+              }));
 
             case 2:
-              childrens = _context.sent;
-              childrens.map(function (ch) {
-                ch.Hierarchy = node.Hierarchy ? node.Hierarchy.concat([node.id]) : [node.id];
-              });
-              onLoadDataFinished({
-                id: node.id,
-                childrens: childrens
-              });
+              setDS(_objectSpread({}, dsDigger.ds));
 
-            case 5:
+            case 3:
             case "end":
@@ -201,3 +191,3 @@ return _context.stop();
 
-    return function onLoadNode(_x) {
+    return function onLoadData(_x, _x2) {
       return _ref2.apply(this, arguments);
@@ -207,33 +197,2 @@ };
 
-  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");
@@ -397,14 +356,14 @@
   function () {
-    var _ref5 = _asyncToGenerator(
+    var _ref3 = _asyncToGenerator(
     /*#__PURE__*/
-    regeneratorRuntime.mark(function _callee3(draggedItemData, dropTargetId) {
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+    regeneratorRuntime.mark(function _callee2(draggedItemData, dropTargetId) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _context3.next = 2;
+              _context2.next = 2;
               return dsDigger.removeNode(draggedItemData.id);
 
             case 2:
-              _context3.next = 4;
+              _context2.next = 4;
               return dsDigger.addChildren(dropTargetId, draggedItemData);
@@ -417,10 +376,10 @@
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
         }
-      }, _callee3);
+      }, _callee2);
     }));
 
     return function changeHierarchy(_x3, _x4) {
-      return _ref5.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
@@ -492,4 +451,4 @@ }();
     onClickNode: onClickNode,
-    loadOnDemand: loadOnDemand,
-    onLoadNode: onLoadNode
+    loadData: loadData,
+    onLoadData: onLoadData
   }))), _react.default.createElement("a", {
@@ -496,0 +455,0 @@ className: "oc-download-btn hidden",

dist/ChartNode.js

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

dist/service.js

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

package.json

 {
   "name": "react-orgchart-lazyload",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "./dist/ChartContainer.js",
@@ -5,0 +5,0 @@ "files": [

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

Worsened metrics

Total package byte prevSize

55397

decreased by-3%

Lines of code

1200

decreased by-1.88%

No dependency changes