dataformsjs
diff --git a/‎docs/to-do-list.txt‎
Lines changed: 4 additions & 0 deletions b/‎docs/to-do-list.txt‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎js/react/jsxLoader.js‎
Lines changed: 39 additions & 3 deletions b/‎js/react/jsxLoader.js‎
Lines changed: 39 additions & 3 deletions
@@ -22,6 +22,10 @@ TODO List
 |
 --------------------------------------------------------------------------
 
+**) As of 2022-01-06 updates are being tested for the following issues:
+    https://github.com/dataformsjs/dataformsjs/issues/20
+    https://github.com/dataformsjs/dataformsjs/issues/21
+    This will likely be published later this week
 
 **) Update the Getting Started CSS Template used here:
         https://www.dataformsjs.com/en/getting-started
 
@@ -181,6 +181,7 @@
             { find: /export default class/g,        replace: 'class' },
             { find: /import React from 'react';/g,  replace: '' },
             { find: /import React from"react";/g,   replace: '' },
+            { find: /=>,/g,                         replace:'=>' }, // Work-around for edge-case JSX, Issue 21 on GitHub
         ],
 
         /**
@@ -588,6 +589,41 @@
                 return false;
             },
 
+            /**
+             * Helper function that gets called when a '<' charater is
+             * found to determine if it's likely an element or not.
+             *
+             * @param {string} input
+             * @param {number} current
+             * @param {number} length
+             * @returns {bool}
+             */
+            isExpression: function(input, current, length) {
+                var pos = current + 2;
+                var foundName = false;
+                while (pos < length) {
+                    var nextChar = input[pos];
+                    pos++;
+                    if (/[a-zA-Z0-9_/]/.test(nextChar)) {
+                        if (foundName) {
+                            break;
+                        } else {
+                            continue;
+                        }
+                    } else if (nextChar === '>') {
+                        break;
+                    } else if (nextChar === ' ') {
+                        foundName = true;
+                        continue;
+                    } else if (nextChar === ')' || nextChar === '&' || nextChar === '|' || nextChar === '?' || nextChar === ';') {
+                        // This happens if an less than expression uses no spaces and the
+                        // right-hand side value is a variable. Issue #20 on GitHub.
+                        return true;
+                    }
+                }
+                return false;
+            },
+
             /**
              * Compiler Step 1 - Remove Comments from the Code
              *
@@ -709,7 +745,7 @@
                                 break;
                             case '<':
                                 charNext = peekNext();
-                                if (/[a-zA-Z>]/.test(charNext)) {
+                                if (/[a-zA-Z>]/.test(charNext) && !this.isExpression(input, current, length)) {
                                     state.elementCount++;
                                 } else if (charNext === '/') {
                                     state.elementCount--;
@@ -785,7 +821,7 @@
                                     state.inStringMultiLine = true;
                                     break;
                                 case '<':
-                                    if (/[a-zA-Z>]/.test(input[c + 1])) {
+                                    if (/[a-zA-Z>]/.test(input[c + 1]) && !jsxLoader.compiler.isExpression(input, c, length)) {
                                         return c; // Start of Element found
                                     }
                                     break;
@@ -1103,7 +1139,7 @@
                                     }
                                     break;
                                 case '<':
-                                    if (/[a-zA-Z>/]/.test(peekNext())) {
+                                    if (/[a-zA-Z>/]/.test(peekNext()) && !jsxLoader.compiler.isExpression(input, current, length)) {
                                         state.addChild = true;
                                         state.inElement = true;
                                     }
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@ TODO List`
`22`	`22`	`\|`
`23`	`23`	`--------------------------------------------------------------------------`
`24`	`24`
	`25`	`+**) As of 2022-01-06 updates are being tested for the following issues:`
	`26`	`+ https://github.com/dataformsjs/dataformsjs/issues/20`
	`27`	`+ https://github.com/dataformsjs/dataformsjs/issues/21`
	`28`	`+ This will likely be published later this week`
`25`	`29`
`26`	`30`	`**) Update the Getting Started CSS Template used here:`
`27`	`31`	`https://www.dataformsjs.com/en/getting-started`