Skip to content

Commit b0816c3

Browse files
authored
fix(Popover): fix arrow spacing error (#840)
* fix(Popover): fix arrow spacing error * feat(GridItem): optimize size calculation logic * test: update snapshots
1 parent a9608bb commit b0816c3

File tree

4 files changed

+98
-97
lines changed

4 files changed

+98
-97
lines changed

src/grid/GridItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const GridItem: FC<GridItemProp> = (prop) => {
4343
}, [column, align]);
4444

4545
const size = useMemo(() => {
46-
if (column > 4 || !column) return 'small';
47-
return column < 4 ? 'large' : 'middle';
46+
if (!column || column === 4) return 'middle';
47+
return column > 4 ? 'small' : 'large';
4848
}, [column]);
4949

5050
const gridItemImage = useMemo(() => {

src/popover/Popover.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ const Popover = forwardRef<PopoverExposeRef, PopoverProps>((props, ref) => {
4545
classNames({
4646
[`${popoverClass}__content`]: true,
4747
[`${popoverClass}--${theme}`]: true,
48+
[`${popoverClass}__content--arrow`]: showArrow,
4849
}),
49-
[popoverClass, theme],
50+
[popoverClass, theme, showArrow],
5051
);
5152

5253
const getPopperPlacement = (placement: PopoverProps['placement']): Placement =>
@@ -88,14 +89,14 @@ const Popover = forwardRef<PopoverExposeRef, PopoverProps>((props, ref) => {
8889
if (isHorizontal) {
8990
const padding = isEnd ? Math.min(width + x, popperWidth) : Math.min(windowWidth - x, popperWidth);
9091
return {
91-
[isEnd ? 'left' : 'right']: padding - 22,
92+
[isEnd ? 'left' : 'right']: padding - 28,
9293
};
9394
}
9495

9596
const isVertical = vertical.find((item) => placement.includes(item));
9697
if (isVertical) {
9798
return {
98-
[isEnd ? 'top' : 'bottom']: popperHeight - 22,
99+
[isEnd ? 'top' : 'bottom']: popperHeight - 28,
99100
};
100101
}
101102
};

0 commit comments

Comments
 (0)