Updates

2023-01-05 00:49:10 +01:00 · 2023-01-05 00:49:10 +01:00 · feadcc019c
parent bb9fa0c752
commit feadcc019c
7 changed files with 28 additions and 17 deletions
--- a/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch
+++ b/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch
@ -1,5 +1,5 @@
 diff --git a/RNFastImage.podspec b/RNFastImage.podspec
-index db0fada63fc06191f8620d336d244edde6c3dba3..b23cd91a9d70bdb8abd2f4ba1417c2c35e5a1d4c 100644
+index db0fada63fc06191f8620d336d244edde6c3dba3..b6ffe6c77ab1fd5b821525f6f0b7363a13cba3a0 100644
 --- a/RNFastImage.podspec
 +++ b/RNFastImage.podspec
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
@ -8,7 +8,7 @@ index db0fada63fc06191f8620d336d244edde6c3dba3..b23cd91a9d70bdb8abd2f4ba1417c2c3
   s.dependency 'React-Core'
 -  s.dependency 'SDWebImage', '~> 5.11.1'
 -  s.dependency 'SDWebImageWebPCoder', '~> 0.8.4'
-+  s.dependency 'SDWebImage', '~> 5.14.2'
+  s.dependency 'SDWebImage', '~> 5.14.3'
 +  s.dependency 'SDWebImageWebPCoder', '~> 0.9.1'
 end
 diff --git a/android/build.gradle b/android/build.gradle
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -398,7 +398,7 @@ PODS:
    - React-Core
  - RNFastImage (8.6.3):
    - React-Core
-    - SDWebImage (~> 5.14.2)
+    - SDWebImage (~> 5.14.3)
    - SDWebImageWebPCoder (~> 0.9.1)
  - RNGestureHandler (2.8.0):
    - React-Core
@ -439,9 +439,9 @@ PODS:
    - React
  - RNSVG (13.6.0):
    - React-Core
-  - SDWebImage (5.14.2):
-    - SDWebImage/Core (= 5.14.2)
-  - SDWebImage/Core (5.14.2)
+  - SDWebImage (5.14.3):
+    - SDWebImage/Core (= 5.14.3)
+  - SDWebImage/Core (5.14.3)
  - SDWebImageWebPCoder (0.9.1):
    - libwebp (~> 1.0)
    - SDWebImage/Core (~> 5.13)
@ -769,14 +769,14 @@ SPEC CHECKSUMS:
  ReactCommon: 349be31adeecffc7986a0de875d7fb0dcf4e251c
  RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
  RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd
-  RNFastImage: c5dd1b551779c5826fe43b7d36788385da2021e2
+  RNFastImage: 756ab178acb5e3f11d8b0a931956fbd9da8d6e54
  RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
  RNReanimated: ce445c233a6ff5600223484a88ad5704945d972a
  RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
  RNSentry: 4c09f4dd9740cb9b33e94303de5b6d0dbeb0737d
  RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3
  RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17
-  SDWebImage: b9a731e1d6307f44ca703b3976d18c24ca561e84
+  SDWebImage: 9c36e66c8ce4620b41a7407698dda44211a96764
  SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
  Sentry: 08884c523575ec0f6690d94ed3ccb0246a1600bf
  Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
--- a/src/components/Parse/HTML.tsx
+++ b/src/components/Parse/HTML.tsx
@ -87,14 +87,14 @@ const ParseHTML: React.FC<Props> = ({
        return ''
    }
  }
