toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Upgrade to RN 0.54.3 and other dependencies (#1539)

Browse source 
* Upgrade to RN 0.54.2 and other dependencies

* feedback review

* upgrade mattermost-redux

* Update dependencies
This commit is contained in:
Elias Nahum 2018-03-29 17:05:49 +03:00 committed by Harrison Healey
parent b3806c04b3
commit 6698dbf678
9 changed files with 1017 additions and 728 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/components/channel_drawer/teams_list/teams_list_item/teams_list_item.js
View file

@ -77,6 +77,7 @@ export default class TeamsListItem extends React.PureComponent {
teamId={teamId}
styleContainer={styles.teamIconContainer}
styleText={styles.teamIconText}
styleImage={styles.imageContainer}
/>
<View style={styles.teamNameContainer}>
<Text
@ -134,6 +135,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
color: changeOpacity(theme.sidebarText, 0.5),
fontSize: 12,
},
imageContainer: {
backgroundColor: theme.sidebarBg,
},
checkmarkContainer: {
alignItems: 'flex-end',
},

20
app/components/post_textbox/post_textbox.js
View file

@ -171,16 +171,16 @@ export default class PostTextbox extends PureComponent {
};
handleContentSizeChange = (event) => {
let contentHeight = event.nativeEvent.contentSize.height;
if (contentHeight < INITIAL_HEIGHT) {
contentHeight = INITIAL_HEIGHT;
} else if (Platform.OS === 'ios') {
contentHeight += 5;
}
if (Platform.OS === 'android') {
let contentHeight = event.nativeEvent.contentSize.height;
if (contentHeight < INITIAL_HEIGHT) {
contentHeight = INITIAL_HEIGHT;
}
this.setState({
contentHeight,
});
this.setState({
contentHeight,
});
}
};
handleEndEditing = (e) => {
@ -476,7 +476,7 @@ export default class PostTextbox extends PureComponent {
numberOfLines={5}
blurOnSubmit={false}
underlineColorAndroid='transparent'
style={[style.input, {height: textInputHeight}]}
style={[style.input, Platform.OS === 'android' ? {height: textInputHeight} : {maxHeight: MAX_CONTENT_HEIGHT}]}
onContentSizeChange={this.handleContentSizeChange}
keyboardType={this.state.keyboardType}
onEndEditing={this.handleEndEditing}

4
app/components/team_icon/team_icon.js
View file

@ -49,7 +49,7 @@ export default class TeamIcon extends React.PureComponent {
teamIconContent = (
<Image
style={[styles.image, styleImage]}
source={{uri: teamIconUrl}}
source={{uri: teamIconUrl, headers: {Authorization: `Bearer ${Client4.getToken()}`}}}
onError={() => this.setState({imageError: true})}
/>
);
@ -94,4 +94,4 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
right: 0,
},
};
});
});

4
app/screens/select_team/select_team.js
View file

