🐞 Fix: Type Errors Due To Update

Author: dominicstop

src/native_components/RNIContextMenuButton/RNIContextMenuButtonNativeComponent.ts

@@ -4,24 +4,23 @@ import type { HostComponent, ViewProps } from 'react-native';
 
 // stubs
 export interface NativeProps extends ViewProps {
-  isMenuPrimaryAction: boolean;
+  isMenuPrimaryAction?: boolean;
 
   // shared props
-  onDidSetViewID: BubblingEventHandler<{}>;
+  onDidSetViewID?: BubblingEventHandler<{}>;
 
   // inherited props
-  menuConfig: string;
-  isContextMenuEnabled: boolean;
-
-  onMenuWillShow: BubblingEventHandler<{}>;
-  onMenuDidShow: BubblingEventHandler<{}>;
-  onMenuWillHide: BubblingEventHandler<{}>;
-  onMenuDidHide: BubblingEventHandler<{}>;
-  onMenuWillCancel: BubblingEventHandler<{}>;
-  onMenuDidCancel: BubblingEventHandler<{}>;
-  onRequestDeferredElement: BubblingEventHandler<{}>;
-  onPressMenuItem: BubblingEventHandler<{}>;
+  menuConfig?: string;
+  isContextMenuEnabled?: boolean;
 
+  onMenuWillShow?: BubblingEventHandler<{}>;
+  onMenuDidShow?: BubblingEventHandler<{}>;
+  onMenuWillHide?: BubblingEventHandler<{}>;
+  onMenuDidHide?: BubblingEventHandler<{}>;
+  onMenuWillCancel?: BubblingEventHandler<{}>;
+  onMenuDidCancel?: BubblingEventHandler<{}>;
+  onRequestDeferredElement?: BubblingEventHandler<{}>;
+  onPressMenuItem?: BubblingEventHandler<{}>;
 };
 
 // stubs

src/native_components/RNIContextMenuButton/RNIContextMenuButtonNativeView.ts

