zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Make posts behave more like links (#1316) 

* use cursor for post cards

* ignore type error

* handle meta keys on non native links

(cherry picked from commit daccafea0b7ab21af6572767e496d20f32ead353)

* remove cursor on non-post notifications, not quite right

* Simplify link handling

---------

Co-authored-by: Paul Frazee <pfrazee@gmail.com>
zio/stable
Eric Bailey 2023-08-28 20:41:28 -05:00 committed by GitHub
parent cc2838761b
commit 1c460c40f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/view/com/post-thread/PostThreadItem.tsx
View File

@ -367,6 +367,7 @@ export const PostThreadItem = observer(function PostThreadItem({
pal.border,
pal.view,
item._showParentReplyLine && hasPrecedingItem && styles.noTopBorder,
styles.cursor,
]}
moderation={item.moderation.content}>
<PostSandboxWarning />
@ -616,4 +617,8 @@ const styles = StyleSheet.create({
marginLeft: 'auto',
marginRight: 'auto',
},
cursor: {
// @ts-ignore web only
cursor: 'pointer',
},
})

1
src/view/com/post/Post.tsx
View File

@ -304,6 +304,7 @@ const styles = StyleSheet.create({
paddingBottom: 5,
paddingLeft: 10,
borderTopWidth: 1,
cursor: 'pointer',
},
layout: {
flexDirection: 'row',

1
src/view/com/posts/FeedItem.tsx
View File

@ -343,6 +343,7 @@ const styles = StyleSheet.create({
borderTopWidth: 1,
paddingLeft: 10,
paddingRight: 15,
cursor: 'pointer',
},
outerSmallTop: {
borderTopWidth: 0,

16
src/view/com/util/Link.tsx
View File

@ -259,15 +259,21 @@ function onPressInner(
e?: Event,
) {
let shouldHandle = false
const isLeftClick =
// @ts-ignore Web only -prf
Platform.OS === 'web' && (e.button == null || e.button === 0)
// @ts-ignore Web only -prf
const isMiddleClick = Platform.OS === 'web' && e.button === 1
const isMetaKey =
// @ts-ignore Web only -prf
Platform.OS === 'web' && (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)
const newTab = isMetaKey || isMiddleClick
if (Platform.OS !== 'web' || !e) {
shouldHandle = e ? !e.defaultPrevented : true
} else if (
!e.defaultPrevented && // onPress prevented default
// @ts-ignore Web only -prf
!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) && // ignore clicks with modifier keys
// @ts-ignore Web only -prf
(e.button == null || e.button === 0) && // ignore everything but left clicks
(isLeftClick || isMiddleClick) && // ignore everything but left and middle clicks
// @ts-ignore Web only -prf
[undefined, null, '', 'self'].includes(e.currentTarget?.target) // let browser handle "target=_blank" etc.
) {
@ -277,7 +283,7 @@ function onPressInner(
if (shouldHandle) {
href = convertBskyAppUrlIfNeeded(href)
if (href.startsWith('http') || href.startsWith('mailto')) {
if (newTab || href.startsWith('http') || href.startsWith('mailto')) {
Linking.openURL(href)
} else {
store.shell.closeModal() // close any active modals