Skip to content

Commit

Permalink
fix: popover & popconfirm auto placement, close #4767
Browse files Browse the repository at this point in the history
  • Loading branch information
tangjinzhou committed Oct 14, 2021
1 parent 7638d3c commit 98b5e5d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
2 changes: 2 additions & 0 deletions components/popconfirm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import classNames from '../_util/classNames';
import { getTransitionName } from '../_util/transition';
import { cloneVNodes } from '../_util/vnode';
import omit from '../_util/omit';
import { tooltipDefaultProps } from '../tooltip/Tooltip';

export const popconfirmProps = () => ({
...abstractTooltipProps(),
Expand Down Expand Up @@ -47,6 +48,7 @@ export interface PopconfirmLocale {
const Popconfirm = defineComponent({
name: 'APopconfirm',
props: initDefaultProps(popconfirmProps(), {
...tooltipDefaultProps,
trigger: 'click',
transitionName: 'zoom-big',
align: () => ({}),
Expand Down
2 changes: 2 additions & 0 deletions components/popover/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { withInstall } from '../_util/type';
import useConfigInject from '../_util/hooks/useConfigInject';
import omit from '../_util/omit';
import { getTransitionName } from '../_util/transition';
import { tooltipDefaultProps } from '../tooltip/Tooltip';

export const popoverProps = () => ({
...abstractTooltipProps(),
Expand All @@ -20,6 +21,7 @@ export type PopoverProps = Partial<ExtractPropTypes<ReturnType<typeof popoverPro
const Popover = defineComponent({
name: 'APopover',
props: initDefaultProps(popoverProps(), {
...tooltipDefaultProps,
trigger: 'hover',
transitionName: 'zoom-big',
placement: 'top',
Expand Down
11 changes: 11 additions & 0 deletions components/tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ export const tooltipProps = () => ({
title: PropTypes.any,
});

export const tooltipDefaultProps = {
trigger: 'hover',
transitionName: 'zoom-big-fast',
align: () => ({}),
placement: 'top',
mouseEnterDelay: 0.1,
mouseLeaveDelay: 0.1,
arrowPointAtCenter: false,
autoAdjustOverflow: true,
};

export type TriggerTypes = typeof triggerTypes[number];

export type PlacementTypes = typeof placementTypes[number];
Expand Down

0 comments on commit 98b5e5d

Please sign in to comment.