wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-10 09:22:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace usage of packages emoji with plugin emoji

Browse Source 
Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
This commit is contained in:
Anton Alexeyev 2025-05-07 11:05:23 +07:00
parent 5d5f47e792
commit e34e6250a1
14 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ui-next/package.json
View File

@ -58,6 +58,8 @@
"@hcengineering/view-resources": "^0.6.0",
"@hcengineering/presence": "^0.6.0",
"@hcengineering/presence-resources": "^0.6.0",
"@hcengineering/emoji": "^0.6.0",
"@hcengineering/emoji-resources": "^0.6.0",
"@tiptap/core": "^2.11.7",
"@tiptap/pm": "^2.11.7",
"fast-equals": "^5.2.2",

7
packages/ui-next/src/components/ReactionsList.svelte
View File

@ -15,9 +15,10 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte'
import { EmojiPopup, showPopup } from '@hcengineering/ui'
import { showPopup } from '@hcengineering/ui'
import { getCurrentAccount, groupByArray } from '@hcengineering/core'
import { Reaction } from '@hcengineering/communication-types'
import emojiPlugin from '@hcengineering/emoji'
import ReactionPresenter from './ReactionPresenter.svelte'
import IconEmojiAdd from './icons/IconEmojiAdd.svelte'
@ -34,11 +35,11 @@
event.stopPropagation()
emojiPopupOpened = true
showPopup(
EmojiPopup,
emojiPlugin.component.EmojiPopup,
{},
event.target as HTMLElement,
(result) => {
const emoji = result?.emoji
const emoji = result?.text
emojiPopupOpened = false
if (emoji == null) {
return

7
packages/ui-next/src/components/message/MessageActionsPanel.svelte
View File

@ -14,9 +14,10 @@
-->
<script lang="ts">
import { showPopup, EmojiPopup } from '@hcengineering/ui'
import { showPopup } from '@hcengineering/ui'
import { Message } from '@hcengineering/communication-types'
import { createEventDispatcher } from 'svelte'
import emojiPlugin from '@hcengineering/emoji'
import IconEmoji from '../icons/IconEmoji.svelte'
import IconMessageMultiple from '../icons/IconMessageMultiple.svelte'
@ -42,12 +43,12 @@
action: (event: MouseEvent): void => {
isOpened = true
showPopup(
EmojiPopup,
emojiPlugin.component.EmojiPopup,
{},
event.target as HTMLElement,
async (result) => {
isOpened = false
const emoji = result?.emoji
const emoji = result?.text
if (emoji == null) {
return
}

7
packages/ui-next/src/components/message/MessagePresenter.svelte
View File

@ -19,11 +19,12 @@
import { getClient } from '@hcengineering/presentation'
import { Card } from '@hcengineering/card'
import { getCurrentAccount } from '@hcengineering/core'
import { EmojiPopup, getEventPositionElement, showPopup, Action as MenuAction } from '@hcengineering/ui'
import { getEventPositionElement, showPopup, Action as MenuAction } from '@hcengineering/ui'
import { PersonPreviewProvider, personByPersonIdStore } from '@hcengineering/contact-resources'
import type { SocialID } from '@hcengineering/communication-types'
import { AttachmentPreview } from '@hcengineering/attachment-resources'
import { Message, MessageType } from '@hcengineering/communication-types'
import emojiPlugin from '@hcengineering/emoji'
import MessageContentViewer from './MessageContentViewer.svelte'
import { AvatarSize } from '../../types'
@ -130,11 +131,11 @@
icon: IconEmoji,
action: async (): Promise<void> => {
showPopup(
EmojiPopup,
emojiPlugin.component.EmojiPopup,
{},
event.target as HTMLElement,
async (result) => {
const emoji = result?.emoji
const emoji = result?.text
if (emoji == null) {
return
}

7
packages/ui-next/src/utils.ts
View File

@ -12,12 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
import { EmojiPopup, showPopup } from '@hcengineering/ui'
import { showPopup } from '@hcengineering/ui'
import { getCurrentAccount, type Markup } from '@hcengineering/core'
import { markupToJSON, jsonToMarkup } from '@hcengineering/text'
import { markupToMarkdown, markdownToMarkup } from '@hcengineering/text-markdown'
import { type Message } from '@hcengineering/communication-types'
import { getCommunicationClient } from '@hcengineering/presentation'
import emojiPlugin from '@hcengineering/emoji'
import IconAt from './components/icons/IconAt.svelte'
import IconEmoji from './components/icons/IconEmoji.svelte'
@ -39,7 +40,7 @@ export const defaultMessageInputActions: TextInputAction[] = [
icon: IconEmoji,
action: (element, editorHandler) => {
showPopup(
EmojiPopup,
emojiPlugin.component.EmojiPopup,
{},
element,
(emoji) => {
@ -47,7 +48,7 @@ export const defaultMessageInputActions: TextInputAction[] = [
return
}
editorHandler.insertText(emoji)
editorHandler.insertText(emoji.text)
editorHandler.focus()
},
() => {}

2
plugins/activity-resources/package.json
View File

@ -52,6 +52,8 @@
"@hcengineering/view": "^0.6.13",
"@hcengineering/view-resources": "^0.6.0",
"@hcengineering/communication-types": "0.1.172",
"@hcengineering/emoji": "^0.6.0",
"@hcengineering/emoji-resources": "^0.6.0",
"svelte": "^4.2.19"
}
}

7
plugins/activity-resources/src/components/reactions/Reactions.svelte
View File

@ -16,8 +16,9 @@
import { createEventDispatcher } from 'svelte'
import { Reaction } from '@hcengineering/activity'
import { Doc, getCurrentAccount, PersonId } from '@hcengineering/core'
import { EmojiPopup, IconAdd, showPopup, tooltip, type Emojis } from '@hcengineering/ui'
import { IconAdd, showPopup, tooltip } from '@hcengineering/ui'
import { includesAny } from '@hcengineering/contact'
import emojiPlugin, { type Emojis } from '@hcengineering/emoji'
import ReactionsTooltip from './ReactionsTooltip.svelte'
import { updateDocReactions } from '../../utils'
@ -55,8 +56,8 @@
ev.preventDefault()
ev.stopPropagation()
opened = true
showPopup(EmojiPopup, {}, ev.target as HTMLElement, async (emoji: Emojis) => {
if (emoji?.emoji !== undefined) await updateDocReactions(reactions, object, emoji.emoji)
showPopup(emojiPlugin.component.EmojiPopup, {}, ev.target as HTMLElement, async (emoji: Emojis) => {
if (emoji?.text !== undefined) await updateDocReactions(reactions, object, emoji.text)
opened = false
})
}

7
plugins/activity-resources/src/components/reactions/ReactionsPreview.svelte
View File

@ -16,8 +16,9 @@
<script lang="ts">
import activity, { ActivityMessage, Reaction } from '@hcengineering/activity'
import { createQuery, getClient } from '@hcengineering/presentation'
import { EmojiPopup, showPopup, type Emojis } from '@hcengineering/ui'
import { showPopup } from '@hcengineering/ui'
import { SortingOrder } from '@hcengineering/core'
import emojiPlugin, { type Emojis } from '@hcengineering/emoji'
import { updateDocReactions } from '../../utils'
@ -65,8 +66,8 @@
e.stopPropagation()
e.preventDefault()
showPopup(EmojiPopup, {}, e.target as HTMLElement, (emoji: Emojis) => {
if (emoji?.emoji !== undefined) void updateDocReactions(reactions, message, emoji.emoji)
showPopup(emojiPlugin.component.EmojiPopup, {}, e.target as HTMLElement, (emoji: Emojis) => {
if (emoji?.text !== undefined) void updateDocReactions(reactions, message, emoji.text)
})
}
</script>

7
plugins/activity-resources/src/utils.ts
View File

@ -2,7 +2,6 @@ import type { ActivityMessage, Reaction } from '@hcengineering/activity'
import core, { getCurrentAccount, isOtherHour, type Doc, type Ref, type Space } from '@hcengineering/core'
import { getClient, isSpace } from '@hcengineering/presentation'
import {
EmojiPopup,
closePopup,
getCurrentResolvedLocation,
getEventPositionElement,
@ -11,6 +10,7 @@ import {
type EmojiWithGroup, isCustomEmoji
} from '@hcengineering/ui'
import { type AttributeModel } from '@hcengineering/view'
import emojiPlugin from '@hcengineering/emoji'
import { get } from 'svelte/store'
import { savedMessagesStore } from './activity'
@ -61,9 +61,8 @@ export async function addReactionAction (
closePopup()
showPopup(EmojiPopup, {}, element, (emoji: EmojiWithGroup) => {
// TODO: add custom emoji
if (!isCustomEmoji(emoji) && emoji?.emoji !== undefined) void updateDocReactions(reactions, message, emoji.emoji)
showPopup(emojiPlugin.component.EmojiPopup, {}, element, (emoji) => {
if (emoji?.text !== undefined) void updateDocReactions(reactions, message, emoji.text)
params?.onClose?.()
})
params?.onOpen?.()

1
plugins/emoji-resources/src/components/EmojiPopup.svelte
View File

@ -102,6 +102,7 @@
addFrequentlyEmojis(emoji)
dispatch('close', {
text: selected,
codes: isCustomEmoji(emoji) ? undefined : emoji.hexcode.split('-').map((hc) => parseInt(hc, 16)),
url: isCustomEmoji(emoji) ? emoji.url : undefined
})
}

4
plugins/task-resources/package.json
View File

@ -63,6 +63,8 @@
"@hcengineering/kanban": "^0.6.0",
"@hcengineering/contact-resources": "^0.6.0",
"@hcengineering/setting": "^0.6.17",
"@hcengineering/setting-resources": "^0.6.0"
"@hcengineering/setting-resources": "^0.6.0",
"@hcengineering/emoji": "^0.6.0",
"@hcengineering/emoji-resources": "^0.6.0"
}
}

14
plugins/task-resources/src/components/state/CreateStatePopup.svelte
View File

@ -19,9 +19,9 @@
import { clearSettingsStore, settingsStore } from '@hcengineering/setting-resources'
import { ProjectType, TaskType, calculateStatuses, createState } from '@hcengineering/task'
import {
Component,
ButtonIcon,
ButtonMenu,
EmojiPopup,
IconCopy,
IconDelete,
IconSettings,
@ -38,6 +38,7 @@
} from '@hcengineering/ui'
import { ColorsPopup, statusStore } from '@hcengineering/view-resources'
import view from '@hcengineering/view-resources/src/plugin'
import emojiPlugin from '@hcengineering/emoji'
import { taskTypeStore, typeStore } from '../..'
import task from '../../plugin'
import ApproveStatusRenamePopup from './ApproveStatusRenamePopup.svelte'
@ -432,11 +433,12 @@
}}
/>
{:else}
<EmojiPopup
embedded
selected={Array.isArray(color) ? fromCodePoint(...color) : color ? fromCodePoint(color) : undefined}
disabled={readonly}
kind={'default'}
<Component is={emojiPlugin.component.EmojiPopup}
props={{
selected: Array.isArray(color) ? fromCodePoint(...color) : color ? fromCodePoint(color) : undefined,
disabled: readonly,
kind: 'default'
}}
on:close={(evt) => {
if (readonly) return
color = evt.detail.codes

2
plugins/view-resources/package.json
View File

@ -58,6 +58,8 @@
"@hcengineering/text-editor-resources": "^0.6.0",
"@hcengineering/analytics": "^0.6.0",
"@hcengineering/query": "^0.6.12",
"@hcengineering/emoji": "^0.6.0",
"@hcengineering/emoji-resources": "^0.6.0",
"fast-equals": "^5.2.2"
}
}

11
plugins/view-resources/src/components/IconPicker.svelte
View File

@ -16,15 +16,15 @@
import { Asset, Metadata } from '@hcengineering/platform'
import {
ButtonIcon,
EmojiPopup,
TabsControl,
fromCodePoint,
Scroller,
getPlatformColor,
getPlatformColorDef,
themeStore,
Label
Label, Component
} from '@hcengineering/ui'
import emojiPlugin from '@hcengineering/emoji'
import { createEventDispatcher } from 'svelte'
import { iconsLibrary } from '../icons'
import view from '../plugin'
@ -96,9 +96,10 @@
{/if}
</div>
{:else}
<EmojiPopup
embedded
selected={Array.isArray(color) ? fromCodePoint(...color) : fromCodePoint(color)}
<Component is={emojiPlugin.component.EmojiPopup}
props={{
selected: Array.isArray(color) ? fromCodePoint(...color) : color ? fromCodePoint(color) : undefined
}}
on:close={(evt) => {
dispatch('close', { icon: iconWithEmoji, color: evt.detail.codes })
}}