diff --git a/native/chat/reaction-selection-popover.react.js b/native/chat/reaction-selection-popover.react.js index 4a3a7dd57..3e0e3c365 100644 --- a/native/chat/reaction-selection-popover.react.js +++ b/native/chat/reaction-selection-popover.react.js @@ -1,219 +1,224 @@ // @flow import invariant from 'invariant'; import * as React from 'react'; import { View, TouchableOpacity, Text } from 'react-native'; import Animated from 'react-native-reanimated'; import { useReactionSelectionPopoverPosition, getCalculatedMargin, reactionSelectionPopoverDimensions, } from './reaction-message-utils.js'; import SWMansionIcon from '../components/swmansion-icon.react.js'; import type { AppNavigationProp } from '../navigation/app-navigator.react.js'; import { OverlayContext } from '../navigation/overlay-context.js'; import type { TooltipModalParamList } from '../navigation/route-names.js'; import { useSelector } from '../redux/redux-utils.js'; import { useStyles } from '../themes/colors.js'; import { useTooltipActions } from '../tooltip/tooltip-hooks.js'; import type { TooltipRoute } from '../tooltip/tooltip.react.js'; -import { AnimatedView } from '../types/styles.js'; +import { + AnimatedView, + type WritableAnimatedStyleObj, + type ReanimatedTransform, +} from '../types/styles.js'; type Props> = { +navigation: AppNavigationProp, +route: TooltipRoute, +openEmojiPicker: () => mixed, +sendReaction: (reaction: string) => mixed, }; /* eslint-disable import/no-named-as-default-member */ const { Extrapolate, interpolateNode, add, multiply } = Animated; /* eslint-enable import/no-named-as-default-member */ function ReactionSelectionPopover>( props: Props, ): React.Node { const { navigation, route, openEmojiPicker, sendReaction } = props; const { verticalBounds, initialCoordinates, margin } = route.params; const { containerStyle: popoverContainerStyle, popoverLocation } = useReactionSelectionPopoverPosition({ initialCoordinates, verticalBounds, margin, }); const overlayContext = React.useContext(OverlayContext); invariant( overlayContext, 'ReactionSelectionPopover should have OverlayContext', ); const { position } = overlayContext; const dimensions = useSelector(state => state.dimensions); const popoverHorizontalOffset = React.useMemo(() => { const { x, width } = initialCoordinates; const extraLeftSpace = x; const extraRightSpace = dimensions.width - width - x; const popoverWidth = reactionSelectionPopoverDimensions.width; if (extraLeftSpace < extraRightSpace) { const minWidth = width + 2 * extraLeftSpace; return (minWidth - popoverWidth) / 2; } else { const minWidth = width + 2 * extraRightSpace; return (popoverWidth - minWidth) / 2; } }, [initialCoordinates, dimensions]); const calculatedMargin = getCalculatedMargin(margin); const animationStyle = React.useMemo(() => { - const style = {}; + const style: WritableAnimatedStyleObj = {}; style.opacity = interpolateNode(position, { inputRange: [0, 0.1], outputRange: [0, 1], extrapolate: Extrapolate.CLAMP, }); - style.transform = [ + const transform: Array = [ { scale: interpolateNode(position, { inputRange: [0.2, 0.8], outputRange: [0, 1], extrapolate: Extrapolate.CLAMP, }), }, { translateX: multiply( add(1, multiply(-1, position)), popoverHorizontalOffset, ), }, ]; if (popoverLocation === 'above') { - style.transform.push({ + transform.push({ translateY: interpolateNode(position, { inputRange: [0, 1], outputRange: [ calculatedMargin + reactionSelectionPopoverDimensions.height / 2, 0, ], extrapolate: Extrapolate.CLAMP, }), }); } else { - style.transform.push({ + transform.push({ translateY: interpolateNode(position, { inputRange: [0, 1], outputRange: [ -calculatedMargin - reactionSelectionPopoverDimensions.height / 2, 0, ], extrapolate: Extrapolate.CLAMP, }), }); } + style.transform = transform; return style; }, [position, calculatedMargin, popoverLocation, popoverHorizontalOffset]); const styles = useStyles(unboundStyles); const containerStyle = React.useMemo( () => ({ ...styles.reactionSelectionPopoverContainer, ...popoverContainerStyle, ...animationStyle, }), [ popoverContainerStyle, styles.reactionSelectionPopoverContainer, animationStyle, ], ); const tooltipRouteKey = route.key; const { hideTooltip, dismissTooltip } = useTooltipActions( navigation, tooltipRouteKey, ); const onPressDefaultEmoji = React.useCallback( (emoji: string) => { sendReaction(emoji); dismissTooltip(); }, [sendReaction, dismissTooltip], ); const onPressEmojiKeyboardButton = React.useCallback(() => { openEmojiPicker(); hideTooltip(); }, [openEmojiPicker, hideTooltip]); const defaultEmojis = React.useMemo(() => { const defaultEmojisData = ['❤️', '😆', '😮', '😠', '👍']; return defaultEmojisData.map(emoji => ( onPressDefaultEmoji(emoji)}> {emoji} )); }, [ onPressDefaultEmoji, styles.reactionSelectionItemContainer, styles.reactionSelectionItemEmoji, ]); return ( {defaultEmojis} ); } const unboundStyles = { reactionSelectionPopoverContainer: { flexDirection: 'row', alignItems: 'center', backgroundColor: 'tooltipBackground', padding: 8, borderRadius: 8, flex: 1, }, reactionSelectionItemContainer: { backgroundColor: 'reactionSelectionPopoverItemBackground', justifyContent: 'center', alignItems: 'center', padding: 8, borderRadius: 20, width: 40, height: 40, marginRight: 12, }, reactionSelectionItemEmoji: { fontSize: 18, }, emojiKeyboardButtonContainer: { backgroundColor: 'reactionSelectionPopoverItemBackground', justifyContent: 'center', alignItems: 'center', padding: 8, borderRadius: 20, width: 40, height: 40, }, icon: { color: 'modalForegroundLabel', }, }; export default ReactionSelectionPopover; diff --git a/native/tooltip/tooltip.react.js b/native/tooltip/tooltip.react.js index ad02b843f..1d14b39bc 100644 --- a/native/tooltip/tooltip.react.js +++ b/native/tooltip/tooltip.react.js @@ -1,601 +1,607 @@ // @flow import type { RouteProp } from '@react-navigation/core'; import * as Haptics from 'expo-haptics'; import invariant from 'invariant'; import * as React from 'react'; import { View, TouchableWithoutFeedback, Platform, Keyboard, } from 'react-native'; import Animated from 'react-native-reanimated'; import { TooltipContextProvider, TooltipContext, type TooltipContextType, } from './tooltip-context.react.js'; import BaseTooltipItem, { type TooltipItemBaseProps, } from './tooltip-item.react.js'; import { ChatContext, type ChatContextType } from '../chat/chat-context.js'; import SWMansionIcon from '../components/swmansion-icon.react.js'; import type { AppNavigationProp } from '../navigation/app-navigator.react.js'; import { OverlayContext, type OverlayContextType, } from '../navigation/overlay-context.js'; import type { TooltipModalParamList } from '../navigation/route-names.js'; import { type DimensionsInfo } from '../redux/dimensions-updater.react.js'; import { useSelector } from '../redux/redux-utils.js'; import { useStyles } from '../themes/colors.js'; import { type VerticalBounds, type LayoutCoordinates, } from '../types/layout-types.js'; import type { LayoutEvent } from '../types/react-native.js'; import { AnimatedView, type ViewStyle, type AnimatedViewStyle, + type WritableAnimatedStyleObj, + type ReanimatedTransform, } from '../types/styles.js'; /* eslint-disable import/no-named-as-default-member */ const { Value, Node, Extrapolate, add, multiply, interpolateNode } = Animated; /* eslint-enable import/no-named-as-default-member */ const unboundStyles = { backdrop: { backgroundColor: 'black', bottom: 0, left: 0, position: 'absolute', right: 0, top: 0, }, container: { flex: 1, }, contentContainer: { flex: 1, overflow: 'hidden', }, icon: { color: 'modalForegroundLabel', }, itemContainer: { alignItems: 'center', flex: 1, flexDirection: 'row', justifyContent: 'center', padding: 10, }, itemContainerFixed: { flexDirection: 'column', }, items: { backgroundColor: 'tooltipBackground', borderRadius: 5, overflow: 'hidden', }, itemsFixed: { flex: 1, flexDirection: 'row', }, triangleDown: { borderBottomColor: 'transparent', borderBottomWidth: 0, borderLeftColor: 'transparent', borderLeftWidth: 10, borderRightColor: 'transparent', borderRightWidth: 10, borderStyle: 'solid', borderTopColor: 'tooltipBackground', borderTopWidth: 10, height: 10, top: Platform.OS === 'android' ? -1 : 0, width: 10, }, triangleUp: { borderBottomColor: 'tooltipBackground', borderBottomWidth: 10, borderLeftColor: 'transparent', borderLeftWidth: 10, borderRightColor: 'transparent', borderRightWidth: 10, borderStyle: 'solid', borderTopColor: 'transparent', borderTopWidth: 0, bottom: Platform.OS === 'android' ? -1 : 0, height: 10, width: 10, }, }; export type TooltipParams = { ...CustomProps, +presentedFrom: string, +initialCoordinates: LayoutCoordinates, +verticalBounds: VerticalBounds, +tooltipLocation?: 'above' | 'below' | 'fixed', +margin?: number, +visibleEntryIDs?: $ReadOnlyArray, +chatInputBarHeight?: number, +hideTooltip?: boolean, }; export type TooltipRoute> = RouteProp< TooltipModalParamList, RouteName, >; export type BaseTooltipProps = { +navigation: AppNavigationProp, +route: TooltipRoute, }; type ButtonProps = { ...Base, +progress: Node, +isOpeningSidebar: boolean, }; type TooltipProps = { ...Base, // Redux state +dimensions: DimensionsInfo, +overlayContext: ?OverlayContextType, +chatContext: ?ChatContextType, +styles: typeof unboundStyles, +tooltipContext: TooltipContextType, +closeTooltip: () => mixed, +boundTooltipItem: React.ComponentType, }; export type TooltipMenuProps = { ...BaseTooltipProps, +tooltipItem: React.ComponentType, }; function createTooltip< RouteName: $Keys, BaseTooltipPropsType: BaseTooltipProps = BaseTooltipProps, >( ButtonComponent: React.ComponentType>, MenuComponent: React.ComponentType>, ): React.ComponentType { class Tooltip extends React.PureComponent< TooltipProps, > { backdropOpacity: Node; tooltipContainerOpacity: Node; tooltipVerticalAbove: Node; tooltipVerticalBelow: Node; tooltipHorizontalOffset: Value = new Value(0); tooltipHorizontal: Node; tooltipScale: Node; fixedTooltipVertical: Node; constructor(props: TooltipProps) { super(props); const { overlayContext } = props; invariant(overlayContext, 'Tooltip should have OverlayContext'); const { position } = overlayContext; this.backdropOpacity = interpolateNode(position, { inputRange: [0, 1], outputRange: [0, 0.7], extrapolate: Extrapolate.CLAMP, }); this.tooltipContainerOpacity = interpolateNode(position, { inputRange: [0, 0.1], outputRange: [0, 1], extrapolate: Extrapolate.CLAMP, }); const { margin } = this; this.tooltipVerticalAbove = interpolateNode(position, { inputRange: [0, 1], outputRange: [margin + this.tooltipHeight / 2, 0], extrapolate: Extrapolate.CLAMP, }); this.tooltipVerticalBelow = interpolateNode(position, { inputRange: [0, 1], outputRange: [-margin - this.tooltipHeight / 2, 0], extrapolate: Extrapolate.CLAMP, }); const invertedPosition = add(1, multiply(-1, position)); this.tooltipHorizontal = multiply( invertedPosition, this.tooltipHorizontalOffset, ); this.tooltipScale = interpolateNode(position, { inputRange: [0, 0.2, 0.8, 1], outputRange: [0, 0, 1, 1], extrapolate: Extrapolate.CLAMP, }); this.fixedTooltipVertical = multiply( invertedPosition, props.dimensions.height, ); } componentDidMount() { Haptics.impactAsync(); } get tooltipHeight(): number { if (this.props.route.params.tooltipLocation === 'fixed') { return fixedTooltipHeight; } else { return tooltipHeight(this.props.tooltipContext.getNumVisibleEntries()); } } get tooltipLocation(): 'above' | 'below' | 'fixed' { const { params } = this.props.route; const { tooltipLocation } = params; if (tooltipLocation) { return tooltipLocation; } const { initialCoordinates, verticalBounds } = params; const { y, height } = initialCoordinates; const contentTop = y; const contentBottom = y + height; const boundsTop = verticalBounds.y; const boundsBottom = verticalBounds.y + verticalBounds.height; const { margin, tooltipHeight: curTooltipHeight } = this; const fullHeight = curTooltipHeight + margin; if ( contentBottom + fullHeight > boundsBottom && contentTop - fullHeight > boundsTop ) { return 'above'; } return 'below'; } get opacityStyle(): AnimatedViewStyle { return { ...this.props.styles.backdrop, opacity: this.backdropOpacity, }; } get contentContainerStyle(): ViewStyle { const { verticalBounds } = this.props.route.params; const fullScreenHeight = this.props.dimensions.height; const top = verticalBounds.y; const bottom = fullScreenHeight - verticalBounds.y - verticalBounds.height; return { ...this.props.styles.contentContainer, marginTop: top, marginBottom: bottom, }; } get buttonStyle(): ViewStyle { const { params } = this.props.route; const { initialCoordinates, verticalBounds } = params; const { x, y, width, height } = initialCoordinates; return { width: Math.ceil(width), height: Math.ceil(height), marginTop: y - verticalBounds.y, marginLeft: x, }; } get margin(): number { const customMargin = this.props.route.params.margin; return customMargin !== null && customMargin !== undefined ? customMargin : 20; } get tooltipContainerStyle(): AnimatedViewStyle { const { dimensions, route } = this.props; const { initialCoordinates, verticalBounds, chatInputBarHeight } = route.params; const { x, y, width, height } = initialCoordinates; const { margin, tooltipLocation } = this; - const style = {}; + const style: WritableAnimatedStyleObj = {}; style.position = 'absolute'; style.alignItems = 'center'; style.opacity = this.tooltipContainerOpacity; + const transform: Array = []; + if (tooltipLocation !== 'fixed') { - style.transform = [{ translateX: this.tooltipHorizontal }]; + transform.push({ translateX: this.tooltipHorizontal }); } const extraLeftSpace = x; const extraRightSpace = dimensions.width - width - x; if (extraLeftSpace < extraRightSpace) { style.left = 0; style.minWidth = width + 2 * extraLeftSpace; } else { style.right = 0; style.minWidth = width + 2 * extraRightSpace; } const inputBarHeight = chatInputBarHeight ?? 0; if (tooltipLocation === 'fixed') { const padding = 8; style.minWidth = dimensions.width - 16; style.left = 8; style.right = 8; style.bottom = dimensions.height - verticalBounds.height - verticalBounds.y - inputBarHeight + padding; - style.transform = [{ translateY: this.fixedTooltipVertical }]; + transform.push({ translateY: this.fixedTooltipVertical }); } else if (tooltipLocation === 'above') { style.bottom = dimensions.height - Math.max(y, verticalBounds.y) + margin; - style.transform.push({ translateY: this.tooltipVerticalAbove }); + transform.push({ translateY: this.tooltipVerticalAbove }); } else { style.top = Math.min(y + height, verticalBounds.y + verticalBounds.height) + margin; - style.transform.push({ translateY: this.tooltipVerticalBelow }); + transform.push({ translateY: this.tooltipVerticalBelow }); } if (tooltipLocation !== 'fixed') { - style.transform.push({ scale: this.tooltipScale }); + transform.push({ scale: this.tooltipScale }); } + style.transform = transform; + return style; } render(): React.Node { const { dimensions, overlayContext, chatContext, styles, tooltipContext, closeTooltip, boundTooltipItem, ...navAndRouteForFlow } = this.props; const tooltipContainerStyle: Array = [styles.itemContainer]; if (this.tooltipLocation === 'fixed') { tooltipContainerStyle.push(styles.itemContainerFixed); } const items: Array = [ , ]; if (this.props.tooltipContext.shouldShowMore()) { items.push( , ); } let triangleStyle; const { route } = this.props; const { initialCoordinates } = route.params; const { x, width } = initialCoordinates; const extraLeftSpace = x; const extraRightSpace = dimensions.width - width - x; if (extraLeftSpace < extraRightSpace) { triangleStyle = { alignSelf: 'flex-start', left: extraLeftSpace + (width - 20) / 2, }; } else { triangleStyle = { alignSelf: 'flex-end', right: extraRightSpace + (width - 20) / 2, }; } let triangleDown = null; let triangleUp = null; const { tooltipLocation } = this; if (tooltipLocation === 'above') { triangleDown = ; } else if (tooltipLocation === 'below') { triangleUp = ; } invariant(overlayContext, 'Tooltip should have OverlayContext'); const { position } = overlayContext; const isOpeningSidebar = !!chatContext?.currentTransitionSidebarSourceID; const buttonProps: ButtonProps = { ...navAndRouteForFlow, progress: position, isOpeningSidebar, }; const itemsStyles = [styles.items, styles.itemsFixed]; let tooltip = null; if (this.tooltipLocation !== 'fixed') { tooltip = ( {triangleUp} {items} {triangleDown} ); } else if ( this.tooltipLocation === 'fixed' && !this.props.route.params.hideTooltip ) { tooltip = ( {items} ); } return ( {tooltip} ); } getTooltipItem(): React.ComponentType { const BoundTooltipItem = this.props.boundTooltipItem; return BoundTooltipItem; } onPressMore = () => { Keyboard.dismiss(); this.props.tooltipContext.showActionSheet(); }; renderMoreIcon = (): React.Node => { const { styles } = this.props; return ( ); }; onTooltipContainerLayout = (event: LayoutEvent) => { const { route, dimensions } = this.props; const { x, width } = route.params.initialCoordinates; const extraLeftSpace = x; const extraRightSpace = dimensions.width - width - x; const actualWidth = event.nativeEvent.layout.width; if (extraLeftSpace < extraRightSpace) { const minWidth = width + 2 * extraLeftSpace; this.tooltipHorizontalOffset.setValue((minWidth - actualWidth) / 2); } else { const minWidth = width + 2 * extraRightSpace; this.tooltipHorizontalOffset.setValue((actualWidth - minWidth) / 2); } }; } function ConnectedTooltip( props: $ReadOnly<{ ...BaseTooltipPropsType, +hideTooltip: () => mixed, }>, ) { const dimensions = useSelector(state => state.dimensions); const overlayContext = React.useContext(OverlayContext); const chatContext = React.useContext(ChatContext); const { params } = props.route; const { tooltipLocation } = params; const isFixed = tooltipLocation === 'fixed'; const { hideTooltip, ...rest } = props; const { goBackOnce } = props.navigation; const closeTooltip = React.useCallback(() => { goBackOnce(); if (isFixed) { hideTooltip(); } }, [isFixed, hideTooltip, goBackOnce]); const styles = useStyles(unboundStyles); const boundTooltipItem = React.useCallback( (innerProps: TooltipItemBaseProps) => { const containerStyle = isFixed ? [styles.itemContainer, styles.itemContainerFixed] : styles.itemContainer; return ( ); }, [isFixed, styles, closeTooltip], ); const tooltipContext = React.useContext(TooltipContext); invariant(tooltipContext, 'TooltipContext should be set in Tooltip'); return ( ); } function MemoizedTooltip(props: BaseTooltipPropsType) { const { visibleEntryIDs } = props.route.params; const { goBackOnce } = props.navigation; const { setParams } = props.navigation; const hideTooltip = React.useCallback(() => { const paramsUpdate: any = { hideTooltip: true }; setParams(paramsUpdate); }, [setParams]); return ( ); } return React.memo(MemoizedTooltip); } function tooltipHeight(numEntries: number): number { // 10 (triangle) + 37 * numEntries (entries) + numEntries - 1 (padding) return 9 + 38 * numEntries; } const fixedTooltipHeight: number = 53; export { createTooltip, fixedTooltipHeight }; diff --git a/native/types/react-native.js b/native/types/react-native.js index e05b29b95..2dfd03d60 100644 --- a/native/types/react-native.js +++ b/native/types/react-native.js @@ -1,45 +1,48 @@ // @flow import AnimatedInterpolation from 'react-native/Libraries/Animated/nodes/AnimatedInterpolation.js'; import type ReactNativeAnimatedValue from 'react-native/Libraries/Animated/nodes/AnimatedValue.js'; import type { ViewToken } from 'react-native/Libraries/Lists/ViewabilityHelper.js'; +import type { ____ViewStyle_Internal } from 'react-native/Libraries/StyleSheet/StyleSheetTypes.js'; export type { Layout, LayoutEvent, ScrollEvent, } from 'react-native/Libraries/Types/CoreEventTypes.js'; export type { ContentSizeChangeEvent, KeyPressEvent, FocusEvent, BlurEvent, SelectionChangeEvent, } from 'react-native/Libraries/Components/TextInput/TextInput.js'; export type { NativeMethods } from 'react-native/Libraries/Renderer/shims/ReactNativeTypes.js'; export type { KeyboardEvent } from 'react-native/Libraries/Components/Keyboard/Keyboard.js'; export type { EventSubscription } from 'react-native/Libraries/vendor/emitter/EventEmitter.js'; export type AnimatedValue = ReactNativeAnimatedValue; export type ViewableItemsChange = { +viewableItems: ViewToken[], +changed: ViewToken[], ... }; export type EmitterSubscription = { +remove: () => void, ... }; export type ImagePasteEvent = { +fileName: string, +filePath: string, +height: number, +width: number, +threadID: string, }; export type { AnimatedInterpolation }; + +export type ViewStyleObj = ____ViewStyle_Internal; diff --git a/native/types/styles.js b/native/types/styles.js index 49eec70e1..e90e97686 100644 --- a/native/types/styles.js +++ b/native/types/styles.js @@ -1,66 +1,73 @@ // @flow import * as React from 'react'; import { View, Text, Image } from 'react-native'; import Animated, { type ReanimatedAnimationBuilder, type EntryExitAnimationFunction, } from 'react-native-reanimated'; +import type { ViewStyleObj } from './react-native.js'; + type ViewProps = React.ElementConfig; export type ViewStyle = $PropertyType; type TextProps = React.ElementConfig; export type TextStyle = $PropertyType; type ImageProps = React.ElementConfig; export type ImageStyle = $PropertyType; -export type AnimatedStyleObj = { - +opacity?: ?number | Animated.Node, - +height?: ?number | Animated.Node, - +width?: ?number | Animated.Node, - +marginTop?: ?number | Animated.Node, - +marginRight?: ?number | Animated.Node, - +marginLeft?: ?number | Animated.Node, - +backgroundColor?: ?string | Animated.Node, - +bottom?: ?number | Animated.Node, - +transform?: $ReadOnlyArray<{ - +scale?: ?number | Animated.Node, - +translateX?: ?number | Animated.Node, - +translateY?: ?number | Animated.Node, - ... - }>, +export type ReanimatedTransform = { + +scale?: ?number | Animated.Node, + +translateX?: ?number | Animated.Node, + +translateY?: ?number | Animated.Node, ... }; +export type WritableAnimatedStyleObj = { + ...ViewStyleObj, + opacity?: ?number | Animated.Node, + height?: ?number | Animated.Node, + width?: ?number | Animated.Node, + marginTop?: ?number | Animated.Node, + marginRight?: ?number | Animated.Node, + marginLeft?: ?number | Animated.Node, + backgroundColor?: ?string | Animated.Node, + bottom?: ?number | Animated.Node, + transform?: $ReadOnlyArray, + ... +}; + +export type AnimatedStyleObj = $ReadOnly; + export type AnimatedViewStyle = | AnimatedStyleObj | $ReadOnlyArray; const AnimatedView: React.ComponentType<{ ...$Diff, +style: AnimatedViewStyle, +entering?: | ReanimatedAnimationBuilder | EntryExitAnimationFunction | Keyframe, +exiting?: ReanimatedAnimationBuilder | EntryExitAnimationFunction | Keyframe, }> = Animated.View; export type AnimatedTextStyle = | AnimatedStyleObj | $ReadOnlyArray; const AnimatedText: React.ComponentType<{ ...$Diff, +style: AnimatedTextStyle, }> = Animated.Text; export type AnimatedImageStyle = | AnimatedStyleObj | $ReadOnlyArray; const AnimatedImage: React.ComponentType<{ ...$Diff, +style: AnimatedImageStyle, }> = Animated.Image; export { AnimatedView, AnimatedText, AnimatedImage };