Merge pull request #388 from kevinlin98z/users/kevinlin/loading-pane-…

…icon-bug Fix loading pane icon image fit
microsoft · Nov 3, 2023 · 330480a · 330480a
2 parents d29da65 + 4fbf654
commit 330480a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
@@ -218,6 +218,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed loading pane icon image fit
+
 ## [1.0.9] 2023-10-31
 
 ### Changed

diff --git a/chat-components/src/components/loadingpane/LoadingPane.tsx b/chat-components/src/components/loadingpane/LoadingPane.tsx
@@ -1,4 +1,4 @@
-import { IIconStyles, ILabelStyles, ISpinnerStyles, IStackStyles, Icon, Label, Spinner, Stack } from "@fluentui/react";
+import { IIconStyles, IImageProps, ILabelStyles, ISpinnerStyles, IStackStyles, Icon, Label, Spinner, Stack } from "@fluentui/react";
 
 import { ILoadingPaneProps } from "./interfaces/ILoadingPaneProps";
 import React from "react";
@@ -24,7 +24,7 @@ function LoadingPane(props: ILoadingPaneProps) {
         root: Object.assign({}, defaultLoadingPaneIconStyles, props.styleProps?.iconStyleProps)
     };
 
-    const iconImageProps = props.styleProps?.iconImageProps ?? defaultLoadingPaneIconImageProps;
+    const iconImageProps: IImageProps = Object.assign({}, defaultLoadingPaneIconImageProps, props.styleProps?.iconImageProps);
 
     const titleStyles: ILabelStyles = {
         root: Object.assign({}, defaultLoadingPaneTitleStyles, props.styleProps?.titleStyleProps)

diff --git a/...ponents/loadingpane/common/defaultProps/defaultStyles/defaultLoadingPaneIconImageProps.ts b/...ponents/loadingpane/common/defaultProps/defaultStyles/defaultLoadingPaneIconImageProps.ts
@@ -4,7 +4,7 @@ import { ModernChatIconBase64 } from "../../../../../assets/Icons";
 
 export const defaultLoadingPaneIconImageProps: IImageProps = {
     src: ModernChatIconBase64,
-    imageFit: ImageFit.center,
+    imageFit: ImageFit.centerContain,
     width: "86px",
     height: "86px",
     shouldFadeIn: false,