From 64e1ca2657d0b714bbfff50f30d69d7bc2ed47d8 Mon Sep 17 00:00:00 2001
From: HEGGRIA <34475327+HEGGRIA@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:16:59 +0800
Subject: [PATCH] chore(reactivity): effectScope.ts variable declarations
 optimized and remove useless code in effect.ts (#11721)

* chore(reactivity): effectScope.ts variable declarations optimized and remove useless code in effect.ts

* fix(reactivity): batchDepth count error fixed

* fix(reactivity): batchDepth count error fixed

* chore(reactivity): modify the batchDepth increase type
---
 packages/reactivity/src/effect.ts      |  4 +---
 packages/reactivity/src/effectScope.ts | 10 ++++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts
index c769ba57d8..11d8324428 100644
--- a/packages/reactivity/src/effect.ts
+++ b/packages/reactivity/src/effect.ts
@@ -258,12 +258,10 @@ export function startBatch(): void {
  * @internal
  */
 export function endBatch(): void {
-  if (batchDepth > 1) {
-    batchDepth--
+  if (--batchDepth > 0) {
     return
   }
 
-  batchDepth--
   let error: unknown
   while (batchedEffect) {
     let e: ReactiveEffect | undefined = batchedEffect
diff --git a/packages/reactivity/src/effectScope.ts b/packages/reactivity/src/effectScope.ts
index 898a7cb027..4fa9686083 100644
--- a/packages/reactivity/src/effectScope.ts
+++ b/packages/reactivity/src/effectScope.ts
@@ -53,12 +53,13 @@ export class EffectScope {
   pause(): void {
     if (this._active) {
       this._isPaused = true
+      let i, l
       if (this.scopes) {
-        for (let i = 0, l = this.scopes.length; i < l; i++) {
+        for (i = 0, l = this.scopes.length; i < l; i++) {
           this.scopes[i].pause()
         }
       }
-      for (let i = 0, l = this.effects.length; i < l; i++) {
+      for (i = 0, l = this.effects.length; i < l; i++) {
         this.effects[i].pause()
       }
     }
@@ -71,12 +72,13 @@ export class EffectScope {
     if (this._active) {
       if (this._isPaused) {
         this._isPaused = false
+        let i, l
         if (this.scopes) {
-          for (let i = 0, l = this.scopes.length; i < l; i++) {
+          for (i = 0, l = this.scopes.length; i < l; i++) {
             this.scopes[i].resume()
           }
         }
-        for (let i = 0, l = this.effects.length; i < l; i++) {
+        for (i = 0, l = this.effects.length; i < l; i++) {
           this.effects[i].resume()
         }
       }
-- 
2.47.2