Skip to content

Commit 53360aa

Browse files
committed
Revert "fix: Make popover white-space style deterministic (#3047)"
This reverts commit 6605b1c.
1 parent cfa13bc commit 53360aa

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/copy-to-clipboard/internal.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default function InternalCopyToClipboard({
6363
const isInline = variant === 'inline';
6464
const trigger = (
6565
<InternalPopover
66-
isInline={isInline}
66+
className={clsx(isInline && styles['inline-trigger'])}
6767
size="medium"
6868
position="top"
6969
triggerType="custom"

src/copy-to-clipboard/styles.scss

+4
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@
1616
margin-inline-end: awsui.$space-scaled-xxs;
1717
}
1818
}
19+
20+
.inline-trigger {
21+
white-space: nowrap;
22+
}

src/internal/styles/utils/styles-reset.scss

+3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
direction: inherit;
1515
empty-cells: show;
1616
font-family: serif;
17+
font-size: medium;
1718
font-style: normal;
1819
font-variant: normal;
20+
font-weight: 400;
1921
font-stretch: normal;
22+
line-height: normal;
2023
hyphens: none;
2124
letter-spacing: normal;
2225
list-style: disc outside none;

src/popover/internal.tsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export interface InternalPopoverProps extends Omit<PopoverProps, 'triggerType' |
2828
triggerType?: PopoverProps.TriggerType | 'filtering-token';
2929
size: PopoverProps.Size | 'content';
3030
__closeAnalyticsAction?: string;
31-
isInline?: boolean;
3231
}
3332

3433
export interface InternalPopoverRef {
@@ -52,13 +51,11 @@ function InternalPopover(
5251
triggerAriaLabel,
5352

5453
wrapTriggerText = true,
55-
isInline = false,
5654
renderWithPortal = false,
5755

5856
__onOpen,
5957
__internalRootRef = null,
6058
__closeAnalyticsAction,
61-
6259
...restProps
6360
}: InternalPopoverProps,
6461
ref: React.Ref<InternalPopoverRef>
@@ -189,8 +186,7 @@ function InternalPopover(
189186
className={clsx(
190187
styles.root,
191188
baseProps.className,
192-
triggerType === 'filtering-token' && styles['root-filtering-token'],
193-
isInline && styles['no-wrap']
189+
triggerType === 'filtering-token' && styles['root-filtering-token']
194190
)}
195191
ref={mergedRef}
196192
onMouseDown={() => {

src/popover/styles.scss

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
.root {
1616
@include styles.styles-reset;
1717
color: inherit;
18-
&.no-wrap {
19-
white-space: nowrap;
20-
}
2118
}
2219

2320
.root-filtering-token {

0 commit comments

Comments
 (0)