-  const openingMentions = useRef<boolean>(true)
+  const prevMentionRemoved = useRef<boolean>(false)
  const renderNode = (node: ChildNode, index: number) => {
    switch (node.type) {
      case ElementType.Text:
        let content: string = node.data
-        if (openingMentions.current) {
+        if (prevMentionRemoved.current) {
+          prevMentionRemoved.current = false // Removing empty spaces appeared between tags and mentions
          if (node.data.trim().length) {
-            openingMentions.current = false // Removing empty spaces appeared between tags and mentions
            content = excludeMentions?.current.length
              ? node.data.replace(new RegExp(/^\s+/), '')
              : node.data
@ -119,7 +119,6 @@ const ParseHTML: React.FC<Props> = ({
            const href = node.attribs.href
            if (classes) {
              if (classes.includes('hashtag')) {
-                openingMentions.current = false
                const tag = href.match(new RegExp(/\/tags?\/(.*)/, 'i'))?.[1].toLowerCase()
                const paramsHashtag = (params as { hashtag: Mastodon.Tag['name'] } | undefined)
                  ?.hashtag
@ -156,6 +155,7 @@ const ParseHTML: React.FC<Props> = ({
                  matchedMention &&
                  excludeMentions?.current.find(eM => eM.id === matchedMention.id)
                ) {
+                  prevMentionRemoved.current = true
                  return null
                }
                const paramsAccount = (params as { account: Mastodon.Account } | undefined)?.account
@ -176,7 +176,6 @@ const ParseHTML: React.FC<Props> = ({
              }
            }

-            openingMentions.current = false
            const content = node.children.map(child => unwrapNode(child)).join('')
            const shouldBeTag = status?.tags?.find(tag => `#${tag.name}` === content)
            return (
@ -198,6 +197,12 @@ const ParseHTML: React.FC<Props> = ({
              />
            )
            break
+          case 'br':
+            return (
+              <Text key={index} style={{ lineHeight: adaptedLineheight / 2 }}>
+                {'\n'}
+              </Text>
+            )
          case 'p':
            if (index < document.children.length - 1) {
              return (
--- a/src/components/Timeline/Shared/Content.tsx
+++ b/src/components/Timeline/Shared/Content.tsx
@ -24,6 +24,10 @@ const TimelineContent: React.FC<Props> = ({ notificationOwnToot = false, setSpoi

  return (
    <View>
+      {/* <CustomText
+        children={excludeMentions?.current.map(mention => mention.username).join(' - ')}
+        style={{ color: colors.secondary }}
+      /> */}
      {status.spoiler_text?.length ? (
        <>
          <ParseHTML
--- a/src/screens/Tabs/Shared/Account/index.tsx
+++ b/src/screens/Tabs/Shared/Account/index.tsx
@ -47,7 +47,8 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
            }
          ])
        }
-      }
+      },
+      onError: () => navigation.goBack()
    }
  })

--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@ -92,7 +92,8 @@ export type ScreenTabsScreenProps<T extends keyof ScreenTabsStackParamList> = Bo

 export type TabSharedStackParamList = {
  'Tab-Shared-Account': {
-    account: Pick<Mastodon.Account, 'id' | 'username' | 'acct' | 'url' | '_remote'>
+    account: Partial<Pick<Mastodon.Account, 'id' | 'url' | '_remote'>> &
+      Pick<Mastodon.Account, 'acct' | 'url'>
    queryKey?: QueryKeyTimeline
  }
  'Tab-Shared-Account-In-Lists': { account: Pick<Mastodon.Account, 'id' | 'username'> }
--- a/yarn.lock
+++ b/yarn.lock
@ -9491,11 +9491,11 @@ __metadata:

 "react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::locator=tooot%40workspace%3A.":
  version: 8.6.3
-  resolution: "react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::version=8.6.3&hash=61017c&locator=tooot%40workspace%3A."
+  resolution: "react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::version=8.6.3&hash=d37d57&locator=tooot%40workspace%3A."
  peerDependencies:
    react: ^17 || ^18
    react-native: ">=0.60.0"
-  checksum: ffdd0bdf16ef618235bdac64771bb41fb26142737aa98c2c49679025ab1f97e3c8e8d09e23ba2ebe780691f1d11df5e154576f40e057797923a09fa945db8c1b
+  checksum: e5749406ed7608d606df8a7d298a6adaeefdf1077e5349ceb51b344e1fc9de62923f0af05c753c0baa59f476be6d46aee20a20c92c7840a30d8b473a156dfec5
  languageName: node
  linkType: hard