forked from Ivasoft/mattermost-mobile
[MM-16593] Upgrade to RN 0.61.2 (#3455)
* [MM-16593] [MM-17175] [MM-17164] [MM-17189] [MM-17181] Android - Upgrade to RN 0.60 (#3145) * Upgrade to react-native 0.60 * Use @sentry/react-native * Manually link @sentry/react-native * Address review comments * Jetify after install * Call jetify from node_modules * [MM-17785] iOS - Upgrade to RN 0.60 (#3153) * Upgrade to react-native 0.60 * Use @sentry/react-native * Manually link @sentry/react-native * Address review comments * Jetify after install * Call jetify from node_modules * Get app building for iOS * Revert react-native-image-picker upgrade * Minor version upgrade of react-native-image-picker * [MM-17142] Convert all string refs to callbacks (#3217) * Replace string refs * Fix tests * Don't use inline functions * Fix mattermost-redux reversion from master merge * [MM-18336] Upload Sentry debug symbols only when SENTRY_ENABLED is true (#3227) * Upgrade @sentry/react-native * Run Sentry gradle tasks only when enabled * Upgrade @sentry/react-native and remove extra Sentry build phase * [MM-17144] Use Hermes (#3226) * Replace string refs * Fix tests * Don't use inline functions * Fix mattermost-redux reversion from master merge * Use Hermes * bundleCommand ram-bundle no longer needed * Require harmony-reflect only for Android * Fix failing test * Path react-native's splitLayoutProps (#3337) * [MM-18867] [MM-17186] [MM-18866] [MM-19447] [MM-18967] Upgrade to RN 0.61.2 (#3423) * Upgrade to RN 0.61.2 * Update rn-fetch-blob commit hash * Update react-native-keyboard-tracking-view commit hash * Use react-native-youtube with AVPlayer fix * Fix jest mocks * Use updated document picker API * Remove unnecessary linking * Revert "MM-17759 Add code highlighting (#3072)" This reverts commit26b999e885. * Fix share extension * Revert "Revert "MM-17759 Add code highlighting (#3072)"" This reverts commit52aca776b1. * Address PR reviews * Rename patch to match version * Update react-native-youtube patch * Update dependencies * Fix RNDocViewer reference * Update tests and revert to redux-persist 4.10.2 * Revert "Revert "Revert "MM-17759 Add code highlighting (#3072)""" This reverts commit5ef383be26. * Android fixes after dep upgrades * Use fresco 2.0.0 * Use mattermost forks * Use React-Core in Mattermost.scheme instead of react * Remove packager (#3452) * Remove Pods from source control * Fix unit tests * Add new line before entering the keystore in gradle.properties * set ios as working directory for cocoapods * Cache cocoapods on circleCI builds * set ios as working dir * fix cocoapods cache key * Unify fastlane and npm dependencies command * Use package-lock.json checksum for npm cache * Fix package.json and use the checksum as the cache key * Fix package.json and use the checksum as the cache key * changes to circleci.yaml fastlane and removing pods from git * Fix Mattermost.xcodeproj * Update coocoapods to 1.7.5 and fix xcode header search paths * Update package-lock.json * Remove unused tooltip component * Fix incorrect ref * Disable Hermes (#3460) * Revert "Remove packager (#3452)" This reverts commitb2a79e184b. * Disable Hermes :'( * Update preloaded modules * Fix packages moduleNames and modulePaths, update snapshots and update mm-redux (ts version) * remove document picker from modulePaths * Fix package-lock.json * Add eslint disable rules
This commit is contained in:
@@ -5,22 +5,19 @@ import {PropTypes} from 'prop-types';
|
||||
import React from 'react';
|
||||
import {intlShape} from 'react-intl';
|
||||
import {
|
||||
Platform,
|
||||
Clipboard,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
} from 'react-native';
|
||||
|
||||
import SyntaxHighlighter from 'react-native-syntax-highlighter';
|
||||
|
||||
import CustomPropTypes from 'app/constants/custom_prop_types';
|
||||
import FormattedText from 'app/components/formatted_text';
|
||||
import TouchableWithFeedback from 'app/components/touchable_with_feedback';
|
||||
import BottomSheet from 'app/utils/bottom_sheet';
|
||||
import {getDisplayNameForLanguage, getCodeFont} from 'app/utils/markdown';
|
||||
import {getDisplayNameForLanguage} from 'app/utils/markdown';
|
||||
import {preventDoubleTap} from 'app/utils/tap';
|
||||
import {changeOpacity, makeStyleSheetFromTheme, getHighlightStyleFromTheme} from 'app/utils/theme';
|
||||
import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
|
||||
import mattermostManaged from 'app/mattermost_managed';
|
||||
import {goToScreen} from 'app/actions/navigation';
|
||||
|
||||
@@ -43,13 +40,11 @@ export default class MarkdownCodeBlock extends React.PureComponent {
|
||||
};
|
||||
|
||||
handlePress = preventDoubleTap(() => {
|
||||
const {language, content, textStyle} = this.props;
|
||||
const {language, content} = this.props;
|
||||
const {intl} = this.context;
|
||||
const screen = 'Code';
|
||||
const passProps = {
|
||||
content,
|
||||
language,
|
||||
textStyle,
|
||||
};
|
||||
|
||||
const languageDisplayName = getDisplayNameForLanguage(language);
|
||||
@@ -155,26 +150,6 @@ export default class MarkdownCodeBlock extends React.PureComponent {
|
||||
);
|
||||
}
|
||||
|
||||
let textComponent = null;
|
||||
if (Platform.OS === 'ios') {
|
||||
textComponent = (
|
||||
<SyntaxHighlighter
|
||||
language={this.props.language}
|
||||
style={getHighlightStyleFromTheme(this.props.theme)}
|
||||
highlighter={'hljs'}
|
||||
customStyle={{...style.codeText, ...this.props.textStyle}}
|
||||
>
|
||||
{content}
|
||||
</SyntaxHighlighter>
|
||||
);
|
||||
} else {
|
||||
textComponent = (
|
||||
<Text style={[style.codeText, this.props.textStyle]}>
|
||||
{content}
|
||||
</Text>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<TouchableWithFeedback
|
||||
onPress={this.handlePress}
|
||||
@@ -189,7 +164,9 @@ export default class MarkdownCodeBlock extends React.PureComponent {
|
||||
</View>
|
||||
<View style={style.rightColumn}>
|
||||
<View style={style.code}>
|
||||
{textComponent}
|
||||
<Text style={[style.codeText, this.props.textStyle]}>
|
||||
{content}
|
||||
</Text>
|
||||
</View>
|
||||
{plusMoreLines}
|
||||
</View>
|
||||
@@ -227,15 +204,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
|
||||
flexDirection: 'column',
|
||||
flex: 1,
|
||||
paddingHorizontal: 6,
|
||||
...Platform.select({
|
||||
ios: {
|
||||
paddingVertical: 0,
|
||||
backgroundColor: getHighlightStyleFromTheme(theme).hljs.background,
|
||||
},
|
||||
android: {
|
||||
paddingVertical: 4,
|
||||
},
|
||||
}),
|
||||
paddingVertical: 4,
|
||||
},
|
||||
code: {
|
||||
flexDirection: 'row',
|
||||
@@ -245,12 +214,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
|
||||
color: changeOpacity(theme.centerChannelColor, 0.65),
|
||||
fontSize: 12,
|
||||
lineHeight: 18,
|
||||
...Platform.select({
|
||||
ios: {
|
||||
fontFamily: getCodeFont(),
|
||||
paddingVertical: 6,
|
||||
},
|
||||
}),
|
||||
},
|
||||
plusMoreLinesText: {
|
||||
color: changeOpacity(theme.centerChannelColor, 0.4),
|
||||
|
||||
Reference in New Issue
Block a user