@mappable-world/mappable-types 0.0.6 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mappable-world/mappable-types",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "description": "Types for mappable maps library",
     "main": "",
     "types": "index.d.ts",

package/packages/clusterer/MMapClusterer/react/MMapClusterer.d.ts

@@ -1,6 +1,6 @@
 import type TReact from "react";
 import type { LngLat, MMapEntity } from "../../../..";
-import type { CustomReactify } from "../../../../reactify/reactify";
+import type { CustomReactify, OverrideProps } from "../../../../reactify/reactify";
 import type { Feature } from "../interface";
 import type { MMapClusterer as MMapClustererI, MMapClustererProps } from "../MMapClusterer";
 /**
@@ -33,12 +33,12 @@ import type { MMapClusterer as MMapClustererI, MMapClustererProps } from "../MMa
  * </MMap>
  * ```
  */
-type MMapClustererReactifiedProps = MMapClustererProps & {
+type MMapClustererReactifiedProps = OverrideProps<MMapClustererProps, {
     /** Function that returns MMapMarker react component to render marker*/
     marker: (feature: Feature) => TReact.ReactElement;
     /** Function that returns MMapMarker react component to render cluster*/
     cluster: (coordinates: LngLat, features: Feature[]) => TReact.ReactElement;
-};
+}>;
 type MMapClustererR = TReact.ForwardRefExoticComponent<MMapClustererReactifiedProps & React.RefAttributes<MMapEntity<MMapClustererReactifiedProps>>>;
 export declare const MMapClustererReactifyOverride: CustomReactify<MMapClustererI, MMapClustererR>;
 export {};

package/reactify/reactify.d.ts

@@ -26,20 +26,21 @@ export type CustomReactify<TEntity extends GenericEntity<unknown>, TResult> = (c
     React: typeof TReact;
     ReactDOM: typeof TReactDOM;
 }) => TResult;
-export type Overrided<TReactResult> = {
-    [overrideKeyReactify]: CustomReactify<GenericEntity<unknown>, TReactResult>;
+export type Overrided<TCtor extends EntityConstructor<GenericEntity<unknown>>, TReactResult> = {
+    [overrideKeyReactify]: CustomReactify<InstanceType<TCtor>, TReactResult>;
 };
 type InternalReactify<TEntity extends GenericEntity<unknown>> = (ctor: EntityConstructor<TEntity>, displayName?: string) => TReact.ForwardRefExoticComponent<TReact.PropsWithoutRef<TReact.PropsWithChildren<EntityProps<TEntity>>> & React.RefAttributes<TEntity | undefined>>;
-type InternalReactifyEntity<TCtor extends EntityConstructor<GenericEntity<unknown>>> = (ctor: TCtor, displayName?: string) => TCtor extends Overrided<infer TResult> ? TResult : ReturnType<InternalReactify<InstanceType<TCtor>>>;
+type InternalReactifyEntity<TCtor extends EntityConstructor<GenericEntity<unknown>>> = (ctor: TCtor, displayName?: string) => TCtor extends Overrided<TCtor, infer TResult> ? TResult : ReturnType<InternalReactify<InstanceType<TCtor>>>;
 export type ReactifyEntity = <TCtor extends EntityConstructor<GenericEntity<unknown>>>(...args: Parameters<InternalReactifyEntity<TCtor>>) => ReturnType<InternalReactifyEntity<TCtor>>;
 export type ReactifiedEntity<TCtor extends EntityConstructor<GenericEntity<unknown>>> = ReturnType<InternalReactifyEntity<TCtor>>;
-export interface ReactifyModule<TModule extends BaseModule = BaseModule> {
-    (module: TModule): ReactifiedModule<TModule>;
+export interface ReactifyModule {
+    <TModule extends BaseModule = BaseModule>(module: TModule): ReactifiedModule<TModule>;
 }
 export type GetReactContext<TContext extends Context<unknown>> = (context?: TContext | undefined) => React.Context<unknown>;
 export type ReactifiedModule<TModule extends BaseModule> = {
     [Property in keyof TModule]: TModule[Property] extends EntityConstructor<GenericEntity<unknown>> ? ReturnType<InternalReactifyEntity<TModule[Property]>> : TModule[Property] extends typeof Context ? ReturnType<GetReactContext<TModule[Property]>> : TModule[Property];
 };
 export type BaseModule = Record<string | symbol, unknown>;
+export type OverrideProps<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;
 export default function createReactify(React: typeof TReact, ReactDOM: typeof TReactDOM): Reactify;
 export {};