fix icon rendering with context

Author: snowystinger

packages/@react-spectrum/s2/src/Icon.tsx

@@ -89,14 +89,17 @@ export function createIcon(Component: ComponentType<SVGProps<SVGSVGElement>>, co
     let ctx;
     // TODO: remove this default once we release RAC and use DEFAULT_SLOT.
     [ctx, ref] = useSpectrumContextProps({slot: props.slot || 'icon'} as IconContextValue, ref, context);
-    let {render, styles: ctxStyles} = ctx;
+    let {styles: ctxStyles} = ctx;
     let {
       UNSAFE_className,
       UNSAFE_style,
       slot,
       'aria-label': ariaLabel,
       'aria-hidden': ariaHidden,
       styles,
+      // props are already merged with context via rac's useContextProps in generateS2IconIndex
+      // @ts-ignore
+      render,
       ...otherProps
     } = props;
 
@@ -142,7 +145,7 @@ export function createIllustration(Component: ComponentType<SVGProps<SVGSVGEleme
     let ref = useRef<SVGElement>(null);
     let ctx;
     [ctx, ref] = useSpectrumContextProps({slot: props.slot || 'icon'} as IconContextValue, ref, IllustrationContext);
-    let {render, styles: ctxStyles} = ctx;
+    let {styles: ctxStyles} = ctx;
     let {
       UNSAFE_className,
       UNSAFE_style,
@@ -151,6 +154,9 @@ export function createIllustration(Component: ComponentType<SVGProps<SVGSVGEleme
       'aria-hidden': ariaHidden,
       size = ctx.size || 'M',
       styles,
+      // props are already merged with context via rac's useContextProps in generateS2IconIndex
+      // @ts-ignore
+      render,
       ...otherProps
     } = props;