fix: critical bug with enableOnDemand behaviour (enabled false was ignored)

Author: js2me

src/mobx-inifinite-query.ts

@@ -244,16 +244,14 @@ export class MobxInfiniteQuery<
     // to do this, we hold the original value of the enabled option
     // and set enabled to false until the user requests the result (this.isResultRequsted)
     if (this.isEnabledOnResultDemand) {
-      if (options.enabled !== false) {
-        this.holdedEnabledOption = options.enabled;
-      }
-
       if (this.isResultRequsted) {
         if (this.isEnabledHolded) {
           options.enabled = this.holdedEnabledOption;
           this.isEnabledHolded = false;
+          this.holdedEnabledOption = undefined;
         }
       } else {
+        this.holdedEnabledOption = options.enabled;
         options.enabled = false;
         this.isEnabledHolded = true;
       }

src/mobx-query.test.ts

@@ -581,6 +581,30 @@ describe('MobxQuery', () => {
 
         mobxQuery.dispose();
       });
+
+      it('should enable query from dynamic options ONLY AFTER result is requested', () => {
+        const valueBox = observable.box<string | undefined>();
+
+        const mobxQuery = new MobxQueryMock({
+          queryFn: () => 100,
+          enableOnDemand: true,
+          options: () => ({
+            queryKey: ['values', valueBox.get()] as const,
+            enabled: !!valueBox.get(),
+          }),
+        });
+
+        mobxQuery.result.data;
+        mobxQuery.result.isLoading;
+
+        expect(mobxQuery.spies.queryFn).toBeCalledTimes(0);
+
+        valueBox.set('value');
+
+        expect(mobxQuery.spies.queryFn).toBeCalledTimes(1);
+
+        mobxQuery.dispose();
+      });
     });
   });
 

src/mobx-query.ts

@@ -209,16 +209,14 @@ export class MobxQuery<
     // to do this, we hold the original value of the enabled option
     // and set enabled to false until the user requests the result (this.isResultRequsted)
     if (this.isEnabledOnResultDemand) {
-      if (options.enabled !== false) {
-        this.holdedEnabledOption = options.enabled;
-      }
-
       if (this.isResultRequsted) {
         if (this.isEnabledHolded) {
           options.enabled = this.holdedEnabledOption;
           this.isEnabledHolded = false;
+          this.holdedEnabledOption = undefined;
         }
       } else {
+        this.holdedEnabledOption = options.enabled;
         options.enabled = false;
         this.isEnabledHolded = true;
       }