Merge pull request #553 from trey-wallis/fix-number-input

Fix number input

Author: decaf-dev

src/react/table-app/currency-cell-edit/index.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 
 import { useCompare, useInputSelection } from "src/shared/hooks";
-import { isValidNumberInput } from "src/shared/validators";
+import { isNumber, isValidNumberInput } from "src/shared/validators";
 import { MenuCloseRequest } from "src/shared/menu/types";
 import { numberInputStyle } from "src/react/table-app/shared-styles";
 
@@ -18,7 +18,8 @@ export default function CurrencyCellEdit({
 	onChange,
 	onMenuClose,
 }: Props) {
-	const [localValue, setLocalValue] = React.useState(value);
+	const initialValue = isNumber(value) ? value : "";
+	const [localValue, setLocalValue] = React.useState(initialValue);
 	const inputRef = React.useRef<HTMLInputElement | null>(null);
 	const { setPreviousSelectionStart } = useInputSelection(
 		inputRef,

src/react/table-app/number-cell-edit/index.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 
 import { useCompare, useInputSelection } from "src/shared/hooks";
-import { isValidNumberInput } from "src/shared/validators";
+import { isNumber, isValidNumberInput } from "src/shared/validators";
 import { MenuCloseRequest } from "src/shared/menu/types";
 import { numberInputStyle } from "src/react/table-app/shared-styles";
 
@@ -18,7 +18,8 @@ export default function NumberCellEdit({
 	onChange,
 	onMenuClose,
 }: Props) {
-	const [localValue, setLocalValue] = React.useState(value);
+	const initialValue = isNumber(value) ? value : "";
+	const [localValue, setLocalValue] = React.useState(initialValue);
 	const inputRef = React.useRef<HTMLInputElement | null>(null);
 	const { setPreviousSelectionStart } = useInputSelection(
 		inputRef,

src/shared/export/cell-content.ts

@@ -46,12 +46,17 @@ export const getEmbedContent = (markdown: string) => {
 	return markdown;
 };
 
+export const getNumberCellContent = (value: string) => {
+	if (isNumber(value)) return value;
+	return "";
+};
+
 export const getCurrencyCellContent = (
 	value: string,
 	currencyType: CurrencyType
 ) => {
 	if (isNumber(value)) return stringToCurrencyString(value, currencyType);
-	return value;
+	return "";
 };
 
 export const getCellContent = (
@@ -62,8 +67,9 @@ export const getCellContent = (
 	switch (column.type) {
 		case CellType.TEXT:
 		case CellType.FILE:
-		case CellType.NUMBER:
 			return cell.markdown;
+		case CellType.NUMBER:
+			return getNumberCellContent(cell.markdown);
 		case CellType.EMBED:
 			return getEmbedContent(cell.markdown);
 		case CellType.CHECKBOX: