Skip to content

Commit 828024d

Browse files
authored
Merge pull request wix-incubator#24 from philpettican/bugfix/end-of-scroll
Unable to scroll to end of editor after embedding multiple images
2 parents 4912973 + 37bc6b2 commit 828024d

File tree

5 files changed

+3
-18
lines changed

5 files changed

+3
-18
lines changed

example/android/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ import com.android.build.OutputFile
7878
project.ext.react = [
7979
entryFile: "index.js",
8080
enableHermes: false, // clean and rebuild if changing,
81-
cliPath: "node_modules/@haul-bundler/cli/bin/haul.js"
8281
]
8382

8483
apply from: "../../node_modules/react-native/react.gradle"

example/babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
presets: ['module:@haul-bundler/babel-preset-react-native'],
2+
presets: ['module:metro-react-native-babel-preset'],
33
};

example/haul.config.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

example/package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
"ios": "react-native run-ios",
88
"start": "react-native start",
99
"test": "jest",
10-
"lint": "eslint .",
11-
"haul": "haul start"
10+
"lint": "eslint ."
1211
},
1312
"dependencies": {
1413
"react": "16.9.0",
@@ -20,9 +19,6 @@
2019
"devDependencies": {
2120
"@babel/core": "^7.7.7",
2221
"@babel/runtime": "^7.7.7",
23-
"@haul-bundler/babel-preset-react-native": "^0.16.0",
24-
"@haul-bundler/cli": "^0.21.0",
25-
"@haul-bundler/preset-0.60": "^0.18.0",
2622
"@react-native-community/eslint-config": "^0.0.5",
2723
"babel-jest": "^24.9.0",
2824
"eslint": "^6.8.0",

src/RichTextEditor.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ export default class RichTextEditor extends Component {
115115
const { marginTop = 0, marginBottom = 0 } = this.props.style;
116116
const spacing = marginTop + marginBottom + top + bottom;
117117

118-
const editorAvailableHeight =
119-
Dimensions.get('window').height - keyboardHeight - spacing;
118+
const editorAvailableHeight = Dimensions.get('window').height - keyboardHeight * 2 - spacing;
120119
this.setEditorHeight(editorAvailableHeight);
121120
}
122121

0 commit comments

Comments
 (0)