Skip to content

Solution for issue: 4077 #4412

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

Closed
Vivek-Kamboj wants to merge 2 commits into from
Closed

Solution for issue: 4077 #4412

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
50244a2
Solution for issue: 4077
Vivek-Kamboj Jan 5, 2021
41195af
Expected solution for issue: #4077 #4412
Vivek-Kamboj Jan 11, 2021
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: 2 additions & 2 deletions src/components/code/_code_block.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ export const EuiCodeBlockImpl: FunctionComponent<Props> = ({
const getCopyButton = (textToCopy?: string) => {
let copyButton: JSX.Element | undefined;

if (isCopyable && textToCopy) {
if (isCopyable) {
copyButton = (
<div className="euiCodeBlock__copyButton">
<EuiI18n token="euiCodeBlock.copyButton" default="Copy">
{(copyButton: string) => (
<EuiCopy textToCopy={textToCopy}>
<EuiCopy textToCopy={textToCopy?textToCopy:""}>
{(copy) => (
<EuiButtonIcon
size="s"
Expand Down
9 changes: 6 additions & 3 deletions src/components/inner_text/inner_text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@ export function useInnerText(
// while the result of `textContent` could correctly be non-`null` due to
// differing reliance on browser layout calculations.
// We prefer the result of `innerText`, if available.
'innerText' in node
? node.innerText
: node.textContent || innerTextFallback

// 'innerText' in node
// ? node.innerText
// : node.textContent || innerTextFallback

node.textContent === null ? undefined: node.textContent
);
},
[innerTextFallback]
Expand Down