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

WV76 - Added TruncateMarkup fix to disappearing text issue Team Review #3861

Merged
merged 7 commits into from
Mar 31, 2024
Merged

WV76 - Added TruncateMarkup fix to disappearing text issue Team Review #3861

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75fa59d
Added TruncateMarkup fix to disappearing text issue
fdiazq Mar 15, 2024
0e2120a
Merge branch 'wevote:develop' into develop
fdiazq Mar 19, 2024
9e869ff
Changes to styling of linktext and lint issues
fdiazq Mar 21, 2024
cddd6c6
Merge branch 'wevote:develop' into develop
fdiazq Mar 26, 2024
3afc557
Added formatting changes
fdiazq Mar 27, 2024
c38f9a2
Added underline to linktext
fdiazq Mar 27, 2024
b9cbac9
Merge branch 'wevote:develop' into develop
fdiazq Mar 27, 2024
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
62 changes: 32 additions & 30 deletions src/js/common/components/Widgets/ReadMore.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import TextTruncate from 'react-text-truncate'; // TODO APRIL 2021: This doesn't support the latest React libs, can't we do the same with css? (See note below)
import { renderLog } from '../../utils/logging';

// import TextTruncate from 'react-text-truncate'; // TODO APRIL 2021: This doesn't support the latest React libs, can't we do the same with css? (See note below)
// 2021-02-23 NOTE FROM DALE: I'd like to try to upgrade ReadMore to use react-truncate-markup
// This newer package supports truncating JSX, and isn't limited to text only:
// import TruncateMarkup from 'react-truncate-markup';
import TruncateMarkup from 'react-truncate-markup';
import { renderLog } from '../../utils/logging';

export default class ReadMore extends Component {
constructor (...args) {
Expand Down Expand Up @@ -111,39 +110,42 @@ export default class ReadMore extends Component {
if (notEnoughTextToTruncate) {
return <span className={this.props.className}>{expandedTextToDisplay}</span>;
}

const showMoreEllipsis = (
<span>
&hellip;
{' '}
<a //eslint-disable-line
className="u-link-color u-link-underline-on hover u-no-break"
href="#"
id="readMore"
onClick={this.toggleLines}
onKeyDown={this.onKeyDown.bind(this)}
>
{linkText}
</a>

</span>
);

if (this.state.readMore) {
return (
<span>
<TextTruncate
containerClassName={this.props.className}
element="span"
line={numberOfLines}
truncateText="..."
text={textToDisplay}
textTruncateChild={(
<a // eslint-disable-line
className="u-link-color u-no-break"
// tabIndex="0"
href="#"
id="readMore"
onClick={this.toggleLines}
onKeyDown={this.onKeyDown.bind(this)}
>
{linkText}
</a>
)}
/>
<span className="text">
<TruncateMarkup lines={numberOfLines} ellipsis={showMoreEllipsis} tokenize="words">
<span>
{textToDisplay}
</span>
</TruncateMarkup>
</span>
);
} else {
return (
<span className={this.props.className}>
{' '}

<span>
{expandedTextToDisplay}
&nbsp;&nbsp;
<a // eslint-disable-line
className="u-link-color u-no-break"
// tabIndex="0"
{' '}
<a //eslint-disable-line
className="u-link-color u-link-underline-on hover u-no-break"
href="#"
id="showLess"
onClick={this.toggleLines}
Expand Down
Loading