mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-24 19:55:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

sdk.getComponent shall die

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-07-20 12:42:21 +02:00
parent 73187156d4
commit 333608c4c4
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
5 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/dialogs/AddressPickerDialog.tsx
View file

@ -21,7 +21,6 @@ import React, { createRef } from 'react';
import { sleep } from "matrix-js-sdk/src/utils";
import { _t, _td } from '../../../languageHandler';
import * as sdk from '../../../index';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import dis from '../../../dispatcher/dispatcher';
import { AddressType, addressTypes, getAddressType, IUserAddress } from '../../../UserAddress';
@ -34,6 +33,9 @@ import { Key } from "../../../Keyboard";
import { Action } from "../../../dispatcher/actions";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import AddressSelector from '../elements/AddressSelector';
import AddressTile from '../elements/AddressTile';
import BaseDialog from "./BaseDialog";
import DialogButtons from "../elements/DialogButtons";
const TRUNCATE_QUERY_LIST = 40;
const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
@ -621,10 +623,6 @@ export default class AddressPickerDialog extends React.Component<IProps, IState>
};
render() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
const AddressSelector = sdk.getComponent("elements.AddressSelector");
let inputLabel;
if (this.props.description) {
inputLabel = <div className="mx_AddressPickerDialog_label">
@ -635,7 +633,6 @@ export default class AddressPickerDialog extends React.Component<IProps, IState>
const query = [];
// create the invite list
if (this.state.selectedList.length > 0) {
const AddressTile = sdk.getComponent("elements.AddressTile");
for (let i = 0; i < this.state.selectedList.length; i++) {
query.push(
<AddressTile

3
src/components/views/elements/ActionButton.tsx
View file

@ -17,9 +17,9 @@ limitations under the License.
import React from 'react';
import AccessibleButton from './AccessibleButton';
import dis from '../../../dispatcher/dispatcher';
import * as sdk from '../../../index';
import Analytics from '../../../Analytics';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import Tooltip from './Tooltip';
interface IProps {
size?: string;
@ -71,7 +71,6 @@ export default class ActionButton extends React.Component<IProps, IState> {
render() {
let tooltip;
if (this.state.showTooltip) {
const Tooltip = sdk.getComponent("elements.Tooltip");
tooltip = <Tooltip className="mx_RoleButton_tooltip" label={this.props.label} />;
}

5
src/components/views/elements/AddressSelector.tsx
View file

@ -16,10 +16,10 @@ limitations under the License.
*/
import React, { createRef } from 'react';
import * as sdk from '../../../index';
import classNames from 'classnames';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { IUserAddress } from '../../../UserAddress';
import AddressTile from './AddressTile';
interface IProps {
onSelected: (index: number) => void;
@ -128,7 +128,6 @@ export default class AddressSelector extends React.Component<IProps, IState> {
};
private createAddressListTiles(): JSX.Element[] {
const AddressTile = sdk.getComponent("elements.AddressTile");
const maxSelected = this.maxSelected(this.props.addressList);
const addressList = [];
@ -156,8 +155,6 @@ export default class AddressSelector extends React.Component<IProps, IState> {
address={this.props.addressList[i]}
showAddress={this.props.showAddress}
justified={true}
networkName="vector"
networkUrl={require("../../../../res/img/search-icon-vector.svg")}
/>
</div>,
);

4
src/components/views/elements/AddressTile.tsx
View file

@ -17,11 +17,11 @@ limitations under the License.
import React from 'react';
import classNames from 'classnames';
import * as sdk from "../../../index";
import { _t } from '../../../languageHandler';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { mediaFromMxc } from "../../../customisations/Media";
import { IUserAddress } from '../../../UserAddress';
import BaseAvatar from '../avatars/BaseAvatar';
interface IProps {
address: IUserAddress;
@ -53,8 +53,6 @@ export default class AddressTile extends React.Component<IProps> {
imgUrls.push(require("../../../../res/img/icon-email-user.svg"));
}
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
const nameClasses = classNames({
"mx_AddressTile_name": true,
"mx_AddressTile_justified": this.props.justified,

9
src/components/views/elements/AppPermission.tsx
View file

@ -18,13 +18,16 @@ limitations under the License.
import React from 'react';
import url from 'url';
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import SdkConfig from '../../../SdkConfig';
import WidgetUtils from "../../../utils/WidgetUtils";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
import MemberAvatar from '../avatars/MemberAvatar';
import BaseAvatar from '../avatars/BaseAvatar';
import AccessibleButton from './AccessibleButton';
import TextWithTooltip from "./TextWithTooltip";
interface IProps {
url: string;
@ -88,10 +91,6 @@ export default class AppPermission extends React.Component<IProps, IState> {
render() {
const brand = SdkConfig.get().brand;
const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
const TextWithTooltip = sdk.getComponent("views.elements.TextWithTooltip");
const displayName = this.state.roomMember ? this.state.roomMember.name : this.props.creatorUserId;
const userId = displayName === this.props.creatorUserId ? null : this.props.creatorUserId;