[FSSDK-10773] hook logic improvement

Author: junaed-optimizely

src/hooks.spec.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022, 2023, 2024 Optimizely
+ * Copyright 2022, 2023, 2024, 2026 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1080,6 +1080,55 @@ describe('hooks', () => {
       });
     });
 
+    it('should make sync decision when qualifiedSegments are provided via OptimizelyProvider with ODP integrated', async () => {
+      const segments = ['segment1', 'segment2'];
+
+      // Mock ODP integration
+      (optimizelyMock as any)._client = {
+        isOdpIntegrated: () => true,
+      };
+
+      // Client not fully ready yet (fetchQualifiedSegments still pending)
+      (optimizelyMock.isReady as any) = () => false;
+      (optimizelyMock.getIsReadyPromiseFulfilled as any) = () => false;
+
+      // Simulate setUser synchronously making config and userContext (with segments) available
+      // This mirrors real behavior: setUser synchronously sets userContext.qualifiedSegments
+      // before awaiting onReady
+      (optimizelyMock.setUser as jest.Mock).mockImplementation((_user, qualifiedSegments) => {
+        (optimizelyMock.getOptimizelyConfig as jest.Mock).mockReturnValue({});
+        (optimizelyMock.getUserContext as jest.Mock).mockReturnValue({ qualifiedSegments });
+      });
+
+      decideMock.mockReturnValue({ ...defaultDecision, enabled: true });
+
+      // Hold onReady so client never becomes "ready" during initial render
+      let resolveReadyPromise: (result: { success: boolean }) => void;
+      const readyPromise = new Promise<any>((res) => {
+        resolveReadyPromise = res;
+      });
+      getOnReadyPromise = (): Promise<any> => readyPromise;
+
+      render(
+        <OptimizelyProvider
+          optimizely={optimizelyMock}
+          user={{ id: 'testuser', attributes: {} }}
+          qualifiedSegments={segments}
+        >
+          <UseDecisionLoggingComponent />
+        </OptimizelyProvider>
+      );
+
+      // hasConfigAndUserInfo returns true (config + userContext + odpIntegrated + qualifiedSegments)
+      // so useDecision should evaluate a sync decision even though client is not ready
+      expect(mockLog).toHaveBeenCalledTimes(1);
+      expect(mockLog).toHaveBeenCalledWith(true);
+      // Cleanup: resolve onReady promise to prevent test timeout
+      await act(async () => {
+        resolveReadyPromise!({ success: true });
+      });
+    });
+
     it('should re-render after updating the override user ID argument', async () => {
       decideMock.mockReturnValue({ ...defaultDecision });
       const { rerender } = render(

src/hooks.ts

@@ -249,6 +249,15 @@ function useCompareAttrsMemoize(value: UserAttributes | undefined): UserAttribut
   return ref.current;
 }
 
+function hasConfigAndUserInfo(optimizely: ReactSDKClient | null): boolean {
+  const hasConfig = !!optimizely?.getOptimizelyConfig();
+  const userContext = optimizely?.getUserContext();
+  // @ts-ignore
+  const isOdpIntegrated = optimizely?._client?.isOdpIntegrated();
+  const areSegmentsAvailable = !!(isOdpIntegrated && userContext?.qualifiedSegments !== undefined);
+  return !!(hasConfig && userContext && (!isOdpIntegrated || areSegmentsAvailable));
+}
+
 /**
  * A React Hook that retrieves the variation for an experiment, optionally
  * auto updating that value based on underlying user or datafile changes.
@@ -270,9 +279,10 @@ export const useExperiment: UseExperiment = (experimentKey, options = {}, overri
 
   const isClientReady = isServerSide || !!optimizely?.isReady();
   const isReadyPromiseFulfilled = !!optimizely?.getIsReadyPromiseFulfilled();
-  const canMakeDecision = !!(optimizely?.getOptimizelyConfig() && optimizely.getUserContext());
+  const isExperimentReady = hasConfigAndUserInfo(optimizely) || isClientReady;
+
   const [state, setState] = useState<ExperimentDecisionValues & InitializationState>(() => {
-    const decisionState = canMakeDecision ? getCurrentDecision() : { variation: null };
+    const decisionState = isExperimentReady ? getCurrentDecision() : { variation: null };
     return {
       ...decisionState,
       clientReady: isClientReady,
@@ -368,10 +378,10 @@ export const useFeature: UseFeature = (featureKey, options = {}, overrides = {})
 
   const isClientReady = isServerSide || !!optimizely?.isReady();
   const isReadyPromiseFulfilled = !!optimizely?.getIsReadyPromiseFulfilled();
-  const canMakeDecision = !!(optimizely?.getOptimizelyConfig() && optimizely.getUserContext());
+  const isFeatureReady = hasConfigAndUserInfo(optimizely) || isClientReady;
 
   const [state, setState] = useState<FeatureDecisionValues & InitializationState>(() => {
-    const decisionState = canMakeDecision ? getCurrentDecision() : { isEnabled: false, variables: {} };
+    const decisionState = isFeatureReady ? getCurrentDecision() : { isEnabled: false, variables: {} };
     return {
       ...decisionState,
       clientReady: isClientReady,
@@ -468,10 +478,11 @@ export const useDecision: UseDecision = (flagKey, options = {}, overrides = {})
 
   const isClientReady = isServerSide || !!optimizely?.isReady();
   const isReadyPromiseFulfilled = !!optimizely?.getIsReadyPromiseFulfilled();
-  const canMakeDecision = !!(optimizely?.getOptimizelyConfig() && optimizely.getUserContext());
+
+  const isDecisionReady = hasConfigAndUserInfo(optimizely) || isClientReady;
 
   const [state, setState] = useState<{ decision: OptimizelyDecision } & InitializationState>(() => {
-    const decisionState = canMakeDecision
+    const decisionState = isDecisionReady
       ? getCurrentDecision()
       : {
           decision: defaultDecision,

src/reactUtils.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright 2026 Optimizely
+ * Copyright 2019, 2026 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/utils.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2026 Optimizely
+ * Copyright 2019, 2026 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.