@ -182,6 +182,7 @@ export default class SelectTeam extends PureComponent {
teamId={item.id}
styleContainer={styles.teamIconContainer}
styleText={styles.teamIconText}
styleImage={styles.imageContainer}
/>
<View style={styles.teamNameContainer}>
<Text
@ -280,6 +281,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
color: theme.sidebarText,
fontSize: 18,
},
imageContainer: {
backgroundColor: theme.centerChannelBg,
},
noTeam: {
color: theme.centerChannelColor,
fontSize: 14,

4
ios/Mattermost/MattermostManaged.m
View file

@ -8,7 +8,7 @@
#import <React/RCTBridge.h>
#import <React/RCTEventDispatcher.h>
#import "RCTTextField.h"
#import "RCTUITextView.h"
#import "MattermostManaged.h"
@implementation MattermostManaged
@ -82,7 +82,7 @@ RCT_EXPORT_METHOD(quitApp)
@end
@implementation RCTTextField (DisableCopyPaste)
@implementation RCTUITextView (DisableCopyPaste)
- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
{

46
package.json
View file

@ -16,43 +16,43 @@
"intl": "1.2.5",
"jail-monkey": "0.2.0",
"mattermost-redux": "mattermost/mattermost-redux",
"prop-types": "15.6.0",
"react": "16.2.0",
"prop-types": "15.6.1",
"react": "^16.3.0-alpha.1",
"react-intl": "2.4.0",
"react-native": "0.52.2",
"react-native": "0.54.3",
"react-native-animatable": "1.2.4",
"react-native-bottom-sheet": "1.0.2",
"react-native-button": "2.2.0",
"react-native-bottom-sheet": "1.0.3",
"react-native-button": "2.3.0",
"react-native-circular-progress": "0.1.0",
"react-native-cookies": "3.2.0",
"react-native-device-info": "0.14.0",
"react-native-doc-viewer": "2.7.3",
"react-native-drawer": "2.5.0",
"react-native-exception-handler": "2.7.1",
"react-native-fast-image": "2.2.4",
"react-native-fast-image": "4.0.0",
"react-native-fetch-blob": "0.10.8",
"react-native-image-picker": "0.26.7",
"react-native-keyboard-aware-scroll-view": "0.4.3",
"react-native-keyboard-aware-scroll-view": "0.5.0",
"react-native-linear-gradient": "2.4.0",
"react-native-local-auth": "enahum/react-native-local-auth.git",
"react-native-navigation": "1.1.369",
"react-native-navigation": "1.1.426",
"react-native-notifications": "enahum/react-native-notifications.git",
"react-native-orientation": "3.1.3",
"react-native-passcode-status": "1.1.0",
"react-native-permissions": "1.1.1",
"react-native-safe-area": "0.2.3",
"react-native-section-list-get-item-layout": "2.2.1",
"react-native-sentry": "0.34.0",
"react-native-section-list-get-item-layout": "2.2.2",
"react-native-sentry": "0.35.3",
"react-native-slider": "0.11.0",
"react-native-status-bar-size": "0.3.3",
"react-native-svg": "6.1.3",
"react-native-svg": "6.3.1",
"react-native-tableview": "2.1.0",
"react-native-tooltip": "5.2.0",
"react-native-vector-icons": "4.5.0",
"react-native-video": "2.0.0",
"react-native-youtube": "1.1.0",
"react-navigation": "1.0.0",
"react-redux": "5.0.6",
"react-navigation": "1.5.8",
"react-redux": "5.0.7",
"redux": "3.7.2",
"redux-batched-actions": "0.2.1",
"redux-persist": "4.10.2",
@ -67,8 +67,8 @@
},
"devDependencies": {
"babel-cli": "6.26.0",
"babel-eslint": "8.2.1",
"babel-plugin-module-resolver": "3.0.0",
"babel-eslint": "8.2.2",
"babel-plugin-module-resolver": "3.1.1",
"babel-plugin-transform-remove-console": "6.9.0",
"babel-preset-env": "1.6.1",
"babel-preset-es2015": "6.24.1",
@ -79,20 +79,20 @@
"babel-register": "6.26.0",
"chai": "4.1.2",
"chai-enzyme": "0.8.0",
"chai-fetch-mock": "1.0.1",
"chai-fetch-mock": "2.0.0",
"deep-freeze": "0.0.1",
"enzyme": "3.3.0",
"eslint": "4.17.0",
"eslint-plugin-mocha": "4.11.0",
"eslint-plugin-react": "7.6.1",
"fetch-mock": "6.0.0",
"eslint": "4.19.1",
"eslint-plugin-mocha": "4.12.1",
"eslint-plugin-react": "7.7.0",
"fetch-mock": "6.3.0",
"jsdom": "11.6.2",
"jsdom-global": "3.0.2",
"mocha": "5.0.0",
"mocha": "5.0.5",
"mocha-react-native": "0.6.0",
"mock-async-storage": "2.0.2",
"mockery": "2.1.0",
"nyc": "11.4.1",
"nyc": "11.6.0",
"react-addons-test-utils": "15.6.2",
"react-dom": "16.2.0",
"react-native-mock": "0.3.1",
@ -100,7 +100,7 @@
"react-test-renderer": "16.2.0",
"remote-redux-devtools": "0.5.12",
"remotedev-rn-debugger": "0.8.3",
"socketcluster": "9.3.1",
"socketcluster": "11.1.0",
"underscore": "1.8.3"
},
"scripts": {

4
share_extension/android/extension_teams/team_item/team_item.js
View file

@ -59,6 +59,7 @@ export default class TeamItem extends PureComponent {
teamId={team.id}
styleContainer={styles.teamIconContainer}
styleText={styles.teamIconText}
styleImage={styles.imageContainer}
/>
<Text
style={[styles.text]}
@ -102,6 +103,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
teamIconText: {
color: theme.sidebarText,
},
imageContainer: {
backgroundColor: theme.centerChannelBg,
},
checkmarkContainer: {
alignItems: 'flex-end',
},

4
share_extension/ios/extension_team_item.js
View file

@ -53,6 +53,7 @@ export default class TeamsListItem extends React.PureComponent {
<TeamIcon
styleContainer={styles.teamIconContainer}
styleText={styles.teamIconText}
styleImage={styles.imageContainer}
teamId={team.id}
team={team}
theme={theme}
@ -104,6 +105,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
teamIconText: {
color: theme.sidebarText,
},
imageContainer: {
backgroundColor: theme.centerChannelBg,
},
checkmarkContainer: {
alignItems: 'flex-end',
},

1655
yarn.lock
View file

File diff suppressed because it is too large Load diff