Skip to content
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

Jump to bottom

hamid/76782/ts-components-desktop-wrapper #45

Merged
merged 4 commits into from
Oct 7, 2022
Merged

hamid/76782/ts-components-desktop-wrapper #45

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6adf3b0
Migrate DesktopWrapper to TS
Oct 3, 2022
355a17c
Remove .jsx
Oct 3, 2022
a9ac253
Change chilren type
Oct 3, 2022
8010d73
Add NS
Oct 3, 2022
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
3 changes: 2 additions & 1 deletion ...nents/desktop-wrapper/desktop-wrapper.jsx → ...nents/desktop-wrapper/desktop-wrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { PropsWithChildren } from 'react';
import { isDesktop } from '@deriv/shared';

const Desktop = ({ children }) => {
const Desktop = ({ children }: PropsWithChildren<never>) => {
Copy link

Choose a reason for hiding this comment

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

@hamid-deriv why did you use never ?

Copy link
Author

Choose a reason for hiding this comment

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

@iman-fs PropsWithChildren is a generic type that requires additional types to be passed. I pass never here because there is just a children prop here and doesn't accept any other props.

Copy link

Choose a reason for hiding this comment

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

type TDesktopProps = { children: React.ReactNode };

Let's stick to the type that we used for children in the whole project.
React.ReactNode is the recommended type for children prop.

Copy link

@shayan-deriv shayan-deriv Oct 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@hamid-deriv Actually I tested it in a sample code.the problem is where you use it:

example 1:

          <Test>
              test
            </Test>
            or
            <Test>
              <div>test</div>
            </Test>
        //returns error: This JSX tag's 'children' prop expects type 'never' which requires multiple children, but only a single child was provided.

I've checked different cases (multiple children with different types) but none works.

Copy link
Author

Choose a reason for hiding this comment

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

Changed 👍

if (!isDesktop()) return null;
return children;
};
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/components/desktop-wrapper/index.js → ...s/src/components/desktop-wrapper/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DesktopWrapper from './desktop-wrapper.jsx';
import DesktopWrapper from './desktop-wrapper';
import './desktop-wrapper.scss';

export default DesktopWrapper;
2 changes: 1 addition & 1 deletion packages/components/src/components/page-error/page-error.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import { isMobile } from '@deriv/shared';
import ButtonLink from '../button-link/button-link.jsx';
import DesktopWrapper from '../desktop-wrapper/desktop-wrapper.jsx';
import DesktopWrapper from '../desktop-wrapper';
import MobileWrapper from '../mobile-wrapper/mobile-wrapper.jsx';
import Text from '../text/text.jsx';

Expand Down