@axelor/aos-mobile-ui 9.2.1 → 9.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/molecules/Increment/Increment.js +121 -65
- package/lib/components/molecules/Increment/Increment.js.map +1 -1
- package/lib/components/molecules/Increment/number.helper.d.ts +7 -0
- package/lib/components/molecules/Increment/number.helper.js +85 -0
- package/lib/components/molecules/Increment/number.helper.js.map +1 -0
- package/lib/components/templates/BottomBar/BarItem.js +3 -2
- package/lib/components/templates/BottomBar/BarItem.js.map +1 -1
- package/lib/utils/formatters.d.ts +5 -0
- package/lib/utils/formatters.js +15 -1
- package/lib/utils/formatters.js.map +1 -1
- package/package.json +1 -1
|
@@ -19,35 +19,34 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
|
|
19
19
|
import { Platform, StyleSheet, TouchableOpacity, View, } from 'react-native';
|
|
20
20
|
import { useDigitFormat, useOutsideClickHandler } from '../../../hooks';
|
|
21
21
|
import { useThemeColor } from '../../../theme';
|
|
22
|
-
import { formatNumber
|
|
22
|
+
import { formatNumber } from '../../../utils';
|
|
23
23
|
import { Input } from '../../atoms';
|
|
24
24
|
import IncrementButton from './IncrementButton';
|
|
25
|
+
import { parseTypedNumber, toEditText, toNumber, } from './number.helper';
|
|
25
26
|
const Increment = ({ style, inputStyle, value, decimalSpacer, thousandSpacer, onValueChange, onFocus, onBlur, readonly = false, defaultFormatting = true, stepSize = 1, minValue = 0, maxValue, isBigButton = false, keyboardType = 'numeric', scale, }) => {
|
|
26
27
|
const Colors = useThemeColor();
|
|
27
28
|
const cutDecimalExcess = useDigitFormat();
|
|
28
29
|
const containerRef = useRef(null);
|
|
29
30
|
const inputRef = useRef(null);
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
/*
|
|
32
|
+
* The value given by the parent is the source of truth. The draft is the text
|
|
33
|
+
* typed while the field is being edited; it is null the rest of the time.
|
|
34
|
+
* The ref copy lets blur and outside click commit the draft only once.
|
|
35
|
+
*/
|
|
36
|
+
const [draft, setDraft] = useState(null);
|
|
37
|
+
const draftRef = useRef(null);
|
|
38
|
+
const isEditedRef = useRef(false);
|
|
39
|
+
const isSelectionPendingRef = useRef(false);
|
|
40
|
+
const separators = useMemo(() => ({
|
|
41
|
+
decimalSpacer: decimalSpacer ?? '.',
|
|
42
|
+
thousandSpacer: thousandSpacer ?? ' ',
|
|
43
|
+
}), [decimalSpacer, thousandSpacer]);
|
|
44
|
+
const committedNumber = useMemo(() => toNumber(value), [value]);
|
|
45
|
+
const roundToText = useCallback((numberToRound) => {
|
|
33
46
|
if (scale == null)
|
|
34
|
-
return cutDecimalExcess(
|
|
35
|
-
|
|
36
|
-
const _value = typeof numberToFormat === 'string'
|
|
37
|
-
? parseFloat(numberToFormat)
|
|
38
|
-
: numberToFormat;
|
|
39
|
-
return _value.toFixed(_scale);
|
|
47
|
+
return cutDecimalExcess(numberToRound);
|
|
48
|
+
return toNumber(numberToRound).toFixed(Math.max(scale, 0));
|
|
40
49
|
}, [cutDecimalExcess, scale]);
|
|
41
|
-
const format = useCallback((number) => _format(number, decimalSpacer, thousandSpacer, handleDecimal), [handleDecimal, decimalSpacer, thousandSpacer]);
|
|
42
|
-
const unformat = useCallback((number) => _unformat(number, decimalSpacer, thousandSpacer), [decimalSpacer, thousandSpacer]);
|
|
43
|
-
const handleValueFormatting = useCallback((_value) => {
|
|
44
|
-
if (defaultFormatting) {
|
|
45
|
-
setValueQty(format(_value));
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
setValueQty(typeof _value === 'string' ? _value : _value.toString());
|
|
49
|
-
}
|
|
50
|
-
}, [defaultFormatting, format]);
|
|
51
50
|
const clampValue = useCallback((_value) => {
|
|
52
51
|
if (minValue != null && _value <= minValue)
|
|
53
52
|
return minValue;
|
|
@@ -55,65 +54,122 @@ const Increment = ({ style, inputStyle, value, decimalSpacer, thousandSpacer, on
|
|
|
55
54
|
return maxValue;
|
|
56
55
|
return _value;
|
|
57
56
|
}, [maxValue, minValue]);
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
57
|
+
const isInRange = useCallback((_value) => (minValue == null || _value >= minValue) &&
|
|
58
|
+
(maxValue == null || _value <= maxValue), [maxValue, minValue]);
|
|
59
|
+
/* The value sent is rounded like the value shown, then kept within limits. */
|
|
60
|
+
const normalize = useCallback((_value) => clampValue(parseFloat(roundToText(_value))), [clampValue, roundToText]);
|
|
61
|
+
const getDisplayText = useCallback((_value) => defaultFormatting
|
|
62
|
+
? formatNumber(_value, separators.decimalSpacer, separators.thousandSpacer, roundToText)
|
|
63
|
+
: _value.toString(), [defaultFormatting, roundToText, separators]);
|
|
64
|
+
const getEditText = useCallback((_value) => defaultFormatting
|
|
65
|
+
? toEditText(_value, separators, roundToText)
|
|
66
|
+
: _value.toString(), [defaultFormatting, roundToText, separators]);
|
|
67
|
+
const updateDraft = useCallback((text) => {
|
|
68
|
+
draftRef.current = text;
|
|
69
|
+
setDraft(text);
|
|
70
|
+
}, []);
|
|
71
|
+
const getCurrentNumber = useCallback(() => {
|
|
72
|
+
if (draftRef.current == null)
|
|
73
|
+
return committedNumber;
|
|
74
|
+
return parseTypedNumber(draftRef.current, separators) ?? committedNumber;
|
|
75
|
+
}, [committedNumber, separators]);
|
|
76
|
+
const handleFocus = () => {
|
|
77
|
+
if (draftRef.current == null) {
|
|
78
|
+
isEditedRef.current = false;
|
|
79
|
+
isSelectionPendingRef.current = true;
|
|
80
|
+
updateDraft(getEditText(committedNumber));
|
|
81
|
+
}
|
|
82
|
+
onFocus?.();
|
|
83
|
+
};
|
|
84
|
+
/*
|
|
85
|
+
* The whole text to edit is selected once it is shown: selecting it in the
|
|
86
|
+
* focus handler would apply to the formatted text that it replaces.
|
|
87
|
+
*/
|
|
69
88
|
useEffect(() => {
|
|
70
|
-
if (
|
|
89
|
+
if (draft == null || !isSelectionPendingRef.current)
|
|
71
90
|
return;
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
if (unformattedValue === '' || unformattedValue == null) {
|
|
88
|
-
handleResult(0);
|
|
91
|
+
isSelectionPendingRef.current = false;
|
|
92
|
+
inputRef.current?.setSelection?.(0, draft.length);
|
|
93
|
+
}, [draft]);
|
|
94
|
+
const handleInputChange = (text) => {
|
|
95
|
+
const typedText = text ?? '';
|
|
96
|
+
isEditedRef.current = true;
|
|
97
|
+
updateDraft(typedText);
|
|
98
|
+
// Text that is not a number yet, like "-" or "12,3,", sends nothing.
|
|
99
|
+
const typedNumber = parseTypedNumber(typedText, separators);
|
|
100
|
+
if (typedNumber == null)
|
|
101
|
+
return;
|
|
102
|
+
const roundedNumber = parseFloat(roundToText(typedNumber));
|
|
103
|
+
if (maxValue != null && roundedNumber > maxValue && roundedNumber >= 0) {
|
|
104
|
+
// More digits cannot bring a positive value back under the maximum.
|
|
105
|
+
onValueChange(maxValue);
|
|
89
106
|
}
|
|
90
|
-
else {
|
|
91
|
-
|
|
107
|
+
else if (isInRange(roundedNumber)) {
|
|
108
|
+
// A value under the minimum may still be typed, like "1" for "12".
|
|
109
|
+
onValueChange(roundedNumber);
|
|
92
110
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
111
|
+
};
|
|
112
|
+
const commitDraft = useCallback(() => {
|
|
113
|
+
const typedText = draftRef.current;
|
|
114
|
+
if (typedText == null)
|
|
115
|
+
return;
|
|
116
|
+
const isEdited = isEditedRef.current;
|
|
117
|
+
isEditedRef.current = false;
|
|
118
|
+
isSelectionPendingRef.current = false;
|
|
119
|
+
updateDraft(null);
|
|
120
|
+
if (isEdited) {
|
|
121
|
+
let nextNumber = committedNumber;
|
|
122
|
+
if (typedText.trim() === '') {
|
|
123
|
+
nextNumber = normalize(0);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
/*
|
|
127
|
+
* Text that is not a number keeps the last valid number typed, which
|
|
128
|
+
* was already sent to the parent while typing.
|
|
129
|
+
*/
|
|
130
|
+
const typedNumber = parseTypedNumber(typedText, separators);
|
|
131
|
+
if (typedNumber != null) {
|
|
132
|
+
nextNumber = normalize(typedNumber);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
if (nextNumber !== committedNumber) {
|
|
136
|
+
onValueChange(nextNumber);
|
|
137
|
+
}
|
|
99
138
|
}
|
|
100
|
-
|
|
101
|
-
|
|
139
|
+
onBlur?.();
|
|
140
|
+
}, [
|
|
141
|
+
committedNumber,
|
|
142
|
+
normalize,
|
|
143
|
+
onBlur,
|
|
144
|
+
onValueChange,
|
|
145
|
+
separators,
|
|
146
|
+
updateDraft,
|
|
147
|
+
]);
|
|
148
|
+
const handleOutsideClick = useCallback(() => {
|
|
149
|
+
commitDraft();
|
|
150
|
+
inputRef.current?.blur?.();
|
|
151
|
+
}, [commitDraft]);
|
|
152
|
+
const handleStep = (step) => {
|
|
153
|
+
const nextNumber = normalize(getCurrentNumber() + step);
|
|
154
|
+
onValueChange(nextNumber);
|
|
155
|
+
if (draftRef.current != null) {
|
|
156
|
+
updateDraft(getEditText(nextNumber));
|
|
102
157
|
}
|
|
103
|
-
onFocus?.();
|
|
104
158
|
};
|
|
159
|
+
const currentNumber = getCurrentNumber();
|
|
160
|
+
const displayedText = draft ?? getDisplayText(committedNumber);
|
|
105
161
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
106
162
|
useOutsideClickHandler({
|
|
107
163
|
wrapperRef: containerRef,
|
|
108
|
-
handleOutsideClick
|
|
109
|
-
activationCondition:
|
|
164
|
+
handleOutsideClick,
|
|
165
|
+
activationCondition: draft != null,
|
|
110
166
|
});
|
|
111
167
|
return (<TouchableOpacity ref={containerRef} style={[styles.container_increment, style]} activeOpacity={0.9} onPress={() => inputRef.current?.focus()} testID="incrementContainer">
|
|
112
|
-
<IncrementButton iconName="dash-lg" onPress={
|
|
168
|
+
<IncrementButton iconName="dash-lg" onPress={() => handleStep(-stepSize)} readonly={readonly} disabled={minValue != null && currentNumber <= minValue} isBigButton={isBigButton}/>
|
|
113
169
|
<View style={[styles.inputLine, isBigButton ? styles.fixedInputWidth : null]}>
|
|
114
|
-
<Input inputRef={inputRef} style={[styles.input, inputStyle]} value={
|
|
170
|
+
<Input inputRef={inputRef} style={[styles.input, inputStyle]} value={displayedText} onChange={handleInputChange} keyboardType={keyboardType} onSelection={handleFocus} onEndFocus={commitDraft} readOnly={readonly}/>
|
|
115
171
|
</View>
|
|
116
|
-
<IncrementButton iconName="plus-lg" onPress={
|
|
172
|
+
<IncrementButton iconName="plus-lg" onPress={() => handleStep(stepSize)} readonly={readonly} disabled={maxValue != null && currentNumber >= maxValue} isBigButton={isBigButton}/>
|
|
117
173
|
</TouchableOpacity>);
|
|
118
174
|
};
|
|
119
175
|
const getStyles = (Colors) => StyleSheet.create({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Increment.js","sourceRoot":"","sources":["../../../../src/components/molecules/Increment/Increment.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAEL,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,IAAI,GACL,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,cAAc,EAAE,sBAAsB,EAAC,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAc,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC1D,OAAO,
|
|
1
|
+
{"version":3,"file":"Increment.js","sourceRoot":"","sources":["../../../../src/components/molecules/Increment/Increment.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export interface NumberSeparators {
|
|
2
|
+
decimalSpacer: string;
|
|
3
|
+
thousandSpacer: string;
|
|
4
|
+
}
|
|
5
|
+
export declare const toNumber: (value: string | number | null | undefined) => number;
|
|
6
|
+
export declare const parseTypedNumber: (text: string | null | undefined, separators: NumberSeparators) => number | null;
|
|
7
|
+
export declare const toEditText: (value: number, { decimalSpacer }: NumberSeparators, roundToText: (value: number) => string) => string;
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Axelor Business Solutions
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2026 Axelor (<http://axelor.com>).
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU Affero General Public License, version 3,
|
|
8
|
+
* as published by the Free Software Foundation.
|
|
9
|
+
*
|
|
10
|
+
* This program is distributed in the hope that it will be useful,
|
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
* GNU Affero General Public License for more details.
|
|
14
|
+
*
|
|
15
|
+
* You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
const DIGITS_REGEX = /^\d*$/;
|
|
19
|
+
const WHITE_SPACE_REGEX = /\s/g;
|
|
20
|
+
const escapeRegex = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
21
|
+
/* Reads the value given to the field: anything that is not a number gives 0. */
|
|
22
|
+
export const toNumber = (value) => {
|
|
23
|
+
const parsedValue = typeof value === 'number' ? value : parseFloat(value ?? '0');
|
|
24
|
+
return Number.isFinite(parsedValue) ? parsedValue : 0;
|
|
25
|
+
};
|
|
26
|
+
/*
|
|
27
|
+
* Decimal separators accepted in typed text: the language one, and "." when it
|
|
28
|
+
* does not group thousands, because some numeric keyboards only show ".".
|
|
29
|
+
*/
|
|
30
|
+
const getDecimalSpacers = ({ decimalSpacer, thousandSpacer, }) => {
|
|
31
|
+
const decimalSpacers = [decimalSpacer];
|
|
32
|
+
if (decimalSpacer !== '.' && thousandSpacer !== '.') {
|
|
33
|
+
decimalSpacers.push('.');
|
|
34
|
+
}
|
|
35
|
+
return decimalSpacers;
|
|
36
|
+
};
|
|
37
|
+
/*
|
|
38
|
+
* Reads the integer part of typed text. Thousands separators are accepted only
|
|
39
|
+
* where they group digits by three, as in "1 234 567" or "1,234,567".
|
|
40
|
+
*/
|
|
41
|
+
const parseIntegerPart = (text, { thousandSpacer }) => {
|
|
42
|
+
const isWhiteSpaceSpacer = thousandSpacer.trim() === '';
|
|
43
|
+
const normalizedText = isWhiteSpaceSpacer
|
|
44
|
+
? text.replace(WHITE_SPACE_REGEX, ' ')
|
|
45
|
+
: text;
|
|
46
|
+
const spacer = isWhiteSpaceSpacer ? ' ' : thousandSpacer;
|
|
47
|
+
if (!normalizedText.includes(spacer)) {
|
|
48
|
+
return DIGITS_REGEX.test(normalizedText) ? normalizedText : null;
|
|
49
|
+
}
|
|
50
|
+
const groupedRegex = new RegExp(`^\\d{1,3}(${escapeRegex(spacer)}\\d{3})+$`);
|
|
51
|
+
return groupedRegex.test(normalizedText)
|
|
52
|
+
? normalizedText.split(spacer).join('')
|
|
53
|
+
: null;
|
|
54
|
+
};
|
|
55
|
+
/*
|
|
56
|
+
* Reads the text typed in the field. Returns null when the text is not a
|
|
57
|
+
* complete number ("-", "12,3,4", "1,23" in English), so nothing is sent for it.
|
|
58
|
+
*/
|
|
59
|
+
export const parseTypedNumber = (text, separators) => {
|
|
60
|
+
const trimmedText = text?.trim() ?? '';
|
|
61
|
+
const isNegative = trimmedText.startsWith('-');
|
|
62
|
+
const unsignedText = isNegative ? trimmedText.slice(1) : trimmedText;
|
|
63
|
+
const decimalSpacers = getDecimalSpacers(separators);
|
|
64
|
+
const decimalIndexes = [...unsignedText]
|
|
65
|
+
.map((character, index) => decimalSpacers.includes(character) ? index : -1)
|
|
66
|
+
.filter(index => index >= 0);
|
|
67
|
+
if (decimalIndexes.length > 1) {
|
|
68
|
+
return null;
|
|
69
|
+
}
|
|
70
|
+
const decimalIndex = decimalIndexes[0] ?? -1;
|
|
71
|
+
const integerText = decimalIndex >= 0 ? unsignedText.slice(0, decimalIndex) : unsignedText;
|
|
72
|
+
const decimalText = decimalIndex >= 0 ? unsignedText.slice(decimalIndex + 1) : '';
|
|
73
|
+
const integerPart = parseIntegerPart(integerText, separators);
|
|
74
|
+
if (integerPart == null || !DIGITS_REGEX.test(decimalText)) {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
if (integerPart === '' && decimalText === '') {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
const parsedValue = parseFloat(`${integerPart || '0'}.${decimalText || '0'}`);
|
|
81
|
+
return isNegative ? -parsedValue : parsedValue;
|
|
82
|
+
};
|
|
83
|
+
/* Text shown while editing: the number without thousands separators. */
|
|
84
|
+
export const toEditText = (value, { decimalSpacer }, roundToText) => roundToText(value).replace('.', decimalSpacer);
|
|
85
|
+
//# sourceMappingURL=number.helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"number.helper.js","sourceRoot":"","sources":["../../../../src/components/molecules/Increment/number.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ import Animated, { useSharedValue, useAnimatedStyle, withSpring, } from 'react-n
|
|
|
21
21
|
import { useThemeColor } from '../../../theme';
|
|
22
22
|
import { Button, NumberBubble } from '../../molecules';
|
|
23
23
|
import ItemTitle from './ItemTitle';
|
|
24
|
+
const INDICATOR_SIZE_RATIO = 0.5;
|
|
24
25
|
const BarItem = ({ iconName, color, title, isSelected = false, size, disabled, indicator, onPress, }) => {
|
|
25
26
|
const Colors = useThemeColor();
|
|
26
27
|
const scale = useSharedValue(0.8);
|
|
@@ -37,8 +38,8 @@ const BarItem = ({ iconName, color, title, isSelected = false, size, disabled, i
|
|
|
37
38
|
<Animated.View style={animatedStyle}>
|
|
38
39
|
<Button iconName={iconName} color={buttonColor} disabled={disabled} onPress={onPress} width={size} style={{ height: size }} iconSize={size * 0.6}/>
|
|
39
40
|
</Animated.View>
|
|
40
|
-
{indicator > 0 && (<Animated.View style={[animatedStyle, styles.indicator]}>
|
|
41
|
-
<NumberBubble number={indicator} color={buttonColor} isNeutralBackground={true}/>
|
|
41
|
+
{indicator > 0 && (<Animated.View style={[animatedStyle, styles.indicator]} pointerEvents="none">
|
|
42
|
+
<NumberBubble number={indicator} color={buttonColor} isNeutralBackground={true} size={size * INDICATOR_SIZE_RATIO}/>
|
|
42
43
|
</Animated.View>)}
|
|
43
44
|
<ItemTitle title={title} style={{ width: size }}/>
|
|
44
45
|
</View>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BarItem.js","sourceRoot":"","sources":["../../../../src/components/templates/BottomBar/BarItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAChD,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,QAAQ,EAAE,EACf,cAAc,EACd,gBAAgB,EAChB,UAAU,GACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAQ,aAAa,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,iBAAiB,CAAC;AACrD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,OAAO,GAAG,CAAC,EACf,QAAQ,EACR,KAAK,EACL,KAAK,EACL,UAAU,GAAG,KAAK,EAClB,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,GAUR,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAElC,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;IAExB,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,EAAE;QAC1C,OAAO;YACL,SAAS,EAAE,CAAC,EAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAC,CAAC;SAClC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAU,OAAO,CAChC,GAAG,EAAE,CAAC,KAAK,IAAI,MAAM,CAAC,YAAY,EAClC,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,CAC7B,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;MAAA,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAClC;QAAA,CAAC,MAAM,CACL,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,KAAK,CAAC,CAAC,WAAW,CAAC,CACnB,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,KAAK,CAAC,CAAC,IAAI,CAAC,CACZ,KAAK,CAAC,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CACtB,QAAQ,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,EAEzB;MAAA,EAAE,QAAQ,CAAC,IAAI,CACf;MAAA,CAAC,SAAS,GAAG,CAAC,IAAI,CAChB,CAAC,QAAQ,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"BarItem.js","sourceRoot":"","sources":["../../../../src/components/templates/BottomBar/BarItem.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
export declare function formatDate(inputDate: string, format: string): string;
|
|
2
2
|
export declare function formatNumber(number: string | number, decimalSpacer?: string, thousandSpacer?: string, cutDecimalExcess?: (value: number | string) => string): string;
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated Does not read back every value formatted by formatNumber: without
|
|
5
|
+
* a decimal part, "1 000" (or "1,000" in English) gives 1. Keep the number
|
|
6
|
+
* itself instead of reading it back from the formatted text.
|
|
7
|
+
*/
|
|
3
8
|
export declare function unformatNumber(number: string, decimalSpacer?: string, thousandSpacer?: string): string;
|
package/lib/utils/formatters.js
CHANGED
|
@@ -43,7 +43,13 @@ export function formatNumber(number, decimalSpacer = '.', thousandSpacer = ' ',
|
|
|
43
43
|
number = cutDecimalExcess(number);
|
|
44
44
|
}
|
|
45
45
|
const decimalPart = splitInTwo(number)[1];
|
|
46
|
-
const
|
|
46
|
+
const signedIntegerPart = splitInTwo(number)[0];
|
|
47
|
+
/*
|
|
48
|
+
* The sign is put back in front once the digits are grouped, otherwise it is
|
|
49
|
+
* counted as a digit ("- 123"). A value rounded to zero is shown unsigned.
|
|
50
|
+
*/
|
|
51
|
+
const isNegative = signedIntegerPart.startsWith('-') && parseFloat(number) !== 0;
|
|
52
|
+
const integerPart = signedIntegerPart.replace('-', '');
|
|
47
53
|
let result = '';
|
|
48
54
|
let counter = 0;
|
|
49
55
|
for (let i = integerPart.length - 1; i >= 0; i--) {
|
|
@@ -53,8 +59,16 @@ export function formatNumber(number, decimalSpacer = '.', thousandSpacer = ' ',
|
|
|
53
59
|
: integerPart[i] + result;
|
|
54
60
|
counter++;
|
|
55
61
|
}
|
|
62
|
+
if (isNegative) {
|
|
63
|
+
result = `-${result}`;
|
|
64
|
+
}
|
|
56
65
|
return decimalPart ? `${result}${decimalSpacer}${decimalPart}` : result;
|
|
57
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* @deprecated Does not read back every value formatted by formatNumber: without
|
|
69
|
+
* a decimal part, "1 000" (or "1,000" in English) gives 1. Keep the number
|
|
70
|
+
* itself instead of reading it back from the formatted text.
|
|
71
|
+
*/
|
|
58
72
|
export function unformatNumber(number, decimalSpacer = '.', thousandSpacer = ' ') {
|
|
59
73
|
if (checkNullString(number)) {
|
|
60
74
|
return '0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../../src/utils/formatters.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AAEtD,MAAM,UAAU,UAAU,CAAC,SAAiB,EAAE,MAAc;IAC1D,4FAA4F;IAC5F,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAEjC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAEhC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAE/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,MAAuB,EACvB,gBAAwB,GAAG,EAC3B,iBAAyB,GAAG,EAC5B,mBAAuD,KAAK,CAAC,EAAE;IAC7D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtC,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../../src/utils/formatters.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AAEtD,MAAM,UAAU,UAAU,CAAC,SAAiB,EAAE,MAAc;IAC1D,4FAA4F;IAC5F,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAEjC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAEhC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAE/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,MAAuB,EACvB,gBAAwB,GAAG,EAC3B,iBAAyB,GAAG,EAC5B,mBAAuD,KAAK,CAAC,EAAE;IAC7D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtC,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAEhD;;;OAGG;IACH,MAAM,UAAU,GACd,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEvD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,KAAK,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,MAAM;YACJ,OAAO,KAAK,CAAC,IAAI,OAAO,GAAG,CAAC,KAAK,CAAC;gBAChC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,cAAc,GAAG,MAAM;gBAC1C,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QAC9B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,aAAa,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AAC1E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAc,EACd,gBAAwB,GAAG,EAC3B,iBAAyB,GAAG;IAE5B,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,MAAM,iBAAiB,GAAG,GAAG,CAAC;IAE9B,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QACtE,OAAO,MAAM;aACV,UAAU,CAAC,cAAc,EAAE,kBAAkB,CAAC;aAC9C,OAAO,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AAChD,CAAC"}
|