ebta-workflow-prod 4.1.1 → 4.1.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "ebta-workflow-prod",
     "private": false,
-    "version": "4.1.1",
+    "version": "4.1.3",
     "description": "",
     "license": "UNLICENSED",
     "author": "",

package/src/elements/AttributeFilter.tsx

@@ -1310,6 +1310,8 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
             setProperty("filteredValues" as any, filterrangeResult)
         };
 
+        const normalizeNumber = (value: number) => Number(value.toFixed(1));
+
         const maxStringLength = 28
         function itemText(item: fieldValue, type?: string) {
             let rawResult: string = ''
@@ -1398,7 +1400,7 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
                                             const newStart = event.target.value ? dayjs(event.target.value) : startDate;
                                             handleDateRangeChange(newStart, endDate);
                                         }}
-                                        style={{ color: 'var(--accentIconBorder)', border: '1px solid var(--accentIconBorder)', borderRadius: 4, padding: '4px 8px', marginRight: 8 }}
+                                        style={{ color: 'var(--accentIconBorder)', backgroundColor: '#fff', colorScheme: 'light', border: '1px solid var(--accentIconBorder)', borderRadius: 4, padding: '4px 8px', marginRight: 8 }}
                                     />
                                     <span>to</span>
                                     <input
@@ -1410,42 +1412,44 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
                                             const newEnd = event.target.value ? dayjs(event.target.value) : endDate;
                                             handleDateRangeChange(startDate, newEnd);
                                         }}
-                                        style={{ color: 'var(--accentIconBorder)', border: '1px solid var(--accentIconBorder)', borderRadius: 4, padding: '4px 8px', marginLeft: 8 }}
+                                        style={{ color: 'var(--accentIconBorder)', backgroundColor: '#fff', colorScheme: 'light', border: '1px solid var(--accentIconBorder)', borderRadius: 4, padding: '4px 8px', marginLeft: 8 }}
                                     />
                                 </Box>
                                 :
                                 ISnumberAttribute && (attribute.uniqValue.length > 6) ?
                                     //Display String search or number Range , don't display if value amount is limited
                                     <Box display="flex" alignItems="center">
-                                        <CustomNumberInput aria-label="min value input" placeholder={`Min  (${attributeMin} ~ ${attributeMax})`} min={attributeMin - 1} max={attributeMax + 1}
-                                            value={minValue == -Infinity ? undefined : minValue} step={0.1}
+                                        <CustomNumberInput aria-label="min value input" placeholder={`Min  (${normalizeNumber(attributeMin)} ~ ${normalizeNumber(attributeMax)})`} min={attributeMin - 1} max={attributeMax + 1}
+                                            value={minValue == -Infinity ? undefined : normalizeNumber(minValue)} step={0.1}
                                             onChange={(event, val) => {
-                                                if (((val || val == 0) && (val <= maxValue))) { setProperty("minValue" as any, val) };
-                                                if (val == undefined || val == null) { setProperty("minValue" as any, -Infinity) };
+                                                const normalizedValue = typeof val === 'number' ? normalizeNumber(val) : val;
+                                                if (((normalizedValue || normalizedValue == 0) && (normalizedValue <= maxValue))) { setProperty("minValue" as any, normalizedValue) };
+                                                if (normalizedValue == undefined || normalizedValue == null) { setProperty("minValue" as any, -Infinity) };
 
-                                                if ((val || val == 0) && val > maxValue) {
+                                                if ((normalizedValue || normalizedValue == 0) && normalizedValue > maxValue) {
                                                     setProperty("minValue" as any, maxValue - 1)
                                                     const filterrangeResult = filterRange(attribute, maxValue - 1, maxValue)
                                                     setProperty("filteredValues" as any, filterrangeResult)
                                                 }
                                                 else {
-                                                    const filterrangeResult = filterRange(attribute, val !== null ? val : -Infinity, maxValue !== Infinity ? maxValue : Infinity)
+                                                    const filterrangeResult = filterRange(attribute, normalizedValue !== null && normalizedValue !== undefined ? normalizedValue : -Infinity, maxValue !== Infinity ? maxValue : Infinity)
                                                     setProperty("filteredValues" as any, filterrangeResult)
                                                 }
                                             }}
                                         />
-                                        <CustomNumberInput aria-label="max value input" placeholder={`Max  (${attributeMin} ~ ${attributeMax})`} min={attributeMin - 1} max={attributeMax + 1}
-                                            value={maxValue == Infinity ? undefined : maxValue} step={0.1}
+                                        <CustomNumberInput aria-label="max value input" placeholder={`Max  (${normalizeNumber(attributeMin)} ~ ${normalizeNumber(attributeMax)})`} min={attributeMin - 1} max={attributeMax + 1}
+                                            value={maxValue == Infinity ? undefined : normalizeNumber(maxValue)} step={0.1}
                                             onChange={(_event, val) => {
-                                                if ((val || val == 0) && (val >= minValue)) { setProperty("maxValue" as any, val) };
-                                                if (val == undefined) { setProperty("maxValue" as any, Infinity) };
-                                                if ((val || val == 0) && val < minValue) {
+                                                const normalizedValue = typeof val === 'number' ? normalizeNumber(val) : val;
+                                                if ((normalizedValue || normalizedValue == 0) && (normalizedValue >= minValue)) { setProperty("maxValue" as any, normalizedValue) };
+                                                if (normalizedValue == undefined || normalizedValue == null) { setProperty("maxValue" as any, Infinity) };
+                                                if ((normalizedValue || normalizedValue == 0) && normalizedValue < minValue) {
                                                     setProperty("maxValue" as any, minValue + 1)
                                                     const filterrangeResult = filterRange(attribute, minValue, minValue + 1)
                                                     setProperty("filteredValues" as any, filterrangeResult)
                                                 }
                                                 else {
-                                                    const filterrangeResult = filterRange(attribute, minValue !== -Infinity ? minValue : -Infinity, val !== null ? val : Infinity || Infinity)
+                                                    const filterrangeResult = filterRange(attribute, minValue !== -Infinity ? minValue : -Infinity, normalizedValue !== null && normalizedValue !== undefined ? normalizedValue : Infinity)
                                                     setProperty("filteredValues" as any, filterrangeResult)
                                                 }
                                             }}

package/src/elements/modules/AttributeFilterEasyComp.tsx

@@ -114,6 +114,16 @@ const StyledButton =  styled('button')(
   `,
 )
 
+const StyledIncrementButton = styled(StyledButton)({
+  gridColumn: 2,
+  gridRow: 1,
+});
+
+const StyledDecrementButton = styled(StyledButton)({
+  gridColumn: 2,
+  gridRow: 2,
+});
+
  
 
 
@@ -151,17 +161,15 @@ const CustomNumberInput = React.forwardRef(function CustomNumberInput(
       slots={{
         root: StyledInputRoot,
         input: StyledInputElement,
-        incrementButton: StyledButton,
-        decrementButton: StyledButton,
+        incrementButton: StyledIncrementButton,
+        decrementButton: StyledDecrementButton,
       }}
       slotProps={{
         incrementButton: {
-          children: 'Increase value',
-          'aria-label': 'Increase value',
+          children: '▴',
         },
         decrementButton: {
-          children: 'Decrease value',
-          'aria-label': 'Decrease value',
+          children: '▾',
         },
       }}
       {...props}