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

UI-291: Popover > Improvement #306

Merged
merged 5 commits into from
Mar 15, 2024
Merged

UI-291: Popover > Improvement #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7a8b12
Remove SCSS
mosarabi Mar 13, 2024
c699477
Fix the small triangle position
mosarabi Mar 13, 2024
a0988be
Fix popover resize offset
mosarabi Mar 14, 2024
4707d50
Update popover overlay condition
mosarabi Mar 14, 2024
531738a
Merge branch 'main' into UI-291
mosarabi Mar 15, 2024
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
74 changes: 42 additions & 32 deletions packages/vue3/src/_dev/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,59 @@
import 'uno.css';
import '../assets/main.css';
import { ref } from 'vue';
import { Draggable, DraggableItem } from '~/components';
import type { DraggableItemType } from '~/types';

const items = ref<DraggableItemType[]>([
{
label: 'Navbar',
value: 1,
},
{
label: 'Hero',
value: 2,
},
{
label: 'Featured Products',
value: 3,
},
]);
const item = ref<DraggableItemType>({
label: 'Do the dishes 🧽',
value: 1,
checked: false,
});
import { Popover, PrimaryButton, TertiaryButton } from '~/components';
const show = ref(false);
</script>

<template>
<div class="container">
<Draggable v-model="items">
<DraggableItem
v-for="(item, index) in items"
:key="item.value as number"
v-model="items[index]"
/>
</Draggable>
<DraggableItem v-model="item" :can-check="true" />
<Popover
v-model:show="show"
position="right"
object-fit="cover"
class="popover"
@click-outside="show = false"
>
<template #title>
Introducing Themes!
</template>
<template #description>
<p class="mr-0">
Introducing themes, a new way to make your store stand out
</p>
</template>
<template #footer>
<div class="actions">
<PrimaryButton @click="show = false">
Get started
</PrimaryButton>
<TertiaryButton @click="show = false">
Later
</TertiaryButton>
</div>
</template>
<PrimaryButton @click="show = !show;">
<span>Show Popover</span>
</PrimaryButton>
</Popover>
</div>
</template>

<style scoped>
.container {
display: flex;
flex-direction: column;
box-sizing: border-box;
align-items: center;
justify-content: center;
gap: 20px;
width: 100vw;
height: 100vh;
padding: 20px;
}

