imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid calling prepareToEncrypt onKeyDown (#10828)

Browse source 
* Avoid calling prepareToEncrypt onKeyDown

* Iterate
This commit is contained in:
Michael Telatynski 2023-05-09 11:56:12 +01:00 • committed by GitHub
parent b3fd9377d6
commit 08368860f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/BasicMessageComposer.tsx
View file

@ -107,7 +107,7 @@ interface IProps {
initialCaret?: DocumentOffset;
disabled?: boolean;
onChange?(): void;
onChange?(selection: Caret, inputType?: string, diff?: IDiff): void;
onPaste?(event: ClipboardEvent<HTMLDivElement>, model: EditorModel): boolean;
}
@ -278,9 +278,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
isTyping,
);
if (this.props.onChange) {
this.props.onChange();
}
this.props.onChange?.(selection, inputType, diff);
};
private showPlaceholder(): void {

16
src/components/views/rooms/SendMessageComposer.tsx
View file

@ -59,6 +59,8 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
import { PosthogAnalytics } from "../../../PosthogAnalytics";
import { addReplyToMessageContent } from "../../../utils/Reply";
import { doMaybeLocalRoomAction } from "../../../utils/local-room";
import { Caret } from "../../../editor/caret";
import { IDiff } from "../../../editor/diff";
/**
* Build the mentions information based on the editor model (and any related events):
@ -353,11 +355,6 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
context: this.context.timelineRenderingType,
});
break;
default:
if (this.prepareToEncrypt) {
// This needs to be last!
this.prepareToEncrypt();
}
}
};
@ -689,8 +686,13 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
return false;
};
private onChange = (): void => {
if (this.props.onChange) this.props.onChange(this.model);
private onChange = (selection: Caret, inputType?: string, diff?: IDiff): void => {
// We call this in here rather than onKeyDown as that would trip it on global shortcuts e.g. Ctrl-k also
if (!!diff) {
this.prepareToEncrypt?.();
}
this.props.onChange?.(this.model);
};
private focusComposer = (): void => {