Skip to content

[C-5278] Trimmed newlines on comments #10386

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

Merged
DejayJD merged 1 commit into from
Nov 7, 2024
Merged

[C-5278] Trimmed newlines on comments #10386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions packages/common/src/utils/formatUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,21 @@ export const formatShareText = (title: string, creator: string) => {
}

/**
* Reduces multiple sequential newlines (> 3) into max `\n\n` and
* Reduces multiple sequential newlines (> newlineCount) into max `\n\n` and
* trims both leading and trailing newlines
*/
export const squashNewLines = (str: string | null) => {
return str ? str.replace(/\n\s*\n\s*\n/g, '\n\n').trim() : str
export const squashNewLines = (str: string | null, newlineMax: number = 2) => {
return str
? str
.replace(
new RegExp(
`\\n\\s*(\\n\\s*){${Math.max(newlineMax - 2, 1)}}\\n`,
'g'
),
'\n'.repeat(newlineMax)
)
.trim()
: str
}

/** Trims a string to alphanumeric values only */
Expand Down
14 changes: 8 additions & 6 deletions packages/mobile/src/components/core/UserGeneratedText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,13 @@ export const UserGeneratedText = (props: UserGeneratedTextProps) => {
}, [])

const renderText = useCallback(
(text: string) => (
<Text suppressHighlighting {...other}>
{text}
</Text>
),
(text: string) => {
return (
<Text suppressHighlighting {...other}>
{text}
</Text>
)
},
// eslint-disable-next-line react-hooks/exhaustive-deps
[]
)
Expand All @@ -330,7 +332,7 @@ export const UserGeneratedText = (props: UserGeneratedTextProps) => {
email
url={false}
style={[{ marginBottom: 3 }, style]}
text={squashNewLines(children) as string}
text={squashNewLines(children, 10) as string}
matchers={[
// Handle matcher e.g. @handle
...(mentions
Expand Down
6 changes: 4 additions & 2 deletions packages/web/src/components/user-generated-text/UserGeneratedTextV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
formatCollectionName,
formatUserName,
handleRegex,
decodeHashId
decodeHashId,
squashNewLines
} from '@audius/common/utils'
import { Text, TextProps } from '@audius/harmony'
import { CommentMention, ResolveApi, Track, User, Playlist } from '@audius/sdk'
Expand Down Expand Up @@ -299,6 +300,7 @@ export const UserGeneratedTextV2 = forwardRef(function (
)

const matchers: Matcher[] = [
// link matcher
{
pattern:
/https?:\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])/g,
Expand All @@ -324,7 +326,7 @@ export const UserGeneratedTextV2 = forwardRef(function (
// Function to split the text and insert rendered elements for matched tokens
const parseText = (text: string) => {
// Start with the entire text as a single unprocessed string
let elements: ReactNode[] = [text]
let elements: ReactNode[] = [squashNewLines(text, 10)]
let key = 0

// Process each matcher sequentially
Expand Down