Skip to content
This repository was archived by the owner on Oct 4, 2022. It is now read-only.

Fix snippet preview elements order. #380

Merged
merged 2 commits into from
Oct 22, 2019
Merged

Fix snippet preview elements order. #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b7a014
Fix snippet preview elements order.
afercia Oct 21, 2019
27f516c
Merge branch 'develop' into 563-snippet-preview-misplaced-text
afercia Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions packages/search-metadata-previews/src/snippet-preview/SnippetPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,21 +584,26 @@ export default class SnippetPreview extends PureComponent {
* However this is not relevant in this case, because the url is not focusable.
*/
/* eslint-disable jsx-a11y/mouse-events-have-key-events */
return <Url>
<BaseUrlOverflowContainer
onMouseUp={ onMouseUp.bind( null, "url" ) }
onMouseEnter={ onMouseEnter.bind( null, "url" ) }
onMouseLeave={ onMouseLeave.bind( null ) }
screenMode={ mode }
>
{ isMobileMode && <Favicon src={ faviconSrc || globeFaviconSrc } alt="" /> }
<UrlContentContainer
return <React.Fragment>
<ScreenReaderText>
{ __( "Url preview", "yoast-components" ) + ":" }
</ScreenReaderText>
<Url>
<BaseUrlOverflowContainer
onMouseUp={ onMouseUp.bind( null, "url" ) }
onMouseEnter={ onMouseEnter.bind( null, "url" ) }
onMouseLeave={ onMouseLeave.bind( null ) }
screenMode={ mode }
>
{ urlContent }
</UrlContentContainer>
</BaseUrlOverflowContainer>
</Url>;
{ isMobileMode && <Favicon src={ faviconSrc || globeFaviconSrc } alt="" /> }
<UrlContentContainer
screenMode={ mode }
>
{ urlContent }
</UrlContentContainer>
</BaseUrlOverflowContainer>
</Url>
</React.Fragment>;
/* eslint-enable jsx-a11y/mouse-events-have-key-events */
}

Expand Down Expand Up @@ -759,10 +764,10 @@ export default class SnippetPreview extends PureComponent {
padding={ WIDTH_PADDING }
>
<PartContainer>
{ ! isDesktopMode && this.renderUrl() }
<ScreenReaderText>
{ __( "SEO title preview", "yoast-components" ) + ":" }
</ScreenReaderText>
{ ! isDesktopMode && this.renderUrl() }
<SnippetTitle
onMouseUp={ onMouseUp.bind( null, "title" ) }
onMouseEnter={ onMouseEnter.bind( null, "title" ) }
Expand All @@ -774,9 +779,6 @@ export default class SnippetPreview extends PureComponent {
</TitleUnbounded>
</TitleBounded>
</SnippetTitle>
<ScreenReaderText>
{ __( "Url preview", "yoast-components" ) + ":" }
</ScreenReaderText>
{ amp }
{ isDesktopMode && this.renderUrl() }
{ downArrow }
Expand Down
Loading