jodit 4.2.21 → 4.2.24

package/esm/plugins/speech-recognize/helpers/recognize-manager.js

@@ -60,7 +60,7 @@ let RecognizeManager = RecognizeManager_1 = class RecognizeManager extends Event
             }, 5000);
             this.emit('pulse', true);
         };
-        this._progressTimeout = 0;
+        this.__interimResults = '';
         this._api = api;
         RecognizeManager_1._instances.add(this);
     }
@@ -82,23 +82,29 @@ let RecognizeManager = RecognizeManager_1 = class RecognizeManager extends Event
                 instance.stop();
             }
         });
-        this._api.start();
+        try {
+            this._api.start();
+        }
+        catch (e) {
+            this._onError(e);
+            this.stop();
+            return;
+        }
         this.__on('speechstart', this._onSpeechStart)
             .__on('error', this._onError)
-            .__on('result', this._onResult);
+            .__on('result', this._onProgress)
+            .__on('end', this._onResults);
     }
     stop() {
         if (!this._isEnabled) {
             return;
         }
-        try {
-            this._api.abort();
-            this._api.stop();
-        }
-        catch { }
+        this._api.abort();
+        this._api.stop();
         this.__off('speechstart', this._onSpeechStart)
             .__off('error', this._onError)
-            .__off('result', this._onResult);
+            .__off('result', this._onProgress)
+            .__off('end', this._onResults);
         this.async.clearTimeout(this._restartTimeout);
         this._isEnabled = false;
         this.emit('pulse', false);
@@ -123,37 +129,47 @@ let RecognizeManager = RecognizeManager_1 = class RecognizeManager extends Event
         this._api.removeEventListener(event, callback);
         return this;
     }
