A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(app): scope the show-send-button toggle to the main composer (#2104)
Hampus19efbd3d619a
diff --git a/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsx b/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsxindex aedbec525..e57ef700c 100644--- a/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsx+++ b/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsx@@ -118,11 +118,19 @@ interface TextareaContextMenuProps {suggestions?: Array<string>;editFlags?: TextareaContextMenuEditFlags;targetElement?: HTMLElement | null;+ showSendButtonToggle?: boolean;onClose: () => void;}export const TextareaContextMenu = observer(- ({misspelledWord, suggestions = [], editFlags, targetElement, onClose}: TextareaContextMenuProps) => {+ ({+ misspelledWord,+ suggestions = [],+ editFlags,+ targetElement,+ showSendButtonToggle = false,+ onClose,+ }: TextareaContextMenuProps) => {const {i18n} = useLingui();const showMessageSendButton = Accessibility.showMessageSendButton;const electronAPI = isElectron() ? getElectronAPI() : null;@@ -309,16 +317,18 @@ export const TextareaContextMenu = observer(data-flx="channel.textarea.textarea-context-menu.menu-item-submenu"/></MenuGroup>- <MenuGroup data-flx="channel.textarea.textarea-context-menu.menu-group--6">- <CheckboxItem- checked={showMessageSendButton}- onCheckedChange={(checked) => AccessibilityCommands.update({showMessageSendButton: checked})}- closeOnChange={false}- data-flx="channel.textarea.textarea-context-menu.checkbox-item.show-send-button"- >- {i18n._(SHOW_SEND_BUTTON_DESCRIPTOR)}- </CheckboxItem>- </MenuGroup>+ {showSendButtonToggle && (+ <MenuGroup data-flx="channel.textarea.textarea-context-menu.menu-group--6">+ <CheckboxItem+ checked={showMessageSendButton}+ onCheckedChange={(checked) => AccessibilityCommands.update({showMessageSendButton: checked})}+ closeOnChange={false}+ data-flx="channel.textarea.textarea-context-menu.checkbox-item.show-send-button"+ >+ {i18n._(SHOW_SEND_BUTTON_DESCRIPTOR)}+ </CheckboxItem>+ </MenuGroup>+ )}</>);},diff --git a/fluxer_app/src/features/ui/hooks/useTextInputContextMenu.tsx b/fluxer_app/src/features/ui/hooks/useTextInputContextMenu.tsxindex 6e4f1227d..fa77bed8c 100644--- a/fluxer_app/src/features/ui/hooks/useTextInputContextMenu.tsx+++ b/fluxer_app/src/features/ui/hooks/useTextInputContextMenu.tsx@@ -218,6 +218,7 @@ export const useTextInputContextMenu = () => {suggestions: params.suggestions,editFlags: params.editFlags as TextareaContextMenuEditFlags | undefined,targetElement: resolvedTarget.editable,+ showSendButtonToggle: resolvedTarget.editable.closest('flx-channel-textarea') != null,});});return () => {