Skip to content

Commit 38004df

Browse files
committed
Merge branch 'master' of ssh://github.com/react-native-menu/menu
2 parents 5f50706 + 86ac443 commit 38004df

6 files changed

Lines changed: 138 additions & 56 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Get yarn cache
2020
id: yarn-cache
2121
run: echo "::set-output name=dir::$(yarn cache dir)"
22-
- uses: actions/cache@v2
22+
- uses: actions/cache@v4
2323
with:
2424
path: ${{ steps.yarn-cache.outputs.dir }}
2525
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -40,7 +40,7 @@ jobs:
4040
- name: Get yarn cache
4141
id: yarn-cache
4242
run: echo "::set-output name=dir::$(yarn cache dir)"
43-
- uses: actions/cache@v2
43+
- uses: actions/cache@v4
4444
with:
4545
path: ${{ steps.yarn-cache.outputs.dir }}
4646
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -60,11 +60,11 @@ jobs:
6060
node-version: ${{ matrix.node-version }}
6161
- uses: actions/setup-java@v1
6262
with:
63-
java-version: '17'
63+
java-version: "17"
6464
- name: Get yarn cache
6565
id: yarn-cache
6666
run: echo "::set-output name=dir::$(yarn cache dir)"
67-
- uses: actions/cache@v2
67+
- uses: actions/cache@v4
6868
with:
6969
path: ${{ steps.yarn-cache.outputs.dir }}
7070
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -77,7 +77,7 @@ jobs:
7777
strategy:
7878
matrix:
7979
node-version: [20]
80-
arch: ['NewArch', 'OldArch']
80+
arch: ["NewArch", "OldArch"]
8181
steps:
8282
- uses: actions/checkout@v2
8383
- uses: actions/setup-node@v1
@@ -86,7 +86,7 @@ jobs:
8686
- name: Get yarn cache
8787
id: yarn-cache
8888
run: echo "::set-output name=dir::$(yarn cache dir)"
89-
- uses: actions/cache@v2
89+
- uses: actions/cache@v4
9090
with:
9191
path: ${{ steps.yarn-cache.outputs.dir }}
9292
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ android {
8989
compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
9090

9191
defaultConfig {
92-
minSdkVersion 23
92+
minSdkVersion 24
9393
targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
9494
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
9595
versionCode 1

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Menu_kotlinVersion=1.7.0
2-
Menu_minSdkVersion=23
2+
Menu_minSdkVersion=24
33
Menu_targetSdkVersion=31
44
Menu_compileSdkVersion=31
55
Menu_ndkversion=21.4.7075529

android/src/main/java/com/reactnativemenu/MenuViewManagerBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ abstract class MenuViewManagerBase : ReactClippingViewManager<MenuView>() {
206206

207207
@ReactProp(name = ViewProps.OVERFLOW)
208208
fun setOverflow(view: ReactViewGroup, overflow: String?) {
209-
view.overflow = overflow
209+
view.setOverflow(overflow)
210210
}
211211

212212
@ReactProp(name = "backfaceVisibility")

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@biomejs/biome": "1.9.4",
4949
"@callstack/react-native-visionos": "^0.73.0",
5050
"@react-native/babel-preset": "^0.77.0",
51-
"@react-native/metro-config": "0.77.0",
51+
"@react-native/metro-config": "0.78.1",
5252
"@release-it/conventional-changelog": "^10.0.0",
5353
"@rnx-kit/metro-config": "^2.0.0",
5454
"@types/jest": "^29.1.2",
@@ -58,10 +58,10 @@
5858
"pod-install": "^0.3.2",
5959
"react": "18.2.0",
6060
"react-native": "^0.73.0",
61-
"react-native-builder-bob": "^0.35.2",
61+
"react-native-builder-bob": "^0.38.0",
6262
"react-native-test-app": "^4.0.4",
6363
"release-it": "^18.1.1",
64-
"typescript": "5.7.3"
64+
"typescript": "5.8.2"
6565
},
6666
"peerDependencies": {
6767
"react": "*",

yarn.lock

Lines changed: 126 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4134,7 +4134,7 @@ __metadata:
41344134
"@biomejs/biome": "npm:1.9.4"
41354135
"@callstack/react-native-visionos": "npm:^0.73.0"
41364136
"@react-native/babel-preset": "npm:^0.77.0"
4137-
"@react-native/metro-config": "npm:0.77.0"
4137+
"@react-native/metro-config": "npm:0.78.1"
41384138
"@release-it/conventional-changelog": "npm:^10.0.0"
41394139
"@rnx-kit/metro-config": "npm:^2.0.0"
41404140
"@types/jest": "npm:^29.1.2"
@@ -4144,10 +4144,10 @@ __metadata:
41444144
pod-install: "npm:^0.3.2"
41454145
react: "npm:18.2.0"
41464146
react-native: "npm:^0.73.0"
4147-
react-native-builder-bob: "npm:^0.35.2"
4147+
react-native-builder-bob: "npm:^0.38.0"
41484148
react-native-test-app: "npm:^4.0.4"
41494149
release-it: "npm:^18.1.1"
4150-
typescript: "npm:5.7.3"
4150+
typescript: "npm:5.8.2"
41514151
peerDependencies:
41524152
react: "*"
41534153
react-native: "*"
@@ -4179,13 +4179,23 @@ __metadata:
41794179
languageName: node
41804180
linkType: hard
41814181

4182-
"@react-native/babel-plugin-codegen@npm:0.77.0":
4183-
version: 0.77.0
4184-
resolution: "@react-native/babel-plugin-codegen@npm:0.77.0"
4182+
"@react-native/babel-plugin-codegen@npm:0.77.1":
4183+
version: 0.77.1
4184+
resolution: "@react-native/babel-plugin-codegen@npm:0.77.1"
41854185
dependencies:
41864186
"@babel/traverse": "npm:^7.25.3"
4187-
"@react-native/codegen": "npm:0.77.0"
4188-
checksum: 10c0/72e8b83c9ea10a0cfcc9bbd3afd05af0a8745ec1210bc3b40b4f58cf1ce132e33de6e8ac073175c59cd6ff43d4662ea581292f8817eb6e062c7c7df7ccba2b03
4187+
"@react-native/codegen": "npm:0.77.1"
4188+
checksum: 10c0/e1efba44d03edc842802242df8cdf3fa123e693c50e248853f2bdf2cf447c730363d007ac0c651af81fab770c05a2e5c58d5b537bf3b1dd946d8fefb30ba5e4e
4189+
languageName: node
4190+
linkType: hard
4191+
4192+
"@react-native/babel-plugin-codegen@npm:0.78.1":
4193+
version: 0.78.1
4194+
resolution: "@react-native/babel-plugin-codegen@npm:0.78.1"
4195+
dependencies:
4196+
"@babel/traverse": "npm:^7.25.3"
4197+
"@react-native/codegen": "npm:0.78.1"
4198+
checksum: 10c0/4db1a1fe88e10fed084bd514188a392f2d0008255ec8e2986cdaed49da5eb3e2ef5fb4d4a97497e971d23ad79475cedbe0f56d7fbd5f7bfc06bab3552688f791
41894199
languageName: node
41904200
linkType: hard
41914201

@@ -4294,9 +4304,64 @@ __metadata:
42944304
languageName: node
42954305
linkType: hard
42964306

4297-
"@react-native/babel-preset@npm:0.77.0, @react-native/babel-preset@npm:^0.77.0":
4298-
version: 0.77.0
4299-
resolution: "@react-native/babel-preset@npm:0.77.0"
4307+
"@react-native/babel-preset@npm:0.78.1":
4308+
version: 0.78.1
4309+
resolution: "@react-native/babel-preset@npm:0.78.1"
4310+
dependencies:
4311+
"@babel/core": "npm:^7.25.2"
4312+
"@babel/plugin-proposal-export-default-from": "npm:^7.24.7"
4313+
"@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
4314+
"@babel/plugin-syntax-export-default-from": "npm:^7.24.7"
4315+
"@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
4316+
"@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
4317+
"@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
4318+
"@babel/plugin-transform-async-generator-functions": "npm:^7.25.4"
4319+
"@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
4320+
"@babel/plugin-transform-block-scoping": "npm:^7.25.0"
4321+
"@babel/plugin-transform-class-properties": "npm:^7.25.4"
4322+
"@babel/plugin-transform-classes": "npm:^7.25.4"
4323+
"@babel/plugin-transform-computed-properties": "npm:^7.24.7"
4324+
"@babel/plugin-transform-destructuring": "npm:^7.24.8"
4325+
"@babel/plugin-transform-flow-strip-types": "npm:^7.25.2"
4326+
"@babel/plugin-transform-for-of": "npm:^7.24.7"
4327+
"@babel/plugin-transform-function-name": "npm:^7.25.1"
4328+
"@babel/plugin-transform-literals": "npm:^7.25.2"
4329+
"@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
4330+
"@babel/plugin-transform-modules-commonjs": "npm:^7.24.8"
4331+
"@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
4332+
"@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.7"
4333+
"@babel/plugin-transform-numeric-separator": "npm:^7.24.7"
4334+
"@babel/plugin-transform-object-rest-spread": "npm:^7.24.7"
4335+
"@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
4336+
"@babel/plugin-transform-optional-chaining": "npm:^7.24.8"
4337+
"@babel/plugin-transform-parameters": "npm:^7.24.7"
4338+
"@babel/plugin-transform-private-methods": "npm:^7.24.7"
4339+
"@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
4340+
"@babel/plugin-transform-react-display-name": "npm:^7.24.7"
4341+
"@babel/plugin-transform-react-jsx": "npm:^7.25.2"
4342+
"@babel/plugin-transform-react-jsx-self": "npm:^7.24.7"
4343+
"@babel/plugin-transform-react-jsx-source": "npm:^7.24.7"
4344+
"@babel/plugin-transform-regenerator": "npm:^7.24.7"
4345+
"@babel/plugin-transform-runtime": "npm:^7.24.7"
4346+
"@babel/plugin-transform-shorthand-properties": "npm:^7.24.7"
4347+
"@babel/plugin-transform-spread": "npm:^7.24.7"
4348+
"@babel/plugin-transform-sticky-regex": "npm:^7.24.7"
4349+
"@babel/plugin-transform-typescript": "npm:^7.25.2"
4350+
"@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
4351+
"@babel/template": "npm:^7.25.0"
4352+
"@react-native/babel-plugin-codegen": "npm:0.78.1"
4353+
babel-plugin-syntax-hermes-parser: "npm:0.25.1"
4354+
babel-plugin-transform-flow-enums: "npm:^0.0.2"
4355+
react-refresh: "npm:^0.14.0"
4356+
peerDependencies:
4357+
"@babel/core": "*"
4358+
checksum: 10c0/fd08eab7c3331d95c8aed9b3972021e052cd2c437d4837d39c615d35302e3894ac39c05db71f4b00e2ed3b17ecc48dba55df97911caf52eeef037825a49c613d
4359+
languageName: node
4360+
linkType: hard
4361+
4362+
"@react-native/babel-preset@npm:^0.77.0":
4363+
version: 0.77.1
4364+
resolution: "@react-native/babel-preset@npm:0.77.1"
43004365
dependencies:
43014366
"@babel/core": "npm:^7.25.2"
43024367
"@babel/plugin-proposal-export-default-from": "npm:^7.24.7"
@@ -4339,13 +4404,13 @@ __metadata:
43394404
"@babel/plugin-transform-typescript": "npm:^7.25.2"
43404405
"@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
43414406
"@babel/template": "npm:^7.25.0"
4342-
"@react-native/babel-plugin-codegen": "npm:0.77.0"
4407+
"@react-native/babel-plugin-codegen": "npm:0.77.1"
43434408
babel-plugin-syntax-hermes-parser: "npm:0.25.1"
43444409
babel-plugin-transform-flow-enums: "npm:^0.0.2"
43454410
react-refresh: "npm:^0.14.0"
43464411
peerDependencies:
43474412
"@babel/core": "*"
4348-
checksum: 10c0/796e34acbdfe429f8a307acf8b525a9322a4c809d18877856d296a1cf34514dda2ba57d632b4be968e60f8db90fa0169f237f301adb3d71da180461f2414eb6f
4413+
checksum: 10c0/62897124911d80faec871a43fb13e88f4a19bbd696b60337e2de6149d95fde4c6be6d1af4d71078971e159c41eacd25d2be40021d0efabf293d30a7f0c86d5a8
43494414
languageName: node
43504415
linkType: hard
43514416

@@ -4383,9 +4448,26 @@ __metadata:
43834448
languageName: node
43844449
linkType: hard
43854450

4386-
"@react-native/codegen@npm:0.77.0":
4387-
version: 0.77.0
4388-
resolution: "@react-native/codegen@npm:0.77.0"
4451+
"@react-native/codegen@npm:0.77.1":
4452+
version: 0.77.1
4453+
resolution: "@react-native/codegen@npm:0.77.1"
4454+
dependencies:
4455+
"@babel/parser": "npm:^7.25.3"
4456+
glob: "npm:^7.1.1"
4457+
hermes-parser: "npm:0.25.1"
4458+
invariant: "npm:^2.2.4"
4459+
jscodeshift: "npm:^17.0.0"
4460+
nullthrows: "npm:^1.1.1"
4461+
yargs: "npm:^17.6.2"
4462+
peerDependencies:
4463+
"@babel/preset-env": ^7.1.6
4464+
checksum: 10c0/e214cbfaa9f2643ddcad4156b57e5b868b90a98af59195b4808d8cfe629b1ee71a617f9266ec004ad50d3444e287e83da0f50ac345cd7bfd51cd06bcf0b020d0
4465+
languageName: node
4466+
linkType: hard
4467+
4468+
"@react-native/codegen@npm:0.78.1":
4469+
version: 0.78.1
4470+
resolution: "@react-native/codegen@npm:0.78.1"
43894471
dependencies:
43904472
"@babel/parser": "npm:^7.25.3"
43914473
glob: "npm:^7.1.1"
@@ -4396,7 +4478,7 @@ __metadata:
43964478
yargs: "npm:^17.6.2"
43974479
peerDependencies:
43984480
"@babel/preset-env": ^7.1.6
4399-
checksum: 10c0/2134ab0f00b4f375b5339c18a86e83c4acd49f5d7c30afd57d278e16bfbc3f7153de03c5d2e2c207c4f47c6ca3a50901caac21d8e994d3ae2968ecbba20f4f3c
4481+
checksum: 10c0/98fffe2e8827f9c2bcf6de866f5d85833cdd267baa1d70b026bac821bbad407cef6c9c7336798d8ca5114ff57305f9c267bd095f43c97639d6e9cbdff48a5d3e
44004482
languageName: node
44014483
linkType: hard
44024484

@@ -4506,10 +4588,10 @@ __metadata:
45064588
languageName: node
45074589
linkType: hard
45084590

4509-
"@react-native/js-polyfills@npm:0.77.0":
4510-
version: 0.77.0
4511-
resolution: "@react-native/js-polyfills@npm:0.77.0"
4512-
checksum: 10c0/d97f7ff9f4a720be33152617feff68da22da5d87cd83414dba8269cf17cc577f20bb3773592adb8f234516b8a8d30a65d3184dd579bfdfcf2015005dfdbe5f70
4591+
"@react-native/js-polyfills@npm:0.78.1":
4592+
version: 0.78.1
4593+
resolution: "@react-native/js-polyfills@npm:0.78.1"
4594+
checksum: 10c0/bbd4e008bcaa5f770411d5160542b94014c74871d1a1d628a5619889e8fdfc1a980e6bf49029ab56ebeab991320c45e09e9e841ca4a86bb2dbfc965b9cfc08a2
45134595
languageName: node
45144596
linkType: hard
45154597

@@ -4541,29 +4623,29 @@ __metadata:
45414623
languageName: node
45424624
linkType: hard
45434625

4544-
"@react-native/metro-babel-transformer@npm:0.77.0":
4545-
version: 0.77.0
4546-
resolution: "@react-native/metro-babel-transformer@npm:0.77.0"
4626+
"@react-native/metro-babel-transformer@npm:0.78.1":
4627+
version: 0.78.1
4628+
resolution: "@react-native/metro-babel-transformer@npm:0.78.1"
45474629
dependencies:
45484630
"@babel/core": "npm:^7.25.2"
4549-
"@react-native/babel-preset": "npm:0.77.0"
4631+
"@react-native/babel-preset": "npm:0.78.1"
45504632
hermes-parser: "npm:0.25.1"
45514633
nullthrows: "npm:^1.1.1"
45524634
peerDependencies:
45534635
"@babel/core": "*"
4554-
checksum: 10c0/31916318141f58cf7a4f025f4d627122a6195fecf9793c071795f00bc6fb9819c8a92c9336873fcde9550da9406d77bdea2aa84382dcfd76915e4a8153c76ffa
4636+
checksum: 10c0/9b766b65cc9bf8353e86cc79e4a954408ac18ec8c92e983b815c7ebf0630a996742cb53c89d9562b88c59b1d163df34cfdcda28dc9a8fb4c479a8586f9272fb0
45554637
languageName: node
45564638
linkType: hard
45574639

4558-
"@react-native/metro-config@npm:0.77.0":
4559-
version: 0.77.0
4560-
resolution: "@react-native/metro-config@npm:0.77.0"
4640+
"@react-native/metro-config@npm:0.78.1":
4641+
version: 0.78.1
4642+
resolution: "@react-native/metro-config@npm:0.78.1"
45614643
dependencies:
4562-
"@react-native/js-polyfills": "npm:0.77.0"
4563-
"@react-native/metro-babel-transformer": "npm:0.77.0"
4644+
"@react-native/js-polyfills": "npm:0.78.1"
4645+
"@react-native/metro-babel-transformer": "npm:0.78.1"
45644646
metro-config: "npm:^0.81.0"
45654647
metro-runtime: "npm:^0.81.0"
4566-
checksum: 10c0/554d23f2b05756b50df07381a7d2f09a2d4dcc56713608ddf1a24e4436ac7b7863c763c3b64d26d2c2b5ef41fe4a767682e45596c0e822868c9f397589dba531
4648+
checksum: 10c0/60a13e122ecad9e9f1ffdad9a915fc94615e62b9598c1c682761f1141771ec29332b8100221e905068eeb5881e07be1a18eec428da7883227f9bc89040178e3a
45674649
languageName: node
45684650
linkType: hard
45694651

@@ -11079,9 +11161,9 @@ __metadata:
1107911161
languageName: node
1108011162
linkType: hard
1108111163

11082-
"react-native-builder-bob@npm:^0.35.2":
11083-
version: 0.35.2
11084-
resolution: "react-native-builder-bob@npm:0.35.2"
11164+
"react-native-builder-bob@npm:^0.38.0":
11165+
version: 0.38.0
11166+
resolution: "react-native-builder-bob@npm:0.38.0"
1108511167
dependencies:
1108611168
"@babel/core": "npm:^7.25.2"
1108711169
"@babel/plugin-transform-strict-mode": "npm:^7.24.7"
@@ -11107,7 +11189,7 @@ __metadata:
1110711189
yargs: "npm:^17.5.1"
1110811190
bin:
1110911191
bob: bin/bob
11110-
checksum: 10c0/3875b61b0855b223567010893fa906ce962eb990e5bc0c8ac054b8bbfd762ed0f627a0d5be03f9630ea7d70883d0be5f95f8221f0bce9173f1018c2e00284e34
11192+
checksum: 10c0/ced02e227184de4884b18ffd84f0102d0764b596f6a29ebb81c1aa023f4ca9c98e7d7528075570bde81e4db25804a47ef7ea92d745f88e74d8ed27f9b7f78c8d
1111111193
languageName: node
1111211194
linkType: hard
1111311195

@@ -12422,23 +12504,23 @@ __metadata:
1242212504
languageName: node
1242312505
linkType: hard
1242412506

12425-
"typescript@npm:5.7.3":
12426-
version: 5.7.3
12427-
resolution: "typescript@npm:5.7.3"
12507+
"typescript@npm:5.8.2":
12508+
version: 5.8.2
12509+
resolution: "typescript@npm:5.8.2"
1242812510
bin:
1242912511
tsc: bin/tsc
1243012512
tsserver: bin/tsserver
12431-
checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa
12513+
checksum: 10c0/5c4f6fbf1c6389b6928fe7b8fcd5dc73bb2d58cd4e3883f1d774ed5bd83b151cbac6b7ecf11723de56d4676daeba8713894b1e9af56174f2f9780ae7848ec3c6
1243212514
languageName: node
1243312515
linkType: hard
1243412516

12435-
"typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>":
12436-
version: 5.7.3
12437-
resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5adc0c"
12517+
"typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>":
12518+
version: 5.8.2
12519+
resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5adc0c"
1243812520
bin:
1243912521
tsc: bin/tsc
1244012522
tsserver: bin/tsserver
12441-
checksum: 10c0/3b56d6afa03d9f6172d0b9cdb10e6b1efc9abc1608efd7a3d2f38773d5d8cfb9bbc68dfb72f0a7de5e8db04fc847f4e4baeddcd5ad9c9feda072234f0d788896
12523+
checksum: 10c0/8a6cd29dfb59bd5a978407b93ae0edb530ee9376a5b95a42ad057a6f80ffb0c410489ccd6fe48d1d0dfad6e8adf5d62d3874bbd251f488ae30e11a1ce6dabd28
1244212524
languageName: node
1244312525
linkType: hard
1244412526

0 commit comments

Comments
 (0)