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

feat: adding the possibility to use emoji default of system #497

Merged
merged 6 commits into from
Nov 2, 2024
Merged

feat: adding the possibility to use emoji default of system #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80d6f7e
fix: add component path
eumarciel404 Oct 21, 2024
d4b3ead
Merge branch 'skyra-project:main' into main
eumarciel404 Oct 28, 2024
14b01a7
add span tag and verification string
eumarciel404 Oct 30, 2024
30da166
adding more verification to emoji string
eumarciel404 Oct 30, 2024
8410688
add span tag and verification string
eumarciel404 Oct 30, 2024
28d2b95
Update package.json
eumarciel404 Oct 30, 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
7 changes: 6 additions & 1 deletion packages/core/src/components/discord-reaction/DiscordReaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { consume } from '@lit/context';
import { css, html, LitElement } from 'lit';
import { customElement, property } from 'lit/decorators.js';
import { ifDefined } from 'lit/directives/if-defined.js';
import { when } from 'lit/directives/when.js';
import type { LightTheme } from '../../types.js';
import { messagesLightTheme } from '../discord-messages/DiscordMessages.js';

Expand Down Expand Up @@ -131,7 +132,11 @@ export class DiscordReaction extends LitElement implements LightTheme {

protected override render() {
return html`<div class="discord-reaction-inner" @click=${this.handleReactionClick} @keydown=${this.handleReactionClick}>
<img src=${ifDefined(this.emoji)} alt=${ifDefined(this.name)} draggable="false" />
${when(
this.emoji.includes('http') || this.emoji.startsWith('/') || this.emoji.startsWith('./'),
() => html`<img src=${ifDefined(this.emoji)} alt=${ifDefined(this.name)} draggable="false" />`,
() => html`<span>${this.emoji}</span>`
)}
<span class="discord-reaction-count">${this.count}</span>
</div>`;
}
Expand Down
21 changes: 12 additions & 9 deletions ...es/core/src/components/discord-string-select-menu-option/DiscordStringSelectMenuOption.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,18 @@ export class DiscordStringSelectMenuOption extends LitElement implements LightTh

return html`
<label>
${when(
this.emoji,
() =>
html`<img
src=${this.emoji}
alt=${ifDefined(this.emojiName)}
draggable="true"
class="discord-string-select-menu-option-emoji"
/>`
${when(this.emoji, () =>
when(
this.emoji.includes('http') || this.emoji.startsWith('/') || this.emoji.startsWith('./'),
() =>
html`<img
src=${this.emoji}
alt=${ifDefined(this.emojiName)}
draggable="true"
class="discord-string-select-menu-option-emoji"
/>`,
() => html`<span class="discord-string-select-menu-option-emoji">${this.emoji}</span>`
)
)}
<div class="discord-string-select-menu-option-ellipsis-text">
<div class="discord-string-select-menu-option-ellipsis-text">
Expand Down