Skip to content

Commit

Permalink
Merge pull request #1939 from wordpress-mobile/issue/fix-caret-scroll…
Browse files Browse the repository at this point in the history
…-calculation

[iOS] Fix autoscroll behaviour.
  • Loading branch information
etoledom committed Mar 13, 2020
2 parents a581444 + 565737b commit 7500e0e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 31 files
+6 −0 docs/manifest.json
+15 −8 lib/client-assets.php
+7 −2 package-lock.json
+1 −0 package.json
+2 −0 packages/base-styles/_variables.scss
+6 −3 packages/block-editor/src/components/block-list/index.native.js
+12 −0 packages/block-editor/src/components/block-list/style.native.scss
+1 −1 packages/block-editor/src/components/block-mobile-toolbar/style.native.scss
+2 −2 packages/block-library/src/embed/test/__snapshots__/index.js.snap
+1 −0 packages/components/src/mobile/bottom-sheet/stepper-cell/style.native.scss
+2 −0 packages/components/src/mobile/keyboard-aware-flat-list/index.ios.js
+1 −0 packages/components/src/style.scss
+7 −3 packages/components/src/tab-panel/index.js
+0 −1 packages/components/src/tab-panel/stories/index.js
+44 −0 packages/components/src/tab-panel/style.scss
+20 −22 packages/edit-post/src/components/header/header-toolbar/index.native.js
+1 −1 packages/edit-post/src/components/header/header-toolbar/style.native.scss
+5 −18 packages/edit-post/src/components/preview-options/index.js
+11 −14 packages/edit-post/src/components/preview-options/style.scss
+2 −2 packages/icons/src/library/external.js
+1 −0 packages/prettier-config/.npmrc
+5 −0 packages/prettier-config/CHANGELOG.md
+27 −0 packages/prettier-config/README.md
+12 −0 packages/prettier-config/lib/index.js
+31 −0 packages/prettier-config/package.json
+15 −0 packages/prettier-config/test/index.js
+4 −0 packages/scripts/CHANGELOG.md
+1 −12 packages/scripts/config/.prettierrc.js
+1 −0 packages/scripts/package.json
+10 −10 storybook/test/__snapshots__/index.js.snap
+9 −0 test/native/__mocks__/styleMock.js
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ PODS:
- React-cxxreact (= 0.61.5)
- React-jsi (= 0.61.5)
- React-jsinspector (0.61.5)
- react-native-keyboard-aware-scroll-view (0.8.7):
- react-native-keyboard-aware-scroll-view (0.8.8):
- React
- react-native-safe-area (0.5.1):
- React
Expand Down Expand Up @@ -377,7 +377,7 @@ SPEC CHECKSUMS:
React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
react-native-keyboard-aware-scroll-view: 01c4b2303c4ef1c49c4d239c9c5856f0393104df
react-native-keyboard-aware-scroll-view: ffa9152671fec9a571197ed2d02e0fcb90206e60
react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3
react-native-slider: f81b89fa0c1f9a65742d33f889a194ca6653a985
react-native-video: 331eaf96cb034fedcc27f4f6ada3ac3cf6c0a78a
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,13 @@
"react-native": "0.61.5",
"react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6",
"react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
"react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7",
"react-native-linear-gradient": "git+https://github.com/wordpress-mobile/react-native-linear-gradient.git#52bf43077171cff8714ce3e0155f3ebb7f55bc37",
"react-native-modal": "^6.5.0",
"react-native-safe-area": "^0.5.0",
"react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#a628e92990a2404e30a0086f168bd2b5b7b4ce96",
"react-native-url-polyfill": "^1.1.2",
"react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#c43bdf6b06d361da399b98b8d2e32b578fa188ac",
"react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.8",
"react-redux": "^5.0.7",
"redux": "^3.7.2",
"redux-multi": "^0.1.12",
Expand Down
4 changes: 0 additions & 4 deletions src/initial-html.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,6 @@ else:
<h2 class="has-text-align-left">Dig in deeper</h2>
<!-- /wp:heading -->
<!-- wp:list -->
<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>
<!-- /wp:list -->
<!-- wp:spacer -->
<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11480,9 +11480,9 @@ react-native-iphone-x-helper@^1.0.3:
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz#645e2ffbbb49e80844bb4cbbe34a126fda1e6772"
integrity sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ==

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

0 comments on commit 7500e0e

Please sign in to comment.