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.

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

Backmerge Main -> Patch #2697

Merged
merged 15 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion example/storybook-nativewind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@gluestack-style/animation-resolver": "^1.0.4",
"@gluestack-style/react": "^1.0.57",
"@gluestack-ui/config": "^1.1.19",
"@gluestack-ui/themed": "^1.1.63",
"@gluestack-ui/themed": "^1.1.65",
"@gluestack/design-system": "^0.5.36",
"@gorhom/bottom-sheet": "^5.0.0-alpha.10",
"@legendapp/motion": "^2.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@
"@gluestack-ui/switch": "0.1.23",
"@gluestack-ui/tabs": "0.1.18",
"@gluestack-ui/textarea": "0.1.24",
"@gluestack-ui/themed": "1.1.63",
"@gluestack-ui/themed": "1.1.65",
"@gluestack-ui/toast": "1.0.8",
"@gluestack-ui/tooltip": "0.1.37",
"@gluestack-ui/tooltip": "0.1.38",
"@legendapp/motion": "latest"
},
"peerDependencies": {
"@gluestack-style/react": ">=1.0.57",
"@gluestack-ui/themed": ">=1.1.62"
"@gluestack-ui/themed": ">=1.1.65"
},
"release-it": {
"git": {
Expand Down
13 changes: 13 additions & 0 deletions packages/themed/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @gluestack-ui/themed

## 1.1.65

### Patch Changes

- Updated dependencies
- @gluestack-ui/[email protected]

## 1.1.64

### Patch Changes

- fix: removed extra dependency

## 1.1.63

### Patch Changes
Expand Down
5 changes: 2 additions & 3 deletions packages/themed/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gluestack-ui/themed",
"version": "1.1.63",
"version": "1.1.65",
"main": "build/index.js",
"types": "build/index.d.ts",
"module": "build/index",
Expand Down Expand Up @@ -50,7 +50,6 @@
"@gluestack-ui/icon": "0.1.25",
"@gluestack-ui/image": "0.1.11",
"@gluestack-ui/input": "0.1.32",
"@gluestack-ui/pin-input": "0.0.2",
"@gluestack-ui/link": "0.1.23",
"@gluestack-ui/menu": "0.2.37",
"@gluestack-ui/modal": "0.1.35",
Expand All @@ -67,7 +66,7 @@
"@gluestack-ui/tabs": "0.1.18",
"@gluestack-ui/textarea": "0.1.24",
"@gluestack-ui/toast": "1.0.8",
"@gluestack-ui/tooltip": "0.1.37",
"@gluestack-ui/tooltip": "0.1.38",
"@legendapp/motion": "latest"
},
"devDependencies": {
Expand Down
12 changes: 12 additions & 0 deletions packages/unstyled/image-viewer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @gluestack-ui/image-viewer

## 0.0.8

### Patch Changes

- fix: ts-ignore for useAnimatedStyle

## 0.0.7

### Patch Changes

- fix: ts-ignore for useAnimatedStyle

## 0.0.6

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/unstyled/image-viewer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gluestack-ui/image-viewer",
"version": "0.0.6",
"version": "0.0.8",
"main": "lib/index",
"module": "lib/index",
"types": "lib/index.d.ts",
Expand Down
6 changes: 6 additions & 0 deletions packages/unstyled/pin-input/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @gluestack-ui/pin-input

## 0.0.8

### Patch Changes

- chore: removed extra dependency for clipboard

## 0.0.7

### Patch Changes
Expand Down
5 changes: 2 additions & 3 deletions packages/unstyled/pin-input/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@gluestack-ui/pin-input",
"description": "A universal headless pin-input component for React Native, Next.js & React",
"version": "0.0.7",
"version": "0.0.8",
"main": "lib/index",
"module": "lib/index",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -33,8 +33,7 @@
"@gluestack-ui/form-control": "^0.1.19",
"@gluestack-ui/utils": "^0.1.14",
"@react-native-aria/focus": "^0.2.9",
"@react-native-aria/interactions": "0.2.13",
"@react-native-clipboard/clipboard": "^1.15.0"
"@react-native-aria/interactions": "0.2.13"
},
"peerDependencies": {
"react": ">=16",
Expand Down
6 changes: 6 additions & 0 deletions packages/unstyled/tooltip/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @gluestack-ui/tooltip

## 0.1.38

### Patch Changes

- trigger prop typing fix

## 0.1.37

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/unstyled/tooltip/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@gluestack-ui/tooltip",
"description": "A universal headless tooltip component for React Native, Next.js & React",
"version": "0.1.37",
"version": "0.1.38",
"main": "lib/index",
"module": "lib/index",
"types": "lib/index.d.ts",
Expand Down
5 changes: 4 additions & 1 deletion packages/unstyled/tooltip/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ export interface InterfaceTooltipProps {
/**
* Function that returns a React Element. This element will be used as a Trigger for the popover.
*/
trigger: ({ ref, onHoverIn, onHoverOut }: any, { open }: any) => void;
trigger: (
{ ref, onHoverIn, onHoverOut }: any,
{ open }: any
) => React.ReactNode;
/**
* Size of the arrow
* @default 12
Expand Down
16 changes: 0 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2670,17 +2670,6 @@
"@react-native-aria/focus" "^0.2.9"
"@react-native-aria/interactions" "^0.2.11"

"@gluestack-ui/[email protected]":
version "0.0.2"
resolved "https://registry.yarnpkg.com/@gluestack-ui/pin-input/-/pin-input-0.0.2.tgz#c1bd598741acc39ccb80ac53e397064dfe1dd10e"
integrity sha512-bQul41HHBpUHBUYUdhjcp8/fTVryN5by3SdcEy5M5DV8uLojhd0RAeTD+C5BRD5X/dRm5ovmTl2RS/k4tEPPxw==
dependencies:
"@gluestack-ui/form-control" "^0.1.19"
"@gluestack-ui/utils" "^0.1.14"
"@react-native-aria/focus" "^0.2.9"
"@react-native-aria/interactions" "0.2.13"
"@react-native-clipboard/clipboard" "^1.15.0"

"@gluestack-ui/[email protected]":
version "0.1.14"
resolved "https://registry.yarnpkg.com/@gluestack-ui/tabs/-/tabs-0.1.14.tgz#5bcb5cc659927cde08f8e32497830257ed5cba4f"
Expand Down Expand Up @@ -4274,11 +4263,6 @@
dependencies:
merge-options "^3.0.4"

"@react-native-clipboard/clipboard@^1.15.0":
version "1.15.0"
resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.15.0.tgz#dcd47279b159289f11b31edf976723ad3984e0ce"
integrity sha512-YDMC3E956jn9zE11uKGcQDKS1SO9q72iNHxZyrKY5y9XYwZcA9vo3Xk74+zRnf7cM48drDO0s9lyAPUlOvyhrw==

"@react-native-community/[email protected]":
version "11.3.6"
resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-11.3.6.tgz#43a06cbee1a5480da804debc4f94662a197720f2"
Expand Down
Loading