Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dialog): resolve slot correctly #258

Merged
merged 2 commits into from
Jul 30, 2022
Merged

fix(dialog): resolve slot correctly #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1484a0
fix(dialog): resolve slot correctly
LeeJim Jul 30, 2022
340c03b
test(dialog): update snapshots
LeeJim Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/dialog/dialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
@close="handleOverlayClick"
>
<div id="root" :class="dClassName" :style="rootStyles">
<div v-if="title" :class="dHeaderClassName">
<div :class="dHeaderClassName">
<slot name="header">
<div :class="dTitleClassName">{{ title }}</div>
<div v-if="title" :class="dTitleClassName">{{ title }}</div>
</slot>
</div>
<div v-if="content" :class="dBodyClassName">
Expand All @@ -19,8 +19,8 @@
</div>
</div>
<div :class="dFooterClassName">
<template v-if="actionsBtnProps">
<slot name="actions">
<slot name="actions">
<template v-if="actionsBtnProps">
<t-button
v-for="(item, index) in actionsBtnProps"
:key="index"
Expand All @@ -29,18 +29,18 @@
:class="dDefaultBtnClassName"
@click="handleCancel"
/>
</slot>
</template>
<template v-if="cancelBtn">
<slot name="cancelBtn">
</template>
</slot>
<slot name="cancelBtn">
<template v-if="cancelBtn">
<t-button v-bind="cancelBtnProps" variant="text" :class="dDefaultBtnClassName" @click="handleCancel" />
</slot>
</template>
<template v-if="confirmBtn">
<slot name="confirmBtn">
</template>
</slot>
<slot name="confirmBtn">
<template v-if="confirmBtn">
<t-button v-bind="confirmBtnProps" variant="text" :class="dConfirmBtnClassName" @click="handleConfirm" />
</slot>
</template>
</template>
</slot>
</div>
</div>
</t-popup>
Expand Down
80 changes: 79 additions & 1 deletion test/snap/__snapshots__/csr.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20524,9 +20524,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/confirm.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -20582,9 +20588,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/confirm.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -20692,9 +20704,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/feedback.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -20775,9 +20793,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/feedback.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -20843,7 +20867,13 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/feedback.vue 1`] = `
class="t-dialog"
id="root"
>
<!--v-if-->
<div
class="t-dialog__header t-dialog__header--has-content"
>

<!--v-if-->

</div>
<div
class="t-dialog__body"
>
Expand All @@ -20856,9 +20886,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/feedback.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -20939,9 +20975,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/feedback.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -21055,9 +21097,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/input.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -21113,9 +21161,15 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/input.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<!--v-if-->

</div>
</div>

Expand Down Expand Up @@ -21263,9 +21317,13 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--primary t-dialog__horizontal-btn"
Expand Down Expand Up @@ -21326,9 +21384,13 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--primary t-dialog__horizontal-btn"
Expand Down Expand Up @@ -21397,9 +21459,13 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--primary t-dialog__horizontal-btn"
Expand Down Expand Up @@ -21468,9 +21534,13 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--primary t-dialog__horizontal-btn"
Expand Down Expand Up @@ -21587,8 +21657,10 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--default t-dialog__horizontal-btn"
Expand Down Expand Up @@ -21671,8 +21743,10 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--default t-dialog__horizontal-btn"
Expand Down Expand Up @@ -21796,8 +21870,10 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__footer"
>

<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--default t-dialog__horizontal-btn"
Expand Down Expand Up @@ -21880,8 +21956,10 @@ exports[`csr snapshot test > csr test ./src/dialog/demos/mobile.vue 1`] = `
<div
class="t-dialog__vertical-footer t-dialog__footer"
>

<!--v-if-->


<button
aria-disabled="false"
class="t-button t-size-m t-button--text t-button--default t-button--shape-rectangle t-dialog__btn t-dialog__btn--default t-dialog__vertical-btn"
Expand Down