Page MenuHomePhorge
Files F32171343

D4925.1765060649.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D4925.1765060649.diff
View Options

diff --git a/web/chat/composed-message.react.js b/web/chat/composed-message.react.js
--- a/web/chat/composed-message.react.js
+++ b/web/chat/composed-message.react.js
@@ -128,17 +128,27 @@
? availableTooltipPositionsForViewerMessage
: availableTooltipPositionsForNonViewerMessage;
- messageTooltip = (
- <MessageTooltip
- threadInfo={threadInfo}
- item={item}
- availableTooltipPositions={availableTooltipPositions}
- setMouseOverMessagePosition={this.props.setMouseOverMessagePosition}
- mouseOverMessagePosition={this.props.mouseOverMessagePosition}
- canReply={this.props.canReply}
- inputState={this.props.inputState}
- />
- );
+ const messageTooltipProps = {
+ threadInfo,
+ item,
+ availableTooltipPositions,
+ mouseOverMessagePosition: this.props.mouseOverMessagePosition,
+ };
+
+ if (this.props.canReply) {
+ messageTooltip = (
+ <MessageTooltip
+ {...messageTooltipProps}
+ canReply={true}
+ setMouseOverMessagePosition={this.props.setMouseOverMessagePosition}
+ inputState={this.props.inputState}
+ />
+ );
+ } else {
+ messageTooltip = (
+ <MessageTooltip {...messageTooltipProps} canReply={false} />
+ );
+ }
}
let messageTooltipLinks;
diff --git a/web/chat/message-tooltip.react.js b/web/chat/message-tooltip.react.js
--- a/web/chat/message-tooltip.react.js
+++ b/web/chat/message-tooltip.react.js
@@ -36,26 +36,32 @@
type TooltipType = 'sidebar' | 'reply';
-type MessageTooltipProps = {
+type BaseMessageTooltipProps = {
+threadInfo: ThreadInfo,
+item: ChatMessageInfoItem,
+availableTooltipPositions: $ReadOnlyArray<TooltipPosition>,
- +setMouseOverMessagePosition?: (
- messagePositionInfo: MessagePositionInfo,
- ) => void,
+mouseOverMessagePosition: OnMessagePositionWithContainerInfo,
- +canReply?: boolean,
- +inputState?: ?InputState,
};
+type MessageTooltipProps =
+ | {
+ ...BaseMessageTooltipProps,
+ +canReply: false,
+ }
+ | {
+ ...BaseMessageTooltipProps,
+ +canReply: true,
+ +inputState: ?InputState,
+ +setMouseOverMessagePosition: (
+ messagePositionInfo: MessagePositionInfo,
+ ) => void,
+ };
function MessageTooltip(props: MessageTooltipProps): React.Node {
const {
threadInfo,
item,
availableTooltipPositions,
- setMouseOverMessagePosition,
mouseOverMessagePosition,
canReply,
- inputState,
} = props;
const { containerPosition } = mouseOverMessagePosition;
@@ -114,12 +120,15 @@
[onPendingSidebarOpen, onThreadOpen, threadCreatedFromMessage],
);
+ const setMouseOverMessagePosition = props.canReply
+ ? props.setMouseOverMessagePosition
+ : null;
+
const onReplyButtonClick = React.useCallback(() => {
- invariant(
- setMouseOverMessagePosition,
- 'setMouseOverMessagePosition should be set if replyButton exists',
- );
- setMouseOverMessagePosition({ type: 'off', item: item });
+ setMouseOverMessagePosition?.({
+ type: 'off',
+ item: item,
+ });
}, [item, setMouseOverMessagePosition]);
let tooltipText = '';
@@ -147,11 +156,7 @@
let replyButton;
if (canReply) {
- invariant(inputState, 'inputState must be set if replyButton exists');
- invariant(
- mouseOverMessagePosition,
- 'mouseOverMessagePosition must be set if replyButton exists',
- );
+ invariant(props.inputState, 'inputState must be set if replyButton exists');
replyButton = (
<div
className={css.messageActionLinkIcon}
@@ -161,7 +166,7 @@
<MessageReplyButton
messagePositionInfo={mouseOverMessagePosition}
onReplyClick={onReplyButtonClick}
- inputState={inputState}
+ inputState={props.inputState}
/>
{activeTooltip === 'reply' ? tooltipMenu : null}
</div>
diff --git a/web/chat/robotext-message.react.js b/web/chat/robotext-message.react.js
--- a/web/chat/robotext-message.react.js
+++ b/web/chat/robotext-message.react.js
@@ -71,6 +71,7 @@
item={item}
mouseOverMessagePosition={this.props.mouseOverMessagePosition}
availableTooltipPositions={availableTooltipPositionsForRobotext}
+ canReply={false}
/>
);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 10:37 PM (18 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5841146
Default Alt Text
D4925.1765060649.diff (4 KB)

Event Timeline