Skip to content

fixed issue with link type text's formatting. #4062

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
RishiRajSahu merged 1 commit into from
Jul 21, 2020
Merged

fixed issue with link type text's formatting. #4062

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
10 changes: 9 additions & 1 deletion src/components/FAQ/FAQItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import cn from 'classnames'
import { documentToReactComponents } from '@contentful/rich-text-react-renderer'
import IconX from ' ../../assets/icons/ui-x-mark.svg'
import IconCarretDown from '../../assets/icons/arrow-6px-carret-down-normal.svg'
import { CONTENTFUL_NODE_TYPES } from '../../config/constants'
import './FAQItem.scss'


Expand All @@ -25,6 +26,13 @@ class FAQItem extends Component {
render() {
const {item} = this.props
const {isOpen} = this.state

const FormattedHyperLink = ({ value, url }) => <a href={url} target="_blank" className="hyperlink-style">{value}</a>
const options = {
renderNode: {/* eslint-disable no-unused-vars*/
[CONTENTFUL_NODE_TYPES.HYPERLINK]: (node, children) => <FormattedHyperLink value={node.content[0].value} url={node.data.uri}/>
}
}
return (
<div styleName={cn('accordion', { 'is-open': isOpen })}>
<div styleName="header" onClick={this.toggle}>
Expand All @@ -33,7 +41,7 @@ class FAQItem extends Component {
{isOpen ? <IconX styleName="toggle-icon" /> : <IconCarretDown styleName="toggle-icon" />}
</div>
</div>
<div styleName="content">{documentToReactComponents(item.fields.answer)}</div>
<div styleName="content">{documentToReactComponents(item.fields.answer, options)}</div>
</div>
)
}
Expand Down
8 changes: 8 additions & 0 deletions src/components/FAQ/FAQItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
line-height: 20px;
text-align: left;
margin-bottom: 2 * $base-unit;

a {
cursor: pointer;
color: $tc-dark-blue;
&:hover {
text-decoration: underline;
}
}
}

.accordion.is-open .content {
Expand Down
10 changes: 9 additions & 1 deletion src/config/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,4 +992,12 @@ export const REPORT_SESSION_LENGTH = 25 * 60 // 25 minutes (5 minutes less than
*/
export const DASHBOARD_FAQ_CONTENT_ID = process.env.DASHBOARD_FAQ_CONTENT_ID
export const CONTENTFUL_DELIVERY_KEY = process.env.CONTENTFUL_DELIVERY_KEY
export const CONTENTFUL_SPACE_ID = process.env.CONTENTFUL_SPACE_ID
export const CONTENTFUL_SPACE_ID = process.env.CONTENTFUL_SPACE_ID


/**
* Contentful node types
*/
export const CONTENTFUL_NODE_TYPES = {
HYPERLINK : 'hyperlink',
}