.actions {
display: flex;
flex-direction: row-reverse;
justify-content: flex-end;
column-gap: 10px;
}
</style>
249 changes: 126 additions & 123 deletions packages/vue3/src/components/Popover/Popover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@ const props = withDefaults(defineProps<PopoverProps>(), {
const emit = defineEmits(['update:show']);

const popover = ref();
const element = ref();
const popoverTrigger = ref();
const trigger = ref();
const triangle = ref();
const triggeredElement = ref();
const top = ref('0px');
const left = ref('0px');
const currentPosition = ref('');

const slots = useSlots();

const setPopoverPosition = () => {
if (popoverTrigger.value && element.value) {
const position = setPosition(popoverTrigger.value, element.value, props.position, 22);
if (triggeredElement.value && trigger.value) {
let position = setPosition(triggeredElement.value, trigger.value, props.position, 22);
if (position.left < 0 && position.currentPosition === 'left') {
position = setPosition(triggeredElement.value, trigger.value, 'top', 22);
}
top.value = `${position.top}px`;
left.value = `${position.left}px`;
currentPosition.value = position.currentPosition;
Expand All @@ -47,9 +51,9 @@ onUnmounted(() => {
</script>

<template>
<div ref="popover" class="popover">
<div ref="popover" class="popover" :class="[currentPosition, { 'has-footer': slots.footer }]">
<Transition name="fade">
<div v-if="show" ref="popoverTrigger" class="popover-trigger" :class="[currentPosition, { 'has-footer': slots.footer }]">
<div v-if="show" ref="triggeredElement" class="triggered-element">
<div class="content">
<div v-if="imgSrc" class="image">
<img :src="imgSrc">
Expand All @@ -66,142 +70,141 @@ onUnmounted(() => {
</div>
</div>
</Transition>
<div ref="element" @click="setPopoverPosition();">
<div ref="trigger" class="trigger" @click="setPopoverPosition();">
<slot />
</div>
<div ref="triangle" class="triangle" :class="[{ show }]" />
</div>
</template>

<style scoped lang="scss">
$margin: 24px;
$caret-size: 22px;
$caret-border: 1px solid var(--gray-300);

<style scoped>
.popover {
--caret-size: 22px;
--caret-border: 1px solid var(--gray-300);

position: relative;
}

&-trigger {
display: flex;
position: fixed;
z-index: 9999999999;
top: v-bind(top);
left: v-bind(left);
flex-direction: column;
width: 400px;
max-width: calc(100vw - 40px);
min-height: 70px;
border: 1px solid var(--gray-200);
border-radius: 8px;
background-color: var(--base-white);
box-shadow: var(--shadow-xl-gray);

&::after {
content: "";
position: absolute;
width: $caret-size;
height: $caret-size;
border-top: $caret-border;
border-right: $caret-border;
border-top-right-radius: 2px;
background-color: var(--base-white);
}
.popover .trigger {
width: max-content;
max-width: 100%;
}

> * {
box-sizing: border-box;
width: 100%;
}
.popover .triggered-element {
display: flex;
position: fixed;
z-index: 9999999999;
top: v-bind(top);
left: v-bind(left);
flex-direction: column;
width: 400px;
max-width: calc(100vw - 40px);
min-height: 70px;
border: 1px solid var(--gray-200);
border-radius: 8px;
background-color: var(--base-white);
box-shadow: var(--shadow-xl-gray);
}

.content {
display: flex;
flex-direction: column;
row-gap: 6px;
padding: 24px;
font: var(--text-sm-regular);

.image {
width: 100%;
height: 220px;
margin-bottom: 14px;
overflow: hidden;
border-radius: 8px;

img {
width: 100%;
height: 100%;
object-fit: v-bind(objectFit);
}
}
}
.popover .triangle {
visibility: hidden;
position: absolute;
z-index: 9999999999;
width: var(--caret-size);
height: var(--caret-size);
transition: opacity 250ms linear;
border-top: var(--caret-border);
border-right: var(--caret-border);
border-top-right-radius: 2px;
opacity: 0;
background-color: var(--base-white);
}

.title {
color: var(--gray-900);
font: var(--text-md-bold);
}
.popover .triangle.show {
visibility: visible;
opacity: 1;
}

.description {
color: var(--gray-600);
}
.popover .triggered-element > * {
box-sizing: border-box;
width: 100%;
}

.footer {
display: flex;
flex-direction: row-reverse;
align-items: center;
justify-content: space-between;
padding: 18px 24px;
column-gap: 20px;
border-top: 1px solid var(--gray-100);
border-radius: 0 0 8px 8px;
background-color: var(--gray-50);
}
.popover .triggered-element .content {
display: flex;
flex-direction: column;
row-gap: 6px;
padding: 24px;
font: var(--text-sm-regular);
}

&.left,
&.right {
&::after {
top: calc(50% - calc($caret-size / 2));
}
}
.popover .triggered-element .content .image {
width: 100%;
height: 220px;
margin-bottom: 14px;
overflow: hidden;
border-radius: 8px;
}

&.left {
&::after {
left: calc(100% - calc($caret-size / 2));
transform: rotate(45deg);
}
}
.popover .triggered-element .content .image img {
width: 100%;
height: 100%;
object-fit: v-bind(objectFit);
}

&.right {
&::after {
right: calc(100% - calc($caret-size / 2));
transform: rotate(-135deg);
}
}
.popover .triggered-element .title {
color: var(--gray-900);
font: var(--text-md-bold);
}

&.top,
&.bottom {
&::after {
left: calc(50% - calc($caret-size / 2));
}
}
.popover .triggered-element .description {
color: var(--gray-600);
}

&.top {
&::after {
top: calc(100% - calc($caret-size / 2));
transform: rotate(135deg);
}

&.has-footer {
&::after {
background-color: var(--gray-50);
}
}
}
.popover .triggered-element .footer {
display: flex;
flex-direction: row-reverse;
align-items: center;
justify-content: space-between;
padding: 18px 24px;
column-gap: 20px;
border-top: 1px solid var(--gray-100);
border-radius: 0 0 8px 8px;
background-color: var(--gray-50);
}

&.bottom {
&::after {
bottom: calc(100% - calc($caret-size / 2));
transform: rotate(-45deg);
}
}
}
.popover.left .triangle,
.popover.right .triangle {
top: calc(50% - var(--caret-size) / 2);
}

.popover.left .triangle {
right: calc(100% + 9px);
transform: rotate(45deg);
}

.popover.right .triangle {
left: calc(100% + 11px);
transform: rotate(-135deg);
}

.popover.top .triangle,
.popover.bottom .triangle {
left: calc(50% - var(--caret-size) / 2);
}

.popover.top .triangle {
bottom: calc(100% + 9px);
transform: rotate(135deg);
}

.popover.bottom .triangle {
top: calc(100% + 11px);
transform: rotate(-45deg);
}

.popover.top.has-footer .triangle {
background-color: var(--gray-50);
}

.fade-enter-active {
Expand Down
Loading
Loading