@vkontakte/vkui 7.11.5 → 7.11.7

package/src/lib/floating/useFloatingWithInteractions/useFloatingWithInteractions.ts

@@ -6,6 +6,7 @@ import { useGlobalOnClickOutside } from '../../../hooks/useGlobalOnClickOutside'
 import { useStableCallback } from '../../../hooks/useStableCallback';
 import { contains, getActiveElementByAnotherElement } from '../../dom';
 import { useIsomorphicLayoutEffect } from '../../useIsomorphicLayoutEffect';
+import { LockFloatingPositionContext } from '../LockFloatingPosition/LockFloatingPosition';
 import { autoUpdateFloatingElement, useFloating } from '../adapters';
 import { convertFloatingDataToReactCSSProperties } from '../functions';
 import { type UseFloatingOptions } from '../types/common';
@@ -83,12 +84,14 @@ export const useFloatingWithInteractions = <T extends HTMLElement = HTMLElement>
 
   const { triggerOnFocus, triggerOnClick, triggerOnHover } = useResolveTriggerType(trigger);
 
+  const isLock = React.useContext(LockFloatingPositionContext);
+
   // Библиотека `floating-ui`
   const { placement, x, y, strategy, refs, middlewareData } = useFloating<T>({
     strategy: strategyProp,
     placement: placementProp,
     middleware: middlewares,
-    whileElementsMounted,
+    whileElementsMounted: isLock ? undefined : whileElementsMounted,
   });
 
   const commitShownLocalState = React.useCallback(

package/src/lib/sheet/controllers/BottomSheetController.ts

@@ -321,9 +321,19 @@ export class BottomSheetController {
       sheetScrollEl.contains(targetEl) &&
       sheetScrollEl.scrollHeight > sheetScrollEl.clientHeight
     ) {
-      sheetScrollEl.style.setProperty('overflow-y', 'hidden');
+      const scrollbarWidth = sheetScrollEl.offsetWidth - sheetScrollEl.clientWidth;
+
+      Object.assign(sheetScrollEl.style, {
+        paddingInlineEnd: `${scrollbarWidth}px`,
+        overflowY: 'hidden',
+        boxSizing: 'border-box',
+      });
       return function dispose() {
-        sheetScrollEl.style.removeProperty('overflow-y');
+        Object.assign(sheetScrollEl.style, {
+          paddingInlineEnd: '',
+          overflowY: '',
+          boxSizing: '',
+        });
       };
     }
     return noop;