Skip to content
This repository has been archived by the owner on Aug 29, 2022. It is now read-only.

Commit

Permalink
fix link
Browse files Browse the repository at this point in the history
  • Loading branch information
natew committed Jul 21, 2022
1 parent 5007f1f commit 33e7fe0
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 20 deletions.
Binary file modified next-expo-solito/.yarn/install-state.gz
Binary file not shown.
11 changes: 5 additions & 6 deletions next-expo-solito/packages/app/features/user/detail-screen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@ import { Button, Paragraph, YStack } from '@my/ui'
import { ChevronLeft } from '@tamagui/feather-icons'
import React from 'react'
import { createParam } from 'solito'
import { Link } from 'solito/link'
import { useLink } from 'solito/link'

const { useParam } = createParam<{ id: string }>()

export function UserDetailScreen() {
const [id] = useParam('id')
const linkProps = useLink({ href: '/' })

return (
<YStack f={1} jc="center" ai="center" space>
<Paragraph ta="center" fow="800">{`User ID: ${id}`}</Paragraph>
<Link href="/">
<Button icon={ChevronLeft}>
Go Home
</Button>
</Link>
<Button {...linkProps} icon={ChevronLeft}>
Go Home
</Button>
</YStack>
)
}
4 changes: 2 additions & 2 deletions next-expo-solito/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@tamagui/font-inter": "1.0.1-beta.115",
"@tamagui/shorthands": "1.0.1-beta.115",
"@tamagui/theme-base": "1.0.1-beta.115",
"expo-linking": "^3.0.0",
"solito": "^0.0.25"
"expo-linking": "^3.1.0",
"solito": "^0.0.26"
},
"sideEffects": false
}
85 changes: 73 additions & 12 deletions next-expo-solito/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1756,13 +1756,43 @@ __metadata:
languageName: node
linkType: hard

"@expo/config-plugins@npm:~5.0.0":
version: 5.0.0
resolution: "@expo/config-plugins@npm:5.0.0"
dependencies:
"@expo/config-types": ^46.0.0
"@expo/json-file": 8.2.36
"@expo/plist": 0.0.18
"@expo/sdk-runtime-versions": ^1.0.0
"@react-native/normalize-color": ^2.0.0
chalk: ^4.1.2
debug: ^4.3.1
find-up: ~5.0.0
getenv: ^1.0.0
glob: 7.1.6
resolve-from: ^5.0.0
semver: ^7.3.5
slash: ^3.0.0
xcode: ^3.0.1
xml2js: 0.4.23
checksum: a7085e7543b35062ea262b82a92383b25ea6743ee452a4fa619508b834903a745b2e83fd83b5d9c83e242177b4791439ff62ecc9f173ea9e2183d814b106068c
languageName: node
linkType: hard

"@expo/config-types@npm:^45.0.0":
version: 45.0.0
resolution: "@expo/config-types@npm:45.0.0"
checksum: 9b4866540654da61af0985ebfc975b3cb690625acf7742443a7e56263bf134b261e22719720982223407f8957d08a3646178c79f482861218882f0956d804021
languageName: node
linkType: hard

"@expo/config-types@npm:^46.0.0":
version: 46.0.1
resolution: "@expo/config-types@npm:46.0.1"
checksum: 2f5b1b03d4636893f406fb934ef76e9ed0b71161bc27f2c53e94223525655111b60ed83e803065f666cca88d2d11e38f604b5513efd641805a9bde4a852b06cb
languageName: node
linkType: hard

"@expo/config@npm:6.0.23, @expo/config@npm:^6.0.14, @expo/config@npm:~6.0.23":
version: 6.0.23
resolution: "@expo/config@npm:6.0.23"
Expand All @@ -1782,6 +1812,25 @@ __metadata:
languageName: node
linkType: hard

