Support min/max in value editor

Gnome-Archiviste · Apr 20, 2024 · fdd742c · fdd742c
1 parent 220d864
commit fdd742c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/src/app/actor/character-sheet-stats.component.html b/src/app/actor/character-sheet-stats.component.html
@@ -2,7 +2,7 @@
     <fieldset class="stat health">
         <legend>{{'Misc.Stat.health' | translate}}</legend>
         <div class="value">
-            <lvl0-relative-value-editor [value$]="characterHealth$" (onChange)="updateHealth($event)">
+            <lvl0-relative-value-editor [value$]="characterHealth$" [min]="0" [max]="characterMaxHealth$ | async" (onChange)="updateHealth($event)">
                 {{characterHealth$ | async}} / {{characterMaxHealth$ | async}}
             </lvl0-relative-value-editor>
         </div>
@@ -24,7 +24,7 @@
     <fieldset class="stat mana">
         <legend>{{'Misc.Stat.mana' | translate}}</legend>
         <div class="value">
-            <lvl0-relative-value-editor [value$]="characterMana$" (onChange)="updateMana($event)">
+            <lvl0-relative-value-editor [value$]="characterMana$" [min]="0" [max]="characterMaxMana$ | async"  (onChange)="updateMana($event)">
                 {{characterMana$ | async}} / {{characterMaxMana$ | async}}
             </lvl0-relative-value-editor>
         </div>

diff --git a/src/app/actor/relative-value-editor.component.html b/src/app/actor/relative-value-editor.component.html
@@ -23,7 +23,10 @@
             </div>
             <div class="help-message">
                 <i class="fa fa-info-circle"></i>
-                <span>Vous pouvez utiliser des valeur relative tel que '+3' ou '-5' pour augmenter ou réduire la valeur, ou mettre une nouvelle valeur absolue.</span>
+                <div>
+                    <div>Vous pouvez utiliser des valeur relative tel que '+3' ou '-5' pour augmenter ou réduire la valeur, ou mettre une nouvelle valeur absolue.</div>
+                    <div *ngIf="max">Vous pouvez utiliser <code>min</code> ou <code>max</code> pour mettre la valeur maximum ou minimum.</div>
+                </div>
             </div>
         </div>
     </div>

diff --git a/src/app/actor/relative-value-editor.component.ts b/src/app/actor/relative-value-editor.component.ts
@@ -1,4 +1,15 @@
-import {Component, ElementRef, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output, ViewChild} from '@angular/core';
+import {
+    Component,
+    ElementRef,
+    EventEmitter,
+    Input,
+    NgZone,
+    numberAttribute,
+    OnDestroy,
+    OnInit,
+    Output,
+    ViewChild
+} from '@angular/core';
 import {Observable, Subscription} from 'rxjs';
 import {CdkMenu} from '@angular/cdk/menu';
 
@@ -14,6 +25,10 @@ export class RelativeValueEditorComponent implements OnInit, OnDestroy {
     value$?: Observable<number>;
     @Input('value')
     value?: number;
+    @Input({transform: numberAttribute, alias: 'max'})
+    max?: number;
+    @Input('min')
+    min?: number;
     @ViewChild('editField', {static: false})
     editField?: ElementRef<HTMLInputElement>
     @Input('editable')
@@ -58,13 +73,20 @@ export class RelativeValueEditorComponent implements OnInit, OnDestroy {
         menuContent.menuStack.closeAll();
         if (!this.fieldValue)
             return;
-        let newValue = this.valueSnapshot;
-        if (this.fieldValue.startsWith('+')) {
-            newValue += parseInt(this.fieldValue.substring(1));
-        } else if (this.fieldValue.startsWith('-')) {
-            newValue += parseInt(this.fieldValue);
+        let newValue = NaN;
+        if (this.fieldValue === 'max') {
+            newValue = this.max ?? NaN;
+        } else if (this.fieldValue === 'min') {
+            newValue = this.min ?? NaN;
         } else {
-            newValue = parseInt(this.fieldValue);
+            newValue = this.valueSnapshot;
+            if (this.fieldValue.startsWith('+')) {
+                newValue += parseInt(this.fieldValue.substring(1));
+            } else if (this.fieldValue.startsWith('-')) {
+                newValue += parseInt(this.fieldValue);
+            } else {
+                newValue = parseInt(this.fieldValue);
+            }
         }
         if (isNaN(newValue))
             return;