javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-09 16:16:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs(popover): fix merge conflict with docs

Browse Source
This commit is contained in:
Liam DeBeasi
2021-09-15 16:08:57 +00:00
parent ecb30af4d8
commit f69c90504e
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/components/popover/readme.md
View File

@ -145,7 +145,12 @@ interface PopoverOptions {
}
```
<<<<<<< HEAD
### PopoverAttributes
```typescript
interface PopoverAttributes extends JSXBase.HTMLAttributes<HTMLElement> {}
```
## Types
Below you will find all of the custom types for `ion-popover`:
@ -183,15 +188,6 @@ type PositionAlign = 'start' | 'center' | 'end';
| `ArrowLeft` | When used in a child popover, closes the popover and returns focus to the parent popover. |
| `Space`, `Enter`, and `ArrowRight` | When focusing a trigger element, opens the associated popover. |
=======
### PopoverAttributes
```typescript
interface PopoverAttributes extends JSXBase.HTMLAttributes<HTMLElement> {}
```
>>>>>>> origin/main
<!-- Auto Generated Below -->