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

Jump to bottom

feat: HTML to Markdown parser integration #3229

Merged
merged 10 commits into from
Jul 1, 2021
Merged

feat: HTML to Markdown parser integration #3229

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee3724c
feat: HTML to Markdown parser integration
pranshuchittora May 29, 2021
5c3f7a6
feat: Updated package json
pranshuchittora Jun 22, 2021
c0f3fc3
Merge remote-tracking branch 'origin/main' into pranshuchittora/feat/…
pranshuchittora Jun 22, 2021
5107f55
feat: Migration to another component
pranshuchittora Jun 23, 2021
e66c1a7
fix: Minor fixes
pranshuchittora Jun 23, 2021
44c75fa
feat: New approach
pranshuchittora Jun 24, 2021
1906234
fix: Removed unwanted props
pranshuchittora Jun 24, 2021
5e610a8
fix: Minor changes to the object keys
pranshuchittora Jun 25, 2021
69f191a
feat: Updated method doc
pranshuchittora Jun 27, 2021
ab6145f
feat: Updated method doc
pranshuchittora Jun 27, 2021
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
35 changes: 30 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"electron-log": "^4.3.5",
"electron-serve": "^1.0.0",
"electron-updater": "^4.3.4",
"expensify-common": "^1.0.1",
"expensify-common": "git://github.com/Expensify/expensify-common.git#c3465bf615390a2844087ec7f2343b0607ea484c",
"file-loader": "^6.0.0",
"html-entities": "^1.3.1",
"lodash": "4.17.21",
Expand Down
1 change: 1 addition & 0 deletions src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ class ReportActionItem extends Component {
<ReportActionItemMessageEdit
action={this.props.action}
draftMessage={this.props.draftMessage}
reportAction={this.props.action}
reportID={this.props.reportID}
index={this.props.index}
/>
Expand Down
13 changes: 11 additions & 2 deletions src/pages/home/report/ReportActionItemMessageEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import ExpensiMark from 'expensify-common/lib/ExpensiMark';
import lodashGet from 'lodash/get';
import ReportActionPropTypes from './ReportActionPropTypes';
import styles from '../../../styles/styles';
import TextInputFocusable from '../../../components/TextInputFocusable';
Expand All @@ -19,6 +21,9 @@ const propTypes = {
/** Draft message */
draftMessage: PropTypes.string.isRequired,

/** The report action this context menu is attached to. */
reportAction: PropTypes.shape(ReportActionPropTypes).isRequired,

/** ReportID that holds the comment we're editing */
reportID: PropTypes.number.isRequired,

Expand All @@ -39,8 +44,12 @@ class ReportActionItemMessageEdit extends React.Component {
this.triggerSaveOrCancel = this.triggerSaveOrCancel.bind(this);
this.onSelectionChange = this.onSelectionChange.bind(this);

const message = _.last(lodashGet(this.props.reportAction, 'message', this.props.draftMessage));
const parser = new ExpensiMark();
const draftMessage = parser.htmlToMarkdown(lodashGet(message, 'html', ''));

this.state = {
draft: this.props.draftMessage,
draft: draftMessage,
selection: {
start: this.props.draftMessage.length,
end: this.props.draftMessage.length,
Expand Down Expand Up @@ -119,7 +128,7 @@ class ReportActionItemMessageEdit extends React.Component {
ref={el => this.textInput = el}
onChangeText={this.updateDraft} // Debounced saveDraftComment
onKeyPress={this.triggerSaveOrCancel}
defaultValue={this.props.draftMessage}
defaultValue={this.state.draft}
maxLines={16} // This is the same that slack has
style={[styles.textInputCompose, styles.flex4]}
onFocus={() => {
Expand Down