-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[No QA] [TS migration] Migrate 'DeviceCapabilities' lib to TypeScript #27314
Merged
Beamanator
merged 3 commits into
Expensify:main
from
software-mansion-labs:ts-migration/device-capabilities-lib
Sep 22, 2023
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
src/libs/DeviceCapabilities/canUseTouchScreen/index.native.js
This file was deleted.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
src/libs/DeviceCapabilities/canUseTouchScreen/index.native.ts
This file contains 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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
import CanUseTouchScreen from './types'; | ||
|
||
const canUseTouchScreen: CanUseTouchScreen = () => true; | ||
|
||
export default canUseTouchScreen; |
This file contains 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 |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import {Merge} from 'type-fest'; | ||
import CanUseTouchScreen from './types'; | ||
|
||
type ExtendedNavigator = Merge<Navigator, {msMaxTouchPoints: number}>; | ||
|
||
/** | ||
* Allows us to identify whether the platform has a touchscreen. | ||
* | ||
* https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent | ||
*/ | ||
const canUseTouchScreen: CanUseTouchScreen = () => { | ||
let hasTouchScreen = false; | ||
|
||
// TypeScript removed support for msMaxTouchPoints, this doesn't mean however that | ||
// this property doesn't exist - hence the use of ExtendedNavigator to ensure | ||
// that the functionality doesn't change | ||
// https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1029 | ||
if ('maxTouchPoints' in navigator) { | ||
hasTouchScreen = navigator.maxTouchPoints > 0; | ||
} else if ('msMaxTouchPoints' in navigator) { | ||
hasTouchScreen = (navigator as ExtendedNavigator).msMaxTouchPoints > 0; | ||
} else { | ||
// Same case as for Navigator - TypeScript thinks that matchMedia is obligatory property of window although it may not be | ||
const mQ = (window as Partial<Window & typeof globalThis>).matchMedia && matchMedia('(pointer:coarse)'); | ||
if (mQ && mQ.media === '(pointer:coarse)') { | ||
hasTouchScreen = !!mQ.matches; | ||
} else if ('orientation' in window) { | ||
hasTouchScreen = true; // deprecated, but good fallback | ||
} else { | ||
// Only as a last resort, fall back to user agent sniffing | ||
const UA = (navigator as ExtendedNavigator).userAgent; | ||
hasTouchScreen = /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) || /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA); | ||
} | ||
} | ||
return hasTouchScreen; | ||
}; | ||
|
||
export default canUseTouchScreen; |
This file contains 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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
type CanUseTouchScreen = () => boolean; | ||
|
||
export default CanUseTouchScreen; |
This file was deleted.
Oops, something went wrong.
7 changes: 3 additions & 4 deletions
7
...abilities/hasHoverSupport/index.native.js → ...abilities/hasHoverSupport/index.native.ts
This file contains 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 |
---|---|---|
@@ -1,9 +1,8 @@ | ||
import HasHoverSupport from './types'; | ||
|
||
/** | ||
* Allows us to identify whether the platform is hoverable. | ||
* | ||
* @returns {Boolean} | ||
*/ | ||
|
||
const hasHoverSupport = () => false; | ||
const hasHoverSupport: HasHoverSupport = () => false; | ||
|
||
export default hasHoverSupport; |
This file contains 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 | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,8 @@ | ||||||
import HasHoverSupport from './types'; | ||||||
|
||||||
/** | ||||||
* Allows us to identify whether the platform is hoverable. | ||||||
*/ | ||||||
const hasHoverSupport: HasHoverSupport = () => window.matchMedia('(hover: hover) and (pointer: fine)').matches; | ||||||
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.
Suggested change
Based on previous comments about |
||||||
|
||||||
export default hasHoverSupport; |
This file contains 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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
type HasHoverSupport = () => boolean; | ||
|
||
export default HasHoverSupport; |
File renamed without changes.
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.
if
matchMedia
can be undefined, maybe this could be a better approach, couldn't? It will only call the function if it exists.