fix(Editor): setTheme not sent on reconnect or language change

MSIS-2643

Author: steven.roulleau

src/Editor.js

@@ -521,7 +521,7 @@ export class Editor {
     this.undoRedoContext = UndoRedoContext.createUndoRedoContext(this.configuration)
     this.undoRedoManager = UndoRedoManager
 
-    const initialize = (model) => {
+    const initialize = (model, shouldSendTheme) => {
       /**
        * @private
        * @type {Recognizer}
@@ -542,6 +542,11 @@ export class Editor {
         this.innerRecognizer.init(this.recognizerContext, model)
           .then((values) => {
             logger.info('Recognizer initialized !')
+            if (shouldSendTheme) {
+              setTheme(this, this.model)
+              setPenStyle(this, this.model)
+              setPenStyleClasses(this, this.model)
+            }
             this.loader.style.display = 'none'
           })
           .catch(err => handleError(this, err))
@@ -554,7 +559,7 @@ export class Editor {
           .then((model) => {
             logger.info('Recognizer closed')
             handleSuccess(this, model)
-            initialize(InkModel.clearModel(model))
+            initialize(InkModel.clearModel(model), true)
           })
           .catch(err => handleError(this, err))
       } else {
@@ -565,7 +570,7 @@ export class Editor {
         this.model = InkModel.createModel(this.configuration)
 
         // INFO: Recognizer needs model to be initialized
-        initialize(this.model)
+        initialize(this.model, false)
       }
     }
   }

src/recognizer/websocket/WsRecognizerUtil.js

@@ -3,7 +3,12 @@ import * as NetworkWSInterface from './networkWSInterface'
 import * as PromiseHelper from '../../util/PromiseHelper'
 import * as InkModel from '../../model/InkModel'
 import * as RecognizerContext from '../../model/RecognizerContext'
-import { responseCallback } from './iinkWsRecognizer'
+import {
+  responseCallback,
+  setTheme,
+  setPenStyle,
+  setPenStyleClasses
+} from './iinkWsRecognizer'
 
 function buildUrl (configuration, suffixUrl) {
   const scheme = (configuration.recognitionParams.server.scheme === 'https') ? 'wss' : 'ws'
@@ -49,6 +54,10 @@ export async function retry (func, recognizerContext, model, buildFunc, ...param
         logger.error('Failed retry', err)
         retry(func, recognizerContext, model, buildFunc, ...params)
       })
+    setTheme(recognizerContext, model, recognizerContext.editor.theme)
+    setPenStyle(recognizerContext, model, recognizerContext.editor.penStyle)
+    setPenStyleClasses(recognizerContext, model, recognizerContext.editor.penStyleClasses)
+
     return func(recognizerContext, model, buildFunc, ...params)
   } else {
     responseCallback(model, 'Unable to reconnect')