Working on bug in annotations

Co-authored-by: jonocr <[email protected]>
Co-authored-by: buddhajjigae <[email protected]>
Co-authored-by: xkevinpark <[email protected]>
Co-authored-by: williamdyoon <[email protected]>

Author: 5 people

app/src/components/App.tsx

@@ -60,12 +60,10 @@ export const App = (): JSX.Element => {
 
   // Caret Start Updated save cycle     
   useEffect(() => {
-    console.log('Legacy state', state);
     // provide config properties to legacy projects so new edits can be auto saved
     if (state.config === undefined) {
       state.config = {saveFlag:true, saveTimer:false};
     };
-    console.log('Updated state for legacy projects', state);
     // New project save configuration to optimize server load and minimize Ajax requests
     if (state.config.saveFlag) {
       state.config.saveFlag = false;

app/src/components/main/DirectChildComponent.tsx

@@ -94,6 +94,7 @@ function DirectChildComponent({ childId, type, typeId, style }: ChildElement) {
             style={combinedStyle}
             placeHolder=""
             linkId={null}
+            childId={childId}
           >
             {renderIndirectChildren(childReferencedComponent)}
           </IndirectChild>
@@ -122,6 +123,7 @@ function DirectChildComponent({ childId, type, typeId, style }: ChildElement) {
                 style={combinedStyle}
                 placeHolder={HTMLDefaultPlaceholder}
                 linkId={null}
+                childId={childId}
                 key={
                   'indChildHTML' +
                   child.childId.toString() +
@@ -135,6 +137,7 @@ function DirectChildComponent({ childId, type, typeId, style }: ChildElement) {
                 style={combinedStyle}
                 placeHolder={HTMLDefaultPlaceholder}
                 linkId={null}
+                childId={childId}
                 key={
                   'indChildNest' +
                   child.childId.toString() +
@@ -158,6 +161,7 @@ function DirectChildComponent({ childId, type, typeId, style }: ChildElement) {
             style={combinedStyle}
             placeHolder=""
             linkId={child.typeId}
+            childId={childId}
           >
             {''}
           </IndirectChild>

app/src/components/main/IndirectChild.tsx

@@ -28,12 +28,6 @@ function IndirectChild({ style, children, placeHolder, linkId, childId, name, an
 
   return (
     <div style={combinedStyle}>
-      {linkId ? (
-        <div onClick={onClickHandlerRoute}>{linkName}</div>
-      ) : (
-        placeHolder
-      )}
-      {children}
       {/* Caret start */}
       {`  ( ${childId} )`}
       <Annotation
@@ -42,6 +36,12 @@ function IndirectChild({ style, children, placeHolder, linkId, childId, name, an
         annotations={annotations}
       />
       {/* Caret end */}
+      {linkId ? (
+        <div onClick={onClickHandlerRoute}>{linkName}</div>
+      ) : (
+        placeHolder
+      )}
+      {children}
     </div>
   );
 }