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

[next] fix(NcEmojiPicker): adjust styles to correctly fit emojis #6471

Merged
merged 1 commit into from
Jan 29, 2025
Merged

[next] fix(NcEmojiPicker): adjust styles to correctly fit emojis #6471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
141 changes: 80 additions & 61 deletions src/components/NcEmojiPicker/NcEmojiPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<slot v-bind="slotProps" />
</template>
<Picker ref="picker"
:auto-focus="false /* We manage the input focus ourselves */"
class="nc-emoji-picker"
color="var(--color-primary-element)"
:data="emojiIndex"
:emoji="previewFallbackEmoji"
Expand Down Expand Up @@ -378,7 +378,7 @@
/**
* Emits a object with more data about the picked emoji
*/
this.$emit('select-data', emojiObject)

Check warning on line 381 in src/components/NcEmojiPicker/NcEmojiPicker.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

Custom event name 'select-data' must be camelCase

if (this.closeOnSelect) {
this.open = false
Expand Down Expand Up @@ -438,25 +438,17 @@
<style lang="scss">
@import 'emoji-mart-vue-fast/css/emoji-mart.css';

.emoji-mart {
.nc-emoji-picker.emoji-mart {
background-color: var(--color-main-background) !important;
border: 0;
color: var(--color-main-text) !important;
display: flex !important;

// default style reset
// Reset emoji-mart styles
button {
margin: 0;
padding: 0;
border: none;
background: transparent;
font-size: inherit;
height: 36px;
width: auto;

* {
cursor: pointer !important;
}
}

.emoji-mart-bar,
Expand All @@ -472,69 +464,95 @@
color: inherit !important;
}

.emoji-mart-search input:focus-visible {
box-shadow: inset 0 0 0 2px var(--color-primary-element);
outline: none;
.emoji-mart-anchors {
padding-block: 0;
padding-inline: calc(2 * var(--default-grid-baseline));
}

.emoji-mart-bar {
&:first-child {
border-top-left-radius: var(--border-radius) !important;
border-top-right-radius: var(--border-radius) !important;
.emoji-mart-anchor {
border-radius: 0;
margin: 0 !important;
padding: 0 !important;
height: var(--clickable-area-small);
min-width: var(--clickable-area-small);

&:hover {
background-color: var(--color-background-hover);
}
}

.emoji-mart-anchors {
button {
border-radius: 0;
padding: 12px 4px;
height: auto;
&:focus-visible {
/* box-shadow: inset 0 0 0 2px var(--color-primary-element); */
outline: 2px solid var(--color-primary-element);
}
&:focus-visible {
outline: 2px solid var(--color-primary-element) !important;
outline-offset: -2px;
}

// Icon
div {
display: grid;
place-content: center;
}
}

.emoji-mart-scroll {
padding-inline: calc(2 * var(--default-grid-baseline));
padding-block: 0 calc(2 * var(--default-grid-baseline));
}

.emoji-mart-category {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: start;

.emoji-mart-category-label,
.emoji-mart-emoji {
user-select: none;
flex-grow: 0;
flex-shrink: 0;
display: grid;
grid-template-columns: repeat(8, 1fr);
justify-items: stretch;

&.emoji-mart-no-results {
grid-template-columns: 1fr;
font-size: inherit;
color: var(--color-text-maxcontrast) !important;
}
}

.emoji-mart-category-label {
flex-basis: 100%;
margin: 0;
}
/* Label element in the section grid */
div.emoji-mart-category-label {
grid-column: span 8;
justify-self: stretch;
}

.emoji-mart-emoji {
// 8 emoji per row
flex-basis: calc(100% / 8);
text-align: center;
/* An actual heading inside the element */
h3.emoji-mart-category-label {
display: flex;
align-items: center;
// Inline with buttons
height: var(--default-clickable-area);
margin: 0;
// Inline with input
padding-inline: calc(2 * var(--default-grid-baseline));
padding-block: 0;
user-select: none;
}

&:hover::before,
&.emoji-mart-emoji-selected::before{
background-color: var(--color-background-hover) !important;
outline: 2px solid var(--color-primary-element);
border-radius: var(--border-radius-element, var(--border-radius-pill));
}
.emoji-mart-emoji {
aspect-ratio: 1 / 1;
text-align: center;
margin: 0 !important;
padding: 0 !important;

&:hover,
&:focus-visible,
&.emoji-mart-emoji-selected {
background-color: var(--color-background-hover) !important;
border: none;
border-radius: var(--border-radius-element, var(--border-radius-pill));
box-shadow: none !important;
outline: 2px solid var(--color-primary-element) !important;
outline-offset: -2px;
}
button {
&:focus-visible {
background-color: var(--color-background-hover);
border: 2px solid var(--color-primary-element) !important;
border-radius: var(--border-radius-element, var(--border-radius-pill));
}

&::before {
display: none;
}
}

span {
cursor: pointer;
}
}
}
</style>

Expand All @@ -543,9 +561,10 @@
&__wrapper {
display: flex;
flex-direction: row;
gap: 4px; // for focus-visible outlines
gap: var(--default-grid-baseline);
align-items: end;
padding: 4px 8px;
padding-block: var(--default-grid-baseline);
padding-inline: calc(2 * var(--default-grid-baseline));
}
}

Expand Down
Loading