Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Do not show user status in input bar placeholder (ACC-443) #14558

Merged
merged 2 commits into from
Jan 30, 2023
Merged

feat: Do not show user status in input bar placeholder (ACC-443) #14558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85a0d8
feat: Do not sure user status in input bar placeholder (ACC-443)
thisisamir98 Jan 27, 2023
6cebdef
add aria-label
thisisamir98 Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/i18n/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,6 +1176,7 @@
"tooltipConversationDetailsAddPeople": "Add participants to conversation ({{shortcut}})",
"tooltipConversationDetailsRename": "Change conversation name",
"tooltipConversationEphemeral": "Self-deleting message",
"tooltipConversationEphemeralAriaLabel": "Type a self-deleting message, currently set to {{time}}",
"tooltipConversationFile": "Add file",
"tooltipConversationInfo": "Conversation info",
"tooltipConversationInputMoreThanTwoUserTyping": "{{user1}} and {{count}} more people are typing",
Expand Down
31 changes: 8 additions & 23 deletions src/script/components/InputBar/InputBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
*
*/

import {ChangeEvent, FormEvent, KeyboardEvent as ReactKeyboardEvent, useEffect, useMemo, useRef, useState} from 'react';
import {ChangeEvent, FormEvent, KeyboardEvent as ReactKeyboardEvent, useEffect, useRef, useState} from 'react';

import {amplify} from 'amplify';
import cx from 'classnames';
import {container} from 'tsyringe';

import {Availability} from '@wireapp/protocol-messaging';
import {useMatchMedia} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';

Expand All @@ -46,7 +45,7 @@ import {
getMentionCandidate,
updateMentionRanges,
} from 'Util/MentionUtil';
import {formatLocale, TIME_IN_MILLIS} from 'Util/TimeUtil';
import {formatDuration, formatLocale, TIME_IN_MILLIS} from 'Util/TimeUtil';
import {getSelectionPosition} from 'Util/util';

import {ControlButtons} from './components/InputBarControls/ControlButtons';
Expand Down Expand Up @@ -125,16 +124,13 @@ const InputBar = ({
['classifiedDomains', 'isSelfDeletingMessagesEnabled', 'isFileSharingSendingEnabled'],
);
const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
const {inTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);
const {
connection,
firstUserEntity,
participating_user_ets: participatingUserEts,
localMessageTimer,
messageTimer,
hasGlobalMessageTimer,
removed_from_conversation: removedFromConversation,
is1to1,
} = useKoSubscribableChildren(conversationEntity, [
'connection',
'firstUserEntity',
Expand All @@ -145,7 +141,6 @@ const InputBar = ({
'removed_from_conversation',
'is1to1',
]);
const {availability} = useKoSubscribableChildren(firstUserEntity, ['availability']);
const {isOutgoingRequest, isIncomingRequest} = useKoSubscribableChildren(connection, [
'isOutgoingRequest',
'isIncomingRequest',
Expand Down Expand Up @@ -173,21 +168,7 @@ const InputBar = ({
const currentState = rightSidebar.history[lastItem];
const isRightSidebarOpen = !!currentState;

const availabilityIsNone = availability === Availability.Type.NONE;
const showAvailabilityTooltip = firstUserEntity && inTeam && is1to1 && !availabilityIsNone;
const availabilityStrings: Record<string, string> = {
[Availability.Type.AVAILABLE]: t('userAvailabilityAvailable'),
[Availability.Type.AWAY]: t('userAvailabilityAway'),
[Availability.Type.BUSY]: t('userAvailabilityBusy'),
};

const inputPlaceholder = useMemo(() => {
if (showAvailabilityTooltip) {
return availabilityStrings[availability];
}

return messageTimer ? t('tooltipConversationEphemeral') : t('tooltipConversationInputPlaceholder');
}, [availability, messageTimer, showAvailabilityTooltip]); // eslint-disable-line react-hooks/exhaustive-deps
const inputPlaceholder = messageTimer ? t('tooltipConversationEphemeral') : t('tooltipConversationInputPlaceholder');

const candidates = participatingUserEts.filter(userEntity => !userEntity.isService);
const mentionSuggestions = editedMention ? searchRepository.searchUserInSet(editedMention.term, candidates) : [];
Expand Down Expand Up @@ -819,7 +800,11 @@ const InputBar = ({
onBlur={() => setIsTyping(false)}
value={inputValue}
placeholder={inputPlaceholder}
aria-label={inputPlaceholder}
aria-label={
messageTimer
? t('tooltipConversationEphemeralAriaLabel', {time: formatDuration(messageTimer).text})
: inputPlaceholder
}
data-uie-name="input-message"
dir="auto"
/>
Expand Down