Skip to content

fix(src): merge upstream master and fix onClose double-call bug#21

Merged
inimaga merged 183 commits intoExpensify:masterfrom
TaduJR:merge-upstream-master
Mar 13, 2026
Merged

fix(src): merge upstream master and fix onClose double-call bug#21
inimaga merged 183 commits intoExpensify:masterfrom
TaduJR:merge-upstream-master

Conversation

@TaduJR
Copy link

@TaduJR TaduJR commented Feb 24, 2026

Summary

  • Merges ~170 upstream commits from lawnstarter/react-native-picker-select into the Expensify fork (version 8.1.0 → 9.3.1)
  • Fixes a pre-existing onClose double-call bug in triggerOpenCloseCallbacks

Upstream improvements included

  • lodash.isobject for improved object value comparison in getSelectedItem
  • dropdownItemStyle / activeItemStyle props for custom picker item styling
  • StyleProp<> wrappers in TypeScript definitions
  • testID on Item interface
  • Updated devDependencies (husky v9, prettier v3, commitlint, lint-staged)

Expensify fork features preserved

  1. PickerAvoidingView + PickerStateProvider + IOS_MODAL_HEIGHT constant
  2. scrollViewRef / scrollToInput for iOS
  3. PickerStateContext integration (modal show/close lifecycle)
  4. preserveSpaces for web labels
  5. TalkBack accessibility fix for Android headless mode (PR fix: android-headless-talkback-accessibility #19)
  6. @react-native-picker/picker as peerDependency

Bug fix

onClose was called twice in triggerOpenCloseCallbacks — once with donePressed arg, then again without args. This was introduced when PickerStateProvider was added to the fork. Consolidated into a single
onClose(donePressed) call.

Tests

40 passed, 4 skipped, 0 failed

asenmitrev and others added 30 commits October 26, 2023 14:45
Co-authored-by: Asen Mitrev <asen.mitrev@mentormate.com>
PE-36722: Adjust comparison for getSelectedItem
refactor(prettier): update eslintrc and tidy code PE-37040
ci(github): migrate from CircleCI to GitHub Actions PE-37036
conf(github): add commitlint PE-37037
conf(github): add dependabot and mergify PE-37038
Bumps [roots/issue-closer](https://github.com/roots/issue-closer) from 1.1 to 1.2.
- [Release notes](https://github.com/roots/issue-closer/releases)
- [Commits](roots/issue-closer-action@v1.1...v1.2)

---
updated-dependencies:
- dependency-name: roots/issue-closer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…_actions/roots/issue-closer-1.2

build(deps-dev): bump roots/issue-closer from 1.1 to 1.2
Bumps [prop-types](https://github.com/facebook/prop-types) from 15.7.2 to 15.8.1.
- [Changelog](https://github.com/facebook/prop-types/blob/main/CHANGELOG.md)
- [Commits](facebook/prop-types@v15.7.2...v15.8.1)

---
updated-dependencies:
- dependency-name: prop-types
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…d_yarn/prop-types-15.8.1

build(deps-dev): bump prop-types from 15.7.2 to 15.8.1
Bumps [eslint-plugin-jsx-a11y](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y) from 6.7.1 to 6.8.0.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/CHANGELOG.md)
- [Commits](jsx-eslint/eslint-plugin-jsx-a11y@v6.7.1...v6.8.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsx-a11y
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…d_yarn/eslint-plugin-jsx-a11y-6.8.0

build(deps-dev): bump eslint-plugin-jsx-a11y from 6.7.1 to 6.8.0
Bumps [enzyme-to-json](https://github.com/adriantoine/enzyme-to-json) from 3.3.5 to 3.6.2.
- [Release notes](https://github.com/adriantoine/enzyme-to-json/releases)
- [Changelog](https://github.com/adriantoine/enzyme-to-json/blob/master/CHANGELOG.md)
- [Commits](adriantoine/enzyme-to-json@v3.3.5...v3.6.2)

---
updated-dependencies:
- dependency-name: enzyme-to-json
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
dependabot bot and others added 7 commits January 19, 2026 17:07
)

Bumps the prettier group with 2 updates: [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) and [prettier](https://github.com/prettier/prettier).


Updates `eslint-plugin-prettier` from 5.5.4 to 5.5.5
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/eslint-plugin-prettier@v5.5.4...v5.5.5)

Updates `prettier` from 3.7.4 to 3.8.0
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.7.4...3.8.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-version: 5.5.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: prettier
- dependency-name: prettier
  dependency-version: 3.8.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: prettier
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oup (lawnstarter#730)

Bumps the prettier group with 1 update: [prettier](https://github.com/prettier/prettier).


Updates `prettier` from 3.8.0 to 3.8.1
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.8.0...3.8.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-version: 3.8.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: prettier
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…starter#731)

Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 19.2.3 to 19.2.4.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.2.4/packages/react-test-renderer)

---
updated-dependencies:
- dependency-name: react-test-renderer
  dependency-version: 19.2.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ter#732)

Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 20.3.1 to 20.4.1.
- [Release notes](https://github.com/conventional-changelog/commitlint/releases)
- [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md)
- [Commits](https://github.com/conventional-changelog/commitlint/commits/v20.4.1/@commitlint/cli)

---
updated-dependencies:
- dependency-name: "@commitlint/cli"
  dependency-version: 20.4.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

Bumps [cz-ls-commits](https://github.com/lawnstarter/cz-ls-commits) from 1.1.0 to 3.0.0.
- [Commits](https://github.com/lawnstarter/cz-ls-commits/commits)

---
updated-dependencies:
- dependency-name: cz-ls-commits
  dependency-version: 3.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ter#734)

Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 20.4.1 to 20.4.2.
- [Release notes](https://github.com/conventional-changelog/commitlint/releases)
- [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md)
- [Commits](https://github.com/conventional-changelog/commitlint/commits/v20.4.2/@commitlint/cli)

---
updated-dependencies:
- dependency-name: "@commitlint/cli"
  dependency-version: 20.4.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge lawnstarter/react-native-picker-select master into the Expensify fork,
preserving all Expensify-specific features:

- PickerAvoidingView + PickerStateProvider + constants
- scrollViewRef / scrollToInput for iOS
- PickerStateContext integration (modal show/close)
- preserveSpaces for web labels
- TalkBack accessibility fix (Android headless)
- @react-native-picker/picker as peerDependency

Upstream improvements included:
- lodash.isobject for object value comparison in getSelectedItem
- dropdownItemStyle / activeItemStyle props
- StyleProp<> wrappers in TypeScript definitions
- testID on Item interface
- Updated devDependencies (commitlint, husky, lint-staged, prettier)
- CI/CD workflow improvements
@TaduJR TaduJR marked this pull request as draft February 24, 2026 15:27
@TaduJR TaduJR marked this pull request as ready for review February 24, 2026 16:00
@inimaga inimaga changed the title Merge upstream master [Hold] Merge upstream master Feb 25, 2026
@inimaga
Copy link

inimaga commented Feb 25, 2026

Let's hold this for now.

)

Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 16.2.7 to 16.3.1.
- [Release notes](https://github.com/lint-staged/lint-staged/releases)
- [Changelog](https://github.com/lint-staged/lint-staged/blob/main/CHANGELOG.md)
- [Commits](lint-staged/lint-staged@v16.2.7...v16.3.1)

---
updated-dependencies:
- dependency-name: lint-staged
  dependency-version: 16.3.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@inimaga inimaga changed the title [Hold] Merge upstream master Merge upstream master Mar 4, 2026
dependabot bot added 2 commits March 9, 2026 15:08
)

Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 16.3.1 to 16.3.2.
- [Release notes](https://github.com/lint-staged/lint-staged/releases)
- [Changelog](https://github.com/lint-staged/lint-staged/blob/main/CHANGELOG.md)
- [Commits](lint-staged/lint-staged@v16.3.1...v16.3.2)

---
updated-dependencies:
- dependency-name: lint-staged
  dependency-version: 16.3.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ter#736)

Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 20.4.2 to 20.4.3.
- [Release notes](https://github.com/conventional-changelog/commitlint/releases)
- [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md)
- [Commits](https://github.com/conventional-changelog/commitlint/commits/v20.4.3/@commitlint/cli)

---
updated-dependencies:
- dependency-name: "@commitlint/cli"
  dependency-version: 20.4.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link

@inimaga inimaga left a comment

Choose a reason for hiding this comment

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

@TaduJR Could you fix the failing workflows and update the PR description.

@TaduJR TaduJR changed the title Merge upstream master fix(src): merge upstream master and fix onClose double-call bug Mar 12, 2026
@TaduJR
Copy link
Author

TaduJR commented Mar 12, 2026

@TaduJR Could you fix the failing workflows and update the PR description.

Done @inimaga

@inimaga inimaga merged commit acf8e54 into Expensify:master Mar 13, 2026
5 checks passed
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.