diff --git a/VERSION b/VERSION index c412a4e..d2b9909 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.14.0 +4.14.1 diff --git a/play-life-web/package.json b/play-life-web/package.json index 8c0e449..8e796e8 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "4.14.0", + "version": "4.14.1", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/TaskDetail.css b/play-life-web/src/components/TaskDetail.css index 22a21bc..c8ca27e 100644 --- a/play-life-web/src/components/TaskDetail.css +++ b/play-life-web/src/components/TaskDetail.css @@ -1,6 +1,6 @@ /* Модальное окно */ .task-detail-modal-overlay { - position: fixed; + position: fixed !important; top: 0; left: 0; right: 0; @@ -9,7 +9,7 @@ display: flex; align-items: center; justify-content: center; - z-index: 1700; + z-index: 9999 !important; padding: 1rem; } diff --git a/play-life-web/src/components/TaskDetail.jsx b/play-life-web/src/components/TaskDetail.jsx index c590fba..bb22ff6 100644 --- a/play-life-web/src/components/TaskDetail.jsx +++ b/play-life-web/src/components/TaskDetail.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react' +import { createPortal } from 'react-dom' import { useAuth } from './auth/AuthContext' import LoadingError from './LoadingError' import Toast from './Toast' @@ -727,7 +728,7 @@ function TaskDetail({ taskId, onClose, onRefresh, onTaskCompleted, onNavigate }) - return ( + const modalContent = (
e.stopPropagation()}>
@@ -919,7 +920,11 @@ function TaskDetail({ taskId, onClose, onRefresh, onTaskCompleted, onNavigate }) )}
-) + ) + + return typeof document !== 'undefined' + ? createPortal(modalContent, document.body) + : modalContent } export default TaskDetail diff --git a/play-life-web/src/components/TaskList.css b/play-life-web/src/components/TaskList.css index ce19dac..c2b88d0 100644 --- a/play-life-web/src/components/TaskList.css +++ b/play-life-web/src/components/TaskList.css @@ -286,7 +286,7 @@ display: flex; align-items: center; justify-content: center; - z-index: 50; + z-index: 1000; } .task-postpone-modal { @@ -451,7 +451,7 @@ display: flex; align-items: center; justify-content: center; - z-index: 50; + z-index: 1000; } .task-modal { @@ -644,7 +644,7 @@ display: flex; align-items: center; justify-content: center; - z-index: 50; + z-index: 1000; } .task-add-modal { diff --git a/play-life-web/src/components/WishlistDetail.css b/play-life-web/src/components/WishlistDetail.css index 6b75fc7..611ebf7 100644 --- a/play-life-web/src/components/WishlistDetail.css +++ b/play-life-web/src/components/WishlistDetail.css @@ -1,6 +1,6 @@ /* Модальное окно */ .wishlist-detail-modal-overlay { - position: fixed; + position: fixed !important; top: 0; left: 0; right: 0; @@ -9,7 +9,7 @@ display: flex; align-items: center; justify-content: center; - z-index: 1700; + z-index: 9999 !important; padding: 1rem; } diff --git a/play-life-web/src/components/WishlistDetail.jsx b/play-life-web/src/components/WishlistDetail.jsx index e0ff084..ec69317 100644 --- a/play-life-web/src/components/WishlistDetail.jsx +++ b/play-life-web/src/components/WishlistDetail.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect, useCallback, useRef } from 'react' +import { createPortal } from 'react-dom' import { useAuth } from './auth/AuthContext' import TaskDetail from './TaskDetail' import LoadingError from './LoadingError' @@ -405,7 +406,7 @@ function WishlistDetail({ wishlistId, onNavigate, onRefresh, boardId, onClose, p } - return ( + const modalContent = (
e.stopPropagation()}>
@@ -648,6 +649,10 @@ function WishlistDetail({ wishlistId, onNavigate, onRefresh, boardId, onClose, p
) + + return typeof document !== 'undefined' + ? createPortal(modalContent, document.body) + : modalContent } export default WishlistDetail