fix: BROS-366: Fix resuming drawing for unfinished region (#8389)

Author: Sergei Koshevarov

web/libs/editor/src/mixins/DrawingTool.js

@@ -141,6 +141,9 @@ const DrawingTool = types
         self.annotation.setIsDrawing(true);
         self.annotation.regionStore.selection.drawingSelect(self.currentArea);
         self.listenForClose?.();
+        if (self.manager.findSelectedTool() !== self) {
+          self.manager.selectTool(self, true);
+        }
       },
       commitDrawingRegion() {
         const { currentArea, control, obj } = self;

web/libs/editor/src/mixins/Tool.js

@@ -63,9 +63,9 @@ const ToolMixin = types
     },
 
     get shouldPreserveSelectedState() {
-      if (!self.obj) return false;
+      if ((!ff.isActive(FF_DEV_3391) && !self.obj) || !self.control) return false;
 
-      const settings = getRoot(self.obj).settings;
+      const settings = getRoot(ff.isActive(FF_DEV_3391) ? self.control : self.obj).settings;
 
       return settings.preserveSelectedTool;
     },