Skip to content

Commit 7500e0e

Browse files
authored
Merge pull request #1939 from wordpress-mobile/issue/fix-caret-scroll-calculation
[iOS] Fix autoscroll behaviour.
2 parents a581444 + 565737b commit 7500e0e

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

gutenberg

Submodule gutenberg updated 31 files

ios/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ PODS:
189189
- React-cxxreact (= 0.61.5)
190190
- React-jsi (= 0.61.5)
191191
- React-jsinspector (0.61.5)
192-
- react-native-keyboard-aware-scroll-view (0.8.7):
192+
- react-native-keyboard-aware-scroll-view (0.8.8):
193193
- React
194194
- react-native-safe-area (0.5.1):
195195
- React
@@ -377,7 +377,7 @@ SPEC CHECKSUMS:
377377
React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
378378
React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
379379
React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
380-
react-native-keyboard-aware-scroll-view: 01c4b2303c4ef1c49c4d239c9c5856f0393104df
380+
react-native-keyboard-aware-scroll-view: ffa9152671fec9a571197ed2d02e0fcb90206e60
381381
react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3
382382
react-native-slider: f81b89fa0c1f9a65742d33f889a194ca6653a985
383383
react-native-video: 331eaf96cb034fedcc27f4f6ada3ac3cf6c0a78a

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@
165165
"react-native": "0.61.5",
166166
"react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6",
167167
"react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
168-
"react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7",
169168
"react-native-linear-gradient": "git+https://github.com/wordpress-mobile/react-native-linear-gradient.git#52bf43077171cff8714ce3e0155f3ebb7f55bc37",
170169
"react-native-modal": "^6.5.0",
171170
"react-native-safe-area": "^0.5.0",
172171
"react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#a628e92990a2404e30a0086f168bd2b5b7b4ce96",
173172
"react-native-url-polyfill": "^1.1.2",
174173
"react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#c43bdf6b06d361da399b98b8d2e32b578fa188ac",
174+
"react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.8",
175175
"react-redux": "^5.0.7",
176176
"redux": "^3.7.2",
177177
"redux-multi": "^0.1.12",

src/initial-html.js

-4
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@ else:
217217
<h2 class="has-text-align-left">Dig in deeper</h2>
218218
<!-- /wp:heading -->
219219
220-
<!-- wp:list -->
221-
<ul><li><a href="https://make.wordpress.org/core/2017/01/17/editor-technical-overview">Gutenberg Editor Technical Overview</a></li><li><a href="https://wordpress.org/gutenberg/handbook/reference/design-principles/">Gutenberg Design Principles</a></li><li><a href="https://make.wordpress.org/core/tag/gutenberg/">Development updates on make.wordpress.org</a></li><li><a href="https://wordpress.tv/?s=gutenberg">WordPress.tv Talks about Gutenberg</a></li><li><a href="https://wordpress.org/gutenberg/handbook/reference/faq/">FAQs</a></li></ul>
222-
<!-- /wp:list -->
223-
224220
<!-- wp:spacer -->
225221
<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
226222
<!-- /wp:spacer -->

yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -11480,9 +11480,9 @@ react-native-iphone-x-helper@^1.0.3:
1148011480
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz#645e2ffbbb49e80844bb4cbbe34a126fda1e6772"
1148111481
integrity sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ==
1148211482

11483-
"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7":
11484-
version "0.8.7"
11485-
resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#ab9d6b88ff6366e49b8a6f97a7dcb114f7d0bbae"
11483+
"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.8":
11484+
version "0.8.8"
11485+
resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#678a4d459caa2f7f448202574dddc6a19954500c"
1148611486
dependencies:
1148711487
prop-types "^15.6.2"
1148811488
react-native-iphone-x-helper "^1.0.3"

0 commit comments

Comments
 (0)