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.

Sign up for GitHub

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

Jump to bottom

fix(code-snippet): scrollbar not clickable on muliline #12605

Merged
merged 2 commits into from
Nov 28, 2022
Merged

fix(code-snippet): scrollbar not clickable on muliline #12605

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
7a728ed
fix(code-snippet): scrollbar not clickable on muliline
alisonjoseph Nov 11, 2022
4d099d3
fix(code-snippet): scrollbar not clickable on muliline
alisonjoseph Nov 11, 2022
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
4 changes: 3 additions & 1 deletion packages/react/src/components/CodeSnippet/CodeSnippet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ function CodeSnippet({
[`${prefix}--snippet--light`]: light,
[`${prefix}--snippet--no-copy`]: hideCopyButton,
[`${prefix}--snippet--wraptext`]: wrapText,
[`${prefix}--snippet--has-right-overflow`]:
type == 'multi' && hasRightOverflow,
});

const expandCodeBtnText = expandedCode ? showLessText : showMoreText;
Expand Down Expand Up @@ -243,7 +245,7 @@ function CodeSnippet({
{hasLeftOverflow && (
<div className={`${prefix}--snippet__overflow-indicator--left`} />
)}
{hasRightOverflow && (
{hasRightOverflow && type !== 'multi' && (
<div className={`${prefix}--snippet__overflow-indicator--right`} />
)}
{!hideCopyButton && (
Expand Down
7 changes: 4 additions & 3 deletions packages/styles/scss/components/code-snippet/_code-snippet.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,15 @@ $copy-btn-feedback: $background-inverse !default;
overflow-x: auto;
}

.#{$prefix}--snippet--multi .#{$prefix}--snippet-container pre::after {
.#{$prefix}--snippet--multi.#{$prefix}--snippet--has-right-overflow
.#{$prefix}--snippet-container
pre::after {
position: absolute;
top: 0;
right: 0;
width: rem(16px);
height: 100%;
// Safari interprets `transparent` differently, so make color token value transparent instead:
background-image: linear-gradient(to right, rgba($layer, 0), $layer);
background-image: linear-gradient(to right, transparent, $layer);
content: '';
}

Expand Down