3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-03 04:07:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "fix(v2): remove auto wrap for code blocks (#2048)" (#2071)

Browse source 
This reverts commit 10cd99b3e4.
This commit is contained in:
Endi 2019-12-01 03:57:56 +07:00 • committed by Yangshun Tay
parent 3caff0d221
commit 39e9e755c3
5 changed files with 88 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
packages/docusaurus-theme-classic/src/theme/CodeBlock/index.js
View file

@ -63,46 +63,43 @@ export default ({children, className: languageClassName, metastring}) => {
}; };
return ( return (
<div className={styles.codeBlockWrapper}> <Highlight
<button {...defaultProps}
ref={button} theme={prism.theme || defaultTheme}
type="button" code={children.trim()}
aria-label="Copy code to clipboard" language={language}>
className={styles.copyButton} {({className, style, tokens, getLineProps, getTokenProps}) => (
onClick={handleCopyCode}> <div className={styles.codeBlockWrapper}>
{showCopied ? 'Copied' : 'Copy'} <pre
</button> ref={target}
className={classnames(className, styles.codeBlock)}
style={style}>
{tokens.map((line, i) => {
const lineProps = getLineProps({line, key: i});
<Highlight if (highlightLines.includes(i + 1)) {
{...defaultProps} lineProps.className = `${lineProps.className} docusaurus-highlight-code-line`;
theme={prism.theme || defaultTheme} }
code={children.trim()}
language={language}>
{({className, style, tokens, getLineProps, getTokenProps}) => (
<pre className={classnames(className, styles.codeBlock)}>
<code
ref={target}
className={classnames(className, styles.codeBlockLines)}
style={style}>
{tokens.map((line, i) => {
const lineProps = getLineProps({line, key: i});
if (highlightLines.includes(i + 1)) { return (
lineProps.className = `${lineProps.className} docusaurus-highlight-code-line`; <div key={i} {...lineProps}>
} {line.map((token, key) => (
<span key={key} {...getTokenProps({token, key})} />
return ( ))}
<div key={i} {...lineProps}> </div>
{line.map((token, key) => ( );
<span key={key} {...getTokenProps({token, key})} /> })}
))}
</div>
);
})}
</code>
</pre> </pre>
)} <button
</Highlight> ref={button}
</div> type="button"
aria-label="Copy code to clipboard"
className={styles.copyButton}
onClick={handleCopyCode}>
{showCopied ? 'Copied' : 'Copy'}
</button>
</div>
)}
</Highlight>
); );
}; };

23
packages/docusaurus-theme-classic/src/theme/CodeBlock/styles.module.css
View file

@ -4,6 +4,14 @@
* This source code is licensed under the MIT license found in the * This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
.codeBlock {
border-radius: 0;
margin-bottom: 0;
overflow: hidden;
overflow-wrap: break-word;
white-space: pre-wrap;
}
.codeBlockWrapper { .codeBlockWrapper {
position: relative; position: relative;
@ -31,18 +39,3 @@
transition: opacity 200ms ease-in-out, visibility 200ms ease-in-out, transition: opacity 200ms ease-in-out, visibility 200ms ease-in-out,
bottom 200ms ease-in-out; bottom 200ms ease-in-out;
} }
.codeBlock {
overflow: auto;
display: block;
padding: 0;
font-size: inherit;
}
.codeBlockLines {
border-radius: 0;
margin-bottom: 0;
float: left;
min-width: 100%;
padding: var(--ifm-pre-padding);
}

2
packages/docusaurus-theme-classic/src/theme/DocItem/index.js
View file

@ -94,7 +94,7 @@ function DocItem(props) {
<div className="padding-vert--lg"> <div className="padding-vert--lg">
<div className="container"> <div className="container">
<div className="row"> <div className="row">
<div className="col col--9"> <div className="col">
<div className={styles.docItemContainer}> <div className={styles.docItemContainer}>
<article> <article>
{version && ( {version && (

73
packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/index.js
View file

@ -81,46 +81,43 @@ export default ({
}; };
return ( return (
<div className={styles.codeBlockWrapper}> <Highlight
<button {...defaultProps}
ref={button} theme={prism.theme || defaultTheme}
type="button" code={children.trim()}
aria-label="Copy code to clipboard" language={language}>
className={styles.copyButton} {({className, style, tokens, getLineProps, getTokenProps}) => (
onClick={handleCopyCode}> <div className={styles.codeBlockWrapper}>
{showCopied ? 'Copied' : 'Copy'} <pre
</button> ref={target}
className={classnames(className, styles.codeBlock)}
style={style}>
{tokens.map((line, i) => {
const lineProps = getLineProps({line, key: i});
<Highlight if (highlightLines.includes(i + 1)) {
{...defaultProps} lineProps.className = `${lineProps.className} docusaurus-highlight-code-line`;
theme={prism.theme || defaultTheme} }
code={children.trim()}
language={language}>
{({className, style, tokens, getLineProps, getTokenProps}) => (
<pre className={classnames(className, styles.codeBlock)}>
<code
ref={target}
className={classnames(className, styles.codeBlockLines)}
style={style}>
{tokens.map((line, i) => {
const lineProps = getLineProps({line, key: i});
if (highlightLines.includes(i + 1)) { return (
lineProps.className = `${lineProps.className} docusaurus-highlight-code-line`; <div key={i} {...lineProps}>
} {line.map((token, key) => (
<span key={key} {...getTokenProps({token, key})} />
return ( ))}
<div key={i} {...lineProps}> </div>
{line.map((token, key) => ( );
<span key={key} {...getTokenProps({token, key})} /> })}
))}
</div>
);
})}
</code>
</pre> </pre>
)} <button
</Highlight> ref={button}
</div> type="button"
aria-label="Copy code to clipboard"
className={styles.copyButton}
onClick={handleCopyCode}>
{showCopied ? 'Copied' : 'Copy'}
</button>
</div>
)}
</Highlight>
); );
}; };

24
packages/docusaurus-theme-live-codeblock/src/theme/CodeBlock/styles.module.css
View file

@ -1,3 +1,12 @@
.codeBlock {
border-radius: 0;
font-size: inherit;
margin-bottom: 0;
overflow: hidden;
overflow-wrap: break-word;
white-space: pre-wrap;
}
.codeBlockWrapper { .codeBlockWrapper {
position: relative; position: relative;
} }
@ -24,18 +33,3 @@
transition: opacity 200ms ease-in-out, visibility 200ms ease-in-out, transition: opacity 200ms ease-in-out, visibility 200ms ease-in-out,
bottom 200ms ease-in-out; bottom 200ms ease-in-out;
} }
.codeBlock {
overflow: auto;
display: block;
padding: 0;
font-size: inherit;
}
.codeBlockLines {
border-radius: 0;
margin-bottom: 0;
float: left;
min-width: 100%;
padding: var(--ifm-pre-padding);
}