Skip to content

PRD-2132: ScreenWrapper keyboard avoidance fix#39

Merged
veliseev93 merged 3 commits intodevelopmentfrom
PRD-2132-keyboard-controllers-refactoring
Feb 2, 2026
Merged

PRD-2132: ScreenWrapper keyboard avoidance fix#39
veliseev93 merged 3 commits intodevelopmentfrom
PRD-2132-keyboard-controllers-refactoring

Conversation

@Tomass673
Copy link
Collaborator

@Tomass673
Copy link
Collaborator Author

Tomass673 commented Jan 27, 2026

Also, i fixed small issue with KnowledgeResponse items transform, which caused A query that was dehydrated as pending ended up rejecting error.

keyBoardAvoidingProps,
}: PropsWithChildren<ScreenWrapperProps>): ReactElement {
const { header, ...restScreenProps } = screenProps || {};
const { header, scrollDisabled, ...restScreenProps } = screenProps || {};
Copy link
Contributor

Choose a reason for hiding this comment

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

Couldn't we simplify it like that?

  const { header, scrollDisabled, ...restScreenProps } = screenProps || {};
  const effectiveScrollDisabled = isKeyboardAvoiding || !!scrollDisabled;

  const content = isKeyboardAvoiding ? (
    <AppKeyboardAvoidingView {...keyBoardAvoidingProps}>
      <AppScreen scrollDisabled={effectiveScrollDisabled} {...restScreenProps}>{children}</AppScreen>
    </AppKeyboardAvoidingView>
  ) : (
    <AppScreen scrollDisabled={effectiveScrollDisabled} {...restScreenProps}>{children}</AppScreen>
  );

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Simplified

@veliseev93 veliseev93 assigned Tomass673 and unassigned veliseev93 Jan 28, 2026
@Tomass673 Tomass673 assigned veliseev93 and unassigned Tomass673 Jan 30, 2026
Base automatically changed from development to production February 2, 2026 02:59
@veliseev93 veliseev93 changed the base branch from production to development February 2, 2026 03:42
@veliseev93 veliseev93 merged commit 2bd056d into development Feb 2, 2026
1 check passed
@veliseev93 veliseev93 deleted the PRD-2132-keyboard-controllers-refactoring branch February 2, 2026 03:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants