Merge branch 'LivePersona_Refractoring' of https://github.com/joaojme…

…ndes/sp-dev-fx-controls-react into joaojmendes-LivePersona_Refractoring
pnp · Jan 29, 2022 · 8a05549 · 8a05549
2 parents 44e1bea + 5f30b47
commit 8a05549
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/docs/documentation/docs/controls/LivePersona.md b/docs/documentation/docs/controls/LivePersona.md
@@ -35,7 +35,7 @@ import { LivePersona } from "@pnp/spfx-controls-react/lib/LivePersona";
       <Persona text="João Mendes" secondaryText="joao.j.mendes@sapteck.com" coinSize={48} />
     </>
   }
-  context={this.props.context}
+ serviceScope={this.context.serviceScope}
 />
 ```
 
@@ -47,7 +47,7 @@ The `LivePersona` control can be configured with the following properties:
 
 | Property | Type | Required | Description |
 | ---- | ---- | ---- | ---- |
-| context | BaseComponentContext | yes | The context object of the SPFx loaded webpart or customizer. |
+| serviceScope | ServiceScope | yes | The SPFx ServiceScope object loaded from context of web part or extension. |
 | upn |string | yes | User UPN. |
 | disableHover | boolean | no | If info should not appear on hover. |
-| template | string \| JSX.ELement | yes | The content to wrap with persona info. |
+| template | string | JSX.ELement | yes | The content to wrap with persona info. |
diff --git a/src/controls/LivePersona/ILivePersonaProps.ts b/src/controls/LivePersona/ILivePersonaProps.ts
@@ -1,13 +1,9 @@
-import { BaseComponentContext} from "@microsoft/sp-component-base";
 import { ServiceScope } from "@microsoft/sp-core-library";
 
 export interface ILivePersonatProps {
-  /**
-   * The Web Part context
-   */
-  context?: BaseComponentContext;
+
 /**
-   * The Web Part context
+   * The service locator pattern used by the SharePoint Framework.
    */
  serviceScope: ServiceScope;
   /**

diff --git a/src/controls/LivePersona/LivePersona.tsx b/src/controls/LivePersona/LivePersona.tsx
@@ -13,7 +13,7 @@ export const LivePersona: React.FunctionComponent<ILivePersonatProps> = (
 ) => {
   const [isComponentLoaded, setIsComponentLoaded] = useState<boolean>(false);
   const sharedLibrary = useRef<any>();
-  const { upn, template, disableHover, context, serviceScope } = props;
+  const { upn, template, disableHover, serviceScope } = props;
 
   useEffect(() => {
     (async () => {
@@ -22,7 +22,7 @@ export const LivePersona: React.FunctionComponent<ILivePersonatProps> = (
           sharedLibrary.current = await SPComponentLoader.loadComponentById(LIVE_PERSONA_COMPONENT_ID);
           setIsComponentLoaded(true);
         } catch (error) {
-          Log.error(`[LivePersona]`, error, serviceScope ?? context.serviceScope);
+          Log.error(`[LivePersona]`, error, serviceScope );
         }
       }
     })();
@@ -38,7 +38,7 @@ if (isComponentLoaded) {
             PersonaType: 'User'
         },
         upn:  upn,
-        serviceScope: serviceScope ?? context.serviceScope,
+        serviceScope: serviceScope,
     }, createElement("div",{},template));
 }
 return renderPersona;