Skip to content

Commit d3c0ee0

Browse files
committed
merge close button props and localized aria-label and title
Signed-off-by: Julio Ortega <julio.ortega@dialpad.com>
1 parent 5b8ad0d commit d3c0ee0

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

packages/dialtone-vue2/components/popover/popover_default.story.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
:initial-focus-element="$attrs.initialFocusElement"
2020
:content-width="$attrs.contentWidth"
2121
:show-close-button="$attrs.showCloseButton"
22+
:close-button-props="$attrs.closeButtonProps"
2223
:header-class="$attrs.headerClass"
2324
:footer-class="$attrs.footerClass"
2425
:max-height="$attrs.maxHeight"

packages/dialtone-vue2/components/popover/popover_header_footer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export default {
100100
101101
computed: {
102102
enhancedCloseButtonProps () {
103-
return Object.assign({}, ...this.closeButtonProps, ...$ta('CLOSE_BUTTON'));
103+
return Object.assign({}, $ta('CLOSE_BUTTON'), this.closeButtonProps);
104104
},
105105
},
106106

0 commit comments

Comments
 (0)