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

Control toolbar, keymap guide, and util fn to create custom toolbars #147

Closed
wants to merge 16 commits into from

Conversation

rexagod
Copy link
Member

@rexagod rexagod commented Feb 22, 2019

Re: #140

screenshot from 2019-02-22 03-44-17

@publiclab/reviewers @jywarren

@rexagod
Copy link
Member Author

rexagod commented Feb 22, 2019

#126

Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

OK i see how this is different from #155 now; this allows for new instances of L.control to be added to the map. However, we should see if that's what #140 needs, or if we need something even broader. @sashadev-sky - in the ideas around an Image Manager UI that is potentially built in React, would that be able to fit within the idea of a Leaflet Control?

https://leafletjs.com/reference-1.4.0.html#control

And if so, could it be passed into the lib using addToolbar here?

Or perhaps we don't need to sweat this because the Image Manager would be a UI to manipulate a collection of images, like #158 #29 describe, and it would just get it's own toolbar UI that wouldn't live inside the individual DistortableImage instances?

Thanks, just making sure I understand the changes in this PR and how they relate to other changes. I appreciate everyone's work here! 👍 👍 👍

src/edit/DistortableImage.Edit.js Show resolved Hide resolved
src/edit/DistortableImage.Edit.js Outdated Show resolved Hide resolved
src/edit/DistortableImage.Edit.js Outdated Show resolved Hide resolved
src/edit/DistortableImage.EditToolbar.js Outdated Show resolved Hide resolved
@jywarren
Copy link
Member

Hi @rexagod can you reply above and rebase this so we can take a fresh clean look at the changes for just this PR? Thank you!!!

@sashadev-sky
Copy link
Member

@jywarren I think we have been diverging into two separate options: individual image toolbars and an image collection manager toolbar (that would still be able to be used with only one image). I was imagining the image collection manager to not rely on individual instances because, for example, if editing multiple images so far my plan has been to move them inside of a container element or layer that the edits will be applied to. It is also possible to create an implementation where the toolbar knows which images are selected and applies the transformations on all of them at once, which would make it reliant on them. So this is dependent on how multiple image select is implemented

@jywarren
Copy link
Member

I agree - we want to preserve the individual toolbars. But the "group of images toolbar" is distinct. Thank you!

Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

I think this looks good and the clarification of DOMStrings can be done in follow-up. Is it ready to merge then (looks like it needs one more conflict resolved?) Thank you!!!

README.md Outdated Show resolved Hide resolved
@jywarren jywarren added the ready label Mar 19, 2019
@jywarren
Copy link
Member

jywarren commented Apr 5, 2019

Hi @sashadev-sky - unfortunately this is now out of sync again... @rexagod is in exams, do you think you could help try to get this rebased and ready to merge? I'm sorry, we've been pushing ahead so hard on multiple image selection that I didn't merge this when we had an opportunity. Thanks all!!!

@sashadev-sky
Copy link
Member

sashadev-sky commented Apr 5, 2019

@jywarren Yes will do! Is it urgent? Is Friday when you usually publish changes in all your repos?

@jywarren
Copy link
Member

jywarren commented Apr 5, 2019 via email

@sashadev-sky
Copy link
Member

No problem I am really excited to pull this and see how it works!

@sashadev-sky
Copy link
Member

@rexagod @jywarren I'll pull this in a minute!

README.md Outdated Show resolved Hide resolved
src/edit/tools/DistortableImage.Guides.js Outdated Show resolved Hide resolved
.gitignore Show resolved Hide resolved
.gitignore Show resolved Hide resolved
README.md Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
dist/leaflet.distortableimage.css Show resolved Hide resolved
examples/index.html Outdated Show resolved Hide resolved
examples/index.html Outdated Show resolved Hide resolved
@sashadev-sky
Copy link
Member

@jywarren @rexagod ok here is what I think should be done: Open a PR just for adding a keymapper guide. Don't mention the custom toolbar at all yet. Then we can ensure the keymapper is clear and makes sense and documented well in the README and then move on from there.

@rexagod can you open a keymapper PR?

Co-Authored-By: rexagod <rexagod@gmail.com>
sashadev-sky and others added 4 commits April 13, 2019 12:30
Co-Authored-By: rexagod <rexagod@gmail.com>
Co-Authored-By: rexagod <rexagod@gmail.com>
Co-Authored-By: rexagod <rexagod@gmail.com>
@rexagod
Copy link
Member Author

rexagod commented Apr 13, 2019

Submitting a keymapper docs PR ASAP!

@rexagod
Copy link
Member Author

rexagod commented Apr 13, 2019

@sashadev-sky Done at #212!

@jywarren
Copy link
Member

Can this be closed in favor of #212 or can we try to open a narrower PR with what's left here? Thank you!

@sashadev-sky
Copy link
Member

@jywarren I will review keymapper again tomorrow, we will know after that is merged exactly what needs to be done here I guess

@rexagod
Copy link
Member Author

rexagod commented Apr 21, 2019

I agree with @jywarren on closing this. We can still extract any relevant code from this branch in a separate PR after that.

@sashadev-sky
Copy link
Member

@rexagod @jywarren ok closed!

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

Successfully merging this pull request may close these issues.

3 participants