PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Iterate PR based on feedback

Browse source
This commit is contained in:
Michael Telatynski 2021-06-03 16:44:28 +01:00
parent f2643151c6
commit 0c97d90fb9
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/css/views/dialogs/_InviteDialog.scss
View file

@ -302,7 +302,11 @@ limitations under the License.
margin-top: 4px; margin-top: 4px;
overflow-y: auto; overflow-y: auto;
padding: 0 45px 4px 0; padding: 0 45px 4px 0;
height: calc(100% - 175px); // mx_InviteDialog's height minus some for the upper and lower elements height: calc(100% - 115px); // mx_InviteDialog's height minus some for the upper and lower elements
}
.mx_InviteDialog_hasFooter .mx_InviteDialog_userSections {
height: calc(100% - 175px);
} }
.mx_InviteDialog_helpText { .mx_InviteDialog_helpText {

16
src/components/views/dialogs/InviteDialog.tsx
View file

@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React, {createRef} from 'react'; import React, { createRef } from 'react';
import classNames from 'classnames';
import {_t, _td} from "../../../languageHandler"; import {_t, _td} from "../../../languageHandler";
import * as sdk from "../../../index"; import * as sdk from "../../../index";
import {MatrixClientPeg} from "../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../MatrixClientPeg";
@ -1252,7 +1254,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
selectText(e.target); selectText(e.target);
} }
async onCopyClick(e) { onCopyClick = async e => {
e.preventDefault(); e.preventDefault();
const target = e.target; // copy target before we go async and React throws it away const target = e.target; // copy target before we go async and React throws it away
@ -1264,7 +1266,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
}); });
// Drop a reference to this close handler for componentWillUnmount // Drop a reference to this close handler for componentWillUnmount
this.closeCopiedTooltip = target.onmouseleave = close; this.closeCopiedTooltip = target.onmouseleave = close;
} };
render() { render() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
@ -1359,7 +1361,9 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
title={_t("Copy")} title={_t("Copy")}
onClick={this.onCopyClick} onClick={this.onCopyClick}
className="mx_InviteDialog_footer_link_copy" className="mx_InviteDialog_footer_link_copy"
/> >
<div />
</AccessibleTooltipButton>
</div> </div>
</div> </div>
} else if (this.props.kind === KIND_INVITE) { } else if (this.props.kind === KIND_INVITE) {
@ -1437,7 +1441,9 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
|| (this.state.filterText && this.state.filterText.includes('@')); || (this.state.filterText && this.state.filterText.includes('@'));
return ( return (
<BaseDialog <BaseDialog
className='mx_InviteDialog' className={classNames("mx_InviteDialog", {
mx_InviteDialog_hasFooter: !!footer,
})}
hasCancel={true} hasCancel={true}
onFinished={this.props.onFinished} onFinished={this.props.onFinished}
title={title} title={title}