Skip to content

TeachingBubble/Coachmark: Fix TeachingBubble content wrapping to next line unnecessarily #5121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leddie24 merged 4 commits into from
Jun 7, 2018
Merged

TeachingBubble/Coachmark: Fix TeachingBubble content wrapping to next line unnecessarily #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abd33d4
Fix teaching bubble breaking text into next line.
edwlmsft Jun 6, 2018
6982a60
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
edwlmsft Jun 6, 2018
462858b
Add change file
edwlmsft Jun 6, 2018
bf1c872
Fix isWide variation of teaching bubble not inheriting max-width.
edwlmsft Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/coachmarkTeachingBubbleFix_2018-06-06-20-52.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "TeachingBubble: Fix content from wrapping to next line unncessarily",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "edwl@microsoft.com"
}
1 change: 1 addition & 0 deletions packages/office-ui-fabric-react/src/components/TeachingBubble/TeachingBubble.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
max-width: 364px;
border: 0;
box-shadow: none !important;
width: calc(100% + 1px);
Copy link
Copy Markdown
Member

@dzearing dzearing Jun 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused why this is needed. Why not white-space: nowrap;

Copy link
Copy Markdown
Collaborator Author

@leddie24 leddie24 Jun 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

white-space: nowrap isn't desirable because we still want content to wrap.

screen shot 2018-06-06 at 6 49 19 pm


animation-name: (bounceAnimation, opacityFadeIn);
animation-duration: 2000ms;
Expand Down
4 changes: 2 additions & 2 deletions packages/office-ui-fabric-react/src/components/TeachingBubble/TeachingBubble.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class TeachingBubble extends BaseComponent<ITeachingBubbleProps, ITeachin
}

public render(): JSX.Element {
const { calloutProps: setCalloutProps, targetElement, onDismiss } = this.props;
const { calloutProps: setCalloutProps, targetElement, onDismiss, isWide } = this.props;
const calloutProps = { ...this._defaultCalloutProps, ...setCalloutProps };

return (
Expand All @@ -56,7 +56,7 @@ export class TeachingBubble extends BaseComponent<ITeachingBubbleProps, ITeachin
className={css(
'ms-TeachingBubble',
styles.root,
this.props.isWide ? styles.wideCallout : null,
isWide ? styles.wideCallout : null,
calloutProps ? calloutProps.className : undefined
)}
>
Expand Down
12 changes: 7 additions & 5 deletions packages/office-ui-fabric-react/src/components/TeachingBubble/TeachingBubbleContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class TeachingBubbleContent extends BaseComponent<ITeachingBubbleProps, I

public render(): JSX.Element {
const {
children,
illustrationImage,
primaryButtonProps,
secondaryButtonProps,
Expand All @@ -34,7 +35,8 @@ export class TeachingBubbleContent extends BaseComponent<ITeachingBubbleProps, I
hasCloseIcon,
onDismiss,
closeButtonAriaLabel,
hasSmallHeadline
hasSmallHeadline,
isWide
} = this.props;

let imageContent;
Expand Down Expand Up @@ -68,10 +70,10 @@ export class TeachingBubbleContent extends BaseComponent<ITeachingBubbleProps, I
);
}

if (this.props.children) {
if (children) {
bodyContent = (
<div className={css('ms-TeachingBubble-body', styles.body)}>
<p className={css('ms-TeachingBubble-subText', styles.subText)}>{this.props.children}</p>
<p className={css('ms-TeachingBubble-subText', styles.subText)}>{children}</p>
</div>
);
}
Expand Down Expand Up @@ -112,14 +114,14 @@ export class TeachingBubbleContent extends BaseComponent<ITeachingBubbleProps, I
}

return (
<div className={css('ms-TeachingBubble-content', styles.root)}>
<div className={css('ms-TeachingBubble-content', styles.root, isWide ? styles.wideCallout : null)}>
{imageContent}
{closeButton}
<div className={css('ms-TeachingBubble-bodycontent', styles.bodyContent)}>
{headerContent}
{bodyContent}
{footerContent}
</div>
{closeButton}
</div>
);
}
Expand Down