From b7a32df33902ca615e9f4e115ade24db57cab4f0 Mon Sep 17 00:00:00 2001 From: MksmOrlov Date: Thu, 18 Jan 2024 14:43:26 +0300 Subject: [PATCH] fix: iframe z-index --- src/components/Popup/Popup.tsx | 34 ---------------------- src/components/Popup/index.tsx | 1 - src/components/Popup/styled.ts | 23 --------------- src/components/Scg/Scg.tsx | 3 +- src/components/ScgPage/ScgPage.module.scss | 2 +- 5 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 src/components/Popup/Popup.tsx delete mode 100644 src/components/Popup/index.tsx delete mode 100644 src/components/Popup/styled.ts diff --git a/src/components/Popup/Popup.tsx b/src/components/Popup/Popup.tsx deleted file mode 100644 index df64dbb..0000000 --- a/src/components/Popup/Popup.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import {FC, useCallback, useEffect, ReactNode, PropsWithChildren} from 'react'; -import ReactDOM from 'react-dom'; - -import { ModalWrap, Overlay } from './styled'; - -const body = document.body; - -interface IProps { - onClose: () => void; -} - -export const Popup: FC> = ({ children, onClose }) => { - const closeByEscape = useCallback( - (e: KeyboardEvent) => { - if (e.key === 'Escape') { - onClose(); - } - }, - [onClose], - ); - - useEffect(() => { - window.addEventListener('keydown', (e) => closeByEscape(e)); - return window.removeEventListener('keydown', (e) => closeByEscape(e)); - }, [onClose, closeByEscape]); - - return ReactDOM.createPortal( - <> - onClose()} /> - {children} - , - body, - ); -}; diff --git a/src/components/Popup/index.tsx b/src/components/Popup/index.tsx deleted file mode 100644 index 95a491c..0000000 --- a/src/components/Popup/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from './Popup'; diff --git a/src/components/Popup/styled.ts b/src/components/Popup/styled.ts deleted file mode 100644 index 0b4d0cb..0000000 --- a/src/components/Popup/styled.ts +++ /dev/null @@ -1,23 +0,0 @@ -import styled from 'styled-components'; - -export const Overlay = styled.div` - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - - background-color: rgba(250, 250, 250, 0.65); - - z-index: 5; -`; - -export const ModalWrap = styled.div` - position: fixed; - top: 50%; - left: 50%; - - transform: translate(-50%, -50%); - - z-index: 5; -`; diff --git a/src/components/Scg/Scg.tsx b/src/components/Scg/Scg.tsx index f654911..68ccd0a 100644 --- a/src/components/Scg/Scg.tsx +++ b/src/components/Scg/Scg.tsx @@ -1,9 +1,8 @@ -import { langToKeynode, snakeToCamelCase, useBooleanState, useLanguage } from 'ostis-ui-lib'; +import { langToKeynode, snakeToCamelCase, useBooleanState, useLanguage, Popup } from 'ostis-ui-lib'; import { FC, useEffect, useRef, useState } from 'react'; import { scUtils } from '@api'; import { removeFromCache } from '@api/requests/scn'; import { ConfirmAction } from '@components/ConfirmAction'; -import { Popup } from '@components/Popup'; import { scgUrl } from '@constants'; import { confirmClearScenePopupContent, confirmDeletePopupContent } from './constants'; import { Frame, StyledSpinner, Wrap } from './styled'; diff --git a/src/components/ScgPage/ScgPage.module.scss b/src/components/ScgPage/ScgPage.module.scss index d2aacca..0219e2c 100644 --- a/src/components/ScgPage/ScgPage.module.scss +++ b/src/components/ScgPage/ScgPage.module.scss @@ -4,7 +4,7 @@ height: calc(100vh - 80px - 36px); top: 116px; right: 0; - z-index: 5; + z-index: 3; } .boundary {