chore: rm types on hasOwnProperty

SevereCloud · SevereCloud · commit dd0a1200f13d · 2026-03-12T17:46:50.000+03:00
diff --git a/packages/vkui/global.d.ts b/packages/vkui/global.d.ts
@@ -23,9 +23,3 @@ interface MediaQueryList {
       options?: boolean | EventListenerOptions,
     ) => void);
 }
-
-// см. https://github.com/microsoft/TypeScript/issues/18282
-interface Object {
-  // eslint-disable-next-line @typescript-eslint/method-signature-style
-  hasOwnProperty<T>(this: T, v: PropertyKey): v is keyof T;
-}
diff --git a/packages/vkui/src/components/AppRoot/helpers.ts b/packages/vkui/src/components/AppRoot/helpers.ts
@@ -31,16 +31,18 @@ export function getSafeAreaInsetsAsCssVariables(
     return {};
   }
 
-  const cssVariables: Record<string, string> = {};
+  const cssVariables = Object.entries(safeAreaInsets).reduce<Record<string, string>>(
+    (result, [key, value]) => {
+      if (value === undefined) {
+        return result;
+      }
 
-  for (const key in safeAreaInsets) {
-    if (safeAreaInsets.hasOwnProperty(key) && typeof safeAreaInsets[key] === 'number') {
-      const propertyKey = `${CUSTOM_PROPERTY_INSET_PREFIX}${key}`;
-      const propertyValue = safeAreaInsets[key];
+      result[`${CUSTOM_PROPERTY_INSET_PREFIX}${key}`] = `${value}px`;
 
-      cssVariables[propertyKey] = `${propertyValue}px`;
-    }
-  }
+      return result;
+    },
+    {},
+  );
 
   return cssVariables;
 }
diff --git a/packages/vkui/src/components/ModalPage/ModalPageInternal.tsx b/packages/vkui/src/components/ModalPage/ModalPageInternal.tsx
@@ -225,7 +225,7 @@ export const ModalPageInternal = ({
   );
 };
 
-const desktopMaxWidthClassNames = {
+const desktopMaxWidthClassNames: Record<string, string | undefined> = {
   s: styles.hostDesktopMaxWidthS,
   m: styles.hostDesktopMaxWidthM,
   l: styles.hostDesktopMaxWidthL,
@@ -238,9 +238,12 @@ function resolveDesktopMaxWidth(
     return [undefined, { '--vkui_internal_ModalPage--desktopMaxWidth': `${desktopMaxWidth}px` }];
   }
 
-  return desktopMaxWidthClassNames.hasOwnProperty(desktopMaxWidth)
-    ? [desktopMaxWidthClassNames[desktopMaxWidth], undefined]
-    : [undefined, { '--vkui_internal_ModalPage--desktopMaxWidth': desktopMaxWidth }];
+  const className = desktopMaxWidthClassNames[desktopMaxWidth];
+  const style = className
+    ? undefined
+    : { '--vkui_internal_ModalPage--desktopMaxWidth': desktopMaxWidth };
+
+  return [className, style];
 }
 
 function getHeightCSSVariable(height?: number | string): CSSCustomProperties | undefined {
diff --git a/packages/vkui/src/helpers/getValueByKey.test.ts b/packages/vkui/src/helpers/getValueByKey.test.ts
@@ -7,8 +7,7 @@ describe('getRequiredValueByKey', () => {
   });
 
   it('should throw error when key does not exist', () => {
-    const map = { key1: 'value1' };
-    // @ts-expect-error: TS2345 функция, как и задумано, ругается на то, что ключа key2 нет в map
+    const map: Record<string, string> = { key1: 'value1' };
     expect(() => getRequiredValueByKey('key2', map)).toThrow('getRequiredValueByKey(key2)');
   });
 });
diff --git a/packages/vkui/src/helpers/getValueByKey.ts b/packages/vkui/src/helpers/getValueByKey.ts
@@ -3,16 +3,14 @@ export const getRequiredValueByKey = <VALUE, KEY extends PropertyKey = PropertyK
   map: Record<KEY, VALUE>,
 ): VALUE => {
   if (!map.hasOwnProperty(key)) {
-    throw new Error(`getRequiredValueByKey(${key})`);
+    throw new Error(`getRequiredValueByKey(${String(key)})`);
   }
   return map[key];
 };
 
 export const getValueByKey = <VALUE, KEY extends PropertyKey = PropertyKey>(
   key: KEY,
-  map: {
-    [key: string]: VALUE;
-  },
+  map: Record<any, VALUE>,
   defaultValue: VALUE,
 ): VALUE => {
   if (!map.hasOwnProperty(key)) {
diff --git a/packages/vkui/src/lib/animation/useCSSKeyframesAnimationController.test.ts b/packages/vkui/src/lib/animation/useCSSKeyframesAnimationController.test.ts
@@ -13,11 +13,9 @@ describe(useCSSKeyframesAnimationController, () => {
   };
 
   beforeEach(() => {
-    for (const key in callbacks) {
-      if (callbacks.hasOwnProperty(key)) {
-        callbacks[key].mockClear();
-      }
-    }
+    Object.values(callbacks).forEach((callback) => {
+      callback.mockClear();
+    });
   });
 
   describe.each([
diff --git a/packages/vkui/src/lib/animation/useCSSTransition.test.tsx b/packages/vkui/src/lib/animation/useCSSTransition.test.tsx
@@ -13,19 +13,15 @@ describe(useCSSTransition, () => {
   };
 
   beforeEach(() => {
-    for (const key in callbacks) {
-      if (callbacks.hasOwnProperty(key)) {
-        callbacks[key].mockClear();
-      }
-    }
+    Object.values(callbacks).forEach((value) => {
+      value.mockClear();
+    });
   });
 
   const expectEveryCallbacksHaveNotBeenCalled = () => {
-    for (const key in callbacks) {
-      if (callbacks.hasOwnProperty(key)) {
-        expect(callbacks[key]).toHaveBeenCalledTimes(0);
-      }
-    }
+    Object.values(callbacks).forEach((value) => {
+      expect(value).toHaveBeenCalledTimes(0);
+    });
   };
 
   describe('first mount', () => {
