mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Several text formatting fixes

Browse source
This commit is contained in:
Scott Nonnenberg 2023-04-17 18:16:41 -07:00 • committed by GitHub
parent f93b4235d5
commit 5395741f11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 72 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ts/state/smart/CompositionArea.tsx
View file

@ -15,7 +15,7 @@ import { imageToBlurHash } from '../../util/imageToBlurHash';
import { getPreferredBadgeSelector } from '../selectors/badges';
import { selectRecentEmojis } from '../selectors/emojis';
import { getIntl, getTheme, getUserConversationId } from '../selectors/user';
import { getEmojiSkinTone } from '../selectors/items';
import { getEmojiSkinTone, getTextFormattingEnabled } from '../selectors/items';
import {
getConversationSelector,
getGroupAdminsSelector,
@ -34,8 +34,8 @@ import {
import { isSignalConversation } from '../../util/isSignalConversation';
import {
getComposerStateForConversationIdSelector,
getIsFormattingEnabled,
getIsFormattingSpoilersEnabled,
getIsFormattingFlagEnabled,
getIsFormattingSpoilersFlagEnabled,
} from '../selectors/composer';
import type { SmartCompositionRecordingProps } from './CompositionRecording';
import { SmartCompositionRecording } from './CompositionRecording';
@ -98,8 +98,11 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
const selectedMessageIds = getSelectedMessageIds(state);
const isFormattingEnabled = getIsFormattingEnabled(state);
const isFormattingSpoilersEnabled = getIsFormattingSpoilersEnabled(state);
const isFormattingEnabled =
getIsFormattingFlagEnabled(state) && getTextFormattingEnabled(state);
const isFormattingSpoilersEnabled =
getIsFormattingSpoilersFlagEnabled(state) &&
getTextFormattingEnabled(state);
return {
// Base