feat: zoom feature with design #553
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/js/action.js # src/js/consts.js # src/js/ui.js
# Conflicts: # apps/image-editor/src/css/icon.styl # apps/image-editor/src/js/action.js # apps/image-editor/src/js/component/zoom.js # apps/image-editor/src/js/consts.js # apps/image-editor/src/js/drawingMode/zoom.js # apps/image-editor/src/js/graphics.js # apps/image-editor/src/js/imageEditor.js # apps/image-editor/src/js/ui.js # apps/image-editor/src/js/ui/history.js # apps/image-editor/src/js/ui/panelMenu.js # apps/image-editor/src/js/ui/template/controls.js # apps/image-editor/src/js/ui/template/submenu/history.js # apps/image-editor/src/js/ui/template/submenu/zoom.js # apps/image-editor/src/js/util.js # apps/image-editor/src/svg/default.svg # apps/image-editor/src/svg/icon-a/ic-history-check.svg # apps/image-editor/src/svg/icon-a/ic-history-crop.svg # apps/image-editor/src/svg/icon-a/ic-history-draw.svg # apps/image-editor/src/svg/icon-a/ic-history-filter.svg # apps/image-editor/src/svg/icon-a/ic-history-flip.svg # apps/image-editor/src/svg/icon-a/ic-history-icon.svg # apps/image-editor/src/svg/icon-a/ic-history-mask.svg # apps/image-editor/src/svg/icon-a/ic-history-rotate.svg # apps/image-editor/src/svg/icon-a/ic-history-shape.svg # apps/image-editor/src/svg/icon-a/ic-history-text.svg # apps/image-editor/src/svg/icon-a/ic-history.svg # apps/image-editor/src/svg/icon-a/ic-zoom-hand.svg # apps/image-editor/src/svg/icon-a/ic-zoom-zoom-in.svg # apps/image-editor/src/svg/icon-a/ic-zoom-zoom-out.svg # apps/image-editor/src/svg/icon-b/ic-history-check.svg # apps/image-editor/src/svg/icon-b/ic-history-crop.svg # apps/image-editor/src/svg/icon-b/ic-history-draw.svg # apps/image-editor/src/svg/icon-b/ic-history-filter.svg # apps/image-editor/src/svg/icon-b/ic-history-flip.svg # apps/image-editor/src/svg/icon-b/ic-history-icon.svg # apps/image-editor/src/svg/icon-b/ic-history-mask.svg # apps/image-editor/src/svg/icon-b/ic-history-rotate.svg # apps/image-editor/src/svg/icon-b/ic-history-shape.svg # apps/image-editor/src/svg/icon-b/ic-history-text.svg # apps/image-editor/src/svg/icon-b/ic-history.svg # apps/image-editor/src/svg/icon-b/ic-zoom-hand.svg # apps/image-editor/src/svg/icon-b/ic-zoom-zoom-in.svg # apps/image-editor/src/svg/icon-b/ic-zoom-zoom-out.svg # apps/image-editor/src/svg/icon-c/ic-history-check.svg # apps/image-editor/src/svg/icon-c/ic-history-crop.svg # apps/image-editor/src/svg/icon-c/ic-history-draw.svg # apps/image-editor/src/svg/icon-c/ic-history-filter.svg # apps/image-editor/src/svg/icon-c/ic-history-flip.svg # apps/image-editor/src/svg/icon-c/ic-history-icon.svg # apps/image-editor/src/svg/icon-c/ic-history-mask.svg # apps/image-editor/src/svg/icon-c/ic-history-rotate.svg # apps/image-editor/src/svg/icon-c/ic-history-shape.svg # apps/image-editor/src/svg/icon-c/ic-history-text.svg # apps/image-editor/src/svg/icon-c/ic-history.svg # apps/image-editor/src/svg/icon-c/ic-zoom-hand.svg # apps/image-editor/src/svg/icon-c/ic-zoom-zoom-in.svg # apps/image-editor/src/svg/icon-c/ic-zoom-zoom-out.svg # apps/image-editor/src/svg/icon-d/ic-history-check.svg # apps/image-editor/src/svg/icon-d/ic-history-crop.svg # apps/image-editor/src/svg/icon-d/ic-history-draw.svg # apps/image-editor/src/svg/icon-d/ic-history-filter.svg # apps/image-editor/src/svg/icon-d/ic-history-flip.svg # apps/image-editor/src/svg/icon-d/ic-history-icon.svg # apps/image-editor/src/svg/icon-d/ic-history-mask.svg # apps/image-editor/src/svg/icon-d/ic-history-rotate.svg # apps/image-editor/src/svg/icon-d/ic-history-shape.svg # apps/image-editor/src/svg/icon-d/ic-history-text.svg # apps/image-editor/src/svg/icon-d/ic-history.svg # apps/image-editor/src/svg/icon-d/ic-zoom-hand.svg # apps/image-editor/src/svg/icon-d/ic-zoom-zoom-in.svg # apps/image-editor/src/svg/icon-d/ic-zoom-zoom-out.svg # apps/image-editor/tests/history.spec.js # apps/image-editor/tests/zoom.spec.js # package-lock.json # src/css/position.styl
lja1018
added a commit
that referenced
this pull request
Mar 8, 2021
* feat: zoom feature with design (#553) * feat: add history element * feat: add history list element, event listener * feat: add history, panel menu component * test: add history component test * chore: remove default history * refactor: constant classname * feat: add history by action * feat: add multiUndo, multiRedo * chore: apply api review * chore: apply detail history * chore: add execution command event * chore: add mask history * chore: select load image history when init history * chore: apply code review * feat: add zoom ui * feat: add zoom component * feat: add zoom virtual scroll * feat: add zoom mode * refactor: refactor zoom components * test: add test for zoom component * chore: add zoom-in when clicked * chore: apply code review * fix: list scroll position is bottom when list element added * feat: add help toolbar * chore: add help menus const * chore: add history icon svg file * chore: add toggle history menu * chore: add list, panel, item style * chore: add history action icon * chore: change history title type * chore: add history template html * chore: resolve detail history information * chore: resolve tooltip position with helpmenubar position * test: fix broken test * chore: add icon for zoom * chore: change help menu bar size * chore: add zoom icon click action * chore: add timer of remove scrollbar * chore: add zoom, hand drawing mode * chore: apply scroll bar style * chore: fix zoom, hand drawing mode * feat: add hand key listener * chore: add hand started,stopped event * test: resolve broken tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements
fix #xxx[,#xxx], where "xxx" is the issue number)Description
Thank you for your contribution to TOAST UI product. 🎉 😘 ✨