Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-08-02 15:03:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix errors when node is the top level container (#853)

Browse source 
* Fix errors when node is the top level container

* simplify by adding findParentOrCurrentNodeOfType
This commit is contained in:
jberg 2019-08-13 03:42:40 -07:00 • committed by Jordan Eldredge
parent fc2a015ae1
commit b713857951
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modern/src/App.js
View file

@ -32,7 +32,7 @@ function handleMouseEventDispatch(node, event, eventName) {
// In order to properly calculate the x/y coordinates like MAKI does we need
// to find the container element and calculate based off of that
const container = Utils.findParentNodeOfType(node, ["container"]);
const container = Utils.findParentOrCurrentNodeOfType(node, "container");
const x = event.clientX - container.getleft();
const y = event.clientY - container.gettop();
node.js_trigger(eventName, x, y);

21
modern/src/utils.js
View file

@ -101,19 +101,32 @@ export function unimplementedWarning(name) {
}
// Operations on trees
function isNodeOfType(node, type) {
const isTypeArray = Array.isArray(type);
return (
(!isTypeArray && node.name === type) ||
(isTypeArray && type.includes(node.name))
);
}
export function findParentNodeOfType(node, type) {
let n = node;
while (n.parent) {
n = n.parent;
if (
(!Array.isArray(type) && n.name === type) ||
(Array.isArray(type) && type.includes(n.name))
) {
if (isNodeOfType(n, type)) {
return n;
}
}
}
export function findParentOrCurrentNodeOfType(node, type) {
if (isNodeOfType(node, type)) {
return node;
} else {
return findParentNodeOfType(node, type);
}
}
export function findDescendantByTypeAndId(node, type, id) {
if (node.children.length === 0) {
return null;