Feat/prt 2005 (#141)

* feat: replace command to navigation fields * Update index.ts remove log * fix: improve logic to return a field * feat: improve to use string comparation
iarahealth · Jun 21, 2024 · 85d58c0 · 85d58c0
1 parent 38fa9a0
commit 85d58c0
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 26 deletions.
diff --git a/src/editor/index.ts b/src/editor/index.ts
@@ -119,26 +119,36 @@ export abstract class EditorAdapter {
   }
 
   private _initCommands(): void {
-    this._recognition.commands.add("iara copiar laudo", async () => {
-      this._getNavigationFieldDeleted();
-      if (this.hasEmptyRequiredFields()) {
-        this.onIaraCommand?.("required fields to copy");
-        return;
+    this._recognition.commands.add(
+      "iara copiar laudo",
+      async (detail, command) => {
+        if (detail.transcript === command) {
+          this._getNavigationFieldDeleted();
+        }
+        if (this.hasEmptyRequiredFields()) {
+          this.onIaraCommand?.("required fields to copy");
+          return;
+        }
+        this._recognition.stop();
+        await this.copyReport();
+        this.onIaraCommand?.("iara copiar laudo");
       }
-      this._recognition.stop();
-      await this.copyReport();
-      this.onIaraCommand?.("iara copiar laudo");
-    });
-    this._recognition.commands.add("iara finalizar laudo", async () => {
-      this._getNavigationFieldDeleted();
-      if (this.hasEmptyRequiredFields()) {
-        this.onIaraCommand?.("required fields to finish");
-        return;
+    );
+    this._recognition.commands.add(
+      "iara finalizar laudo",
+      async (detail, command) => {
+        if (detail.transcript === command) {
+          this._getNavigationFieldDeleted();
+        }
+        if (this.hasEmptyRequiredFields()) {
+          this.onIaraCommand?.("required fields to finish");
+          return;
+        }
+        this._recognition.stop();
+        await this.finishReport();
+        this.onIaraCommand?.("iara finalizar laudo");
       }
-      this._recognition.stop();
-      await this.finishReport();
-      this.onIaraCommand?.("iara finalizar laudo");
-    });
+    );
     this._recognition.commands.add("iara negrito", () => {
       this._styleManager.toggleBold();
     });
@@ -154,22 +164,30 @@ export abstract class EditorAdapter {
     this._recognition.commands.add("iara imprimir", () => {
       this.print();
     });
-    this._recognition.commands.add("iara próximo campo", () => {
-      this._getNavigationFieldDeleted();
+    this._recognition.commands.add("iara próximo campo", (detail, command) => {
+      if (detail.transcript === command) {
+        this._getNavigationFieldDeleted();
+      }
       this._navigationFieldManager.nextField();
     });
-    this._recognition.commands.add("iara campo anterior", () => {
-      this._getNavigationFieldDeleted();
+    this._recognition.commands.add("iara campo anterior", (detail, command) => {
+      if (detail.transcript === command) {
+        this._getNavigationFieldDeleted();
+      }
       this._navigationFieldManager.previousField();
     });
-    this._recognition.commands.add("next", () => {
-      this._getNavigationFieldDeleted();
+    this._recognition.commands.add("next", (detail, command) => {
+      if (detail.transcript === command) {
+        this._getNavigationFieldDeleted();
+      }
       this._navigationFieldManager.nextField();
     });
     this._recognition.commands.add(
       `buscar (\\p{Letter}+)`,
       (detail, command, param, groups) => {
-        this._getNavigationFieldDeleted();
+        if (detail.transcript === command) {
+          this._getNavigationFieldDeleted();
+        }
         try {
           this._navigationFieldManager.goToField(groups ? groups[1] : "");
         } catch (e) {

diff --git a/src/syncfusion/navigationFields/index.ts b/src/syncfusion/navigationFields/index.ts
@@ -100,7 +100,7 @@ export class IaraSyncfusionNavigationFieldManager extends IaraEditorNavigationFi
       )[0];
     }
     this.sortByPosition();
-    if (this.bookmarks.length > 1)
+    if (this.bookmarks.length >= 1)
       this.getPreviousAndNext(this.currentSelectionOffset);
 
     if (setColor) this.setColor();