fix: rename util function

EldarMuhamethanov · EldarMuhamethanov · commit b98962e57adb · 2025-11-19T17:56:15.000+07:00
diff --git a/packages/vkui/src/components/Checkbox/Checkbox.tsx b/packages/vkui/src/components/Checkbox/Checkbox.tsx
@@ -3,8 +3,8 @@
 import * as React from 'react';
 import { hasReactNode } from '@vkontakte/vkjs';
 import { useMergeProps } from '../../hooks/useMergeProps';
-import { onLabelClickWrapper } from '../../lib/onLabelClickWrapper';
 import { warnOnce } from '../../lib/warnOnce';
+import { withLabelClickWrapper } from '../../lib/withLabelClickWrapper';
 import type { HasDataAttribute, HasRootRef } from '../../types';
 import { SelectionControl } from '../SelectionControl/SelectionControl';
 import { SelectionControlLabel } from '../SelectionControl/SelectionControlLabel/SelectionControlLabel';
@@ -145,7 +145,7 @@ const CheckboxComponent = ({
       hasActive={hasActive}
       focusVisibleMode={focusVisibleMode}
       noPadding={noPadding}
-      onClick={onLabelClickWrapper(onClick)}
+      onClick={withLabelClickWrapper(onClick)}
       {...rootRest}
     >
       <CheckboxInput
diff --git a/packages/vkui/src/components/Checkbox/CheckboxSimple/CheckboxSimple.tsx b/packages/vkui/src/components/Checkbox/CheckboxSimple/CheckboxSimple.tsx
@@ -3,7 +3,7 @@
 import { classNames } from '@vkontakte/vkjs';
 import { useAdaptivity } from '../../../hooks/useAdaptivity';
 import { useMergeProps } from '../../../hooks/useMergeProps';
-import { onLabelClickWrapper } from '../../../lib/onLabelClickWrapper';
+import { withLabelClickWrapper } from '../../../lib/withLabelClickWrapper';
 import { Tappable } from '../../Tappable/Tappable';
 import type { CheckboxProps } from '../Checkbox';
 import { CheckboxInput } from '../CheckboxInput/CheckboxInput';
@@ -95,7 +95,7 @@ export function CheckboxSimple({
       hasActive={hasActive}
       focusVisibleMode={focusVisibleMode}
       Component="label"
-      onClick={onLabelClickWrapper(onClick)}
+      onClick={withLabelClickWrapper(onClick)}
       {...rootRest}
     >
       <CheckboxInput
diff --git a/packages/vkui/src/components/Radio/Radio.tsx b/packages/vkui/src/components/Radio/Radio.tsx
@@ -3,8 +3,8 @@
 import * as React from 'react';
 import { classNames } from '@vkontakte/vkjs';
 import { useMergeProps } from '../../hooks/useMergeProps';
-import { onLabelClickWrapper } from '../../lib/onLabelClickWrapper';
 import { warnOnce } from '../../lib/warnOnce';
+import { withLabelClickWrapper } from '../../lib/withLabelClickWrapper';
 import type { HasDataAttribute, HasRootRef } from '../../types';
 import { SelectionControl } from '../SelectionControl/SelectionControl';
 import { SelectionControlLabel } from '../SelectionControl/SelectionControlLabel/SelectionControlLabel';
@@ -148,7 +148,7 @@ export const Radio = ({
       hasActive={hasActive}
       focusVisibleMode={focusVisibleMode}
       disabled={inputRest.disabled}
-      onClick={onLabelClickWrapper(onRootClick)}
+      onClick={withLabelClickWrapper(onRootClick)}
       {...rootRest}
     >
       <RadioInput slotProps={{ input: inputRest }} />
diff --git a/packages/vkui/src/components/Switch/Switch.tsx b/packages/vkui/src/components/Switch/Switch.tsx
@@ -9,8 +9,8 @@ import { useFocusVisibleClassName } from '../../hooks/useFocusVisibleClassName';
 import { useMergeProps } from '../../hooks/useMergeProps';
 import { usePlatform } from '../../hooks/usePlatform';
 import { callMultiple } from '../../lib/callMultiple';
-import { onLabelClickWrapper } from '../../lib/onLabelClickWrapper';
 import { warnOnce } from '../../lib/warnOnce';
+import { withLabelClickWrapper } from '../../lib/withLabelClickWrapper';
 import type { HasDataAttribute, HasRootRef } from '../../types';
 import { RootComponent } from '../RootComponent/RootComponent';
 import { VisuallyHidden, type VisuallyHiddenProps } from '../VisuallyHidden/VisuallyHidden';
@@ -172,7 +172,7 @@ export const Switch = ({
         isRtl && styles.rtl,
         focusVisibleClassNames,
       )}
-      onClick={onLabelClickWrapper(onRootClick)}
+      onClick={withLabelClickWrapper(onRootClick)}
       {...rootRest}
     >
       <VisuallyHidden baseClassName={styles.inputNative} {...inputProps} />
diff --git a/packages/vkui/src/lib/onLabelClickWrapper.ts b/packages/vkui/src/lib/onLabelClickWrapper.ts
diff --git a/packages/vkui/src/lib/withLabelClickWrapper.ts b/packages/vkui/src/lib/withLabelClickWrapper.ts
@@ -0,0 +1,14 @@
+import type * as React from 'react';
+
+export const withLabelClickWrapper = (
+  onClick?: React.MouseEventHandler<HTMLLabelElement>,
+): React.MouseEventHandler<HTMLLabelElement> | undefined => {
+  if (onClick) {
+    return (event) => {
+      if ((event.target as HTMLElement).tagName === 'INPUT') {
+        onClick(event);
+      }
+    };
+  }
+  return undefined;
+};
