react-orgchart-lazyload - npm Package Compare versions

Comparing version 1.0.0 to 1.0.1

dist/ChartContainer.js

@@ -30,6 +30,2 @@ "use strict";
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
@@ -41,2 +37,6 @@
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
@@ -63,3 +63,5 @@
   onClickNode: _propTypes.default.func,
-  onClickChart: _propTypes.default.func
+  onClickChart: _propTypes.default.func,
+  onLoadData: _propTypes.default.func,
+  expandedNodes: _propTypes.default.array
 };
@@ -92,3 +94,5 @@ var defaultProps = {
       onClickChart = _ref.onClickChart,
-      loadOnDemand = _ref.loadOnDemand;
+      loadOnDemand = _ref.loadOnDemand,
+      onLoadData = _ref.onLoadData,
+      expandedNodes = _ref.expandedNodes;
   var container = (0, _react.useRef)();
@@ -163,27 +167,43 @@ var chart = (0, _react.useRef)();
 
-  var onLoadData = function onLoadData(node) {
-    setTimeout(function () {
-      var childrens = [{
-        id: Math.random().toString(),
-        name: "Armin",
-        title: "department manager"
-      }, {
-        id: Math.random().toString(),
-        name: "Elon",
-        title: "department manager"
-      }];
-      childrens.map(function (ch) {
-        ch.Hierarchy = node.Hierarchy ? node.Hierarchy.concat([node.id]) : [node.id];
-      });
-      onLoadDataFinished({
-        id: node.id,
-        childrens: childrens
-      });
-    }, 500);
-  };
+  var onLoadNode =
+  /*#__PURE__*/
+  function () {
+    var _ref2 = _asyncToGenerator(
+    /*#__PURE__*/
+    regeneratorRuntime.mark(function _callee(node) {
+      var childrens;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return onLoadData(node);
 
-  var onLoadDataFinished = function onLoadDataFinished(_ref2) {
-    var id = _ref2.id,
-        childrens = _ref2.childrens;
+            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
+              });
 
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function onLoadNode(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  var onLoadDataFinished = function onLoadDataFinished(_ref3) {
+    var id = _ref3.id,
+        childrens = _ref3.childrens;
+
     var newDs = _objectSpread({}, ds);
@@ -387,14 +407,14 @@
   function () {
-    var _ref3 = _asyncToGenerator(
+    var _ref4 = _asyncToGenerator(
     /*#__PURE__*/
-    regeneratorRuntime.mark(function _callee(draggedItemData, dropTargetId) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+    regeneratorRuntime.mark(function _callee2(draggedItemData, dropTargetId) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _context.next = 2;
+              _context2.next = 2;
               return dsDigger.removeNode(draggedItemData.id);
 
             case 2:
-              _context.next = 4;
+              _context2.next = 4;
               return dsDigger.addChildren(dropTargetId, draggedItemData);
@@ -407,10 +427,10 @@
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function changeHierarchy(_x, _x2) {
-      return _ref3.apply(this, arguments);
+    return function changeHierarchy(_x2, _x3) {
+      return _ref4.apply(this, arguments);
     };
@@ -483,3 +503,3 @@ }();
     loadOnDemand: loadOnDemand,
-    onLoadData: onLoadData
+    onLoadNode: onLoadNode
   }))), _react.default.createElement("a", {
@@ -486,0 +506,0 @@ className: "oc-download-btn hidden",

dist/ChartNode.js

@@ -73,6 +73,6 @@ "use strict";
       loadOnDemand = _ref.loadOnDemand,
-      onLoadData = _ref.onLoadData;
+      onLoadNode = _ref.onLoadNode;
   var node = (0, _react.useRef)();
 
-  var _useState = (0, _react.useState)(loadOnDemand),
+  var _useState = (0, _react.useState)(datasource.defaultExpanded !== undefined ? !datasource.defaultExpanded : false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -92,3 +92,3 @@ isChildrenCollapsed = _useState2[0],
 
-  var _useState7 = (0, _react.useState)(),
+  var _useState7 = (0, _react.useState)(datasource.defaultExpanded === true),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -214,4 +214,4 @@ bottomEdgeExpanded = _useState8[0],
 
-              if (loadOnDemand && datasource.Hierarchy && isChildrenCollapsed) {
-                onLoadData(datasource);
+              if (loadOnDemand && datasource.Hierarchy && isChildrenCollapsed && (!datasource.children || datasource.children.length === 0)) {
+                onLoadNode(datasource);
                 setIsChildrenCollapsed(false);
@@ -370,3 +370,3 @@ setBottomEdgeExpanded(true);
       loadOnDemand: loadOnDemand,
-      onLoadData: onLoadData
+      onLoadNode: onLoadNode
     });
@@ -373,0 +373,0 @@ })));

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

56447

increased by1.35%

Lines of code

1228

increased by1.4%

No dependency changes