chore: Cherry picked OPTIC-353 into release 1.11.0 (#5353)

* [submodules] Copy src HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7641783707 * ci: Build frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7641808946 --------- Co-authored-by: Travis Clark <travisjosephclark@gmail.com> Co-authored-by: robot-ci-heartex <robot-ci-heartex@users.noreply.github.com>
HumanSignal · Jan 24, 2024 · a9766f0 · a9766f0
1 parent 08e726c
commit a9766f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/web/dist/libs/editor/main.js b/web/dist/libs/editor/main.js
diff --git a/web/dist/libs/editor/main.js.map b/web/dist/libs/editor/main.js.map
diff --git a/web/libs/editor/src/LabelStudio.js b/web/libs/editor/src/LabelStudio.js
@@ -79,6 +79,8 @@ 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]);

diff --git a/web/libs/editor/src/regions/VideoRegion.js b/web/libs/editor/src/regions/VideoRegion.js
@@ -1,4 +1,4 @@
-import { types } from 'mobx-state-tree';
+import { getRoot, 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 self.object.annotation;
+      return getRoot(self)?.annotationStore?.selected;
     },
 
     getShape() {