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

15
ts/state/smart/CompositionTextArea.tsx
View file

@ -13,9 +13,10 @@ import { useActions as useItemsActions } from '../ducks/items';
import { getPreferredBadgeSelector } from '../selectors/badges';
import { useComposerActions } from '../ducks/composer';
import {
getIsFormattingEnabled,
getIsFormattingSpoilersEnabled,
getIsFormattingFlagEnabled,
getIsFormattingSpoilersFlagEnabled,
} from '../selectors/composer';
import { getTextFormattingEnabled } from '../selectors/items';
export type SmartCompositionTextAreaProps = Pick<
CompositionTextAreaProps,
@ -41,10 +42,12 @@ export function SmartCompositionTextArea(
const { onTextTooLong } = useComposerActions();
const getPreferredBadge = useSelector(getPreferredBadgeSelector);
const isFormattingEnabled = useSelector(getIsFormattingEnabled);
const isFormattingSpoilersEnabled = useSelector(
getIsFormattingSpoilersEnabled
);
const isFormattingOptionEnabled = useSelector(getTextFormattingEnabled);
const isFormattingEnabled =
useSelector(getIsFormattingFlagEnabled) && isFormattingOptionEnabled;
const isFormattingSpoilersEnabled =
useSelector(getIsFormattingSpoilersFlagEnabled) &&
isFormattingOptionEnabled;
return (
<CompositionTextArea