fix(ouia): don't omit ouiaContext (#3872)

Author: evwilkin

packages/react-core/src/components/withOuia/withOuia.tsx

@@ -17,11 +17,11 @@ export interface OuiaContextProps {
 /**
  * @param { React.ComponentClass | React.FunctionComponent } WrappedComponent - React component
  */
-export function withOuiaContext<P extends { ouiaContext?: OuiaContextProps }, R = Omit<P, 'ouiaContext'>>(
+export function withOuiaContext<P extends { ouiaContext?: OuiaContextProps }>(
   WrappedComponent: React.ComponentClass<P> | React.FunctionComponent<P>
-): React.FunctionComponent<R> {
+): React.FunctionComponent<P> {
   /* eslint-disable react/display-name */
-  return (props: R) => (
+  return (props: P) => (
     <OuiaContext.Consumer>
       {(value: OuiaContextProps) => (
         <ComponentWithOuia consumerContext={value} component={WrappedComponent} componentProps={props} />