@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import type { SharedViewEvents, RemapObject } from 'react-native-ios-utilities';
+import type { SharedViewEvents, RemapObject, NativeComponentBaseProps } from 'react-native-ios-utilities';
 
 import { 
   default as RNIContextMenuButtonNativeComponent,
@@ -9,6 +9,9 @@ import {
 import type { RNIContextMenuNativeViewBaseProps } from '../RNIContextMenuView/RNIContextMenuNativeView';
 
 
+type RNIContextMenuButtonNativeComponentBaseProps = 
+  NativeComponentBaseProps<RNIContextMenuButtonNativeComponentProps>;
+
 export type RNIContextMenuNativeViewInheritedProps = Pick<RNIContextMenuNativeViewBaseProps,
   | 'menuConfig'
   | 'isContextMenuEnabled'
@@ -22,14 +25,11 @@ export type RNIContextMenuNativeViewInheritedProps = Pick<RNIContextMenuNativeVi
   | 'onPressMenuItem'
 >;
 
-type RNIContextMenuButtonNativeComponentBaseProps = Omit<
-  RNIContextMenuButtonNativeComponentProps, 
-  keyof (ViewProps & SharedViewEvents & RNIContextMenuNativeViewInheritedProps)
->;
-
-export type RNIContextMenuButtonNativeViewBaseProps = RemapObject<RNIContextMenuButtonNativeComponentBaseProps, {
+export type RNIContextMenuButtonNativeViewBaseProps = RemapObject<RNIContextMenuButtonNativeComponentBaseProps, ({
   isMenuPrimaryAction: boolean;
-}>;
+} & Required<
+  RNIContextMenuNativeViewInheritedProps>
+)>;
 
 export type RNIContextMenuButtonNativeViewProps = 
     SharedViewEvents
@@ -39,3 +39,5 @@ export type RNIContextMenuButtonNativeViewProps =
 
 export const RNIContextMenuButtonNativeView = 
   RNIContextMenuButtonNativeComponent as unknown as HostComponent<RNIContextMenuButtonNativeViewProps>;
+
+

src/native_components/RNIContextMenuView/RNIContextMenuNativeView.ts

@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import type { SharedViewEvents, RemapObject } from 'react-native-ios-utilities';
+import type { SharedViewEvents, RemapObject, NativeComponentBaseProps } from 'react-native-ios-utilities';
 
 import { 
   default as RNIContextMenuViewNativeComponent,
@@ -11,18 +11,17 @@ import type { MenuConfig } from '../../types/MenuConfig';
 import type { MenuPreviewConfig } from '../../types/MenuPreviewConfig';
 import type { AuxiliaryPreviewConfigBackwardsCompatible } from '../../types/AuxiliaryPreviewConfigBackwardsCompatible';
 
-
 type RNIContextMenuViewNativeComponentBaseProps = 
-  Omit<RNIContextMenuViewNativeComponentProps, keyof (ViewProps & SharedViewEvents)>
+  NativeComponentBaseProps<RNIContextMenuViewNativeComponentProps>;
 
 export type RNIContextMenuNativeViewBaseProps = RemapObject<RNIContextMenuViewNativeComponentBaseProps, {
 
   // Value Props
   // -----------
 
-  menuConfig?: MenuConfig; 
-  previewConfig?: MenuPreviewConfig;
-  auxiliaryPreviewConfig?: AuxiliaryPreviewConfigBackwardsCompatible;
+  menuConfig: MenuConfig; 
+  previewConfig: MenuPreviewConfig;
+  auxiliaryPreviewConfig: AuxiliaryPreviewConfigBackwardsCompatible;
 
   /** 
    * On iOS 15+, the `MenuActionConfig.discoverabilityTitle` is no longer 

src/native_components/RNIContextMenuView/RNIContextMenuViewNativeComponent.ts

@@ -9,23 +9,24 @@ export interface NativeProps extends ViewProps {
   menuConfig?: string; 
   previewConfig?: string;
   auxiliaryPreviewConfig?: string;
-  shouldUseDiscoverabilityTitleAsFallbackValueForSubtitle: string;
-  isContextMenuEnabled: string;
-  isAuxiliaryPreviewEnabled: string;
-  shouldPreventLongPressGestureFromPropagating: string;
+  
+  shouldUseDiscoverabilityTitleAsFallbackValueForSubtitle?: string;
+  isContextMenuEnabled?: string;
+  isAuxiliaryPreviewEnabled?: string;
+  shouldPreventLongPressGestureFromPropagating?: string;
 
-  onMenuWillShow: BubblingEventHandler<{}>;
-  onMenuDidShow: BubblingEventHandler<{}>;
-  onMenuWillHide: BubblingEventHandler<{}>;
-  onMenuDidHide: BubblingEventHandler<{}>;
-  onMenuWillCancel: BubblingEventHandler<{}>;
-  onMenuDidCancel: BubblingEventHandler<{}>;
-  onMenuWillCreate: BubblingEventHandler<{}>;
-  onRequestDeferredElement: BubblingEventHandler<{}>;
-  onPressMenuItem: BubblingEventHandler<{}>;
-  onPressMenuPreview: BubblingEventHandler<{}>;
-  onMenuAuxiliaryPreviewWillShow: BubblingEventHandler<{}>;
-  onMenuAuxiliaryPreviewDidShow: BubblingEventHandler<{}>;
+  onMenuWillShow?: BubblingEventHandler<{}>;
+  onMenuDidShow?: BubblingEventHandler<{}>;
+  onMenuWillHide?: BubblingEventHandler<{}>;
+  onMenuDidHide?: BubblingEventHandler<{}>;
+  onMenuWillCancel?: BubblingEventHandler<{}>;
+  onMenuDidCancel?: BubblingEventHandler<{}>;
+  onMenuWillCreate?: BubblingEventHandler<{}>;
+  onRequestDeferredElement?: BubblingEventHandler<{}>;
+  onPressMenuItem?: BubblingEventHandler<{}>;
+  onPressMenuPreview?: BubblingEventHandler<{}>;
+  onMenuAuxiliaryPreviewWillShow?: BubblingEventHandler<{}>;
+  onMenuAuxiliaryPreviewDidShow?: BubblingEventHandler<{}>;
 };
 
 // stubs