This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[web] Fix incorrect physical size due to visualviewport api on iOS #25895
Merged
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
cc3b6e4
Fix incorrect physical size due to visualviewport api on iOS
ferhatb 4da9185
Fix edit check
ferhatb 197daf1
Merge remote-tracking branch 'upstream/master' into viewportfix
ferhatb 359bad2
Fix null warning
ferhatb 46bb070
address reviewer comments
ferhatb ab9331e
Merge remote-tracking branch 'upstream/master' into viewportfix
ferhatb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -182,8 +182,24 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow { | |
| double windowInnerHeight; | ||
| final html.VisualViewport? viewport = html.window.visualViewport; | ||
| if (viewport != null) { | ||
| windowInnerWidth = viewport.width!.toDouble() * devicePixelRatio; | ||
| windowInnerHeight = viewport.height!.toDouble() * devicePixelRatio; | ||
| if (browserEngine == BrowserEngine.webkit && | ||
| operatingSystem == OperatingSystem.iOs) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. iOS implies webkit
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
| /// Chrome on iOS reports incorrect viewport.height when app | ||
| /// starts in portrait orientation and the phone is rotated to | ||
| /// landscape. | ||
| /// | ||
| /// We instead use documentElement clientWidth/Height to read | ||
| /// accurate physical size. VisualViewport api is only used during | ||
| /// text editing to make sure inset is correctly reported to | ||
| /// framework. | ||
| final double docWidth = html.document.documentElement!.clientWidth.toDouble(); | ||
| final double docHeight = html.document.documentElement!.clientHeight.toDouble(); | ||
| windowInnerWidth = docWidth * devicePixelRatio; | ||
| windowInnerHeight = docHeight * devicePixelRatio; | ||
| } else { | ||
| windowInnerWidth = viewport.width!.toDouble() * devicePixelRatio; | ||
| windowInnerHeight = viewport.height!.toDouble() * devicePixelRatio; | ||
| } | ||
| } else { | ||
| windowInnerWidth = html.window.innerWidth! * devicePixelRatio; | ||
| windowInnerHeight = html.window.innerHeight! * devicePixelRatio; | ||
|
|
@@ -195,11 +211,16 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow { | |
| } | ||
| } | ||
|
|
||
| void computeOnScreenKeyboardInsets() { | ||
| void computeOnScreenKeyboardInsets(bool isEditingOnMobile) { | ||
| double windowInnerHeight; | ||
| final html.VisualViewport? viewport = html.window.visualViewport; | ||
| if (viewport != null) { | ||
| windowInnerHeight = viewport.height!.toDouble() * devicePixelRatio; | ||
| if (browserEngine == BrowserEngine.webkit && | ||
| operatingSystem == OperatingSystem.iOs && isEditingOnMobile) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ios => webkit, so we can just check for ios
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
| windowInnerHeight = html.document.documentElement!.clientHeight! * devicePixelRatio; | ||
| } else { | ||
| windowInnerHeight = viewport.height!.toDouble() * devicePixelRatio; | ||
| } | ||
| } else { | ||
| windowInnerHeight = html.window.innerHeight! * devicePixelRatio; | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be moved out of the if/else. We call it in both cases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated