Skip to content

feat(chart): create getChart, resetPosition and onDropNode function #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 6, 2021
Merged

feat(chart): create getChart, resetPosition and onDropNode function #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fef36f
feat(chart): create getChart, resetPosition and onDropNode function
LuisFilipePedroso Mar 29, 2021
0a8ba07
Merge branch 'master' into feat/drop
giorgiofellipe Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 39 additions & 9 deletions dist/ChartContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";


function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

Expand Down Expand Up @@ -65,7 +65,8 @@ var propTypes = {
multipleSelect: _propTypes.default.bool,
onClickNode: _propTypes.default.func,
onClickChart: _propTypes.default.func,
onZoomChange: _propTypes.default.func
onZoomChange: _propTypes.default.func,
onDropNode: _propTypes.default.func
};
var defaultProps = {
pan: false,
Expand All @@ -92,7 +93,8 @@ var ChartContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
multipleSelect = _ref.multipleSelect,
onClickNode = _ref.onClickNode,
onClickChart = _ref.onClickChart,
onZoomChange = _ref.onZoomChange;
onZoomChange = _ref.onZoomChange,
onDropNode = _ref.onDropNode;
var container = (0, _react.useRef)();
var chart = (0, _react.useRef)();
var downloadButton = (0, _react.useRef)();
Expand Down Expand Up @@ -137,7 +139,13 @@ var ChartContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
download = _useState16[0],
setDownload = _useState16[1];

var attachRel = function attachRel(data, flags) {
var attachRel = (0, _react.useCallback)(function (data, flags) {
if (!!data && data.length) {
data.forEach(function (item) {
attachRel(item, flags === "00" ? flags : "1" + (data.length > 1 ? 1 : 0));
});
}

data.relationship = flags + (data.children && data.children.length > 0 ? 1 : 0);

if (data.children) {
Expand All @@ -147,7 +155,7 @@ var ChartContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
}

return data;
};
}, []);

var _useState17 = (0, _react.useState)(datasource),
_useState18 = _slicedToArray(_useState17, 2),
Expand Down Expand Up @@ -329,8 +337,9 @@ var ChartContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {

case 4:
setDS(_objectSpread({}, dsDigger.ds));
return _context.abrupt("return", _objectSpread({}, dsDigger.ds));

case 5:
case 6:
case "end":
return _context.stop();
}
Expand Down Expand Up @@ -391,9 +400,18 @@ var ChartContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
}

setTransform("matrix(" + newScale + ", 0, 0, " + newScale + ", 0, 0)");
},
getChart: function getChart() {
return ds.children;
},
resetPosition: function resetPosition() {
setTransform("");
}
};
});
var dsWithAttachedRel = (0, _react.useMemo)(function () {
return attachRel(ds, "00");
}, [attachRel, ds]);
return /*#__PURE__*/_react.default.createElement("div", {
ref: container,
className: "orgchart-container " + containerClass,
Expand All @@ -409,14 +427,26 @@ var ChartContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
onClick: clickChartHandler,
onMouseDown: pan ? panStartHandler : undefined,
onMouseMove: pan && panning ? panHandler : undefined
}, /*#__PURE__*/_react.default.createElement("ul", null, /*#__PURE__*/_react.default.createElement(_ChartNode.default, {
datasource: attachRel(ds, "00"),
}, /*#__PURE__*/_react.default.createElement("ul", null, !!dsWithAttachedRel && dsWithAttachedRel.length ? dsWithAttachedRel.map(function (_ds) {
return /*#__PURE__*/_react.default.createElement(_ChartNode.default, {
datasource: _ds,
NodeTemplate: NodeTemplate,
draggable: draggable,
collapsible: collapsible,
multipleSelect: multipleSelect,
changeHierarchy: changeHierarchy,
onClickNode: onClickNode,
onDropNode: onDropNode
});
}) : /*#__PURE__*/_react.default.createElement(_ChartNode.default, {
datasource: dsWithAttachedRel,
NodeTemplate: NodeTemplate,
draggable: draggable,
collapsible: collapsible,
multipleSelect: multipleSelect,
changeHierarchy: changeHierarchy,
onClickNode: onClickNode
onClickNode: onClickNode,
onDropNode: onDropNode
}))), /*#__PURE__*/_react.default.createElement("a", {
className: "oc-download-btn hidden",
ref: downloadButton,
Expand Down
58 changes: 46 additions & 12 deletions dist/ChartNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";


function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

Expand All @@ -21,6 +21,10 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

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; }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
Expand Down Expand Up @@ -54,7 +58,8 @@ var propTypes = {
collapsible: _propTypes.default.bool,
multipleSelect: _propTypes.default.bool,
changeHierarchy: _propTypes.default.func,
onClickNode: _propTypes.default.func
onClickNode: _propTypes.default.func,
onDropNode: _propTypes.default.func
};
var defaultProps = {
draggable: false,
Expand All @@ -69,7 +74,8 @@ var ChartNode = function ChartNode(_ref) {
collapsible = _ref.collapsible,
multipleSelect = _ref.multipleSelect,
changeHierarchy = _ref.changeHierarchy,
onClickNode = _ref.onClickNode;
onClickNode = _ref.onClickNode,
onDropNode = _ref.onDropNode;
var node = (0, _react.useRef)();

var _useState = (0, _react.useState)(false),
Expand Down Expand Up @@ -277,15 +283,42 @@ var ChartNode = function ChartNode(_ref) {
_service.dragNodeService.clearDragInfo();
};

var dropHandler = function dropHandler(event) {
if (!event.currentTarget.classList.contains("allowedDrop")) {
return;
}

_service.dragNodeService.clearDragInfo();
var dropHandler = /*#__PURE__*/function () {
var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(event) {
var data;
return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
if (event.currentTarget.classList.contains("allowedDrop")) {
_context.next = 2;
break;
}

return _context.abrupt("return");

case 2:
_service.dragNodeService.clearDragInfo();

_context.next = 5;
return changeHierarchy(JSON.parse(event.dataTransfer.getData("text/plain")), event.currentTarget.id);

case 5:
data = _context.sent;
onDropNode && onDropNode(data);

case 7:
case "end":
return _context.stop();
}
}
}, _callee);
}));

changeHierarchy(JSON.parse(event.dataTransfer.getData("text/plain")), event.currentTarget.id);
};
return function dropHandler(_x) {
return _ref2.apply(this, arguments);
};
}();

return /*#__PURE__*/_react.default.createElement("li", {
className: "oc-hierarchy"
Expand Down Expand Up @@ -333,7 +366,8 @@ var ChartNode = function ChartNode(_ref) {
collapsible: collapsible,
multipleSelect: multipleSelect,
changeHierarchy: changeHierarchy,
onClickNode: onClickNode
onClickNode: onClickNode,
onDropNode: onDropNode
});
})));
};
Expand Down
Loading