Merge branch 'development' into release_v1.9.0

Author: EmilianoSanchez

src/SplitClient.tsx

@@ -26,7 +26,7 @@ export class SplitComponent extends React.Component<IUpdateProps & { factory: Sp
   static getDerivedStateFromProps(props: ISplitClientProps & { factory: SplitIO.IBrowserSDK | null, client: SplitIO.IBrowserClient | null }, state: ISplitContextValues) {
     const { client, factory, attributes } = props;
     // initAttributes can be called in the `render` method too, but it is better here for separation of concerns
-    if (client) initAttributes(client, attributes);
+    initAttributes(client, attributes);
     const status = getStatus(client);
     // no need to compare status.isTimedout, since it derives from isReady and hasTimedout
     if (client !== state.client ||
@@ -146,7 +146,7 @@ export function SplitClient(props: ISplitClientProps) {
       {(splitContext: ISplitContextValues) => {
         const { factory } = splitContext;
         // getSplitSharedClient is idempotent like factory.client: it returns the same client given the same factory, Split Key and TT
-        const client = factory ? getSplitSharedClient(factory, props.splitKey, props.trafficType, props.attributes) : null;
+        const client = factory ? getSplitSharedClient(factory, props.splitKey, props.trafficType) : null;
         return (
           <SplitComponent {...props} factory={factory} client={client} attributes={props.attributes} />
         );

src/SplitFactory.tsx

@@ -53,7 +53,7 @@ export class SplitFactory extends React.Component<ISplitFactoryProps, { factory:
     }
     this.isFactoryExternal = propFactory ? true : false;
 
-    // Instantiate main client.
+    // Instantiate main client. Attributes are set on `SplitComponent.getDerivedStateFromProps`
     const client = factory ? factory.client() : null;
 
     this.state = {

src/useSplitClient.ts

@@ -17,9 +17,9 @@ export function useSplitClient(key?: SplitIO.SplitKey, trafficType?: string, att
   const context = React.useContext(SplitContext);
   let { factory, client } = context;
   if (key && factory) {
-    client = getSplitSharedClient(factory, key, trafficType, attributes);
+    client = getSplitSharedClient(factory, key, trafficType);
   }
-  if (client) initAttributes(client, attributes);
+  initAttributes(client, attributes);
   return client === context.client ? context : {
     ...context, client, ...(client as IClientWithContext).__getStatus()
   };

src/utils.ts

@@ -44,7 +44,7 @@ export function getSplitFactory(config: SplitIO.IBrowserSettings): IFactoryWithC
 }
 
 // idempotent operation
-export function getSplitSharedClient(factory: SplitIO.IBrowserSDK, key: SplitIO.SplitKey, trafficType?: string, _attributes?: SplitIO.Attributes): IClientWithContext {
+export function getSplitSharedClient(factory: SplitIO.IBrowserSDK, key: SplitIO.SplitKey, trafficType?: string): IClientWithContext {
   // factory.client is an idempotent operation
   const client = factory.client(key, trafficType) as IClientWithContext;
   if ((factory as IFactoryWithClients).sharedClientInstances) {
@@ -127,8 +127,8 @@ export function validateFeatureFlags(maybeFeatureFlags: unknown, listName = 'spl
 /**
  * Manage client attributes binding
  */
-export function initAttributes(client: SplitIO.IBrowserClient, attributes?: SplitIO.Attributes) {
-  if (attributes) client.setAttributes(attributes);
+export function initAttributes(client: SplitIO.IBrowserClient | null, attributes?: SplitIO.Attributes) {
+  if (client && attributes) client.setAttributes(attributes);
 }
 
 const TRIMMABLE_SPACES_REGEX = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/;

types/utils.d.ts

@@ -19,7 +19,7 @@ export interface IFactoryWithClients extends SplitIO.IBrowserSDK {
 }
 export declare const __factories: Map<SplitIO.IBrowserSettings, IFactoryWithClients>;
 export declare function getSplitFactory(config: SplitIO.IBrowserSettings): IFactoryWithClients;
-export declare function getSplitSharedClient(factory: SplitIO.IBrowserSDK, key: SplitIO.SplitKey, trafficType?: string, _attributes?: SplitIO.Attributes): IClientWithContext;
+export declare function getSplitSharedClient(factory: SplitIO.IBrowserSDK, key: SplitIO.SplitKey, trafficType?: string): IClientWithContext;
 export declare function destroySplitFactory(factory: IFactoryWithClients): Promise<void[]>;
 export interface IClientStatus {
     isReady: boolean;
@@ -40,4 +40,4 @@ export declare function validateFeatureFlags(maybeFeatureFlags: unknown, listNam
 /**
  * Manage client attributes binding
  */
-export declare function initAttributes(client: SplitIO.IBrowserClient, attributes?: SplitIO.Attributes): void;
+export declare function initAttributes(client: SplitIO.IBrowserClient | null, attributes?: SplitIO.Attributes): void;