forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Revert "Enable tags inside of quotes (#3041)" (#3075)
This reverts commit f016cdbca9660d9e10faefae5c34c8574795419e.
+25
-22
+24
-18
src/components/RichText.tsx
+24
-18
src/components/RichText.tsx
···
78
78
const link = segment.link
79
79
const mention = segment.mention
80
80
const tag = segment.tag
81
-
if (mention && AppBskyRichtextFacet.validateMention(mention).success) {
81
+
if (
82
+
mention &&
83
+
AppBskyRichtextFacet.validateMention(mention).success &&
84
+
!disableLinks
85
+
) {
82
86
els.push(
83
87
<InlineLink
84
88
selectable={selectable}
85
89
key={key}
86
90
to={`/profile/${mention.did}`}
87
-
style={[...styles, {pointerEvents: disableLinks ? 'none' : 'auto'}]}
91
+
style={[...styles, {pointerEvents: 'auto'}]}
88
92
// @ts-ignore TODO
89
93
dataSet={WORD_WRAP}>
90
94
{segment.text}
91
95
</InlineLink>,
92
96
)
93
97
} else if (link && AppBskyRichtextFacet.validateLink(link).success) {
94
-
els.push(
95
-
<InlineLink
96
-
selectable={selectable}
97
-
key={key}
98
-
to={link.uri}
99
-
style={[...styles, {pointerEvents: disableLinks ? 'none' : 'auto'}]}
100
-
// @ts-ignore TODO
101
-
dataSet={WORD_WRAP}>
102
-
{toShortUrl(segment.text)}
103
-
</InlineLink>,
104
-
)
98
+
if (disableLinks) {
99
+
els.push(toShortUrl(segment.text))
100
+
} else {
101
+
els.push(
102
+
<InlineLink
103
+
selectable={selectable}
104
+
key={key}
105
+
to={link.uri}
106
+
style={[...styles, {pointerEvents: 'auto'}]}
107
+
// @ts-ignore TODO
108
+
dataSet={WORD_WRAP}>
109
+
{toShortUrl(segment.text)}
110
+
</InlineLink>,
111
+
)
112
+
}
105
113
} else if (
114
+
!disableLinks &&
106
115
enableTags &&
107
116
tag &&
108
117
AppBskyRichtextFacet.validateTag(tag).success
···
115
124
style={styles}
116
125
selectable={selectable}
117
126
authorHandle={authorHandle}
118
-
disableLinks={disableLinks}
119
127
/>,
120
128
)
121
129
} else {
···
128
136
<Text
129
137
selectable={selectable}
130
138
testID={testID}
131
-
style={[styles, {pointerEvents: disableLinks ? 'none' : 'auto'}]}
139
+
style={styles}
132
140
numberOfLines={numberOfLines}
133
141
// @ts-ignore web only -prf
134
142
dataSet={WORD_WRAP}>
···
143
151
style,
144
152
selectable,
145
153
authorHandle,
146
-
disableLinks,
147
154
}: {
148
155
text: string
149
156
tag: string
150
157
selectable?: boolean
151
158
authorHandle?: string
152
-
disableLinks?: boolean
153
159
} & TextStyleProp) {
154
160
const t = useTheme()
155
161
const {_} = useLingui()
···
198
204
style={[
199
205
style,
200
206
{
201
-
pointerEvents: disableLinks ? 'none' : 'auto',
207
+
pointerEvents: 'auto',
202
208
color: t.palette.primary_500,
203
209
},
204
210
web({
+1
-4
src/view/com/util/post-embeds/QuoteEmbed.tsx
+1
-4
src/view/com/util/post-embeds/QuoteEmbed.tsx