-    _onResult(e) {
+    _onResults(e) {
+        this.emit('pulse', false);
+        this.emit('result', this.__interimResults);
+        this.__interimResults = '';
+        this._makeSound(PII);
+        this.restart();
+    }
+    _onProgress(e) {
         if (!this._isEnabled) {
             return;
         }
-        this.async.clearTimeout(this._progressTimeout);
-        const resultItem = e.results.item(e.resultIndex);
-        const { transcript } = resultItem.item(0);
-        const resultHandler = () => {
-            try {
-                this.async.clearTimeout(this._restartTimeout);
-                this.emit('result', transcript);
-            }
-            catch { }
-            this.restart();
-            this.emit('pulse', false);
-            this._makeSound(PII);
-        };
-        if (resultItem.isFinal === false) {
-            this.emit('progress', transcript);
-            this._progressTimeout = this.async.setTimeout(resultHandler, 500);
+        this.__interimResults = '';
+        if (!e.results) {
             return;
         }
-        resultHandler();
+        for (let i = 0; i < e.results.length; i++) {
+            const resultItem = e.results.item(i);
+            if (resultItem.length) {
+                const { transcript } = resultItem.item(0);
+                this.__interimResults += transcript;
+            }
+        }
+        if (this.__interimResults) {
+            this.emit('progress', this.__interimResults);
+        }
     }
-    _onError() {
-        if (!this._isEnabled) {
-            return;
+    _onError(e) {
+        if (e.error === 'voice-unavailable') {
+            this.emit('error', 'Voice unavailable');
+        }
+        if (e.error === 'not-allowed') {
+            this.emit('error', 'Not allowed');
+        }
+        if (e.error === 'language-unavailable' ||
+            // @ts-ignore
+            e.error === 'language-not-supported') {
+            this.emit('error', 'Language unavailable');
         }
         this._makeSound(WARN);
         this.emit('pulse', false);
-        this.restart();
+        this.stop();
     }
     _makeSound(frequency) {
         if (this.sound) {

package/esm/plugins/speech-recognize/interface.d.ts

@@ -14,7 +14,9 @@ export interface ISpeechRecognizeResult {
             item(subIndex: number): {
                 transcript: string;
             };
+            length: number;
         };
+        length: number;
     };
 }
 export interface ISpeechRecognize {

package/esm/plugins/speech-recognize/speech-recognize.d.ts

@@ -13,10 +13,14 @@ import { Plugin } from "../../core/plugin";
 import "./config";
 
 export declare class SpeechRecognizeNative extends Plugin implements IPlugin {
-    constructor(j: IJodit);
+    buttons: {
+        group: string;
+        name: string;
+    }[];
     protected afterInit(jodit: IJodit): void;
     protected beforeDestruct(jodit: IJodit): void;
     private messagePopup;
+    private __hidePopupTimeout;
     protected onSpeechRecognizeProgressResult(text: string): void;
     protected onSpeechRecognizeResult(text: string): void;
     private _checkCommand;

package/esm/plugins/speech-recognize/speech-recognize.js

@@ -13,7 +13,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
                 r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { debounce } from "../../core/decorators/debounce/debounce.js";
 import { watch } from "../../core/decorators/watch/watch.js";
 import { Dom } from "../../core/dom/dom.js";
 import { extendLang } from "../../core/global.js";
@@ -24,15 +23,15 @@ import { Jodit } from "../../jodit.js";
 import { execSpellCommand } from "./helpers/exec-spell-command.js";
 import * as langs from "./langs/index.js";
 export class SpeechRecognizeNative extends Plugin {
-    constructor(j) {
-        super(j);
-        this._commandToWord = {};
-        if (j.o.speechRecognize.api) {
-            j.registerButton({
+    constructor() {
+        super(...arguments);
+        this.buttons = [
+            {
                 group: 'state',
                 name: 'speechRecognize'
-            });
-        }
+            }
+        ];
+        this._commandToWord = {};
     }
     afterInit(jodit) {
         const { commands } = jodit.o.speechRecognize;
@@ -53,23 +52,25 @@ export class SpeechRecognizeNative extends Plugin {
             });
         }
     }
-    beforeDestruct(jodit) { }
+    beforeDestruct(jodit) {
+        Dom.safeRemove(this.messagePopup);
+    }
     onSpeechRecognizeProgressResult(text) {
         if (!this.messagePopup) {
             this.messagePopup = this.j.create.div('jodit-speech-recognize__popup');
         }
         this.j.workplace.appendChild(this.messagePopup);
-        this.j.async.setTimeout(() => {
+        this.j.async.clearTimeout(this.__hidePopupTimeout);
+        this.__hidePopupTimeout = this.j.async.setTimeout(() => {
             Dom.safeRemove(this.messagePopup);
-        }, {
-            label: 'onSpeechRecognizeProgressResult',
-            timeout: 1000
-        });
+        }, 1000);
         this.messagePopup.innerText = text + '|';
     }
     onSpeechRecognizeResult(text) {
-        const { j } = this, { s } = j;
+        this.j.async.clearTimeout(this.__hidePopupTimeout);
         Dom.safeRemove(this.messagePopup);
+        const { j } = this;
+        const { s } = j;
         if (!this._checkCommand(text)) {
             const { range } = s, node = s.current();
             if (s.isCollapsed() &&
@@ -100,8 +101,7 @@ export class SpeechRecognizeNative extends Plugin {
     }
 }
 __decorate([
-    watch(':speechRecognizeProgressResult'),
-    debounce()
+    watch(':speechRecognizeProgressResult')
 ], SpeechRecognizeNative.prototype, "onSpeechRecognizeProgressResult", null);
 __decorate([
     watch(':speechRecognizeResult')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit",
-	"version": "4.2.21",
+	"version": "4.2.24",
 	"description": "Jodit is an awesome and useful wysiwyg editor with filebrowser",
 	"main": "esm/index.js",
 	"types": "types/index.d.ts",

package/types/plugins/speech-recognize/config.d.ts

@@ -11,7 +11,7 @@ import type { ISpeechRecognizeConstructor } from "./interface";
 declare module 'jodit/config' {
     interface Config {
         speechRecognize: {
-            readonly api: ISpeechRecognizeConstructor;
+            readonly api: ISpeechRecognizeConstructor | null;
             /**
              * Returns and sets the language of the current SpeechRecognition.
              * If not specified, this defaults to the HTML lang attribute value, or

package/types/plugins/speech-recognize/helpers/recognize-manager.d.ts

@@ -41,8 +41,9 @@ export declare class RecognizeManager extends Eventify<{
     private readonly _api;
     private __on;
     private __off;
-    private _progressTimeout;
-    private _onResult;
+    private _onResults;
+    private __interimResults;
+    private _onProgress;
     private _onError;
     private _makeSound;
 }

package/types/plugins/speech-recognize/interface.d.ts

@@ -14,7 +14,9 @@ export interface ISpeechRecognizeResult {
             item(subIndex: number): {
                 transcript: string;
             };
+            length: number;
         };
+        length: number;
     };
 }
 export interface ISpeechRecognize {

package/types/plugins/speech-recognize/speech-recognize.d.ts

@@ -13,10 +13,14 @@ import { Plugin } from "../../core/plugin";
 import "./config";
 
 export declare class SpeechRecognizeNative extends Plugin implements IPlugin {
-    constructor(j: IJodit);
+    buttons: {
+        group: string;
+        name: string;
+    }[];
     protected afterInit(jodit: IJodit): void;
     protected beforeDestruct(jodit: IJodit): void;
     private messagePopup;
+    private __hidePopupTimeout;
     protected onSpeechRecognizeProgressResult(text: string): void;
     protected onSpeechRecognizeResult(text: string): void;
     private _checkCommand;