Page MenuHomePhabricator

D5719.id18840.diff
No OneTemporary

D5719.id18840.diff

diff --git a/web/chat/chat-constants.js b/web/chat/chat-constants.js
--- a/web/chat/chat-constants.js
+++ b/web/chat/chat-constants.js
@@ -16,3 +16,12 @@
width: 30,
height: 38,
};
+
+export const typeaheadStyle = {
+ tooltipWidth: 296,
+ tooltipMaxHeight: 268,
+ tooltipVerticalPadding: 16,
+ tooltipLeftOffset: 16,
+ tooltipTopOffset: 4,
+ rowHeight: 40,
+};
diff --git a/web/chat/mention-utils.js b/web/chat/mention-utils.js
--- a/web/chat/mention-utils.js
+++ b/web/chat/mention-utils.js
@@ -1,5 +1,7 @@
// @flow
+import * as React from 'react';
+
import { oldValidUsernameRegexString } from 'lib/shared/account-utils';
import SearchIndex from 'lib/shared/search-index';
import { stringForUserExplicit } from 'lib/shared/user-utils';
@@ -9,6 +11,20 @@
`(?<textPrefix>(?:^(?:.|\n)*\\s+)|^)@(?<username>${oldValidUsernameRegexString})?$`,
);
+import { type InputState } from '../input/input-state';
+import { typeaheadStyle } from './chat-constants';
+
+export type MentionSuggestionTooltipAction = {
+ +key: string,
+ +onClick: (SyntheticEvent<HTMLButtonElement>) => mixed,
+ +actionButtonContent: React.Node,
+};
+
+export type TooltipPosition = {
+ +top: number,
+ +left: number,
+};
+
function getTypeaheadUserSuggestions(
userSearchIndex: SearchIndex,
usersInThread: $ReadOnlyArray<RelativeMemberInfo>,
@@ -58,10 +74,84 @@
const { offsetTop, offsetLeft } = span;
document.body?.removeChild(div);
+ const textareaWidth = parseInt(textareaStyle.getPropertyValue('width'));
+
+ const caretLeftOffset =
+ offsetLeft + typeaheadStyle.tooltipWidth > textareaWidth
+ ? textareaWidth - typeaheadStyle.tooltipWidth
+ : offsetLeft;
+
return {
caretTopOffset: offsetTop - textarea.scrollTop,
- caretLeftOffset: offsetLeft,
+ caretLeftOffset: caretLeftOffset,
};
}
-export { mentionRegex, getTypeaheadUserSuggestions, getCaretOffsets };
+function getTypeaheadTooltipActions(
+ inputState: InputState,
+ textarea: HTMLTextAreaElement,
+ suggestedUsers: $ReadOnlyArray<RelativeMemberInfo>,
+ matchedTextBefore: string,
+ wholeMatch: string,
+): $ReadOnlyArray<MentionSuggestionTooltipAction> {
+ return suggestedUsers
+ .filter(
+ suggestedUser => stringForUserExplicit(suggestedUser) !== 'anonymous',
+ )
+ .map(suggestedUser => ({
+ key: suggestedUser.id,
+ onClick: () => {
+ const newPrefixText = matchedTextBefore;
+
+ let newSuffixText = inputState.draft.slice(wholeMatch.length);
+ newSuffixText = (newSuffixText[0] !== ' ' ? ' ' : '') + newSuffixText;
+
+ const newText =
+ newPrefixText +
+ '@' +
+ stringForUserExplicit(suggestedUser) +
+ newSuffixText;
+
+ inputState.setDraft(newText);
+ inputState.setTextCursorPosition(
+ newText.length - newSuffixText.length + 1,
+ );
+ },
+ actionButtonContent: stringForUserExplicit(suggestedUser),
+ }));
+}
+function getTypeaheadTooltipPosition(
+ textarea: HTMLTextAreaElement,
+ actionsLength: number,
+ matchedTextBefore: string,
+): TooltipPosition {
+ const { caretTopOffset, caretLeftOffset } = getCaretOffsets(
+ textarea,
+ matchedTextBefore,
+ );
+
+ const top: number =
+ textarea.getBoundingClientRect().top -
+ Math.min(
+ typeaheadStyle.tooltipVerticalPadding +
+ actionsLength * typeaheadStyle.rowHeight,
+ typeaheadStyle.tooltipMaxHeight,
+ ) -
+ typeaheadStyle.tooltipTopOffset +
+ caretTopOffset;
+
+ const left: number =
+ textarea.getBoundingClientRect().left -
+ typeaheadStyle.tooltipLeftOffset +
+ caretLeftOffset;
+
+ return { top, left };
+}
+
+export {
+ mentionRegex,
+ getTypeaheadUserSuggestions,
+ getCaretOffsets,
+ getTypeaheadTooltipActions,
+ getTypeaheadTooltipPosition,
+};

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 7:51 PM (17 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2580847
Default Alt Text
D5719.id18840.diff (3 KB)

Event Timeline