Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import type {
import { useGestureCallbacks } from './useGestureCallbacks';
import {
bindSharedValues,
prepareConfig,
prepareConfigForNativeSide,
prepareRelations,
unbindSharedValues,
Expand All @@ -41,9 +40,6 @@ export function useGesture<
);
}

// This has to be done ASAP as other hooks depend `shouldUseReanimatedDetector`.
prepareConfig(config);

// TODO: Call only necessary hooks depending on which callbacks are defined (?)
const { jsEventHandler, reanimatedEventHandler, animatedEventHandler } =
useGestureCallbacks(handlerTag, config);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
} from './propsWhiteList';
import { hasWorkletEventHandlers, maybeUnpackValue } from './reanimatedUtils';

export function prepareConfig<
export function resolveInternalConfigProps<
TConfig extends object,
THandlerData,
TExtendedHandlerData extends THandlerData,
Expand Down Expand Up @@ -125,7 +125,7 @@ function remapProps<
TInternalConfig extends Record<string, unknown>,
>(
config: TConfig & TInternalConfig,
propsMapping: Map<string, string>
propsMapping: ReadonlyMap<string, string>
): TInternalConfig {
type MergedConfig = TConfig & TInternalConfig;

Expand All @@ -142,6 +142,11 @@ function remapProps<
return config;
}

const DEFAULT_PROPS_MAPPING = new Map<string, string>();
const DEFAULT_PROPS_TRANSFORMER = <TConfig extends object>(
config: TConfig
): TConfig => config;

export function useClonedAndRemappedConfig<
TConfig extends Record<string, unknown>,
THandlerData,
Expand All @@ -151,8 +156,10 @@ export function useClonedAndRemappedConfig<
config: ExcludeInternalConfigProps<
BaseGestureConfig<TConfig, THandlerData, TExtendedHandlerData>
>,
propsMapping: Map<string, string> = new Map(),
propsTransformer: (config: TInternalConfig) => TInternalConfig = (cfg) => cfg
propsMapping: ReadonlyMap<string, string> = DEFAULT_PROPS_MAPPING,
propsTransformer: (
config: TInternalConfig
) => TInternalConfig = DEFAULT_PROPS_TRANSFORMER
): BaseGestureConfig<TInternalConfig, THandlerData, TExtendedHandlerData> {
return useMemo(() => {
const clonedConfig = cloneConfig<
Expand All @@ -161,11 +168,15 @@ export function useClonedAndRemappedConfig<
TExtendedHandlerData
>(config);

return propsTransformer(
const transformedConfig = propsTransformer(
remapProps<TConfig, TInternalConfig>(
clonedConfig as TConfig & TInternalConfig,
propsMapping
)
);

resolveInternalConfigProps(transformedConfig);

return transformedConfig;
}, [config, propsMapping, propsTransformer]);
}
Comment thread
m-bert marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export {
prepareConfig,
prepareConfigForNativeSide,
useClonedAndRemappedConfig,
} from './configUtils';
Expand Down
Loading