From 7ec76ea59b7eb9a8a16498644396689ddade1a88 Mon Sep 17 00:00:00 2001 From: poignatov Date: Sun, 15 Mar 2026 18:13:20 +0300 Subject: [PATCH] =?UTF-8?q?6.18.0:=20=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0?= =?UTF-8?q?=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=B0=20=D0=B8=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- play-life-web/package.json | 2 +- play-life-web/src/components/ShoppingItemDetail.jsx | 3 ++- play-life-web/src/components/TaskDetail.css | 4 ++++ play-life-web/src/components/TaskDetail.jsx | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 2c2a151..1b386a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.17.5 +6.18.0 diff --git a/play-life-web/package.json b/play-life-web/package.json index f6423fd..cf827ee 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "6.17.5", + "version": "6.18.0", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/ShoppingItemDetail.jsx b/play-life-web/src/components/ShoppingItemDetail.jsx index f0f7fea..8d1dd9d 100644 --- a/play-life-web/src/components/ShoppingItemDetail.jsx +++ b/play-life-web/src/components/ShoppingItemDetail.jsx @@ -196,7 +196,8 @@ function ShoppingItemDetail({ itemId, onClose, onRefresh, onItemCompleted, onNav type="button" className="progression-control-btn progression-control-plus" onClick={() => { - const current = parseFloat(volumeValue) || 0 + const base = item.last_volume ?? item.volume_base ?? 1 + const current = volumeValue.trim() ? parseFloat(volumeValue) : base const step = item.volume_base || 1 setVolumeValue((current + step).toString()) }} diff --git a/play-life-web/src/components/TaskDetail.css b/play-life-web/src/components/TaskDetail.css index ce5ceda..7234619 100644 --- a/play-life-web/src/components/TaskDetail.css +++ b/play-life-web/src/components/TaskDetail.css @@ -218,6 +218,10 @@ flex: 1; } +.shopping-item-complete-row .progression-label { + margin-bottom: 0; +} + .shopping-item-complete-row + .task-action-left { margin-top: 0.75rem; } diff --git a/play-life-web/src/components/TaskDetail.jsx b/play-life-web/src/components/TaskDetail.jsx index da9ca7c..552e4e4 100644 --- a/play-life-web/src/components/TaskDetail.jsx +++ b/play-life-web/src/components/TaskDetail.jsx @@ -840,7 +840,8 @@ function TaskDetail({ taskId, onClose, onRefresh, onTaskCompleted, onNavigate }) type="button" className="progression-control-btn progression-control-plus" onClick={() => { - const current = parseFloat(progressionValue) || 0 + const base = task.progression_base ?? 1 + const current = progressionValue.trim() ? parseFloat(progressionValue) : base const step = task.progression_base || 1 setProgressionValue((current + step).toString()) }}