Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete

 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
This commit is contained in:
Michael Telatynski 2021-07-15 09:59:40 +01:00
commit ebfe38dc4a
910 changed files with 29171 additions and 17758 deletions

View file

@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import {KeyboardEvent} from "react";
import { KeyboardEvent } from "react";
import {Part, CommandPartCreator, PartCreator} from "./parts";
import { Part, CommandPartCreator, PartCreator } from "./parts";
import DocumentPosition from "./position";
import {ICompletion} from "../autocomplete/Autocompleter";
import { ICompletion } from "../autocomplete/Autocompleter";
import Autocomplete from "../components/views/rooms/Autocomplete";
export interface ICallback {
@ -47,7 +47,7 @@ export default class AutocompleteWrapperModel {
}
public close() {
this.updateCallback({close: true});
this.updateCallback({ close: true });
}
public hasSelection() {
@ -61,7 +61,7 @@ export default class AutocompleteWrapperModel {
public async confirmCompletion() {
await this.getAutocompleterComponent().onConfirmCompletion();
this.updateCallback({close: true});
this.updateCallback({ close: true });
}
/**
@ -96,7 +96,7 @@ export default class AutocompleteWrapperModel {
}
private partForCompletion(completion: ICompletion) {
const {completionId} = completion;
const { completionId } = completion;
const text = completion.completion;
switch (completion.type) {
case "room":