AcadeNice/AcadeDoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync

Browse source
This commit is contained in:
Philipinho 2025-09-02 21:38:14 -07:00
parent 00e499b3e5
commit f9e10805f0
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/client/src/features/editor/components/callout/callout-menu.tsx
View file

@ -23,7 +23,7 @@ import EmojiPicker from "@/components/ui/emoji-picker.tsx";
export function CalloutMenu({ editor }: EditorMenuProps) { export function CalloutMenu({ editor }: EditorMenuProps) {
const { t } = useTranslation(); const { t } = useTranslation();
const shouldShow = useCallback( const shouldShow = useCallback(
({ state }: ShouldShowProps) => { ({ state }: ShouldShowProps) => {
if (!state) { if (!state) {
@ -164,19 +164,17 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
</ActionIcon> </ActionIcon>
</Tooltip> </Tooltip>
<Tooltip position="top" label={t("Custom emoji")}> <EmojiPicker
<EmojiPicker onEmojiSelect={setCalloutIcon}
onEmojiSelect={setCalloutIcon} removeEmojiAction={removeCalloutIcon}
removeEmojiAction={removeCalloutIcon} readOnly={false}
readOnly={false} icon={currentIcon || <IconMoodSmile size={18} />}
icon={currentIcon || <IconMoodSmile size={18} />} actionIconProps={{
actionIconProps={{ size: "lg",
size: "lg", variant: "default",
variant: "default", c: undefined,
c: undefined }}
}} />
/>
</Tooltip>
</ActionIcon.Group> </ActionIcon.Group>
</BaseBubbleMenu> </BaseBubbleMenu>
); );

2
apps/server/src/ee

@ -1 +1 @@
Subproject commit aa33dcd2ba310705d6799d1e468390774e0cf3e7 Subproject commit 38de2d0dc1ae233668cf546f3ab74046afa8986a