-
Notifications
You must be signed in to change notification settings - Fork 175
fix: Change color for hotspot rendered inside flashbar #3567
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| import React from 'react'; | ||
|
|
||
| import AnnotationContext from '~components/annotation-context'; | ||
| import Button from '~components/button'; | ||
| import Flashbar, { FlashbarProps } from '~components/flashbar'; | ||
| import Hotspot from '~components/hotspot'; | ||
| import Link from '~components/link'; | ||
|
|
||
| import { annotationContextStrings } from '../onboarding/i18n'; | ||
| import tutorials from '../onboarding/tutorials'; | ||
| import ScreenshotArea from '../utils/screenshot-area'; | ||
|
|
||
| const tutorial = tutorials(() => {})[0]; | ||
| const noop = () => {}; | ||
|
|
||
| const dismissibleCommonProps: Partial<FlashbarProps.MessageDefinition> = { | ||
| dismissible: true, | ||
| dismissLabel: 'Dismiss', | ||
| onDismiss: noop, | ||
| }; | ||
|
|
||
| export default function AnnotationScroll() { | ||
| return ( | ||
| <> | ||
| <h1>Annotation Context: with Hotspots inside flashbar</h1> | ||
| <ScreenshotArea> | ||
| <AnnotationContext | ||
| currentTutorial={tutorial} | ||
| i18nStrings={annotationContextStrings} | ||
| onStartTutorial={noop} | ||
| onExitTutorial={noop} | ||
| > | ||
| <Flashbar | ||
| items={[ | ||
| { | ||
| ...dismissibleCommonProps, | ||
| type: 'info', | ||
| content: ( | ||
| <> | ||
| info variant{' '} | ||
| <Link href="#" color="inverted"> | ||
| click me | ||
| </Link> | ||
| </> | ||
| ), | ||
| action: ( | ||
| <> | ||
| <Button>Click me</Button> | ||
| <Hotspot hotspotId={tutorial.tasks[0].steps[0].hotspotId}></Hotspot> | ||
| </> | ||
| ), | ||
| }, | ||
| { | ||
| ...dismissibleCommonProps, | ||
| type: 'success', | ||
| content: 'success variant', | ||
| action: ( | ||
| <> | ||
| <Button>Click me</Button> | ||
| <Hotspot hotspotId={tutorial.tasks[0].steps[2].hotspotId}></Hotspot> | ||
| </> | ||
| ), | ||
| }, | ||
| { | ||
| ...dismissibleCommonProps, | ||
| type: 'warning', | ||
| content: 'warning variant', | ||
| action: ( | ||
| <> | ||
| <Button>Click me</Button> | ||
| <Hotspot hotspotId={tutorial.tasks[0].steps[3].hotspotId}></Hotspot> | ||
| </> | ||
| ), | ||
| }, | ||
| { | ||
| ...dismissibleCommonProps, | ||
| type: 'error', | ||
| content: 'error variant', | ||
| action: ( | ||
| <> | ||
| <Button>Click me</Button> | ||
| <Hotspot hotspotId={tutorial.tasks[0].steps[4].hotspotId}></Hotspot> | ||
| </> | ||
| ), | ||
| }, | ||
| ]} | ||
| /> | ||
| </AnnotationContext> | ||
| </ScreenshotArea> | ||
| </> | ||
| ); | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just a thought, if this will be a screenshot test, maybe better not to launch any tutorials by default so that popover doesn't cover hotspots on other flashitems?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tried this. When tutorial is not active, hotspots are hidden too.
My plan for the screenshot test – dismiss the currently open popover before taking a screenshot
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P.S. need a new approval, because I needed to resolve merge conflicts with another style-dictionary change: #3558