Merge pull request #8 from decentraland-scenes/html-tag-fix

bug: html tag fix
decentraland-scenes · Jun 16, 2023 · 7dc61db · 7dc61db
2 parents 278b488 + c3d092c
commit 7dc61db
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/dialog.ts b/src/dialog.ts
@@ -627,4 +627,35 @@ export function getImageAtlasMapping(data?: ImageAtlasData): number[] {
     }
     return 0
   }
-
+
+
+
+export function closeTag(dialogData:any, newChars: number){
+  if(dialogData.visibleChars == 0 || newChars ==0 ) return
+
+let openTag: boolean = false
+let closeTag : boolean = false
+for(let i = dialogData.visibleChars-newChars; i < dialogData.visibleChars ; i++){
+
+  if(!openTag){
+    if(dialogData.fullText.substr(i, 1) == '<'){
+      openTag= true
+
+    }
+  } else {
+    if(dialogData.fullText.substr(i, 1) == '>'){
+      closeTag= true
+
+    }
+  }
+}
+
+if(!openTag || closeTag){	
+  return
+}
+
+while(dialogData.visibleChars < dialogData.fullText.length && dialogData.fullText.substr(dialogData.visibleChars-1, 1) != '>'){
+  dialogData.visibleChars+=1
+}
+return
+}
diff --git a/src/systems.ts b/src/systems.ts
@@ -1,7 +1,7 @@
 import { Entity, InputAction, PointerEventType, TextShape, Transform, engine, inputSystem } from "@dcl/sdk/ecs";
 import { IsFollowingPath, IsTypingBubble, IsTypingDialog, TrackUserFlag } from "./components";
 import { activeNPC, walkingTimers } from "./npc";
-import { ConfirmMode, confirmText, npcDialogComponent, rushText, skipDialogs } from "./dialog";
+import { ConfirmMode, closeTag, confirmText, npcDialogComponent, rushText, skipDialogs } from "./dialog";
 import { bubbles, next } from "./bubble";
 import { Quaternion, Vector3 } from "@dcl/sdk/math";
 
@@ -31,6 +31,8 @@ export function handleDialogTyping(dt:number) {
             dialogData.timer = 0
 
             dialogData.visibleChars += charsToAdd
+            closeTag(dialogData, charsToAdd)
+
 
             if (dialogData.visibleChars >= dialogData.fullText.length) {
                 dialogData.typing = false