Various fixes

Author: mattpocock

src/08-advanced-patterns/72-as-prop-with-default.problem.tsx

@@ -6,8 +6,8 @@ export const Link = <T extends ElementType>(
     as: T;
   } & ComponentPropsWithoutRef<T>,
 ) => {
-  const { as: Comp, ...rest } = props;
-  return <Comp {...rest}></Comp>;
+  const Comp = props.as;
+  return <Comp {...(props as any)}></Comp>;
 };
 
 /**

src/08-advanced-patterns/72-as-prop-with-default.solution.2.tsx

@@ -1,9 +1,6 @@
 import { ComponentPropsWithoutRef, ElementType, useRef } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
 
-/**
- * This NEARLY works, but removes autocomplete for the 'as' prop.
- */
 export const Link = <T extends ElementType>(
   props: {
     as?: T;

src/08-advanced-patterns/72.5-as-prop-with-forward-ref.problem.tsx renamed to src/08-advanced-patterns/73-as-prop-with-forward-ref.problem.tsx

@@ -1,21 +1,19 @@
 import {
   ComponentPropsWithoutRef,
-  JSXElementConstructor,
+  ElementType,
   forwardRef,
   useRef,
 } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
 
-function UnwrappedLink<
-  T extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>,
->(
+export const UnwrappedLink = <T extends ElementType>(
   props: {
     as?: T;
-  } & ComponentPropsWithoutRef<T>,
-) {
+  } & ComponentPropsWithoutRef<ElementType extends T ? "a" : T>,
+) => {
   const { as: Comp = "a", ...rest } = props;
   return <Comp {...rest}></Comp>;
-}
+};
 
 const Link = forwardRef(UnwrappedLink);
 

src/08-advanced-patterns/72.5-as-prop-with-forward-ref.solution.tsx renamed to src/08-advanced-patterns/73-as-prop-with-forward-ref.solution.tsx

@@ -1,12 +1,16 @@
 import { ComponentProps, ElementType, forwardRef, useRef } from "react";
 import { Equal, Expect } from "../helpers/type-utils";
 
+// Added fixedForwardRef from a previous exercise
+
 type FixedForwardRef = <T, P = {}>(
   render: (props: P, ref: React.Ref<T>) => React.ReactNode,
 ) => (props: P & React.RefAttributes<T>) => React.ReactNode;
 
 const fixedForwardRef = forwardRef as FixedForwardRef;
 
+// Added a DistributiveOmit type
+
 type DistributiveOmit<T, TOmitted extends PropertyKey> = T extends any
   ? Omit<T, TOmitted>
   : never;