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

fix: change moment of displaying chat after editing existed message #30564

Merged
merged 7 commits into from
Nov 7, 2023
Merged

fix: change moment of displaying chat after editing existed message #30564

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
400c622
fix: change moment of displaying chat after editing existed message
barttom Oct 30, 2023
bc6fd72
fix: add previous solution for android
barttom Oct 31, 2023
45b03b0
refactor: change event handler method
barttom Nov 1, 2023
b18fd59
fix: removed unused Platform dependency
barttom Nov 1, 2023
a20986c
fix: changed comment description
barttom Nov 2, 2023
1ef898c
fix: added files per native platform
barttom Nov 7, 2023
c47a6fe
fix: added files per native platform
barttom Nov 7, 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
18 changes: 12 additions & 6 deletions src/libs/setShouldShowComposeInputKeyboardAware/index.native.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import {EmitterSubscription, Keyboard} from 'react-native';
import getOperatingSystem from '@libs/getOperatingSystem';
import * as Composer from '@userActions/Composer';
import CONST from '@src/CONST';
import SetShouldShowComposeInputKeyboardAware from './types';

let keyboardDidHideListener: EmitterSubscription | null = null;
let keyboardEventListener: EmitterSubscription | null = null;
// On iOS is visible delay with displaying input after keyboard has been closed with `keyboardDidHide` event
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB

Suggested change
// On iOS is visible delay with displaying input after keyboard has been closed with `keyboardDidHide` event
// On iOS, there is a visible delay in displaying input after the keyboard has been closed with the `keyboardDidHide` event

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment fixed

// Because of that - on iOS we can use `keyboardWillHide` that is not available on android
const keyboardEvent = getOperatingSystem() === CONST.OS.IOS ? 'keyboardWillHide' : 'keyboardDidHide';
barttom marked this conversation as resolved.
Show resolved Hide resolved

const setShouldShowComposeInputKeyboardAware: SetShouldShowComposeInputKeyboardAware = (shouldShow) => {
if (keyboardDidHideListener) {
keyboardDidHideListener.remove();
keyboardDidHideListener = null;
if (keyboardEventListener) {
keyboardEventListener.remove();
keyboardEventListener = null;
}

if (!shouldShow) {
Expand All @@ -20,9 +26,9 @@ const setShouldShowComposeInputKeyboardAware: SetShouldShowComposeInputKeyboardA
return;
}

keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
keyboardEventListener = Keyboard.addListener(keyboardEvent, () => {
Composer.setShouldShowComposeInput(true);
keyboardDidHideListener?.remove();
keyboardEventListener?.remove();
});
};

Expand Down
Loading