Import PropsWithChildren in a few components

ammario · ammario · commit 25d747dca597 · 2022-08-15T15:51:18.000Z
diff --git a/site/src/__mocks__/react-markdown.tsx b/site/src/__mocks__/react-markdown.tsx
@@ -1,6 +1,6 @@
-import { FC } from "react"
+import { FC, PropsWithChildren } from "react"
 
-const ReactMarkdown: FC<React.PropsWithChildren<unknown>> = ({ children }) => {
+const ReactMarkdown: FC<PropsWithChildren<unknown>> = ({ children }) => {
   return <div data-testid="markdown">{children}</div>
 }
 
diff --git a/site/src/components/AppLink/AppLink.tsx b/site/src/components/AppLink/AppLink.tsx
@@ -2,7 +2,7 @@ import Button from "@material-ui/core/Button"
 import Link from "@material-ui/core/Link"
 import { makeStyles } from "@material-ui/core/styles"
 import ComputerIcon from "@material-ui/icons/Computer"
-import { FC } from "react"
+import { FC, PropsWithChildren } from "react"
 import * as TypesGen from "../../api/typesGenerated"
 import { generateRandomString } from "../../util/random"
 
@@ -17,7 +17,7 @@ export interface AppLinkProps {
   appIcon?: TypesGen.WorkspaceApp["icon"]
 }
 
-export const AppLink: FC<React.PropsWithChildren<AppLinkProps>> = ({
+export const AppLink: FC<PropsWithChildren<AppLinkProps>> = ({
   userName,
   workspaceName,
   appName,
diff --git a/site/src/components/AuthAndFrame/AuthAndFrame.tsx b/site/src/components/AuthAndFrame/AuthAndFrame.tsx
@@ -13,7 +13,7 @@ interface AuthAndFrameProps {
 /**
  * Wraps page in RequireAuth and renders it between Navbar and Footer
  */
-export const AuthAndFrame: FC<React.PropsWithChildren<AuthAndFrameProps>> = ({ children }) => {
+export const AuthAndFrame: FC<PropsWithChildren<AuthAndFrameProps>> = ({ children }) => {
   const styles = useStyles()
   const xServices = useContext(XServiceContext)
 
diff --git a/site/src/components/AvatarData/AvatarData.tsx b/site/src/components/AvatarData/AvatarData.tsx
@@ -1,7 +1,7 @@
 import Avatar from "@material-ui/core/Avatar"
 import Link from "@material-ui/core/Link"
 import { makeStyles } from "@material-ui/core/styles"
-import { FC } from "react"
+import { FC, PropsWithChildren } from "react"
 import { Link as RouterLink } from "react-router-dom"
 import { firstLetter } from "../../util/firstLetter"
 import {
@@ -18,7 +18,7 @@ export interface AvatarDataProps {
   avatar?: React.ReactNode
 }
 
-export const AvatarData: FC<React.PropsWithChildren<AvatarDataProps>> = ({
+export const AvatarData: FC<PropsWithChildren<AvatarDataProps>> = ({
   title,
   subtitle,
   link,
diff --git a/site/src/components/BorderedMenu/BorderedMenu.tsx b/site/src/components/BorderedMenu/BorderedMenu.tsx
@@ -8,7 +8,7 @@ export type BorderedMenuProps = Omit<PopoverProps, "variant"> & {
   variant?: BorderedMenuVariant
 }
 
-export const BorderedMenu: FC<React.PropsWithChildren<BorderedMenuProps>> = ({
+export const BorderedMenu: FC<PropsWithChildren<BorderedMenuProps>> = ({
   children,
   variant,
   ...rest
diff --git a/site/src/components/TableCellData/TableCellData.tsx b/site/src/components/TableCellData/TableCellData.tsx
@@ -6,7 +6,7 @@ interface StyleProps {
   highlight?: boolean
 }
 
-export const TableCellData: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => {
+export const TableCellData: React.FC<React.ReactNode> = ({ children }) => {
   return <Stack spacing={0}>{children}</Stack>
 }
 
diff --git a/yarn.lock b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-import { FC } from "react"`
	`1`	`+import { FC, PropsWithChildren } from "react"`
`2`	`2`
`3`		`-const ReactMarkdown: FC<React.PropsWithChildren<unknown>> = ({ children }) => {`
	`3`	`+const ReactMarkdown: FC<PropsWithChildren<unknown>> = ({ children }) => {`
`4`	`4`	`return <div data-testid="markdown">{children}</div>`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export type BorderedMenuProps = Omit<PopoverProps, "variant"> & {`
`8`	`8`	`variant?: BorderedMenuVariant`
`9`	`9`	`}`
`10`	`10`
`11`		`-export const BorderedMenu: FC<React.PropsWithChildren<BorderedMenuProps>> = ({`
	`11`	`+export const BorderedMenu: FC<PropsWithChildren<BorderedMenuProps>> = ({`
`12`	`12`	`children,`
`13`	`13`	`variant,`
`14`	`14`	`...rest`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ interface StyleProps {`
`6`	`6`	`highlight?: boolean`
`7`	`7`	`}`
`8`	`8`
`9`		`-export const TableCellData: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => {`
	`9`	`+export const TableCellData: React.FC<React.ReactNode> = ({ children }) => {`
`10`	`10`	`return <Stack spacing={0}>{children}</Stack>`
`11`	`11`	`}`
`12`	`12`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 +# yarn lockfile v1
++
++