ULMS-2995 Fixed problem with timers (toolbar)

foxford · Jun 6, 2024 · 335bbfa · 335bbfa
1 parent f42542c
commit 335bbfa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/drawing-toolbar/package.json b/packages/drawing-toolbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ulms/ui-drawing-toolbar",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "license": "MIT",
   "main": "index.js",
   "module": "es/index.js",

diff --git a/packages/drawing-toolbar/src/drawing-toolbar.jsx b/packages/drawing-toolbar/src/drawing-toolbar.jsx
@@ -40,6 +40,7 @@ class _DrawingToolbarComponent extends React.Component {
     this.state = { opened: '' }
 
     this.mounted = false
+    this.timeoutId = undefined
   }
 
   componentDidMount() {
@@ -53,7 +54,13 @@ class _DrawingToolbarComponent extends React.Component {
     const { opened } = this.state
 
     if (tool !== prevProps.tool || brushMode !== prevProps.brushMode) {
-      setTimeout(() => {
+      // this.setState({ opened: tool })
+
+      this.clearTimeoutId()
+
+      this.timeoutId = setTimeout(() => {
+        this.clearTimeoutId()
+
         // Чтобы успели примениться значения для getOptions
         if (!this.mounted) return
 
@@ -117,6 +124,8 @@ class _DrawingToolbarComponent extends React.Component {
   componentWillUnmount() {
     this.mounted = false
 
+    this.clearTimeoutId()
+
     document.removeEventListener(eventName, this.handleDocumentClickEvent)
   }
 
@@ -176,6 +185,14 @@ class _DrawingToolbarComponent extends React.Component {
     }
   }
 
+  clearTimeoutId() {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId)
+
+      this.timeoutId = undefined
+    }
+  }
+
   render() {
     const {
       brushColor,