-
-
Notifications
You must be signed in to change notification settings - Fork 8.7k
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.
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
fix(theme-classic): inconsistent code block wrapping #7485
Merged
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d6db387
fix(theme-classic): inconsistent code block wrapping
dpang314 9eec193
refactor(theme-classic): abstract mutation observer
dpang314 e2864bc
fix: MutationObserver reference error
dpang314 062348e
Merge branch 'main' into code-wrap
slorber 2eb5951
refactor
slorber df58da0
refactor
slorber File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
packages/docusaurus-theme-common/src/hooks/useMutationObserver.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
import {useRef, useMemo, useEffect} from 'react'; | ||
import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; | ||
|
||
export function useMutationObserver( | ||
target: Element | undefined | null, | ||
callback: (mutations: MutationRecord[]) => void, | ||
options = { | ||
attributes: true, | ||
characterData: true, | ||
childList: true, | ||
subtree: true, | ||
}, | ||
): void { | ||
const mutationObserver = useRef<MutationObserver | undefined>( | ||
ExecutionEnvironment.canUseDOM ? new MutationObserver(callback) : undefined, | ||
); | ||
const memoOptions = useMemo(() => options, [options]); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is useless memo |
||
|
||
useEffect(() => { | ||
const observer = mutationObserver.current; | ||
|
||
if (target && observer) { | ||
observer.observe(target, memoOptions); | ||
} | ||
|
||
return () => { | ||
if (observer) { | ||
observer.disconnect(); | ||
} | ||
}; | ||
}, [target, memoOptions]); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
import CodeBlock from '@theme/CodeBlock'; | ||
import BrowserWindow from '@site/src/components/BrowserWindow'; | ||
import Tabs from '@theme/Tabs'; | ||
import TabItem from '@theme/TabItem'; | ||
|
||
# Code block tests | ||
|
||
|
@@ -190,3 +192,60 @@ function PageLayout(props) { | |
); | ||
} | ||
``` | ||
|
||
## Code block wrapping tests | ||
|
||
[// spell-checker:disable]: # | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Huh, I didn't know this is a thing 🤔 |
||
|
||
```bash | ||
mkdir this_is_a_loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_string_to_test_code_block_wrapping | ||
echo "this is a long string made up of many separate words that should be broken between words when possible" | ||
curl https://docusaurus.io/tests/pages/code-block-tests | ||
``` | ||
|
||
<Tabs> | ||
|
||
<TabItem value="short-tab-1" label="Short tab"> | ||
|
||
```bash | ||
echo "hi" | ||
``` | ||
|
||
</TabItem> | ||
<TabItem value="long-tab" label="Long tab"> | ||
|
||
```bash | ||
mkdir this_will_test_whether_a_long_string_that_is_initially_hidden_will_have_the_option_to_wrap_when_made_visible | ||
``` | ||
|
||
</TabItem> | ||
|
||
<TabItem value="short-tab-2" label="Short tab"> | ||
|
||
```bash | ||
rm short_initially_hidden_string | ||
``` | ||
|
||
</TabItem> | ||
</Tabs> | ||
|
||
<Tabs> | ||
|
||
<TabItem value="long-tab" label="Long tab"> | ||
|
||
```bash | ||
echo medium_length_string_will_have_the_option_to_wrap_after_window_resized_while_it_is_hidden | ||
``` | ||
|
||
</TabItem> | ||
|
||
<TabItem value="short-tab" label="Short tab"> | ||
|
||
```bash | ||
echo "short_initially_hidden_string" | ||
``` | ||
|
||
</TabItem> | ||
</Tabs> | ||
|
||
[// spell-checker:enable]: # |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The whiteSpace style will never break words apart, so for a single word that is long enough to overflow the code block, it would stay on one line and cause the scroll bar to remain.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 will add this back sorry
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#7551