fixed the fact that text, number, and boolean were ignoring input types when accepting input

1 files changed, 69 insertions, 45 deletions

diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaCells.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaCells.tsx
index a8d901f4d..8b7fb9be8 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaCells.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaCells.tsx
@@ -214,6 +214,55 @@ export class CollectionSchemaCell extends React.Component<CellProps> {
                 positions.pop();
             }
         }
+
+        // handles input procedures for string cells
+        let stringInput = (value: string, retVal: boolean): void => {
+            let valueSansQuotes = value;
+            if (this._isEditing) {
+                const vsqLength = valueSansQuotes.length;
+                // get rid of outer quotes
+                valueSansQuotes = valueSansQuotes.substring(value.startsWith("\"") ? 1 : 0,
+                    valueSansQuotes.charAt(vsqLength - 1) == "\"" ? vsqLength - 1 : vsqLength);
+            }
+            let inputAsString = '"';
+            // escape any quotes in the string
+            for (const i of valueSansQuotes) {
+                if (i == '"') {
+                    inputAsString += '\\"';
+                } else {
+                    inputAsString += i;
+                }
+            }
+            // add a closing quote
+            inputAsString += '"';
+            //two options here: we can strip off outer quotes or we can figure out what's going on with the script
+            const script = CompileScript(inputAsString, { requiredType: type, typecheck: false, editable: true, addReturn: true, params: { this: Doc.name, $r: "number", $c: "number", $: "any" } });
+            const changeMade = inputAsString.length !== value.length || inputAsString.length - 2 !== value.length
+            script.compiled && (retVal = this.applyToDoc(changeMade ? this._rowDoc : this._rowDataDoc, this.props.row, this.props.col, script.run));
+        }
+
+        // handles input procedure for number cells
+        let numberInput = (value: string, retVal: boolean): void => {
+            const inputscript = value.substring(value.startsWith("=") ? 1 : 0);
+            // if commas are not stripped, the parser only considers the numbers after the last comma
+            let inputSansCommas = "";
+            for (let s of inputscript) {
+                if (!(s == ",")) {
+                    inputSansCommas += s;
+                }
+            }
+            const script = CompileScript(inputSansCommas, { requiredType: type, typecheck: false, editable: true, addReturn: true, params: { this: Doc.name, $r: "number", $c: "number", $: "any" } });
+            const changeMade = value.length !== value.length || value.length - 2 !== value.length
+            script.compiled && (retVal = this.applyToDoc(changeMade ? this._rowDoc : this._rowDataDoc, this.props.row, this.props.col, script.run));
+        }
+
+        // handles input procedure for boolean cells
+        let boolInput = (value: string, retVal: boolean): void => {
+            const script = CompileScript(value, { requiredType: type, typecheck: false, editable: true, addReturn: true, params: { this: Doc.name, $r: "number", $c: "number", $: "any" } });
+            const changeMade = value.length !== value.length || value.length - 2 !== value.length
+            script.compiled && (retVal = this.applyToDoc(changeMade ? this._rowDoc : this._rowDataDoc, this.props.row, this.props.col, script.run));
+        }
+
         const placeholder = type === "number" ? "0" : contents === "" ? "--" : "undefined";
         return (
             <div className="collectionSchemaView-cellContainer" style={{ cursor: field instanceof Doc ? "grab" : "auto" }}
@@ -253,52 +302,27 @@ export class CollectionSchemaCell extends React.Component<CellProps> {
                                         }
                                         // check if the input is a boolean
                                         let inputIsBool: boolean = value == "false" || value == "true";
-                                        // what to do in the case 
-                                        if (!inputIsNum && !inputIsBool && !value.startsWith("=")) {
-                                            // if it's not a number, it's a string, and should be processed as such
-                                            // strips the string of quotes when it is edited to prevent quotes form being added to the text automatically 
-                                            // after each edit
-                                            let valueSansQuotes = value;
-                                            if (this._isEditing) {
-                                                const vsqLength = valueSansQuotes.length;
-                                                // get rid of outer quotes
-                                                valueSansQuotes = valueSansQuotes.substring(value.startsWith("\"") ? 1 : 0,
-                                                    valueSansQuotes.charAt(vsqLength - 1) == "\"" ? vsqLength - 1 : vsqLength);
-                                            }
-                                            let inputAsString = '"';
-                                            // escape any quotes in the string
-                                            for (const i of valueSansQuotes) {
-                                                if (i == '"') {
-                                                    inputAsString += '\\"';
-                                                } else {
-                                                    inputAsString += i;
-                                                }
-                                            }
-                                            // add a closing quote
-                                            inputAsString += '"';
-                                            //two options here: we can strip off outer quotes or we can figure out what's going on with the script
-                                            const script = CompileScript(inputAsString, { requiredType: type, typecheck: false, editable: true, addReturn: true, params: { this: Doc.name, $r: "number", $c: "number", $: "any" } });
-                                            const changeMade = inputAsString.length !== value.length || inputAsString.length - 2 !== value.length
-                                            script.compiled && (retVal = this.applyToDoc(changeMade ? this._rowDoc : this._rowDataDoc, this.props.row, this.props.col, script.run));
-                                            // handle numbers and expressions
-                                        } else if (inputIsNum || value.startsWith("=")) {
-                                            //TODO: make accept numbers
-                                            const inputscript = value.substring(value.startsWith("=") ? 1 : 0);
-                                            // if commas are not stripped, the parser only considers the numbers after the last comma
-                                            let inputSansCommas = "";
-                                            for (let s of inputscript) {
-                                                if (!(s == ",")) {
-                                                    inputSansCommas += s;
-                                                }
+
+                                        if (type == undefined) {
+                                            // what to do in the case 
+                                            if (!inputIsNum && !inputIsBool && !value.startsWith("=")) {
+                                                // if it's not a number, it's a string, and should be processed as such
+                                                // strips the string of quotes when it is edited to prevent quotes form being added to the text automatically 
+                                                // after each edit
+                                                stringInput(value, retVal);
+                                                // handle numbers and expressions
+                                            } else if (inputIsNum || value.startsWith("=")) {
+                                                numberInput(value, retVal);
+                                                // handle booleans
+                                            } else if (inputIsBool) {
+                                                boolInput(value, retVal);
                                             }
-                                            const script = CompileScript(inputSansCommas, { requiredType: type, typecheck: false, editable: true, addReturn: true, params: { this: Doc.name, $r: "number", $c: "number", $: "any" } });
-                                            const changeMade = value.length !== value.length || value.length - 2 !== value.length
-                                            script.compiled && (retVal = this.applyToDoc(changeMade ? this._rowDoc : this._rowDataDoc, this.props.row, this.props.col, script.run));
-                                            // handle booleans
-                                        } else if (inputIsBool) {
-                                            const script = CompileScript(value, { requiredType: type, typecheck: false, editable: true, addReturn: true, params: { this: Doc.name, $r: "number", $c: "number", $: "any" } });
-                                            const changeMade = value.length !== value.length || value.length - 2 !== value.length
-                                            script.compiled && (retVal = this.applyToDoc(changeMade ? this._rowDoc : this._rowDataDoc, this.props.row, this.props.col, script.run));
+                                        } else if (type == "string") {
+                                            stringInput(value, retVal);
+                                        } else if (type == "number" && inputIsNum) {
+                                            numberInput(value, retVal);
+                                        } else if (type == "boolean" && inputIsBool) {
+                                            boolInput(value, retVal);
                                         }
                                     }
                                     if (retVal) {