feat: #6925 - Emoji selection when typing : (colon) symbol in the chat box #6991
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <!-- | ||
| // Copyright © 2020, 2021 Anticrm Platform Contributors. | ||
| // Copyright © 2022, 2023, 2024 Hardcore Engineering Inc. | ||
| // | ||
| // Licensed under the Eclipse Public License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. You may | ||
| // obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| --> | ||
| <script lang="ts"> | ||
| import EmojiPopup from './EmojiPopup.svelte' | ||
| import Popup from './Popup.svelte' | ||
|
|
||
| export let query: string = '' | ||
ElSalvo96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| export let clientRect: () => ClientRect | ||
| export let command: (props: any) => void | ||
| export let close: () => void | ||
|
|
||
| let searchPopup: EmojiPopup | ||
|
|
||
| function dispatchItem(item: { id: string; objectclass: string }): void { | ||
ElSalvo96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (item == null) { | ||
| close() | ||
| } else { | ||
| command(item) | ||
| } | ||
| } | ||
|
|
||
| export function onKeyDown(ev: KeyboardEvent): boolean { | ||
| return searchPopup.onKeyDown(ev) | ||
| } | ||
| </script> | ||
|
|
||
| <Popup {query} {clientRect} {command} {close}> | ||
| <EmojiPopup | ||
| bind:this={searchPopup} | ||
| {query} | ||
| on:close={(evt) => { | ||
| dispatchItem(evt.detail) | ||
| }} | ||
| /> | ||
| </Popup> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| <!-- | ||
| // Copyright © 2020, 2021 Anticrm Platform Contributors. | ||
| // Copyright © 2021, 2023, 2024 Hardcore Engineering Inc. | ||
| // | ||
| // Licensed under the Eclipse Public License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. You may | ||
| // obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| --> | ||
| <script lang="ts"> | ||
| import presentation, { reduceCalls } from '@hcengineering/presentation' | ||
| import { Label, ListView, resizeObserver } from '@hcengineering/ui' | ||
| import { createEventDispatcher } from 'svelte' | ||
| import emojiReplaceDict from './extension/emojiIdMap.json' | ||
|
|
||
| export let query: string = '' | ||
ElSalvo96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| let items = Object.entries(emojiReplaceDict) | ||
|
|
||
| const dispatch = createEventDispatcher() | ||
|
|
||
| let list: ListView | ||
| let scrollContainer: HTMLElement | ||
| let selection = 0 | ||
|
|
||
| function dispatchItem(item: [string, string]): void { | ||
| dispatch('close', { | ||
| id: item[0], | ||
| objectclass: item[1] | ||
| }) | ||
| } | ||
|
|
||
| export function onKeyDown(key: KeyboardEvent): boolean { | ||
| if (key.key === 'ArrowDown') { | ||
| key.stopPropagation() | ||
| key.preventDefault() | ||
| list?.select(selection + 1) | ||
| return true | ||
| } | ||
| if (key.key === 'ArrowUp') { | ||
| key.stopPropagation() | ||
| key.preventDefault() | ||
| if (selection === 0 && scrollContainer !== undefined) { | ||
| scrollContainer.scrollTop = 0 | ||
| } | ||
| list?.select(selection - 1) | ||
| return true | ||
| } | ||
| if (key.key === 'Enter' || key.key === 'Tab') { | ||
| key.preventDefault() | ||
| key.stopPropagation() | ||
| if (selection < items.length) { | ||
| const searchItem = items[selection] | ||
| dispatchItem(searchItem) | ||
| return true | ||
| } else { | ||
| return false | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| const updateItems = reduceCalls(async function (localQuery: string): Promise<void> { | ||
| items = Object.entries(emojiReplaceDict).filter(([k, v]) => k.includes(localQuery)) | ||
| }) | ||
| $: void updateItems(query) | ||
| </script> | ||
|
|
||
| {#if (items.length === 0 && query !== '') || items.length > 0} | ||
| <!-- svelte-ignore a11y-no-noninteractive-element-interactions --> | ||
| <form class="antiPopup mentionPoup" on:keydown={onKeyDown} use:resizeObserver={() => dispatch('changeSize')}> | ||
| <div class="ap-scroll" bind:this={scrollContainer}> | ||
| <div class="ap-box"> | ||
| {#if items.length === 0 && query !== ''} | ||
| <div class="noResults"><Label label={presentation.string.NoResults} /></div> | ||
| {/if} | ||
| {#if items.length > 0} | ||
| <!-- svelte-ignore a11y-click-events-have-key-events --> | ||
| <ListView bind:this={list} bind:selection count={items.length}> | ||
| <svelte:fragment slot="item" let:item={num}> | ||
| {@const item = items[num]} | ||
| <!-- svelte-ignore a11y-no-static-element-interactions --> | ||
| <div | ||
| class="ap-menuItem withComp h-8" | ||
| on:click={() => { | ||
| dispatchItem(item) | ||
| }} | ||
| > | ||
| <div class="flex-row-center"> | ||
| <div class="flex-center p-1 content-dark-color flex-no-shrink"> | ||
| {item[1]} | ||
| </div> | ||
| <span class="ml-1 max-w-120 overflow-label searchResult"> | ||
| <span class="name">{item[0]}</span> | ||
| </span> | ||
| </div> | ||
| </div> | ||
|
Comment on lines
+89
to
+103
There was a problem hiding this comment. Semantic html please! I cannot help you with that here since I am not fully aware of the context. But the least we could do for accessibility is to add There was a problem hiding this comment. I did how they did. What kind of improvement do you expect with the |
||
| </svelte:fragment> | ||
| </ListView> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
| <div class="ap-space x2" /> | ||
| </form> | ||
| {/if} | ||
|
|
||
| <style lang="scss"> | ||
| .noResults { | ||
| display: flex; | ||
| padding: 0.25rem 1rem; | ||
| align-items: center; | ||
| align-self: stretch; | ||
| } | ||
|
|
||
| .mentionPoup { | ||
| padding-top: 0.5rem; | ||
| } | ||
|
|
||
| .searchResult { | ||
| display: flex; | ||
| flex-direction: row; | ||
|
|
||
| .name { | ||
| display: flex; | ||
| flex: 1; | ||
| } | ||
ElSalvo96 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| </style> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Non-blocking comment]: In this file I have seen 3
eslint-disable-next-line. I do not wanna say do not use it, but rather I prefer to stay safe as much as possible. So for example if the type is an issue I try first to fix that and not useeslint-disable-next-line.