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

feat(highlights): Render staged highlight #553

Merged
merged 8 commits into from
Aug 18, 2020

Conversation

ConradJChan
Copy link
Contributor

@ConradJChan ConradJChan commented Aug 11, 2020

TODO:

  • Unit tests
  • Remove test UI code

Screenshot of rendering staged highlight
render-staged-highlight

src/region/RegionAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightCanvas.tsx Outdated Show resolved Hide resolved
src/highlight/SingleHighlightAnnotation.tsx Outdated Show resolved Hide resolved
src/highlight/highlightUtil.ts Outdated Show resolved Hide resolved
src/region/RegionAnnotations.tsx Outdated Show resolved Hide resolved
src/region/RegionAnnotations.tsx Outdated Show resolved Hide resolved
src/region/RegionContainer.tsx Outdated Show resolved Hide resolved
@ConradJChan ConradJChan marked this pull request as ready for review August 14, 2020 06:24
@ConradJChan ConradJChan requested a review from a team as a code owner August 14, 2020 06:24
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
}
setMode(Mode.HIGHLIGHT);
setStatus(CreatorStatus.staged);
setStaged({ target: { location: { value: location, type: 'page' }, shapes, type: 'highlight' } });
Copy link
Collaborator

Choose a reason for hiding this comment

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

Most of this should be handled in something similar to createRegionAction.

src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/__tests__/HighlightContainer-test.tsx Outdated Show resolved Hide resolved
src/highlight/__tests__/HighlightContainer-test.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightList.tsx Outdated Show resolved Hide resolved
src/highlight/__tests__/HighlightContainer-test.tsx Outdated Show resolved Hide resolved
src/highlight/__tests__/HighlightList-test.tsx Outdated Show resolved Hide resolved
src/region/actions.ts Outdated Show resolved Hide resolved
src/region/RegionAnnotations.tsx Outdated Show resolved Hide resolved
@ConradJChan ConradJChan force-pushed the render-staged-highlight branch from a671478 to 8ba5802 Compare August 17, 2020 23:35
src/highlight/HighlightAnnotations.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightCanvas.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightCanvas.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightList.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightList.tsx Outdated Show resolved Hide resolved
src/highlight/__tests__/HighlightList-test.tsx Outdated Show resolved Hide resolved
src/region/RegionAnnotations.tsx Outdated Show resolved Hide resolved
src/region/RegionContainer.tsx Outdated Show resolved Hide resolved
src/region/RegionAnnotations.tsx Outdated Show resolved Hide resolved
src/region/RegionAnnotations.tsx Show resolved Hide resolved
jstoffan
jstoffan previously approved these changes Aug 18, 2020
Copy link
Collaborator

@jstoffan jstoffan left a comment

Choose a reason for hiding this comment

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

LGTM other than some minor cleanup

src/highlight/HighlightList.tsx Outdated Show resolved Hide resolved
src/highlight/HighlightList.tsx Outdated Show resolved Hide resolved
src/highlight/__tests__/HighlightAnnotations-test.tsx Outdated Show resolved Hide resolved
src/region/__tests__/RegionAnnotations-test.tsx Outdated Show resolved Hide resolved
src/region/__tests__/actions-test.ts Outdated Show resolved Hide resolved
@ConradJChan ConradJChan merged commit 57f5eb4 into box:master Aug 18, 2020
@ConradJChan ConradJChan deleted the render-staged-highlight branch August 18, 2020 18:37
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.

3 participants