Skip to content

V7 typescript #2490

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 16, 2023
Merged

V7 typescript #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b2991f
V7 - Upgrade typescript to latest version 4.9.5 and fix errors
ethanshar Feb 16, 2023
7360f3f
Merge branch 'v7' into v7_typescript
ethanshar Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"react-test-renderer": "^17.0.1",
"reassure": "^0.4.1",
"shell-utils": "^1.0.10",
"typescript": "4.3.2",
"typescript": "4.9.5",
"postcss": "^8.4.21",
"postcss-js": "^4.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/button/Button.driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class ButtonDriver extends ComponentDriver {
}

isPressable = async () => {
if (this.exists()) {
if (await this.exists()) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Miki just change the onPress to be sync as it actually is sync. Don't we need to remove the async instead?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/wix/react-native-ui-lib/pull/2459/files
It was merged after the Adi cut the version (I wasn't aware that we're cutting a version yesterday) so maybe we should include it in v7

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were there changes in v6 before we cut the version?
There shouldn't be delta between last v6 and start of v7
@M-i-k-e-l ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Inbal-Tish This fix is relevant. The isExists is async and we address it a sync function..

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As Inbal stated it looks like it was merged to master after we started working on v7.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any delta.
Which change are you referring to exactly? why did we merged changes while working on v7?
anyway, do we need to cherry pick it to v7?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I merged the PR since no one told me that we were cutting a version. The change is in the PR I added here

return typeof (await this.getElementProps()).onPress === 'function';
} else {
console.warn(`TextDriver: cannot click because testID:${this.testID} were not found`);
Expand Down
4 changes: 2 additions & 2 deletions src/components/hint/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ class Hint extends Component<HintProps, HintState> {

return (
<View style={[styles.mockChildrenContainer, layout]}>
{React.cloneElement(children, {
{React.cloneElement<any>(children, {
collapsable: false,
key: 'mock',
style: [children.props.style, styles.mockChildren]
Expand All @@ -552,7 +552,7 @@ class Hint extends Component<HintProps, HintState> {
const {targetFrame} = this.props;

if (!targetFrame && isValidElement(this.props.children)) {
return React.cloneElement(this.props.children, {
return React.cloneElement<any>(this.props.children, {
key: 'clone',
collapsable: false,
onLayout: this.onTargetLayout,
Expand Down
2 changes: 1 addition & 1 deletion src/components/text/Text.driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class TextDriver extends ComponentDriver {
}

isPressable = async () => {
if (this.exists()) {
if (await this.exists()) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

return typeof (await this.getElementProps()).onPress === 'function';
} else {
console.warn(`TextDriver: cannot click because testID:${this.testID} were not found`);
Expand Down
1 change: 0 additions & 1 deletion src/incubator/toast/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ const Toast = (props: PropsWithChildren<ToastProps>) => {
const playAccessibilityFeatures = () => {
if (visible) {
if (viewRef.current && action) {
// @ts-expect-error
const reactTag = findNodeHandle(viewRef.current);
AccessibilityInfo.setAccessibilityFocus(reactTag!);
} else if (message) {
Expand Down