Bump expensify-common and update styling for short-mentions

Author: Kicu

ios/Podfile.lock

@@ -2522,7 +2522,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.233):
+  - RNLiveMarkdown (0.1.234):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2542,10 +2542,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/newarch (= 0.1.233)
+    - RNLiveMarkdown/newarch (= 0.1.234)
     - RNReanimated/worklets
     - Yoga
-  - RNLiveMarkdown/newarch (0.1.233):
+  - RNLiveMarkdown/newarch (0.1.234):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3292,8 +3292,8 @@ SPEC CHECKSUMS:
   AirshipServiceExtension: 9c73369f426396d9fb9ff222d86d842fac76ba46
   AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
   AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
-  boost: 26992d1adf73c1c7676360643e687aee6dda994b
-  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
+  boost: d7090b1a93a9798c029277a8288114f2948f471c
+  DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
   EXAV: 9773c9799767c9925547b05e41a26a0240bb8ef2
   EXImageLoader: 759063a65ab016b836f73972d3bb25404888713d
   expensify-react-native-background-task: 6f797cf470b627912c246514b1631a205794775d
@@ -3313,11 +3313,11 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
   FirebasePerformance: 0c01a7a496657d7cea86d40c0b1725259d164c6c
   FirebaseRemoteConfig: 2d6e2cfdb49af79535c8af8a80a4a5009038ec2b
-  fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
+  fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
   ForkInputMask: 55e3fbab504b22da98483e9f9a6514b98fdd2f3c
   FullStory: c8a10b2358c0d33c57be84d16e4c440b0434b33d
   fullstory_react-native: 63a803cca04b0447a71daa73e4df3f7b56e1919d
-  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
+  glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
@@ -3343,7 +3343,7 @@ SPEC CHECKSUMS:
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   pusher-websocket-react-native: e40c49a1e4ec96d4157375aebcf44943f0f8f62f
   PusherSwift: cad631bad86cfff4b8458dce1310a7774e469b1f
-  RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
+  RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
   RCTDeprecation: 2c5e1000b04ab70b53956aa498bf7442c3c6e497
   RCTRequired: 5f785a001cf68a551c5f5040fb4c415672dbb481
   RCTTypeSafety: 6b98db8965005d32449605c0d005ecb4fee8a0f7
@@ -3433,7 +3433,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 364e6862a112045bb5c5d35601f0bdb0304af979
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: 763a9c03a90435770c2d49f9e99a7fc72ea49552
+  RNLiveMarkdown: 79e0b13fd3d058a715d31e7ef65afa7287cdcae4
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: d184c8d3213acf4c97ec71fbbb6f9d4954552d80
   RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28

package-lock.json

@@ -121,7 +121,7 @@
     "date-fns-tz": "^3.2.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "2.0.115",
+    "expensify-common": "2.0.124",
     "expo": "52.0.14",
     "expo-asset": "^11.0.1",
     "expo-av": "^15.0.1",

package.json

@@ -174,14 +174,6 @@ function SearchAutocompleteInput(
         [currentUserPersonalDetails.displayName, substitutionMap, currencySharedValue, categorySharedValue, tagSharedValue, emailListSharedValue],
     );
 
-    const additionalMarkdownStyle = useMemo(
-        () => ({
-            mentionHere: styles.br1,
-            mentionUser: styles.br1,
-        }),
-        [styles.br1],
-    );
-
     const inputWidth = isFullWidth ? styles.w100 : {width: variables.popoverWidth};
 
     // Parse Fullstory attributes on initial render
