fix: LEAP-580: Display non-string values in Text

web/libs/editor/src/LabelStudio.js

@@ -79,8 +79,6 @@ export class LabelStudio {
     };
 
     const clearRenderedApp = () => {
-      if (!rootElement.childNodes?.length) return;
-
       const childNodes = [...rootElement.childNodes];
       // cleanDomAfterReact needs this key to be sure that cleaning affects only current react subtree
       const reactKey = findReactKey(childNodes[0]);

web/libs/editor/src/core/Hotkey.ts

@@ -5,22 +5,10 @@ import { createElement, Fragment } from 'react';
 import { Tooltip } from '../common/Tooltip/Tooltip';
 import Hint from '../components/Hint/Hint';
 import { Block, Elem } from '../utils/bem';
-import { FF_LSDV_1148, FF_MULTI_OBJECT_HOTKEYS, isFF } from '../utils/feature-flags';
+import { FF_LSDV_1148, isFF } from '../utils/feature-flags';
 import { isDefined, isMacOS } from '../utils/utilities';
 import defaultKeymap from './settings/keymap.json';
 
-if (!isFF(FF_MULTI_OBJECT_HOTKEYS)) {
-  const prev = (defaultKeymap as Keymap)['image:prev'];
-  const next = (defaultKeymap as Keymap)['image:next'];
-
-  if (prev) {
-    prev.key = prev.mac = 'ctrl+a';
-  }
-  if (next) {
-    next.key = next.mac = 'ctrl+d';
-  }
-}
-
 // Validate keymap integrity
 const allowedKeympaKeys = ['key', 'mac', 'description', 'modifier', 'modifierDescription'];
 

web/libs/editor/src/core/settings/keymap.json

@@ -168,13 +168,11 @@
     "description": "Previous Page"
   },
   "image:prev": {
-    "key": "ctrl+left",
-    "mac": "command+left",
+    "key": "ctrl+a",
     "description": "Previous Image"
   },
   "image:next": {
-    "key": "ctrl+right",
-    "mac": "command+right",
+    "key": "ctrl+d",
     "description": "Next Image"
   }
 }

web/libs/editor/src/regions/VideoRegion.js

@@ -1,4 +1,4 @@
-import { getRoot, types } from 'mobx-state-tree';
+import { types } from 'mobx-state-tree';
 
 import { guidGenerator } from '../core/Helpers';
 import { AreaMixin } from '../mixins/AreaMixin';
@@ -34,7 +34,7 @@ const Model = types
     },
 
     get annotation() {
-      return getRoot(self)?.annotationStore?.selected;
+      return self.object.annotation;
     },
 
     getShape() {

web/libs/editor/src/tags/object/RichText/model.js

@@ -222,7 +222,7 @@ const Model = types
         // nodes count better be the same, so replace them with stubs
         // we should not sanitize text tasks because we already have htmlEscape in view.js
         if (isFF(FF_SAFE_TEXT) && self.type === 'text') {
-          self._value = val;
+          self._value = String(val);
         } else {
           self._value = sanitizeHtml(String(val));
         }

web/libs/editor/src/utils/data.js

@@ -16,10 +16,10 @@ export const parseValue = (value, task) => {
 
   // value can refer to structures, not only texts, so just replace wouldn't be enough
   if (value.match(reVar)?.[0] === value) {
-    return get(task, value.substr(1)) ?? '';
+    return get(task, value.slice(1)) ?? '';
   }
 
-  return value.replace(reVar, (v) => get(task, v.substr(1) ?? ''));
+  return value.replace(reVar, (v) => get(task, v.slice(1) ?? ''));
 };
 
 /**

web/libs/editor/src/utils/feature-flags.ts

@@ -333,8 +333,6 @@ export const FF_ZOOM_OPTIM = 'fflag_fix_front_leap_32_zoom_perf_190923_short';
 
 export const FF_SAFE_TEXT = 'fflag_fix_leap_466_text_sanitization';
 
-export const FF_MULTI_OBJECT_HOTKEYS = 'fflag_fix_leap_246_multi_object_hotkeys_160124_short';
-
 Object.assign(window, {
   APP_SETTINGS: {
     ...(window.APP_SETTINGS ?? {}),