Update feature branch to account for React 18 changes

cee-chen · Aug 3, 2023 · e64f745 · e64f745
1 parent c83abe1
commit e64f745
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/components/provider/component_defaults/component_defaults.test.tsx b/src/components/provider/component_defaults/component_defaults.test.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import React, { PropsWithChildren } from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import React, { FunctionComponent, PropsWithChildren } from 'react';
+import { renderHook } from '../../../test/rtl';
 
 import {
   EuiComponentDefaultsProvider,
@@ -18,7 +18,7 @@ import {
 describe('EuiComponentDefaultsProvider', () => {
   describe('useComponentDefaults', () => {
     it('allows accessing provided `componentDefaults` from anywhere', () => {
-      const wrapper = ({ children }: PropsWithChildren<{}>) => (
+      const wrapper: FunctionComponent<PropsWithChildren> = ({ children }) => (
         <EuiComponentDefaultsProvider
           componentDefaults={{
             EuiPortal: {

diff --git a/src/components/provider/component_defaults/component_defaults.tsx b/src/components/provider/component_defaults/component_defaults.tsx
@@ -11,6 +11,7 @@ import React, {
   useContext,
   useMemo,
   FunctionComponent,
+  PropsWithChildren,
 } from 'react';
 
 import type { EuiPortalProps } from '../../portal';
@@ -50,9 +51,11 @@ export const EuiComponentDefaultsContext =
 /*
  * Component
  */
-export const EuiComponentDefaultsProvider: FunctionComponent<{
-  componentDefaults?: EuiComponentDefaults;
-}> = ({ componentDefaults = emptyDefaults, children }) => {
+export const EuiComponentDefaultsProvider: FunctionComponent<
+  PropsWithChildren & {
+    componentDefaults?: EuiComponentDefaults;
+  }
+> = ({ componentDefaults = emptyDefaults, children }) => {
   return (
     <EuiComponentDefaultsContext.Provider value={componentDefaults}>
       {children}