@lowentry/mui 1.2.9 → 1.2.11

package/src/components/NumericTextField.jsx

@@ -1,101 +1,99 @@
 import React from 'react';
 import {LeRed} from '@lowentry/react-redux';
-import {LeUtils, FLOAT_LAX, INT_LAX_ANY} from '@lowentry/utils';
+import {FLOAT_LAX, INT_LAX_ANY, STRING} from '@lowentry/utils';
 import {LeMuiUtils} from '../LeMuiUtils.js';
 import TextField from './TextField.jsx';
 
 
-const NumericTextField = LeRed.memo(({decimals, allowZero, allowNegative, value, onChange, onRenderValue, className, inputProps, children, ...props}) =>
+const getProcessedValue = (value, decimals, allowZero, allowNegative) =>
 {
-	if(typeof allowZero === 'undefined')
-	{
-		allowZero = true;
-	}
-	if(typeof allowNegative === 'undefined')
-	{
-		allowNegative = true;
-	}
-	decimals = INT_LAX_ANY(decimals, 2);
+	let text = LeMuiUtils.purgePrependedHiddenChar(STRING(value));
+	let val = 0;
 	
+	const negative = text.includes('-');
 	
-	const getVisualValue = (value) =>
+	text = text.replace(',', '.').replace(/[^0-9.]/g, '');
+	if(text !== '')
 	{
-		let text = FLOAT_LAX(LeMuiUtils.purgePrependedHiddenChar(value));
-		if(!allowNegative)
+		let stringVal = Math.abs(FLOAT_LAX(text)).toFixed(decimals + 1); // prevents rounding (by adding an extra digit and then cutting it off)
+		stringVal = stringVal.substring(0, stringVal.length - 1);
+		
+		const textDotCount = text.split('.').length - 1;
+		if((textDotCount <= 0) || (decimals <= 0))
+		{
+			text = stringVal.split('.')[0];
+		}
+		else if((textDotCount === 1) && text.endsWith('.'))
 		{
-			text = Math.abs(text);
+			text = stringVal.split('.')[0] + '.';
+		}
+		else
+		{
+			text = stringVal.substring(0, stringVal.length - Math.max(0, decimals - text.split('.')[1].length));
 		}
 		
-		text = text.toFixed(decimals); // rounds it
-		text = LeUtils.trimEnd(LeUtils.trimEnd(text, '0'), '.');
 		if(!allowZero && (text === '0'))
 		{
 			text = '';
 		}
-		return text;
-	};
+	}
+	
+	if(allowNegative && negative)
+	{
+		text = '-' + text;
+	}
+	
+	val = FLOAT_LAX(text);
+	if(val !== 0)
+	{
+		if(decimals > 0)
+		{
+			val = Math.round(val * Math.pow(10, decimals)) / Math.pow(10, decimals);
+		}
+		else
+		{
+			val = Math.round(val);
+		}
+	}
+	
+	return {text, val};
+};
+
+
+const NumericTextField = LeRed.memo(({decimals, allowZero, allowNegative, value, onChange, onRenderValue, className, inputProps, children, ...props}) =>
+{
+	allowZero = !!allowZero;
+	allowNegative = !!allowNegative;
+	decimals = INT_LAX_ANY(decimals, 0);
+	
+	
+	const getVisualValue = LeRed.useCallback((value) =>
+	{
+		return getProcessedValue(value, decimals, allowZero, allowNegative).text;
+	}, [decimals, allowZero, allowNegative]);
 	
 	
 	const [visualValue, setVisualValue] = LeRed.useState(getVisualValue(value));
 	
 	LeRed.useEffect(() =>
 	{
-		setVisualValue(getVisualValue(value));
-	}, [value]);
+		const newVisualValue = getVisualValue(value);
+		if(FLOAT_LAX(visualValue) !== FLOAT_LAX(newVisualValue))
+		{
+			setVisualValue(newVisualValue);
+		}
+	}, [value, getVisualValue]);
 	
 	
 	const onChanged = LeRed.useCallback((event) =>
 	{
 		const originalTargetValue = event.target.value;
-		const targetValue = LeMuiUtils.purgePrependedHiddenChar(originalTargetValue);
-		
-		let text = targetValue;
-		let val = 0;
+		const {text, val} = getProcessedValue(originalTargetValue, decimals, allowZero, allowNegative);
 		
-		{// visual >>
-			const minus = text.includes('-');
-			text = text.replace(',', '.').replace(/[^0-9.]/g, '');
-			if(text !== '')
-			{
-				val = Math.abs(FLOAT_LAX(text));
-				if(allowNegative && minus)
-				{
-					val = -val;
-				}
-				
-				let stringVal = val.toFixed(decimals + 1); // prevents rounding (by adding an extra digit and then cutting it off)
-				stringVal = stringVal.substring(0, stringVal.length - 1);
-				
-				if(!text.includes('.') || (decimals <= 0))
-				{
-					text = stringVal.split('.')[0];
-				}
-				else if(text.endsWith('.'))
-				{
-					text = stringVal.split('.')[0] + '.';
-				}
-				else
-				{
-					text = stringVal.substring(0, stringVal.length - Math.max(0, decimals - text.split('.')[1].length));
-				}
-				setVisualValue(text);
-			}
-		}// visual <<
+		setVisualValue(text);
 		
 		if(onChange)
 		{
-			if(val !== 0)
-			{
-				if(decimals > 0)
-				{
-					val = Math.round(val * Math.pow(10, decimals)) / Math.pow(10, decimals);
-				}
-				else
-				{
-					val = Math.round(val);
-				}
-			}
-			
 			const newEvent = {
 				...event,
 				target:{

package/src/components/RemovableNumericTextField.jsx

@@ -35,7 +35,7 @@ const RemovableNumericTextField = LeRed.memo(({onRemove, onChange, onSelect, cla
 	
 	
 	return (<>
-		<NumericTextField className={'lowentry-mui--removable-textfield lowentry-mui--removable-numeric-textfield ' + (className ?? '')} onRenderValue={LeMuiUtils.prependHiddenChar} onChange={onChanged} onSelect={onSelected}>{children}</NumericTextField>
+		<NumericTextField className={'lowentry-mui--removable-textfield lowentry-mui--removable-numeric-textfield ' + (className ?? '')} onRenderValue={LeMuiUtils.prependHiddenChar} onChange={onChanged} onSelect={onSelected} {...props}>{children}</NumericTextField>
 	</>);
 });
 export default RemovableNumericTextField;

package/style-inject.es-1f59c1d0.js

@@ -1,2 +1,29 @@
-function e(e,t){void 0===t&&(t={});var d=t.insertAt;if(e&&"undefined"!=typeof document){var n=document.head||document.getElementsByTagName("head")[0],s=document.createElement("style");s.type="text/css","top"===d&&n.firstChild?n.insertBefore(s,n.firstChild):n.appendChild(s),s.styleSheet?s.styleSheet.cssText=e:s.appendChild(document.createTextNode(e))}}export{e as s};
+function styleInject(css, ref) {
+  if ( ref === void 0 ) ref = {};
+  var insertAt = ref.insertAt;
+
+  if (!css || typeof document === 'undefined') { return; }
+
+  var head = document.head || document.getElementsByTagName('head')[0];
+  var style = document.createElement('style');
+  style.type = 'text/css';
+
+  if (insertAt === 'top') {
+    if (head.firstChild) {
+      head.insertBefore(style, head.firstChild);
+    } else {
+      head.appendChild(style);
+    }
+  } else {
+    head.appendChild(style);
+  }
+
+  if (style.styleSheet) {
+    style.styleSheet.cssText = css;
+  } else {
+    style.appendChild(document.createTextNode(css));
+  }
+}
+
+export { styleInject as s };
 //# sourceMappingURL=style-inject.es-1f59c1d0.js.map

package/style-inject.es-1f59c1d0.js.map

@@ -1 +1 @@
-{"version":3,"file":"style-inject.es-1f59c1d0.js","sources":["../node_modules/style-inject/dist/style-inject.es.js"],"sourcesContent":["function styleInject(css, ref) {\n  if ( ref === void 0 ) ref = {};\n  var insertAt = ref.insertAt;\n\n  if (!css || typeof document === 'undefined') { return; }\n\n  var head = document.head || document.getElementsByTagName('head')[0];\n  var style = document.createElement('style');\n  style.type = 'text/css';\n\n  if (insertAt === 'top') {\n    if (head.firstChild) {\n      head.insertBefore(style, head.firstChild);\n    } else {\n      head.appendChild(style);\n    }\n  } else {\n    head.appendChild(style);\n  }\n\n  if (style.styleSheet) {\n    style.styleSheet.cssText = css;\n  } else {\n    style.appendChild(document.createTextNode(css));\n  }\n}\n\nexport default styleInject;\n"],"names":["styleInject","css","ref","insertAt","document","head","getElementsByTagName","style","createElement","type","firstChild","insertBefore","appendChild","styleSheet","cssText","createTextNode"],"mappings":"AAAA,SAASA,EAAYC,EAAKC,QACX,IAARA,IAAiBA,EAAM,CAAA,GAC5B,IAAIC,EAAWD,EAAIC,SAEnB,GAAKF,GAA2B,oBAAbG,SAAnB,CAEA,IAAIC,EAAOD,SAASC,MAAQD,SAASE,qBAAqB,QAAQ,GAC9DC,EAAQH,SAASI,cAAc,SACnCD,EAAME,KAAO,WAEI,QAAbN,GACEE,EAAKK,WACPL,EAAKM,aAAaJ,EAAOF,EAAKK,YAKhCL,EAAKO,YAAYL,GAGfA,EAAMM,WACRN,EAAMM,WAAWC,QAAUb,EAE3BM,EAAMK,YAAYR,SAASW,eAAed,GAnBY,CAqB1D"}
+{"version":3,"file":"style-inject.es-1f59c1d0.js","sources":["../node_modules/style-inject/dist/style-inject.es.js"],"sourcesContent":["function styleInject(css, ref) {\n  if ( ref === void 0 ) ref = {};\n  var insertAt = ref.insertAt;\n\n  if (!css || typeof document === 'undefined') { return; }\n\n  var head = document.head || document.getElementsByTagName('head')[0];\n  var style = document.createElement('style');\n  style.type = 'text/css';\n\n  if (insertAt === 'top') {\n    if (head.firstChild) {\n      head.insertBefore(style, head.firstChild);\n    } else {\n      head.appendChild(style);\n    }\n  } else {\n    head.appendChild(style);\n  }\n\n  if (style.styleSheet) {\n    style.styleSheet.cssText = css;\n  } else {\n    style.appendChild(document.createTextNode(css));\n  }\n}\n\nexport default styleInject;\n"],"names":[],"mappings":"AAAA,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE;AAC/B,EAAE,KAAK,GAAG,KAAK,KAAK,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;AACjC,EAAE,IAAI,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;AAC9B;AACA,EAAE,IAAI,CAAC,GAAG,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,EAAE,OAAO,EAAE;AAC1D;AACA,EAAE,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,EAAE,IAAI,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AAC9C,EAAE,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC;AAC1B;AACA,EAAE,IAAI,QAAQ,KAAK,KAAK,EAAE;AAC1B,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE;AACzB,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;AAChD,KAAK,MAAM;AACX,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC9B,KAAK;AACL,GAAG,MAAM;AACT,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5B,GAAG;AACH;AACA,EAAE,IAAI,KAAK,CAAC,UAAU,EAAE;AACxB,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC;AACnC,GAAG,MAAM;AACT,IAAI,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AACpD,GAAG;AACH;;;;"}