@@ -214,7 +206,6 @@ function SearchAutocompleteInput(
                         enterKeyHint="search"
                         accessibilityLabel={translate('search.searchPlaceholder')}
                         disabled={disabled}
-                        markdownStyle={additionalMarkdownStyle}
                         maxLength={CONST.SEARCH_QUERY_LIMIT}
                         onSubmitEditing={onSubmit}
                         shouldUseDisabledStyles={false}

patches/expensify-common+2.0.115+001+TEMP-add-short-mentions.patch

@@ -84,14 +84,15 @@ function BaseTextInput(
     const InputComponent = InputComponentMap.get(type) ?? RNTextInput;
     const isMarkdownEnabled = type === 'markdown';
     const isAutoGrowHeightMarkdown = isMarkdownEnabled && autoGrowHeight;
+
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {hasError = false, markdownStyle: propsMarkdownStyle} = inputProps;
-    const markdownStyle = useMarkdownStyle(undefined, excludedMarkdownStyles, propsMarkdownStyle);
+    const markdownStyle = useMarkdownStyle(undefined, excludedMarkdownStyles);
+    const {hasError = false} = inputProps;
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
 
-    // Disabling this line for saftiness as nullish coalescing works only if value is undefined or null
+    // Disabling this line for safeness as nullish coalescing works only if value is undefined or null
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const initialValue = value || defaultValue || '';
     const initialActiveLabel = !!forceActiveLabel || initialValue.length > 0 || !!prefixCharacter || !!suffixCharacter;

src/components/Search/SearchAutocompleteInput.tsx

@@ -7,7 +7,7 @@ import useTheme from './useTheme';
 
 const defaultEmptyArray: Array<keyof MarkdownStyle> = [];
 
-function useMarkdownStyle(message: string | null = null, excludeStyles: Array<keyof MarkdownStyle> = defaultEmptyArray, additionalStyles?: MarkdownStyle): MarkdownStyle {
+function useMarkdownStyle(message: string | null = null, excludeStyles: Array<keyof MarkdownStyle> = defaultEmptyArray): MarkdownStyle {
     const theme = useTheme();
     const hasMessageOnlyEmojis = message != null && message.length > 0 && containsOnlyEmojis(message);
     const emojiFontSize = hasMessageOnlyEmojis ? variables.fontSizeOnlyEmojis : variables.fontSizeEmojisWithinText;
@@ -67,10 +67,12 @@ function useMarkdownStyle(message: string | null = null, excludeStyles: Array<ke
             mentionHere: {
                 color: theme.ourMentionText,
                 backgroundColor: theme.ourMentionBG,
+                borderRadius: variables.componentBorderRadiusSmall,
             },
             mentionUser: {
                 color: theme.mentionText,
                 backgroundColor: theme.mentionBG,
+                borderRadius: variables.componentBorderRadiusSmall,
             },
             mentionReport: {
                 color: theme.mentionText,
@@ -102,41 +104,10 @@ function useMarkdownStyle(message: string | null = null, excludeStyles: Array<ke
             });
         }
 
-        if (additionalStyles) {
-            Object.keys(additionalStyles).forEach((key) => {
-                if (!isValidStyleKey(styling, key)) {
-                    return;
-                }
-
-                const style = getStyle(styling, key);
-                const additionalStyle = getStyle(additionalStyles, key);
-
-                if (!style || !additionalStyle) {
-                    return;
-                }
-
-                Object.keys(additionalStyle).forEach((styleKey) => {
-                    if (!isValidStyleKey(additionalStyle, styleKey)) {
-                        return;
-                    }
-
-                    style[styleKey] = additionalStyle[styleKey];
-                });
-            });
-        }
-
         return styling;
-    }, [theme, emojiFontSize, excludeStyles, nonStylingDefaultValues, additionalStyles]);
+    }, [theme, emojiFontSize, excludeStyles, nonStylingDefaultValues]);
 
     return markdownStyle;
 }
 
-function isValidStyleKey<T extends MarkdownStyle>(obj: T, key: PropertyKey): key is keyof T {
-    return key in obj;
-}
-
-function getStyle<T extends MarkdownStyle, K extends keyof T>(obj: T, key: K): Record<string, unknown> | undefined {
-    return obj[key] as Record<string, unknown> | undefined;
-}
-
 export default useMarkdownStyle;