"@expo/config@npm:~7.0.0":
version: 7.0.0
resolution: "@expo/config@npm:7.0.0"
dependencies:
"@babel/code-frame": ~7.10.4
"@expo/config-plugins": ~5.0.0
"@expo/config-types": ^46.0.0
"@expo/json-file": 8.2.36
getenv: ^1.0.0
glob: 7.1.6
require-from-string: ^2.0.2
resolve-from: ^5.0.0
semver: 7.3.2
slugify: ^1.3.4
sucrase: ^3.20.0
checksum: e061decfc47b8bf144c54b34f788c244f2befa31604c9370eeae281d8e64a22cedf30f5d10d33be612ddc711a0c86cd6c25c14da068c51e50c3f2dd0bd8e4e49
languageName: node
linkType: hard

"@expo/configure-splash-screen@npm:^0.6.0":
version: 0.6.0
resolution: "@expo/configure-splash-screen@npm:0.6.0"
Expand Down Expand Up @@ -4567,8 +4616,8 @@ __metadata:
"@tamagui/font-inter": 1.0.1-beta.115
"@tamagui/shorthands": 1.0.1-beta.115
"@tamagui/theme-base": 1.0.1-beta.115
expo-linking: ^3.0.0
solito: ^0.0.25
expo-linking: ^3.1.0
solito: ^0.0.26
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -8452,7 +8501,7 @@ __metadata:
languageName: node
linkType: hard

"expo-constants@npm:~13.1.0, expo-constants@npm:~13.1.1":
"expo-constants@npm:~13.1.1":
version: 13.1.1
resolution: "expo-constants@npm:13.1.1"
dependencies:
Expand All @@ -8464,6 +8513,18 @@ __metadata:
languageName: node
linkType: hard

"expo-constants@npm:~13.2.0":
version: 13.2.2
resolution: "expo-constants@npm:13.2.2"
dependencies:
"@expo/config": ~7.0.0
uuid: ^3.3.2
peerDependencies:
expo: "*"
checksum: 2cd3b04b2c726c5a1cdfefdef4ff39fa7e3be9850c91d9b42f92d9073248a7538c3b49b600ddecf07abdb92b54ad1c220faef79bc5a65581e17d919a2ad11d1f
languageName: node
linkType: hard

"expo-error-recovery@npm:~3.1.0":
version: 3.1.0
resolution: "expo-error-recovery@npm:3.1.0"
Expand Down Expand Up @@ -8514,15 +8575,15 @@ __metadata:
languageName: node
linkType: hard

"expo-linking@npm:^3.0.0":
version: 3.1.0
resolution: "expo-linking@npm:3.1.0"
"expo-linking@npm:^3.1.0":
version: 3.2.1
resolution: "expo-linking@npm:3.2.1"
dependencies:
expo-constants: ~13.1.0
expo-constants: ~13.2.0
invariant: ^2.2.4
qs: ^6.9.1
url-parse: ^1.5.9
checksum: 0469e0dd428eae5c228ef7afadb6636bc179a15f578a7aca0fbb1561b1bef52f6de550bc257c7db4887324ae456d1ccfffc9cb2dddb5fe633bfd214808892b72
checksum: cc0961382fa7b5ca57182e395cf1103aed4868b9038b01235edf55f15f1ecd1afc0ee04ccb8ccd4f9f14c6d80e32af5fc0f5356cd91c63f64155e5432e639241
languageName: node
linkType: hard

Expand Down Expand Up @@ -16249,10 +16310,10 @@ __metadata:
languageName: node
linkType: hard

"solito@npm:^0.0.25":
version: 0.0.25
resolution: "solito@npm:0.0.25"
checksum: 200eaacbc553be10e73af2d195868efc3a0e477628a1fcbe26f22e3dcacf4c6b742ce81ed7aa23fd5106812c0d9210db369e0fba1720f1f39ab3ae63e7f5e6b1
"solito@npm:^0.0.26":
version: 0.0.26
resolution: "solito@npm:0.0.26"
checksum: c3cbee8e33bd9849d85bbe3e1c9d862eca06b17a2b76cd9d856d39cea01755faad92a2cfe37c77a8419ca8efa133b93935034996a3bc14522c270cb727a297d0
languageName: node
linkType: hard

Expand Down

0 comments on commit 33e7fe0

Please sign in to comment.