6.12.0: Улучшения блока выбора доски в товарах и желаниях
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m5s
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m5s
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "play-life-web",
|
"name": "play-life-web",
|
||||||
"version": "6.11.5",
|
"version": "6.12.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ function BoardSelector({
|
|||||||
onBoardChange,
|
onBoardChange,
|
||||||
onBoardEdit,
|
onBoardEdit,
|
||||||
onAddBoard,
|
onAddBoard,
|
||||||
loading
|
loading,
|
||||||
|
showBoardAction = true
|
||||||
}) {
|
}) {
|
||||||
const [isOpen, setIsOpen] = useState(false)
|
const [isOpen, setIsOpen] = useState(false)
|
||||||
const dropdownRef = useRef(null)
|
const dropdownRef = useRef(null)
|
||||||
@@ -106,7 +107,7 @@ function BoardSelector({
|
|||||||
<span>Создать доску</span>
|
<span>Создать доску</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{selectedBoard && (
|
{selectedBoard && showBoardAction && (
|
||||||
<button
|
<button
|
||||||
className="dropdown-item board-action-item"
|
className="dropdown-item board-action-item"
|
||||||
onClick={(e) => { setIsOpen(false); onBoardEdit() }}
|
onClick={(e) => { setIsOpen(false); onBoardEdit() }}
|
||||||
|
|||||||
@@ -17,6 +17,8 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
max-width: none;
|
max-width: none;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shopping-close-btn {
|
.shopping-close-btn {
|
||||||
|
|||||||
@@ -539,6 +539,7 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia
|
|||||||
onBoardEdit={handleBoardEdit}
|
onBoardEdit={handleBoardEdit}
|
||||||
onAddBoard={handleAddBoard}
|
onAddBoard={handleAddBoard}
|
||||||
loading={boardsLoading}
|
loading={boardsLoading}
|
||||||
|
showBoardAction={false}
|
||||||
/>
|
/>
|
||||||
<button className="shopping-close-btn" onClick={() => window.history.back()}>✕</button>
|
<button className="shopping-close-btn" onClick={() => window.history.back()}>✕</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -680,6 +680,7 @@ function Wishlist({ onNavigate, refreshTrigger = 0, isActive = false, initialBoa
|
|||||||
onBoardEdit={handleBoardEdit}
|
onBoardEdit={handleBoardEdit}
|
||||||
onAddBoard={handleAddBoard}
|
onAddBoard={handleAddBoard}
|
||||||
loading={boardsLoading}
|
loading={boardsLoading}
|
||||||
|
showBoardAction={false}
|
||||||
/>
|
/>
|
||||||
<LoadingError onRetry={() => fetchItems()} />
|
<LoadingError onRetry={() => fetchItems()} />
|
||||||
</div>
|
</div>
|
||||||
@@ -696,6 +697,7 @@ function Wishlist({ onNavigate, refreshTrigger = 0, isActive = false, initialBoa
|
|||||||
onBoardEdit={handleBoardEdit}
|
onBoardEdit={handleBoardEdit}
|
||||||
onAddBoard={handleAddBoard}
|
onAddBoard={handleAddBoard}
|
||||||
loading={boardsLoading}
|
loading={boardsLoading}
|
||||||
|
showBoardAction={false}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{/* Основной список */}
|
{/* Основной список */}
|
||||||
|
|||||||
Reference in New Issue
Block a user