From 29a99e6f2cdd564e60b4512fd49f4fad7889a7f4 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Fri, 20 Nov 2020 18:44:15 +0700 Subject: [PATCH] fixed scroll --- .env_example | 5 +++-- src/containers/dialogs/BetterScrollDialog/index.tsx | 12 ++++++------ tsconfig.json | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.env_example b/.env_example index 0a7bb6cd..06034750 100644 --- a/.env_example +++ b/.env_example @@ -1,2 +1,3 @@ -API_HOST = http://localhost:3333 -REMOTE_CURRENT = http://localhost/7777 +REACT_APP_API_HOST = https://pig.staging.vault48.org/ +REACT_APP_REMOTE_CURRENT = https://pig.staging.vault48.org/static/ +EXPOSE = 4000 diff --git a/src/containers/dialogs/BetterScrollDialog/index.tsx b/src/containers/dialogs/BetterScrollDialog/index.tsx index 66f1a525..974702d3 100644 --- a/src/containers/dialogs/BetterScrollDialog/index.tsx +++ b/src/containers/dialogs/BetterScrollDialog/index.tsx @@ -1,8 +1,8 @@ -import React, { FC, MouseEventHandler, ReactElement, useEffect, useRef, } from 'react'; -import styles from './styles.module.scss'; -import { disableBodyScroll, enableBodyScroll } from 'body-scroll-lock'; -import { Icon } from '~/components/input/Icon'; -import { LoaderCircle } from '~/components/input/LoaderCircle'; +import React, { FC, MouseEventHandler, ReactElement, useEffect, useRef } from "react"; +import styles from "./styles.module.scss"; +import { clearAllBodyScrollLocks, disableBodyScroll } from "body-scroll-lock"; +import { Icon } from "~/components/input/Icon"; +import { LoaderCircle } from "~/components/input/LoaderCircle"; interface IProps { children: React.ReactChild; @@ -36,7 +36,7 @@ const BetterScrollDialog: FC = ({ useEffect(() => { disableBodyScroll(ref.current, { reserveScrollBarGap: true }); - return () => enableBodyScroll(ref.current); + return () => clearAllBodyScrollLocks(); }, [ref]); return ( diff --git a/tsconfig.json b/tsconfig.json index e61bed94..d0a4b9ad 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.paths.json", "compilerOptions": { - "target": "es5", + "target": "es6", "lib": [ "dom", "dom.iterable",