urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-06 21:18:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

dms: hiding delete for dms and hiding dropdown if only reply

Browse Source
This commit is contained in:
Hunter Miller 2022-01-11 16:43:57 -06:00
parent f6db32e669
commit 8efc0a9006
2 changed files with 45 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/interface/src/views/apps/chat/DmResource.tsx
View File

@ -1,4 +1,4 @@
import { acceptDm, cite, Content, declineDm, deSig, Post, removeDmMessage } from '@urbit/api'; import { acceptDm, cite, Content, declineDm, deSig, Post } from '@urbit/api';
import React, { useCallback, useEffect } from 'react'; import React, { useCallback, useEffect } from 'react';
import _ from 'lodash'; import _ from 'lodash';
import bigInt from 'big-integer'; import bigInt from 'big-integer';
@ -77,7 +77,7 @@ export function DmResource(props: DmResourceProps) {
); );
useEffect(() => { useEffect(() => {
if(!dm) { if(dm.size === 0) {
getNewest(`~${window.ship}`, 'dm-inbox', 100, `/${patp2dec(ship)}`); getNewest(`~${window.ship}`, 'dm-inbox', 100, `/${patp2dec(ship)}`);
} }
}, [ship, dm]); }, [ship, dm]);
@ -127,10 +127,6 @@ export function DmResource(props: DmResourceProps) {
[ship, addDmMessage] [ship, addDmMessage]
); );
const onDelete = useCallback((msg: Post) => {
airlock.poke(removeDmMessage(`~${window.ship}`, msg.index));
}, []);
const onAccept = async () => { const onAccept = async () => {
await airlock.poke(acceptDm(ship)); await airlock.poke(acceptDm(ship));
}; };
@ -208,7 +204,6 @@ export function DmResource(props: DmResourceProps) {
onReply={quoteReply} onReply={quoteReply}
fetchMessages={fetchMessages} fetchMessages={fetchMessages}
dismissUnread={dismissUnread} dismissUnread={dismissUnread}
onDelete={onDelete}
getPermalink={() => undefined} getPermalink={() => undefined}
isAdmin={false} isAdmin={false}
onSubmit={onSubmit} onSubmit={onSubmit}

126
pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
View File

@ -284,6 +284,9 @@ const MessageActionItem = (props) => {
const MessageActions = ({ onReply, onDelete, msg, isAdmin, permalink }) => { const MessageActions = ({ onReply, onDelete, msg, isAdmin, permalink }) => {
const isOwn = () => msg.author === window.ship; const isOwn = () => msg.author === window.ship;
const { doCopy, copyDisplay } = useCopy(permalink, 'Copy Message Link'); const { doCopy, copyDisplay } = useCopy(permalink, 'Copy Message Link');
const showCopyMessageLink = Boolean(permalink);
const showDelete = (isAdmin || isOwn()) && onDelete;
const showDropdown = showCopyMessageLink || showDelete;
return ( return (
<Box <Box
@ -304,6 +307,7 @@ const MessageActions = ({ onReply, onDelete, msg, isAdmin, permalink }) => {
> >
<Icon icon='Chat' size={3} /> <Icon icon='Chat' size={3} />
</Box> </Box>
{showDropdown && (
<Dropdown <Dropdown
dropWidth='250px' dropWidth='250px'
width='auto' width='auto'
@ -325,20 +329,15 @@ const MessageActions = ({ onReply, onDelete, msg, isAdmin, permalink }) => {
<MessageActionItem onClick={() => onReply(msg)}> <MessageActionItem onClick={() => onReply(msg)}>
Reply Reply
</MessageActionItem> </MessageActionItem>
{permalink ? ( {showCopyMessageLink && (
<MessageActionItem onClick={doCopy}> <MessageActionItem onClick={doCopy}>
{copyDisplay} {copyDisplay}
</MessageActionItem> </MessageActionItem>
) : null } )}
{(isAdmin || isOwn()) ? ( {showDelete && (
<MessageActionItem onClick={e => onDelete(msg)} color='red'> <MessageActionItem onClick={e => onDelete(msg)} color='red'>
Delete Message Delete Message
</MessageActionItem> </MessageActionItem>
) : null}
{false && (
<MessageActionItem onClick={e => console.log(e)}>
View Signature
</MessageActionItem>
)} )}
</Col> </Col>
} }
@ -347,6 +346,7 @@ const MessageActions = ({ onReply, onDelete, msg, isAdmin, permalink }) => {
<Icon icon='Menu' size={3} /> <Icon icon='Menu' size={3} />
</Box> </Box>
</Dropdown> </Dropdown>
)}
</Row> </Row>
</Box> </Box>
); );
@ -418,7 +418,7 @@ function ChatMessage(props: ChatMessageProps) {
} }
const onReply = props?.onReply || emptyCallback; const onReply = props?.onReply || emptyCallback;
const onDelete = props?.onDelete || emptyCallback; const onDelete = props?.onDelete; // If missing hide delete action
const transcluded = props?.transcluded || 0; const transcluded = props?.transcluded || 0;
const renderSigil = props.renderSigil || (Boolean(nextMsg && msg.author !== nextMsg.author) || const renderSigil = props.renderSigil || (Boolean(nextMsg && msg.author !== nextMsg.author) ||
!nextMsg !nextMsg
@ -513,111 +513,3 @@ function ChatMessage(props: ChatMessageProps) {
export default React.memo(React.forwardRef((props: Omit<ChatMessageProps, 'innerRef'>, ref: any) => ( export default React.memo(React.forwardRef((props: Omit<ChatMessageProps, 'innerRef'>, ref: any) => (
<ChatMessage {...props} innerRef={ref} /> <ChatMessage {...props} innerRef={ref} />
))); )));
export const MessagePlaceholder = ({
height,
index,
className = '',
style = {},
...props
}) => (
<Box
width='100%'
fontSize={2}
pl={3}
pt={4}
pr={3}
display='flex'
lineHeight='tall'
className={className}
style={{ height, ...style }}
{...props}
>
<Box
pr={3}
verticalAlign='top'
backgroundColor='white'
style={{ float: 'left' }}
>
<Text
display='block'
background='washedGray'
width='24px'
height='24px'
borderRadius='50%'
style={{
visibility: index % 5 == 0 ? 'initial' : 'hidden'
}}
></Text>
</Box>
<Box
style={{ float: 'right', flexGrow: 1 }}
color='black'
className='clamp-message'
>
<Box
className='hide-child'
paddingTop={4}
style={{ visibility: index % 5 == 0 ? 'initial' : 'hidden' }}
>
<Text
display='inline-block'
verticalAlign='middle'
fontSize={0}
color='washedGray'
cursor='default'
>
<Text maxWidth='32rem' display='block'>
<Text
backgroundColor='washedGray'
borderRadius={2}
display='block'
width='100%'
height='100%'
></Text>
</Text>
</Text>
<Text
display='inline-block'
mono
verticalAlign='middle'
fontSize={0}
color='washedGray'
>
<Text
background='washedGray'
borderRadius={2}
display='block'
height='1em'
style={{ width: `${((index % 3) + 1) * 3}em` }}
></Text>
</Text>
<Text
mono
verticalAlign='middle'
fontSize={0}
ml={2}
color='washedGray'
borderRadius={2}
display={['none', 'inline-block']}
className='child'
>
<Text
backgroundColor='washedGray'
borderRadius={2}
display='block'
width='100%'
height='100%'
></Text>
</Text>
</Box>
<Text
display='block'
backgroundColor='washedGray'
borderRadius={2}
height='1em'
style={{ width: `${(index % 5) * 20}%` }}
></Text>
</Box>
</Box>
);