Skip to content

Commit 22fa248

Browse files
authored
Merge pull request #1842 from gluestack/main
Backmerge Main -> Patch
2 parents 46378b3 + 7e53030 commit 22fa248

File tree

9 files changed

+388
-57
lines changed

9 files changed

+388
-57
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"access": "public",
88
"baseBranch": "main",
99
"updateInternalDependencies": "patch",
10-
"ignore": ["@gluestack/ui-storybook"]
10+
"ignore": ["@gluestack/ui-storybook", "@gluestack/storybook-nativewind"]
1111
}

example/storybook-nativewind/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"@expo/webpack-config": "^0.17.2",
2929
"@geometricpanda/storybook-addon-iframe": "^0.2.2",
3030
"@gluestack-style/react": "^1.0.26",
31-
"@gluestack-ui/config": "^1.0.8",
32-
"@gluestack-ui/themed": "^1.1.2",
31+
"@gluestack-ui/config": "^1.1.9",
32+
"@gluestack-ui/themed": "^1.1.9",
3333
"@gluestack/design-system": "^0.5.27",
3434
"@legendapp/motion": "^2.2.0",
3535
"@react-aria/button": "^3.7.0",
@@ -40,7 +40,7 @@
4040
"@react-aria/separator": "^3.3.0",
4141
"@react-aria/utils": "^3.15.0",
4242
"@react-native-aria/button": "^0.2.5",
43-
"@react-native-aria/overlays": "0.3.10",
43+
"@react-native-aria/overlays": "^0.3.10",
4444
"@react-native-aria/separator": "^0.2.6",
4545
"@react-native-async-storage/async-storage": "~1.17.3",
4646
"@react-native-community/datetimepicker": "6.5.2",

packages/config/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @gluestack-ui/config
22

3+
## 1.1.9
4+
5+
### Patch Changes
6+
7+
- fix: `lineHeight` issue with `Text`.
8+
- @gluestack-ui/themed@1.1.9
9+
310
## 1.1.2
411

512
### Patch Changes

packages/config/package.json

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gluestack-ui/config",
3-
"version": "1.1.8",
3+
"version": "1.1.9",
44
"main": "build/gluestack-ui.config.js",
55
"types": "build/gluestack-ui.config.d.ts",
66
"module": "build/gluestack-ui.config",
@@ -34,46 +34,12 @@
3434
"author": "",
3535
"license": "ISC",
3636
"devDependencies": {
37-
"@expo/html-elements": "latest",
38-
"@gluestack-style/animation-resolver": "latest",
39-
"@gluestack-style/legend-motion-animation-driver": "latest",
40-
"@gluestack-style/react": "latest",
41-
"@gluestack-ui/accordion": "latest",
42-
"@gluestack-ui/actionsheet": "latest",
43-
"@gluestack-ui/alert": "latest",
44-
"@gluestack-ui/alert-dialog": "latest",
45-
"@gluestack-ui/avatar": "latest",
46-
"@gluestack-ui/button": "latest",
47-
"@gluestack-ui/checkbox": "latest",
48-
"@gluestack-ui/divider": "latest",
49-
"@gluestack-ui/fab": "latest",
50-
"@gluestack-ui/form-control": "latest",
51-
"@gluestack-ui/icon": "latest",
52-
"@gluestack-ui/image": "latest",
53-
"@gluestack-ui/input": "latest",
54-
"@gluestack-ui/link": "latest",
55-
"@gluestack-ui/menu": "latest",
56-
"@gluestack-ui/modal": "latest",
57-
"@gluestack-ui/overlay": "latest",
58-
"@gluestack-ui/popover": "latest",
59-
"@gluestack-ui/pressable": "latest",
60-
"@gluestack-ui/progress": "latest",
61-
"@gluestack-ui/provider": "latest",
62-
"@gluestack-ui/radio": "latest",
63-
"@gluestack-ui/select": "latest",
64-
"@gluestack-ui/slider": "latest",
65-
"@gluestack-ui/spinner": "latest",
66-
"@gluestack-ui/switch": "latest",
67-
"@gluestack-ui/tabs": "latest",
68-
"@gluestack-ui/textarea": "latest",
69-
"@gluestack-ui/themed": "latest",
70-
"@gluestack-ui/toast": "latest",
71-
"@gluestack-ui/tooltip": "latest",
72-
"@legendapp/motion": "latest"
37+
"@gluestack-style/react": "^1.0.43",
38+
"@gluestack-ui/themed": "^1.1.9"
7339
},
7440
"peerDependencies": {
7541
"@gluestack-style/react": ">=1.0",
76-
"@gluestack-ui/themed": ">=1.1.0"
42+
"@gluestack-ui/themed": ">=1.1.9"
7743
},
7844
"release-it": {
7945
"git": {

packages/themed/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @gluestack-ui/themed
22

3+
## 1.1.9
4+
5+
### Patch Changes
6+
7+
- feat: added `useRNModal` support in `Menu`.
8+
- Updated dependencies
9+
- @gluestack-ui/menu@0.2.30
10+
311
## 1.1.8
412

513
### Patch Changes

packages/themed/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gluestack-ui/themed",
3-
"version": "1.1.8",
3+
"version": "1.1.9",
44
"main": "build/index.js",
55
"types": "build/index.d.ts",
66
"module": "build/index",
@@ -51,7 +51,7 @@
5151
"@gluestack-ui/image": "0.1.7",
5252
"@gluestack-ui/input": "0.1.24",
5353
"@gluestack-ui/link": "0.1.17",
54-
"@gluestack-ui/menu": "0.2.29",
54+
"@gluestack-ui/menu": "0.2.30",
5555
"@gluestack-ui/modal": "0.1.29",
5656
"@gluestack-ui/overlay": "0.1.12",
5757
"@gluestack-ui/popover": "0.1.31",

packages/unstyled/menu/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @gluestack-ui/menu
22

3+
## 0.2.30
4+
5+
### Patch Changes
6+
7+
- feat: added `useRNModal` support in `Menu`.
8+
39
## 0.2.29
410

511
### Patch Changes

packages/unstyled/menu/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"ios",
1616
"nextjs"
1717
],
18-
"version": "0.2.29",
18+
"version": "0.2.30",
1919
"main": "lib/commonjs/index",
2020
"module": "lib/module/index",
2121
"types": "lib/typescript/index.d.ts",

0 commit comments

Comments
 (0)