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

Add Mermaid copy button, avoid unnecessary tooltip hide #22225

Merged
merged 3 commits into from
Dec 25, 2022
Merged

Add Mermaid copy button, avoid unnecessary tooltip hide #22225

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba43adf
Add Mermaid copy button, avoid unnecessary tooltip hide
silverwind Dec 23, 2022
275ea2c
Merge branch 'main' into mermaid-copy
lafriks Dec 23, 2022
97aa633
Merge branch 'main' into mermaid-copy
KN4CK3R Dec 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions web_src/js/markup/codecopy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
import {svg} from '../svg.js';

export function renderCodeCopy() {
const els = document.querySelectorAll('.markup .code-block code');
if (!els.length) return;

export function makeCodeCopyButton() {
const button = document.createElement('button');
button.classList.add('code-copy', 'ui', 'button');
button.innerHTML = svg('octicon-copy');
return button;
}

export function renderCodeCopy() {
const els = document.querySelectorAll('.markup .code-block code');
if (!els.length) return;

for (const el of els) {
const btn = button.cloneNode(true);
const btn = makeCodeCopyButton();
btn.setAttribute('data-clipboard-text', el.textContent);
el.after(btn);
}
Expand Down
10 changes: 9 additions & 1 deletion web_src/js/markup/mermaid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import {isDarkTheme} from '../utils.js';
import {makeCodeCopyButton} from './codecopy.js';

const {mermaidMaxSourceCharacters} = window.config;

const iframeCss = `
Expand Down Expand Up @@ -58,7 +60,13 @@ export async function renderMermaid() {
iframe.sandbox = 'allow-scripts';
iframe.style.height = `${Math.ceil(parseFloat(heightStr))}px`;
iframe.srcdoc = `<html><head><style>${iframeCss}</style></head><body>${svgStr}</body></html>`;
el.closest('pre').replaceWith(iframe);
const mermaidBlock = document.createElement('div');
mermaidBlock.classList.add('mermaid-block');
mermaidBlock.append(iframe);
const btn = makeCodeCopyButton();
btn.setAttribute('data-clipboard-text', source);
mermaidBlock.append(btn);
el.closest('pre').replaceWith(mermaidBlock);
});
} catch (err) {
displayError(el, err);
Expand Down
3 changes: 2 additions & 1 deletion web_src/js/modules/tippy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export function createTippy(target, opts = {}) {
placement: target.getAttribute('data-placement') || 'top-start',
animation: false,
allowHTML: false,
hideOnClick: false,
interactiveBorder: 30,
ignoreAttributes: true,
maxWidth: 500, // increase over default 350px
Expand Down Expand Up @@ -46,7 +47,7 @@ export function showTemporaryTooltip(target, content) {
}

tippy.setContent(content);
tippy.show();
if (!tippy.state.isShown) tippy.show();
tippy.setProps({
onHidden: (tippy) => {
if (oldContent) {
Expand Down
6 changes: 4 additions & 2 deletions web_src/less/markup/codecopy.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.markup .code-block {
.markup .code-block,
.markup .mermaid-block {
position: relative;
}

Expand Down Expand Up @@ -26,7 +27,8 @@
background: var(--color-secondary-dark-1) !important;
}

.markup .code-block:hover .code-copy {
.markup .code-block:hover .code-copy,
.markup .mermaid-block:hover .code-copy {
visibility: visible;
animation: fadein .2s both;
}