Skip to content

Commit

Permalink
Merge branch 'main' into optimize-vueuc-placement
Browse files Browse the repository at this point in the history
  • Loading branch information
07akioni authored Dec 30, 2021
2 parents b57782d + 2c71424 commit b08c353
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/popover/demos/enUS/index.demo-entry.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ header
| raw | `boolean` | `false` | Whether to use no default styles. |
| shift | `boolean` | `false` | Whether to shift the popover when there is no space for current placement. |
| show-arrow | `boolean` | `true` | Whether to show arrow if set. |
| show | `boolean` | `undefined` | Whether to show arrow. |
| show | `boolean` | `undefined` | Whether to show popover. |
| title | `string` | `undefined` | Popover title. |
| to | `string \| HTMLElement \| false` | `'body'` | Container node of the popover content. `false` will keep it at trigger container. |
| trigger | `'hover' \| 'click' \| 'focus' \| 'manual'` | `'hover'` | The popover trigger type. |
| width | `number \| 'trigger'` | `undefined` | `'trigger'` means popover's witdh will follow its trigger's width. |
| width | `number \| 'trigger'` | `undefined` | `'trigger'` means popover's width will follow its trigger's width. |
| x | `number` | `undefined` | The CSS `left` pixel value when popover manually positioned (x, y need to be set together). |
| y | `number` | `undefined` | The CSS `top` pixel value when popover manually positioned (x, y need to be set together). |
| z-index | `number` | `undefined` | The z-index of the popover. |
Expand Down
3 changes: 1 addition & 2 deletions src/popselect/src/Popselect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { popselectInjectionKey } from './interface'

const popselectProps = {
...(useTheme.props as ThemeProps<PopselectTheme>),
...popoverBaseProps,
...omit(popoverBaseProps, ['showArrow', 'arrow']),
placement: {
...popoverBaseProps.placement,
default: 'bottom'
Expand All @@ -23,7 +23,6 @@ const popselectProps = {
type: String as PropType<PopoverTrigger>,
default: 'hover'
},
showArrow: Boolean,
...panelProps
}

Expand Down

0 comments on commit b08c353

Please sign in to comment.