Skip to content

Commit

Permalink
Merge branch 'adam/react-18-migration-fork' of github.com:mongodb/lea…
Browse files Browse the repository at this point in the history
…fygreen-ui into adam/react-18-migration-fork
  • Loading branch information
bruugey committed Jul 10, 2023
2 parents 686d908 + a2f9711 commit 0dfd10b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
6 changes: 3 additions & 3 deletions packages/form-footer/src/FormFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export interface FormFooterProps extends HTMLElementProps<'footer'> {
*
* darkMode is handled internally so you do not have to pass the darkMode prop.
*/
primaryButton: React.ReactChild | PrimaryButtonProps;
primaryButton: React.ReactElement | PrimaryButtonProps;

/**
* Text for the cancel button.
Expand Down Expand Up @@ -178,8 +178,8 @@ export default function FormFooter({
{cancelButtonText || 'Cancel'}
</Button>
)}
{isComponentType(primaryButton, 'Button') ? (
React.cloneElement(primaryButton, {
{isComponentType(primaryButton as React.ReactElement, 'Button') ? (
React.cloneElement(primaryButton as React.ReactElement, {
darkMode: darkMode,
})
) : (
Expand Down
7 changes: 1 addition & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18177,16 +18177,11 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^4.1.0:
typescript@^4.1.0, typescript@^4.1.0-dev.20201026, typescript@^4.4.3:
version "4.9.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==

typescript@^4.1.0-dev.20201026, typescript@^4.4.3:
version "4.6.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==

uglify-js@^3.1.4:
version "3.15.4"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz#fa95c257e88f85614915b906204b9623d4fa340d"
Expand Down

0 comments on commit 0dfd10b

Please sign in to comment.