mirror of
https://github.com/ilyakooo0/urbit.git
synced 2025-01-02 03:52:13 +03:00
Merge branch 'la/contact-store' of github.com:urbit/urbit into la/contact-store
This commit is contained in:
commit
8769f14a70
@ -7,6 +7,7 @@ import {
|
||||
Text,
|
||||
Row,
|
||||
Button,
|
||||
Col
|
||||
} from "@tlon/indigo-react";
|
||||
import { AsyncButton } from "~/views/components/AsyncButton";
|
||||
import RichText from "~/views/components/RichText";
|
||||
@ -37,16 +38,17 @@ export function ViewProfile(props: any) {
|
||||
<Text mono color="darkGray">{ship}</Text>
|
||||
</Center>
|
||||
</Row>
|
||||
<Row
|
||||
<Col
|
||||
pb={2}
|
||||
alignItems="center"
|
||||
justifyContent="center"
|
||||
width="100%">
|
||||
<Center width="100%">
|
||||
<RichText>
|
||||
<Center flexDirection="column" maxWidth='32rem'>
|
||||
<RichText width='100%'>
|
||||
{(contact?.bio ? contact.bio : "")}
|
||||
</RichText>
|
||||
</Center>
|
||||
</Row>
|
||||
</Center>
|
||||
</Col>
|
||||
{ (ship === `~${window.ship}`) ? (
|
||||
<Row
|
||||
pb={2}
|
||||
|
@ -26,11 +26,13 @@ type ProfileOverlayProps = ColProps & {
|
||||
|
||||
class ProfileOverlay extends PureComponent<ProfileOverlayProps, {}> {
|
||||
public popoverRef: React.Ref<typeof Col>;
|
||||
public dropdownRef: React.Ref<typeof Col>;
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.popoverRef = React.createRef();
|
||||
this.dropdownRef = React.createRef();
|
||||
this.onDocumentClick = this.onDocumentClick.bind(this);
|
||||
}
|
||||
|
||||
@ -45,9 +47,9 @@ class ProfileOverlay extends PureComponent<ProfileOverlayProps, {}> {
|
||||
}
|
||||
|
||||
onDocumentClick(event) {
|
||||
const { popoverRef } = this;
|
||||
const { popoverRef, dropdownRef } = this;
|
||||
// Do nothing if clicking ref's element or descendent elements
|
||||
if (!popoverRef.current || popoverRef.current.contains(event.target)) {
|
||||
if (!popoverRef.current || dropdownRef.current.contains(event.target) || popoverRef.current.contains(event.target)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -129,13 +131,14 @@ class ProfileOverlay extends PureComponent<ProfileOverlayProps, {}> {
|
||||
border={1}
|
||||
borderRadius={2}
|
||||
borderColor="lightGray"
|
||||
ref={this.dropdownRef}
|
||||
boxShadow="0px 0px 0px 3px">
|
||||
<Row
|
||||
p={1}
|
||||
color='black'
|
||||
cursor='pointer'
|
||||
fontSize={0}
|
||||
onClick={() => history.push('/~profile/' + window.ship)}>
|
||||
onClick={() => history.push('/~profile/~' + window.ship)}>
|
||||
View Profile
|
||||
</Row>
|
||||
{(!isOwn) && (
|
||||
|
Loading…
Reference in New Issue
Block a user