diff --git a/web/chat/chat-input-bar.react.js b/web/chat/chat-input-bar.react.js --- a/web/chat/chat-input-bar.react.js +++ b/web/chat/chat-input-bar.react.js @@ -51,9 +51,9 @@ import { useSelector } from '../redux/redux-utils'; import { nonThreadCalendarQuery } from '../selectors/nav-selectors'; import SWMansionIcon from '../SWMansionIcon.react'; +import { typeaheadRegex } from '../utils/typeahead-utils'; import css from './chat-input-bar.css'; import TypeaheadTooltip from './typeahead-tooltip.react'; -import { typeaheadRegex } from './typeahead-utils'; type BaseProps = { +threadInfo: ThreadInfo, +inputState: InputState, diff --git a/web/chat/typeahead-tooltip.react.js b/web/chat/typeahead-tooltip.react.js --- a/web/chat/typeahead-tooltip.react.js +++ b/web/chat/typeahead-tooltip.react.js @@ -10,12 +10,12 @@ import Button from '../components/button.react'; import type { InputState } from '../input/input-state'; -import { type TypeaheadMatchedStrings } from './chat-input-bar.react'; -import css from './typeahead-tooltip.css'; import { getTypeaheadTooltipActions, getTypeaheadTooltipPosition, -} from './typeahead-utils'; +} from '../utils/typeahead-utils'; +import type { TypeaheadMatchedStrings } from './chat-input-bar.react'; +import css from './typeahead-tooltip.css'; export type TypeaheadTooltipProps = { +inputState: InputState, diff --git a/web/chat/typeahead-utils.js b/web/utils/typeahead-utils.js rename from web/chat/typeahead-utils.js rename to web/utils/typeahead-utils.js --- a/web/chat/typeahead-utils.js +++ b/web/utils/typeahead-utils.js @@ -6,13 +6,13 @@ import { stringForUserExplicit } from 'lib/shared/user-utils'; import type { RelativeMemberInfo } from 'lib/types/thread-types'; +import { typeaheadStyle } from '../chat/chat-constants'; +import { type InputState } from '../input/input-state'; + const typeaheadRegex: RegExp = new RegExp( `(?(?:^(?:.|\n)*\\s+)|^)@(?${oldValidUsernameRegexString})?$`, ); -import { type InputState } from '../input/input-state'; -import { typeaheadStyle } from './chat-constants'; - export type TypeaheadTooltipAction = { +key: string, +onClick: (SyntheticEvent) => mixed,