Skip to content

Commit a8d53ed

Browse files
committed
fix: Fix formatting and chromatic
1 parent d4e2482 commit a8d53ed

File tree

30 files changed

+112
-76
lines changed

30 files changed

+112
-76
lines changed

src/components/draft-js-editor/DraftJSEditor.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,13 @@ class DraftJSEditor extends React.Component<Props> {
126126
{description}
127127
</span>
128128

129-
<Tooltip isShown={!!error} position="bottom-left" text={error ? error.message : ''} theme="error">
129+
<Tooltip
130+
targetWrapperClassName="bdl-DraftJSEditor-target"
131+
isShown={!!error}
132+
position="bottom-left"
133+
text={error ? error.message : ''}
134+
theme="error"
135+
>
130136
{/* need div so tooltip can set aria-describedby */}
131137
<div>
132138
<Editor

src/components/draft-js-editor/DraftJSEditor.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@
1616
.draft-js-editor {
1717
overflow: hidden;
1818
}
19+
20+
.bdl-DraftJSEditor-target {
21+
display: block;
22+
}

src/components/dropdown-menu/DropdownMenu.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ type Props = {
1313
children: React.Node,
1414
/** Forces menu to render within the scroll parent */
1515
className?: string,
16+
/** Optional class name for the target wrapper element */
17+
targetWrapperClassName?: string,
1618
/** Forces menu to render within the visible window */
1719
constrainToScrollParent: boolean,
1820
/** Right aligns menu to button */
@@ -182,6 +184,7 @@ class DropdownMenu extends React.Component<Props, State> {
182184
bodyElement,
183185
children,
184186
className,
187+
targetWrapperClassName,
185188
constrainToScrollParent,
186189
constrainToWindow,
187190
constrainToWindowWithPin,
@@ -271,13 +274,13 @@ class DropdownMenu extends React.Component<Props, State> {
271274
renderElementTo={bodyEl}
272275
targetAttachment={tetherTargetAttachment || targetAttachment}
273276
renderTarget={ref => (
274-
<div ref={ref} style={{ display: 'inline-block' }}>
277+
<div ref={ref} className={classNames('bdl-DropdownMenu-target', targetWrapperClassName)}>
275278
{React.cloneElement(menuButton, menuButtonProps)}
276279
</div>
277280
)}
278281
renderElement={ref => {
279282
return isOpen ? (
280-
<div ref={ref} style={{ display: 'inline-block' }}>
283+
<div ref={ref} className="bdl-DropdownMenu-element">
281284
{React.cloneElement(menu, menuProps)}
282285
</div>
283286
) : null;

src/components/dropdown-menu/DropdownMenu.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
margin-top: 5px;
2020
}
2121

22+
.bdl-DropdownMenu-target {
23+
display: inline-block;
24+
}
25+
2226
@include breakpoint($medium-screen) {
2327
.bdl-DropdownMenu--responsive {
2428
&.dropdown-menu-enabled {

src/components/footer-indicator/FooterIndicator.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@
3535
white-space: nowrap;
3636
text-overflow: ellipsis;
3737
}
38+
39+
.bdl-FooterIndicator-tooltipTarget {
40+
height: 100%;
41+
}

src/components/footer-indicator/FooterIndicator.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ type Props = {
1111
const FooterIndicator = ({ indicatorText }: Props) => {
1212
return (
1313
<div className="bdl-FooterIndicator">
14-
<Tooltip position={TooltipPosition.TOP_RIGHT} text={indicatorText}>
14+
<Tooltip
15+
targetWrapperClassName="bdl-FooterIndicator-tooltipTarget"
16+
position={TooltipPosition.TOP_RIGHT}
17+
text={indicatorText}
18+
>
1519
<div className="bdl-FooterIndicator-content">
1620
<span className="bdl-FooterIndicator-iconWrapper">
1721
<IconPuzzlePiece height={14} width={14} />

src/components/footer-indicator/__tests__/__snapshots__/FooterIndicator.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ exports[`feature/footer-indicator/FooterIndicator should render a FooterIndicato
99
constrainToWindow={true}
1010
isDisabled={false}
1111
position="top-right"
12+
targetWrapperClassName="bdl-FooterIndicator-tooltipTarget"
1213
text="abcdefghijklmnopqrstuvwxyz"
1314
theme="default"
1415
>

src/components/media/Media.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@
4040
margin-left: 10px;
4141
}
4242
}
43+
44+
.bdl-Media-menu-target {
45+
display: block;
46+
}

src/components/media/MediaMenu.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ const MediaMenu = ({
3838
intl,
3939
...rest
4040
}: MediaMenuProps) => (
41-
<DropdownMenu constrainToScrollParent isRightAligned {...dropdownProps}>
41+
<DropdownMenu
42+
constrainToScrollParent
43+
isRightAligned
44+
targetWrapperClassName="bdl-Media-menu-target"
45+
{...dropdownProps}
46+
>
4247
<PlainButton
4348
aria-label={intl.formatMessage(messages.menuButtonArialLabel)}
4449
className={classnames('bdl-Media-menu', className)}

src/components/media/__tests__/__snapshots__/Media.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ exports[`components/Media compound component 1`] = `
1616
class="bdl-Media-body"
1717
>
1818
<div
19-
style="display: inline-block;"
19+
class="bdl-DropdownMenu-target bdl-Media-menu-target"
2020
>
2121
<button
2222
aria-expanded="false"

0 commit comments

Comments
 (0)