diff --git a/native/chat/inline-engagement.react.js b/native/chat/inline-engagement.react.js --- a/native/chat/inline-engagement.react.js +++ b/native/chat/inline-engagement.react.js @@ -465,7 +465,7 @@ type TooltipInlineEngagementProps = { +item: ChatComposedMessageInfoItemWithHeight, +isOpeningSidebar: boolean, - +progressV2: SharedValue, + +progress: SharedValue, +windowWidth: number, +positioning: 'left' | 'right' | 'center', +initialCoordinates: { @@ -482,7 +482,7 @@ const { item, isOpeningSidebar, - progressV2, + progress, windowWidth, initialCoordinates, positioning, @@ -509,7 +509,7 @@ const inlineEngagementContainer = useAnimatedStyle(() => { const opacity = isOpeningSidebar ? 0 - : interpolate(progressV2.value, [0, 1], [1, 0], Extrapolate.CLAMP); + : interpolate(progress.value, [0, 1], [1, 0], Extrapolate.CLAMP); return { position: 'absolute', width: windowWidth, diff --git a/native/chat/multimedia-message-tooltip-button.react.js b/native/chat/multimedia-message-tooltip-button.react.js --- a/native/chat/multimedia-message-tooltip-button.react.js +++ b/native/chat/multimedia-message-tooltip-button.react.js @@ -34,11 +34,11 @@ type Props = { +navigation: AppNavigationProp<'MultimediaMessageTooltipModal'>, +route: TooltipRoute<'MultimediaMessageTooltipModal'>, - +progressV2: SharedValue, + +progress: SharedValue, +isOpeningSidebar: boolean, }; function MultimediaMessageTooltipButton(props: Props): React.Node { - const { navigation, route, progressV2, isOpeningSidebar } = props; + const { navigation, route, progress, isOpeningSidebar } = props; const windowWidth = useSelector(state => state.dimensions.width); @@ -54,14 +54,14 @@ sourceMessage: item, initialCoordinates, messageListVerticalBounds: verticalBounds, - progressV2, + progress, targetInputBarHeight: sidebarInputBarHeight, }); const headerStyle = useAnimatedStyle(() => { const bottom = initialCoordinates.height; const opacity = interpolate( - progressV2.value, + progress.value, [0, 0.05], [0, 1], Extrapolate.CLAMP, @@ -84,12 +84,12 @@ item={item} positioning={item.messageInfo.creator.isViewer ? 'right' : 'left'} isOpeningSidebar={isOpeningSidebar} - progressV2={progressV2} + progress={progress} windowWidth={windowWidth} initialCoordinates={initialCoordinates} /> ); - }, [initialCoordinates, isOpeningSidebar, item, progressV2, windowWidth]); + }, [initialCoordinates, isOpeningSidebar, item, progress, windowWidth]); const innerMultimediaMessage = React.useMemo( () => ( diff --git a/native/chat/robotext-message-tooltip-button.react.js b/native/chat/robotext-message-tooltip-button.react.js --- a/native/chat/robotext-message-tooltip-button.react.js +++ b/native/chat/robotext-message-tooltip-button.react.js @@ -30,11 +30,11 @@ type Props = { +navigation: AppNavigationProp<'RobotextMessageTooltipModal'>, +route: TooltipRoute<'RobotextMessageTooltipModal'>, - +progressV2: SharedValue, + +progress: SharedValue, ... }; function RobotextMessageTooltipButton(props: Props): React.Node { - const { navigation, route, progressV2 } = props; + const { navigation, route, progress } = props; const windowWidth = useSelector(state => state.dimensions.width); @@ -50,14 +50,14 @@ sourceMessage: item, initialCoordinates, messageListVerticalBounds: verticalBounds, - progressV2, + progress, targetInputBarHeight: sidebarInputBarHeight, }); const headerStyle = useAnimatedStyle(() => { const bottom = initialCoordinates.height; const opacity = interpolate( - progressV2.value, + progress.value, [0, 0.05], [0, 1], Extrapolate.CLAMP, diff --git a/native/chat/text-message-tooltip-button.react.js b/native/chat/text-message-tooltip-button.react.js --- a/native/chat/text-message-tooltip-button.react.js +++ b/native/chat/text-message-tooltip-button.react.js @@ -34,11 +34,11 @@ type Props = { +navigation: AppNavigationProp<'TextMessageTooltipModal'>, +route: TooltipRoute<'TextMessageTooltipModal'>, - +progressV2: SharedValue, + +progress: SharedValue, +isOpeningSidebar: boolean, }; function TextMessageTooltipButton(props: Props): React.Node { - const { navigation, route, progressV2, isOpeningSidebar } = props; + const { navigation, route, progress, isOpeningSidebar } = props; const windowWidth = useSelector(state => state.dimensions.width); @@ -58,14 +58,14 @@ sourceMessage: item, initialCoordinates, messageListVerticalBounds: verticalBounds, - progressV2, + progress, targetInputBarHeight: sidebarInputBarHeight, }); const headerStyle = useAnimatedStyle(() => { const bottom = initialCoordinates.height; const opacity = interpolate( - progressV2.value, + progress.value, [0, 0.05], [0, 1], Extrapolate.CLAMP, @@ -95,12 +95,12 @@ item={item} positioning={item.messageInfo.creator.isViewer ? 'right' : 'left'} isOpeningSidebar={isOpeningSidebar} - progressV2={progressV2} + progress={progress} windowWidth={windowWidth} initialCoordinates={initialCoordinates} /> ); - }, [initialCoordinates, isOpeningSidebar, item, progressV2, windowWidth]); + }, [initialCoordinates, isOpeningSidebar, item, progress, windowWidth]); const { messageInfo, threadInfo, reactions } = item; diff --git a/native/chat/utils.js b/native/chat/utils.js --- a/native/chat/utils.js +++ b/native/chat/utils.js @@ -174,7 +174,7 @@ +sourceMessage: ChatMessageInfoItemWithHeight, +initialCoordinates: LayoutCoordinates, +messageListVerticalBounds: VerticalBounds, - +progressV2: SharedValue, + +progress: SharedValue, +targetInputBarHeight: ?number, }; @@ -182,7 +182,7 @@ sourceMessage, initialCoordinates, messageListVerticalBounds, - progressV2, + progress, targetInputBarHeight, }: AnimatedMessageArgs): { +style: AnimatedViewStyle, @@ -259,11 +259,11 @@ ) { return null; } - if (progressV2.value === 1) { + if (progress.value === 1) { runOnJS(setThreadColorBrightness)(); } return interpolateColor( - progressV2.value, + progress.value, [0, 1], [`#${targetColor}`, `#${sourceMessage.threadInfo.color}`], ); @@ -277,7 +277,7 @@ const messageContainerStyle = useAnimatedStyle(() => { const bottom = interpolate( - progressV2.value, + progress.value, [0.3, 1], [targetPosition, 0], Extrapolate.CLAMP, diff --git a/native/tooltip/tooltip.react.js b/native/tooltip/tooltip.react.js --- a/native/tooltip/tooltip.react.js +++ b/native/tooltip/tooltip.react.js @@ -135,7 +135,7 @@ }; type ButtonProps = { ...Base, - +progressV2: SharedValue, + +progress: SharedValue, +isOpeningSidebar: boolean, }; @@ -466,7 +466,7 @@ const buttonProps: ButtonProps = { ...navAndRouteForFlow, - progressV2: position, + progress: position, isOpeningSidebar, };