Skip to content
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.

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

Reorganizing the computation of arrows and links for circle nodes #271

Merged

Conversation

antoninklopp
Copy link
Collaborator

@antoninklopp antoninklopp commented Nov 23, 2019

As explained in #265, I think that it would be better to make arrows points to nodes and not to the middle (under) the nodes.

This PR solves this arrow problem when config is circle

Some tests fail, as it changes from snapshots. I will change the snapshots if the PR is accepted

screen-pr
screen-pr2

Copy link
Owner

@danielcaldas danielcaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for looking into this, please check some of the comments 🙂

src/components/graph/graph.builder.js Outdated Show resolved Hide resolved
src/components/graph/graph.builder.js Outdated Show resolved Hide resolved
src/components/graph/graph.builder.js Outdated Show resolved Hide resolved
src/components/graph/graph.helper.js Outdated Show resolved Hide resolved
src/components/graph/graph.helper.js Show resolved Hide resolved
src/components/graph/graph.helper.js Outdated Show resolved Hide resolved
src/components/graph/graph.renderer.jsx Outdated Show resolved Hide resolved
src/components/graph/graph.renderer.jsx Outdated Show resolved Hide resolved
@antoninklopp
Copy link
Collaborator Author

@danielcaldas , I think that I resolved everything, please tell me if there is more 😄

Copy link
Owner

@danielcaldas danielcaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one final comment, thanks for the good work 👍

src/components/marker/marker.helper.js Show resolved Hide resolved
@danielcaldas
Copy link
Owner

Looking good now @antoninklopp 👏 You can go ahead and update the snapshot tests that are failing at the moment due to the changes introduced and push the new snapshots.

@danielcaldas danielcaldas removed their request for review December 1, 2019 08:25
Copy link
Owner

@danielcaldas danielcaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good, ready to merge as soon snapshots are updated

@antoninklopp
Copy link
Collaborator Author

@danielcaldas I updated the snapshots, the tests are passing but I get this error, that seems related to CI pipeline :

The cypress npm package is installed, but the Cypress binary is missing.

We expected the binary to be installed here: /home/travis/.cache/Cypress/3.4.1/Cypress/Cypress

Could you take a look at the travis build please?

@antoninklopp
Copy link
Collaborator Author

@danielcaldas Any update on this?

@danielcaldas
Copy link
Owner

Sorry for the delay @antoninklopp, I'm currently with no much time to look into this. I cleaned the cache on travis to see if the issue goes away. Once the build it's green, I'll try to move forward with this as soon as I have some time.

@antoninklopp
Copy link
Collaborator Author

Hi @danielcaldas, after trying to integrate this with my project, I discovered that this works not really great with Custom nodes (I have to make some tests on this).
I also discovered that the custom nodes are not drawn the same way as the normal nodes, and even if I use the circle node type, my changes won't be taken into account on my node.

Would you like me to do the changes on that too?
You can have a look at the changes I made here

@danielcaldas
Copy link
Owner

Hi @danielcaldas, after trying to integrate this with my project, I discovered that this works not really great with Custom nodes (I have to make some tests on this).

Would it be possible to have this newly introduced logic not run for custom nodes? And for now, we leave it only for the default nodes? Otherwise, feel free to go ahead and try to make the changes for custom nodes, it will tough takes as long because it will be a broader change, we will need more eyes on this and more testing.

@anothrNick
Copy link

Any update on this @antoninklopp @danielcaldas ? This would be a very helpful addition.

@antoninklopp
Copy link
Collaborator Author

Hi @danielcaldas,

I just made a change which should remove the new feature for custom nodes.
I will create a new PR for custom nodes.

Does this sound OK?

Thanks

Copy link
Owner

@danielcaldas danielcaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now @antoninklopp! Thanks a lot for this contribution, and sorry for the long wait.

@danielcaldas danielcaldas merged commit 3983bd6 into danielcaldas:master May 17, 2020
danielcaldas added a commit that referenced this pull request Sep 11, 2020
* Bug fix around node offset for arrow positioning #271

* Small update in RELEASE_PROCESS

* Split implementations for source and target nodes coordinates positioning

* Fix unit tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants