From e9a705612f99bf81fdb9d14950d3464fcd01ea8d Mon Sep 17 00:00:00 2001 From: Fernando Rojo Date: Mon, 23 May 2022 23:21:12 -0500 Subject: [PATCH 1/7] remove @motify packages --- examples/with-expo/src/Moti.PressableMenu.tsx | 2 +- .../with-expo/src/Moti.PressableTooltip.tsx | 2 +- examples/with-expo/src/Moti.Skeleton.tsx | 2 +- packages/components/CHANGELOG.md | 420 -------------- packages/components/package.json | 61 -- packages/components/src/index.ts | 29 - packages/components/tsconfig.build.json | 7 - packages/components/tsconfig.json | 10 - packages/core/CHANGELOG.md | 411 -------------- packages/core/package.json | 69 --- packages/core/tsconfig.build.json | 7 - packages/core/tsconfig.json | 10 - packages/moti/package.json | 5 +- packages/moti/src/components/image.tsx | 5 + packages/moti/src/components/index.ts | 20 + .../src/components}/progress/index.tsx | 2 +- .../moti/src/components/safe-area-view.tsx | 5 + packages/moti/src/components/scroll-view.tsx | 5 + packages/moti/src/components/text.tsx | 5 + packages/moti/src/components/view.tsx | 5 + .../src/core}/constants/color-keys.ts | 0 .../src => moti/src/core}/constants/index.ts | 0 .../src/core}/constants/package-name.ts | 0 packages/{core/src => moti/src/core}/index.ts | 3 +- .../{core/src => moti/src/core}/motify.tsx | 15 +- packages/{core/src => moti/src/core}/types.ts | 0 .../src/core}/use-animator/index.ts | 0 .../src/core}/use-dynamic-animation/index.ts | 0 .../src/core/use-motify.ts} | 0 .../{core/src => moti/src/core}/use-value.ts | 0 .../src => moti/src/core}/use-value.web.ts | 0 packages/moti/src/index.tsx | 4 +- .../src/interactions/pressable/pressable.tsx | 2 +- .../moti/src/interactions/pressable/types.ts | 5 +- .../use-moti-pressable-transition.ts | 2 +- .../interactions/pressable/use-pressable.ts | 2 +- .../interactions/pressable/use-pressables.ts | 2 +- packages/moti/src/skeleton/skeleton.tsx | 6 +- packages/skeleton/CHANGELOG.md | 302 ---------- packages/skeleton/README.md | 9 - packages/skeleton/package.json | 66 --- packages/skeleton/src/index.ts | 11 - packages/skeleton/src/skeleton.tsx | 265 --------- packages/skeleton/tsconfig.build.json | 6 - packages/skeleton/tsconfig.json | 11 - yarn.lock | 528 ++++-------------- 46 files changed, 170 insertions(+), 2151 deletions(-) delete mode 100644 packages/components/CHANGELOG.md delete mode 100644 packages/components/package.json delete mode 100644 packages/components/src/index.ts delete mode 100644 packages/components/tsconfig.build.json delete mode 100644 packages/components/tsconfig.json delete mode 100644 packages/core/CHANGELOG.md delete mode 100644 packages/core/package.json delete mode 100644 packages/core/tsconfig.build.json delete mode 100644 packages/core/tsconfig.json create mode 100644 packages/moti/src/components/image.tsx create mode 100644 packages/moti/src/components/index.ts rename packages/{components/src => moti/src/components}/progress/index.tsx (99%) create mode 100644 packages/moti/src/components/safe-area-view.tsx create mode 100644 packages/moti/src/components/scroll-view.tsx create mode 100644 packages/moti/src/components/text.tsx create mode 100644 packages/moti/src/components/view.tsx rename packages/{core/src => moti/src/core}/constants/color-keys.ts (100%) rename packages/{core/src => moti/src/core}/constants/index.ts (100%) rename packages/{core/src => moti/src/core}/constants/package-name.ts (100%) rename packages/{core/src => moti/src/core}/index.ts (77%) rename packages/{core/src => moti/src/core}/motify.tsx (87%) rename packages/{core/src => moti/src/core}/types.ts (100%) rename packages/{core/src => moti/src/core}/use-animator/index.ts (100%) rename packages/{core/src => moti/src/core}/use-dynamic-animation/index.ts (100%) rename packages/{core/src/use-map-animate-to-style.ts => moti/src/core/use-motify.ts} (100%) rename packages/{core/src => moti/src/core}/use-value.ts (100%) rename packages/{core/src => moti/src/core}/use-value.web.ts (100%) delete mode 100644 packages/skeleton/CHANGELOG.md delete mode 100644 packages/skeleton/README.md delete mode 100644 packages/skeleton/package.json delete mode 100644 packages/skeleton/src/index.ts delete mode 100644 packages/skeleton/src/skeleton.tsx delete mode 100644 packages/skeleton/tsconfig.build.json delete mode 100644 packages/skeleton/tsconfig.json diff --git a/examples/with-expo/src/Moti.PressableMenu.tsx b/examples/with-expo/src/Moti.PressableMenu.tsx index deea4cc..bf89ca9 100644 --- a/examples/with-expo/src/Moti.PressableMenu.tsx +++ b/examples/with-expo/src/Moti.PressableMenu.tsx @@ -13,7 +13,7 @@ import { MotiPressable, useMotiPressable, useMotiPressableAnimatedProps, -} from '@motify/interactions' +} from 'moti/interactions' import { MotiView } from 'moti' import { Ionicons } from '@expo/vector-icons' diff --git a/examples/with-expo/src/Moti.PressableTooltip.tsx b/examples/with-expo/src/Moti.PressableTooltip.tsx index 49c2394..f707d2b 100644 --- a/examples/with-expo/src/Moti.PressableTooltip.tsx +++ b/examples/with-expo/src/Moti.PressableTooltip.tsx @@ -6,7 +6,7 @@ import { MotiPressable, useMotiPressable, useMotiPressableTransition, -} from '@motify/interactions' +} from 'moti/interactions' function Logo() { const state = useMotiPressable( diff --git a/examples/with-expo/src/Moti.Skeleton.tsx b/examples/with-expo/src/Moti.Skeleton.tsx index c40d5ca..c962337 100644 --- a/examples/with-expo/src/Moti.Skeleton.tsx +++ b/examples/with-expo/src/Moti.Skeleton.tsx @@ -1,7 +1,7 @@ import React, { useReducer } from 'react' import { StyleSheet, Pressable } from 'react-native' import { View } from 'moti' -import { Skeleton } from '@motify/skeleton' +import { Skeleton } from 'moti/skeleton' const Spacer = ({ height = 16 }) => diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md deleted file mode 100644 index 89f87b0..0000000 --- a/packages/components/CHANGELOG.md +++ /dev/null @@ -1,420 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.18.0](https://github.com/nandorojo/moti/compare/v0.18.1...v0.18.0) (2022-05-11) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.18.1](https://github.com/nandorojo/moti/compare/v0.18.0...v0.18.1) (2022-05-11) - - -### Bug Fixes - -* remove warnings ([afa1114](https://github.com/nandorojo/moti/commit/afa1114ac6ea3f8949199cb109b8606b8d16ecc0)) - - - - - - - -**Note:** Version bump only for package @motify/components - - - - - -## [0.17.1](https://github.com/nandorojo/moti/compare/v0.17.0...v0.17.1) (2021-12-15) - - -### Features - -* add support for layout, entering & exiting props from reanimated ([1d09705](https://github.com/nandorojo/moti/commit/1d097052fc1c3c22c749ed53885b6c34fadcd714)) - - - - - -# [0.17.0](https://github.com/nandorojo/moti/compare/v0.16.1...v0.17.0) (2021-12-15) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.16.1](https://github.com/nandorojo/moti/compare/v0.16.0...v0.16.1) (2021-11-03) - -**Note:** Version bump only for package @motify/components - - - - - - - -**Note:** Version bump only for package @motify/components - - - - - - - -**Note:** Version bump only for package @motify/components - - - - - - - -**Note:** Version bump only for package @motify/components - - - - - -# [0.16.0](https://github.com/nandorojo/moti/compare/v0.15.4...v0.16.0) (2021-10-07) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.15.3](https://github.com/nandorojo/moti/compare/v0.15.2...v0.15.3) (2021-09-30) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.15.2](https://github.com/nandorojo/moti/compare/v0.15.1...v0.15.2) (2021-09-23) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.15.1](https://github.com/nandorojo/moti/compare/v0.15.0...v0.15.1) (2021-09-23) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.15.0](https://github.com/nandorojo/moti/compare/v0.14.2...v0.15.0) (2021-09-22) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.14.2](https://github.com/nandorojo/moti/compare/v0.14.1...v0.14.2) (2021-09-03) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.14.1](https://github.com/nandorojo/moti/compare/v0.14.0...v0.14.1) (2021-09-02) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.14.0](https://github.com/nandorojo/moti/compare/v0.13.0...v0.14.0) (2021-09-02) - - - -# [0.13.0-alpha.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.13.0-alpha.0) (2021-08-29) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.13.0-alpha.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.13.0-alpha.0) (2021-08-29) -# [0.13.0](https://github.com/nandorojo/moti/compare/v0.12.3...v0.13.0) (2021-09-02) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.12.3](https://github.com/nandorojo/moti/compare/v0.12.2...v0.12.3) (2021-09-01) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.12.2](https://github.com/nandorojo/moti/compare/v0.12.1...v0.12.2) (2021-09-01) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.12.1](https://github.com/nandorojo/moti/compare/v0.12.0...v0.12.1) (2021-09-01) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.12.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.12.0) (2021-09-01) - - -### Features - -* progress bar, transform does not work? ([9823cd1](https://github.com/nandorojo/moti/commit/9823cd1a22dfd98fdf7fb776ec3e1cb7593ff7b0)) - - - - - -# [0.11.0](https://github.com/nandorojo/moti/compare/v0.10.1...v0.11.0) (2021-05-17) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.10.0](https://github.com/nandorojo/moti/compare/v0.9.0...v0.10.0) (2021-04-21) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.9.0](https://github.com/nandorojo/moti/compare/v0.8.2...v0.9.0) (2021-04-21) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.8.2](https://github.com/nandorojo/moti/compare/v0.8.1...v0.8.2) (2021-04-02) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.8.1](https://github.com/nandorojo/moti/compare/v0.8.0...v0.8.1) (2021-04-01) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.8.0](https://github.com/nandorojo/moti/compare/v0.7.7...v0.8.0) (2021-04-01) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.7.7](https://github.com/nandorojo/moti/compare/v0.7.6...v0.7.7) (2021-04-01) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.7.6](https://github.com/nandorojo/moti/compare/v0.7.5...v0.7.6) (2021-04-01) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.7.5](https://github.com/nandorojo/moti/compare/v0.7.4...v0.7.5) (2021-04-01) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.7.4](https://github.com/nandorojo/moti/compare/v0.7.3...v0.7.4) (2021-04-01) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.7.3](https://github.com/nandorojo/moti/compare/v0.7.2...v0.7.3) (2021-03-30) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.7.2](https://github.com/nandorojo/moti/compare/v0.7.1...v0.7.2) (2021-03-28) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.7.1](https://github.com/nandorojo/moti/compare/v0.7.0...v0.7.1) (2021-03-23) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.7.0](https://github.com/nandorojo/moti/compare/v0.6.5...v0.7.0) (2021-03-22) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.6.5](https://github.com/nandorojo/moti/compare/v0.6.4...v0.6.5) (2021-03-19) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.6.4](https://github.com/nandorojo/moti/compare/v0.6.3...v0.6.4) (2021-03-13) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.6.3](https://github.com/nandorojo/moti/compare/v0.6.2...v0.6.3) (2021-03-13) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.6.2](https://github.com/nandorojo/moti/compare/v0.6.1...v0.6.2) (2021-03-13) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.6.1](https://github.com/nandorojo/moti/compare/v0.6.0...v0.6.1) (2021-03-13) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.6.0](https://github.com/nandorojo/moti/compare/v0.5.8...v0.6.0) (2021-03-04) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.5.8](https://github.com/nandorojo/moti/compare/v0.5.7...v0.5.8) (2021-03-04) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.5.7](https://github.com/nandorojo/moti/compare/v0.5.6...v0.5.7) (2021-03-02) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.5.5](https://github.com/nandorojo/moti/compare/v0.5.4...v0.5.5) (2021-03-02) - - -### Bug Fixes - -* dev type errors w paths ([0815f29](https://github.com/nandorojo/moti/commit/0815f29c2ce71b39150b0c0b8f7d2a3497b2541b)) - - - - - -## [0.5.4](https://github.com/nandorojo/moti/compare/v0.5.3...v0.5.4) (2021-03-02) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.5.3](https://github.com/nandorojo/moti/compare/v0.5.2...v0.5.3) (2021-03-02) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.5.2](https://github.com/nandorojo/moti/compare/v0.5.1...v0.5.2) (2021-03-02) - -**Note:** Version bump only for package @motify/components - - - - - -## [0.5.1](https://github.com/nandorojo/moti/compare/v0.5.0...v0.5.1) (2021-03-02) - -**Note:** Version bump only for package @motify/components - - - - - -# [0.5.0](https://github.com/nandorojo/moti/compare/v0.4.1...v0.5.0) (2021-03-02) - - -### Features - -* skeleton basic ([f4d86dc](https://github.com/nandorojo/moti/commit/f4d86dc751fbe142cd8db0229db8a8aa8cf6127e)) diff --git a/packages/components/package.json b/packages/components/package.json deleted file mode 100644 index b6eb01a..0000000 --- a/packages/components/package.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "name": "@motify/components", - "private": false, - "version": "0.18.1", - "keywords": [ - "react-native", - "ios", - "android", - "web" - ], - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/nandorojo/moti.git", - "directory": "packages/components" - }, - "bugs": { - "url": "https://github.com/nandorojo/moti/issues" - }, - "homepage": "https://github.com/nandorojo/moti.git#readme", - "main": "lib/commonjs/index.js", - "react-native": "src/index.ts", - "source": "src/index.ts", - "module": "lib/module/index.js", - "types": "lib/typescript/src/index.d.ts", - "files": [ - "src", - "lib", - "!**/__tests__" - ], - "sideEffects": false, - "publishConfig": { - "access": "public" - }, - "scripts": { - "prepare": "bob build", - "clean": "del lib" - }, - "dependencies": { - "@motify/core": "^0.18.1" - }, - "devDependencies": { - "react-native-reanimated": "~2.3.1", - "typescript": "^4.0.3" - }, - "react-native-builder-bob": { - "source": "src", - "output": "lib", - "targets": [ - "commonjs", - "module", - [ - "typescript", - { - "project": "tsconfig.build.json" - } - ] - ] - }, - "gitHead": "3f8122778be80f775d62748ad658719d38745056" -} diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts deleted file mode 100644 index c34d278..0000000 --- a/packages/components/src/index.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { motify } from '@motify/core' -import { - View as RView, - Text as RText, - Image as RImage, - ScrollView as RScrollView, - SafeAreaView as RSafeAreaView, -} from 'react-native' - -const View = motify(RView)() -const Text = motify(RText)() -const Image = motify(RImage)() -const ScrollView = motify(RScrollView)() -const SafeAreaView = motify(RSafeAreaView)() - -export * from './progress' - -export { - View as MotiView, - Text as MotiText, - Image as MotiImage, - ScrollView as MotiScrollView, - SafeAreaView as MotiSafeAreaView, - View, - Text, - Image, - ScrollView, - SafeAreaView, -} diff --git a/packages/components/tsconfig.build.json b/packages/components/tsconfig.build.json deleted file mode 100644 index 99f24dc..0000000 --- a/packages/components/tsconfig.build.json +++ /dev/null @@ -1,7 +0,0 @@ - -{ - "extends": "./tsconfig", - "compilerOptions": { - "paths": {} - } -} diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json deleted file mode 100644 index 6167ca1..0000000 --- a/packages/components/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "./lib/typescript", - "paths": { - "@motify/*": ["../*/src"], - "moti": ["../moti/src"] - } - } -} diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md deleted file mode 100644 index e869913..0000000 --- a/packages/core/CHANGELOG.md +++ /dev/null @@ -1,411 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.18.0](https://github.com/nandorojo/moti/compare/v0.18.1...v0.18.0) (2022-05-11) - -**Note:** Version bump only for package @motify/core - - - - - -## [0.18.1](https://github.com/nandorojo/moti/compare/v0.18.0...v0.18.1) (2022-05-11) - - -### Bug Fixes - -* partially fix [#185](https://github.com/nandorojo/moti/issues/185) ([a4d7d18](https://github.com/nandorojo/moti/commit/a4d7d18010fe0b285c5150ac9d32191ce23590e5)) -* remove warnings ([afa1114](https://github.com/nandorojo/moti/commit/afa1114ac6ea3f8949199cb109b8606b8d16ecc0)) - - - - - - - -**Note:** Version bump only for package @motify/core - - - - - -## [0.17.1](https://github.com/nandorojo/moti/compare/v0.17.0...v0.17.1) (2021-12-15) - - -### Features - -* add support for layout, entering & exiting props from reanimated ([1d09705](https://github.com/nandorojo/moti/commit/1d097052fc1c3c22c749ed53885b6c34fadcd714)) - - - - - -# [0.17.0](https://github.com/nandorojo/moti/compare/v0.16.1...v0.17.0) (2021-12-15) - - -### Bug Fixes - -* custom types ([8586b26](https://github.com/nandorojo/moti/commit/8586b26bdd79449da77d2a1205377d3728e3e957)) -* dep ([2495f64](https://github.com/nandorojo/moti/commit/2495f64a4a7c42e9045ce8b79839a64f7999a652)) - - -### Features - -* add decay support ([be6618e](https://github.com/nandorojo/moti/commit/be6618eb8da49662831e3f53aa0fed94f779a850)) -* add deps arrays, docs, & close [#120](https://github.com/nandorojo/moti/issues/120) ([96c01ec](https://github.com/nandorojo/moti/commit/96c01ec6d703560d834534543bc32c97f4a6740d)) - - - - - -## [0.16.1](https://github.com/nandorojo/moti/compare/v0.16.0...v0.16.1) (2021-11-03) - -**Note:** Version bump only for package @motify/core - - - - - - - -**Note:** Version bump only for package @motify/core - - - - - - - -**Note:** Version bump only for package @motify/core - - - - - - - -**Note:** Version bump only for package @motify/core - - - - - -# [0.16.0](https://github.com/nandorojo/moti/compare/v0.15.4...v0.16.0) (2021-10-07) - - -### Features - -* shared values in animate prop ([4ffb25f](https://github.com/nandorojo/moti/commit/4ffb25fc1a21fe739405cb932c54e610d982381b)) - - - - - -## [0.15.3](https://github.com/nandorojo/moti/compare/v0.15.2...v0.15.3) (2021-09-30) - -**Note:** Version bump only for package @motify/core - - - - - -## [0.15.2](https://github.com/nandorojo/moti/compare/v0.15.1...v0.15.2) (2021-09-23) - -**Note:** Version bump only for package @motify/core - - - - - -## [0.15.1](https://github.com/nandorojo/moti/compare/v0.15.0...v0.15.1) (2021-09-23) - -**Note:** Version bump only for package @motify/core - - - - - -# [0.15.0](https://github.com/nandorojo/moti/compare/v0.14.2...v0.15.0) (2021-09-22) - - -### Bug Fixes - -* inital style ([60c3167](https://github.com/nandorojo/moti/commit/60c31675a6021c36358af1668b938495ff9c95b7)) - - - - - -## [0.14.2](https://github.com/nandorojo/moti/compare/v0.14.1...v0.14.2) (2021-09-03) - -**Note:** Version bump only for package @motify/core - - - - - -## [0.14.1](https://github.com/nandorojo/moti/compare/v0.14.0...v0.14.1) (2021-09-02) - -**Note:** Version bump only for package @motify/core - - - - - -# [0.14.0](https://github.com/nandorojo/moti/compare/v0.13.0...v0.14.0) (2021-09-02) - - -### Bug Fixes - -* remove web delay default; attemptedValue typo ([df5174f](https://github.com/nandorojo/moti/commit/df5174fc6251b2694ab51d91bcca6f45c0fd06f9)) - - -### Features - -* transition & exitTransition can be shared/derived value ([0c945b7](https://github.com/nandorojo/moti/commit/0c945b7c40ff34315f3a385c61cb63d2ca3aea58)) -* use-moti-pressable-transition ([cf6162d](https://github.com/nandorojo/moti/commit/cf6162d3ed1a28f51232b7b5bb0a98bf3ba57749)) - - - -# [0.13.0-alpha.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.13.0-alpha.0) (2021-08-29) - - -### Features - -* add animated TS types to moti types ([7845c44](https://github.com/nandorojo/moti/commit/7845c4462d54da6d3ebb9651cb32f8bc351f6a65)) -* init pressable ([7b9e897](https://github.com/nandorojo/moti/commit/7b9e8977837239a6592a624745c8291c37ef82c9)) -* web-only dropdown menu ([2b8c944](https://github.com/nandorojo/moti/commit/2b8c94407b15b3169dbe46541370a47af692f413)) - - - - - -# [0.13.0-alpha.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.13.0-alpha.0) (2021-08-29) - -# [0.13.0](https://github.com/nandorojo/moti/compare/v0.12.3...v0.13.0) (2021-09-02) - -### Bug Fixes - -- typeof null === object fix for sequences ([80f7092](https://github.com/nandorojo/moti/commit/80f70928e92d36918247804e9a0189c34cf07eb5)) - -### Features - -- transform support, with sequences ([665bdf6](https://github.com/nandorojo/moti/commit/665bdf6df362d05b5bff2bd1ec12b36a69d84118)) - -## [0.12.3](https://github.com/nandorojo/moti/compare/v0.12.2...v0.12.3) (2021-09-01) - -### Bug Fixes - -- exit over-memoized on native ([2f717df](https://github.com/nandorojo/moti/commit/2f717df0dd7d986b6a13c2c8209e17b6e782160d)) - -### Reverts - -- removing useValue hack, as order is not preserved. only solution is transform array ([42dd3c9](https://github.com/nandorojo/moti/commit/42dd3c969c61a52efc6a13d2b3c28d3d86bea153)) -- removing useValue hack, as order is not preserved. only solution is transform array ([034c8dc](https://github.com/nandorojo/moti/commit/034c8dc5d03d65e335258c8cef3a534cb99ea4ae)) - -## [0.12.2](https://github.com/nandorojo/moti/compare/v0.12.1...v0.12.2) (2021-09-01) - -### Bug Fixes - -- closes [#104](https://github.com/nandorojo/moti/issues/104), where exit completion never fired ([da4eafa](https://github.com/nandorojo/moti/commit/da4eafa66476c7d32a1fc5f0a1c925c3a8bc3786)) - -## [0.12.1](https://github.com/nandorojo/moti/compare/v0.12.0...v0.12.1) (2021-09-01) - -### Bug Fixes - -- closes [#103](https://github.com/nandorojo/moti/issues/103), which broke web ([c917b73](https://github.com/nandorojo/moti/commit/c917b733f2efcce0a37c64bf2b385975eed56c8d)) - -# [0.12.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.12.0) (2021-09-01) - -### Bug Fixes - -- transform errors from [#85](https://github.com/nandorojo/moti/issues/85), [#83](https://github.com/nandorojo/moti/issues/83), [#76](https://github.com/nandorojo/moti/issues/76), [#65](https://github.com/nandorojo/moti/issues/65) ([fef3ad0](https://github.com/nandorojo/moti/commit/fef3ad0e593b56ef4477ccdc8488625fd331a282)) - -### Features - -- add animated TS types to moti types ([7845c44](https://github.com/nandorojo/moti/commit/7845c4462d54da6d3ebb9651cb32f8bc351f6a65)) -- init pressable ([7b9e897](https://github.com/nandorojo/moti/commit/7b9e8977837239a6592a624745c8291c37ef82c9)) -- # web-only dropdown menu ([2b8c944](https://github.com/nandorojo/moti/commit/2b8c94407b15b3169dbe46541370a47af692f413)) -- add custom & initial props to animate-presence ([7fafc30](https://github.com/nandorojo/moti/commit/7fafc3065b51f210ffa934eb41dfd656e27c08bb)) - -# [0.11.0](https://github.com/nandorojo/moti/compare/v0.10.1...v0.11.0) (2021-05-17) - -### Features - -- add onDidAnimate callback 4th arg w/ attemptedValue; docs ([66dfa76](https://github.com/nandorojo/moti/commit/66dfa766fccf6b35606d61b9e262a2d90b35dde7)) - -# [0.10.0](https://github.com/nandorojo/moti/compare/v0.9.0...v0.10.0) (2021-04-21) - -### Features - -- add `exitTransition` support & docs! ([26a55ac](https://github.com/nandorojo/moti/commit/26a55acbfc66e29db9eee24fe1adeec923226acd)) - -# [0.9.0](https://github.com/nandorojo/moti/compare/v0.8.2...v0.9.0) (2021-04-21) - -### Features - -- upgrade reanimated, add custom sequence transitions! ([8e64014](https://github.com/nandorojo/moti/commit/8e640149b187c4e253746c2d80d1a5c2b2749d55)) - -## [0.8.2](https://github.com/nandorojo/moti/compare/v0.8.1...v0.8.2) (2021-04-02) - -### Bug Fixes - -- [#48](https://github.com/nandorojo/moti/issues/48) Solve broken Skeleton, AnimatePresence ([080b7c9](https://github.com/nandorojo/moti/commit/080b7c9427e293d6b3201fd0b8bb16ecf6dd3370)) - -## [0.8.1](https://github.com/nandorojo/moti/compare/v0.8.0...v0.8.1) (2021-04-01) - -**Note:** Version bump only for package @motify/core - -# [0.8.0](https://github.com/nandorojo/moti/compare/v0.7.7...v0.8.0) (2021-04-01) - -### Features - -- turn useDynamicAnimation().animateTo into a worklet` ([ebd2830](https://github.com/nandorojo/moti/commit/ebd2830c757427474c48c4cf0a5faf862c59c4c4)) - -## [0.7.7](https://github.com/nandorojo/moti/compare/v0.7.6...v0.7.7) (2021-04-01) - -### Bug Fixes - -- initial bounce from spring ([9783548](https://github.com/nandorojo/moti/commit/97835481a63f4789bf3bab1cbd8313e2362b0ecf)) -- v2 stable spring support ([b9fad59](https://github.com/nandorojo/moti/commit/b9fad5970fb7427aaca7d8fdd9aa9bc895c84bb5)) - -## [0.7.6](https://github.com/nandorojo/moti/compare/v0.7.5...v0.7.6) (2021-04-01) - -### Bug Fixes - -- un-workletize ([0c34a71](https://github.com/nandorojo/moti/commit/0c34a715242e5f474e65f26e74a1c4e303858bda)) - -## [0.7.5](https://github.com/nandorojo/moti/compare/v0.7.4...v0.7.5) (2021-04-01) - -### Bug Fixes - -- workletize hooks ([9eeff15](https://github.com/nandorojo/moti/commit/9eeff15797bae42bbc3e03f05d6d229a1b6b0f14)) - -## [0.7.4](https://github.com/nandorojo/moti/compare/v0.7.3...v0.7.4) (2021-04-01) - -### Bug Fixes - -- deprecated react native types message ([6cc94f9](https://github.com/nandorojo/moti/commit/6cc94f9cfeaf57c6215f50265d950ba2ef31afd2)) - -## [0.7.3](https://github.com/nandorojo/moti/compare/v0.7.2...v0.7.3) (2021-03-30) - -**Note:** Version bump only for package @motify/core - -## [0.7.2](https://github.com/nandorojo/moti/compare/v0.7.1...v0.7.2) (2021-03-28) - -### Bug Fixes - -- animate presence callback ([8bde766](https://github.com/nandorojo/moti/commit/8bde766a64d8aebc81c0fa6ecbea5d9e59bab99b)) - -## [0.7.1](https://github.com/nandorojo/moti/compare/v0.7.0...v0.7.1) (2021-03-23) - -### Bug Fixes - -- nullable loop, allows false ([f65ae59](https://github.com/nandorojo/moti/commit/f65ae5920f2c9a9bc372ca196ed4f50b7c5d53c0)) - -# [0.7.0](https://github.com/nandorojo/moti/compare/v0.6.5...v0.7.0) (2021-03-22) - -### Features - -- performant, dynamic-animation hook ([8f65da7](https://github.com/nandorojo/moti/commit/8f65da78fd913f87e089ddbc3c402fc42e41d9d2)) - -## [0.6.5](https://github.com/nandorojo/moti/compare/v0.6.4...v0.6.5) (2021-03-19) - -### Bug Fixes - -- config fixes ([160fd67](https://github.com/nandorojo/moti/commit/160fd677604a8a97980a6878b17a0be92688cdc1)) - -## [0.6.4](https://github.com/nandorojo/moti/compare/v0.6.3...v0.6.4) (2021-03-13) - -**Note:** Version bump only for package @motify/core - -## [0.6.3](https://github.com/nandorojo/moti/compare/v0.6.2...v0.6.3) (2021-03-13) - -**Note:** Version bump only for package @motify/core - -## [0.6.2](https://github.com/nandorojo/moti/compare/v0.6.1...v0.6.2) (2021-03-13) - -**Note:** Version bump only for package @motify/core - -## [0.6.1](https://github.com/nandorojo/moti/compare/v0.6.0...v0.6.1) (2021-03-13) - -### Bug Fixes - -- reanimated v2 compat ([b4ef4f2](https://github.com/nandorojo/moti/commit/b4ef4f2d30158c3ef0ef618a01fc1e773d4c2342)) - -# [0.6.0](https://github.com/nandorojo/moti/compare/v0.5.8...v0.6.0) (2021-03-04) - -### Features - -- [skeleton] custom transition, fade in ([1f42d28](https://github.com/nandorojo/moti/commit/1f42d28405abaaa7ae59e89b29a7bd486847bb7a)) - -## [0.5.8](https://github.com/nandorojo/moti/compare/v0.5.7...v0.5.8) (2021-03-04) - -### Bug Fixes - -- spread -> assign ([8d0f89a](https://github.com/nandorojo/moti/commit/8d0f89a899e0c6e3e2b7285d98831addef48dd6c)) - -## [0.5.7](https://github.com/nandorojo/moti/compare/v0.5.6...v0.5.7) (2021-03-02) - -**Note:** Version bump only for package @motify/core - -## [0.5.5](https://github.com/nandorojo/moti/compare/v0.5.4...v0.5.5) (2021-03-02) - -### Bug Fixes - -- broken types ([320f66f](https://github.com/nandorojo/moti/commit/320f66f1c0861e9ab3f47a06289183745e958d59)) -- dev type errors w paths ([0815f29](https://github.com/nandorojo/moti/commit/0815f29c2ce71b39150b0c0b8f7d2a3497b2541b)) - -## [0.5.4](https://github.com/nandorojo/moti/compare/v0.5.3...v0.5.4) (2021-03-02) - -**Note:** Version bump only for package @motify/core - -## [0.5.3](https://github.com/nandorojo/moti/compare/v0.5.2...v0.5.3) (2021-03-02) - -**Note:** Version bump only for package @motify/core - -## [0.5.2](https://github.com/nandorojo/moti/compare/v0.5.1...v0.5.2) (2021-03-02) - -**Note:** Version bump only for package @motify/core - -## [0.5.1](https://github.com/nandorojo/moti/compare/v0.5.0...v0.5.1) (2021-03-02) - -**Note:** Version bump only for package @motify/core - -# [0.5.0](https://github.com/nandorojo/moti/compare/v0.4.1...v0.5.0) (2021-03-02) - -**Note:** Version bump only for package @motify/core - -# [0.4.0](https://github.com/nandorojo/moti/compare/v0.3.1...v0.4.0) (2021-02-07) - -### Features - -- fix potential circular type dep? ([9d8ca81](https://github.com/nandorojo/moti/commit/9d8ca815574467200c6b28bf05cb61d18aa031a8)) - -## [0.3.1](https://github.com/nandorojo/moti/compare/v0.3.0...v0.3.1) (2021-02-07) - -**Note:** Version bump only for package @motify/core - -# [0.3.0](https://github.com/nandorojo/moti/compare/v0.2.2...v0.3.0) (2021-02-07) - -### Features - -- add types for variants, many examples ([99b0675](https://github.com/nandorojo/moti/commit/99b0675f0895b35a018176cccf1506372142ac47)) - -## [0.2.2](https://github.com/nandorojo/moti/compare/v0.2.0...v0.2.2) (2021-02-06) - -**Note:** Version bump only for package @motify/core - -# [0.2.0](https://github.com/nandorojo/moti/compare/v0.0.6...v0.2.0) (2021-02-05) - -**Note:** Version bump only for package @motify/core - -## 0.0.9 (2021-02-05) - -**Note:** Version bump only for package @motify/core - -## 0.0.8 (2021-02-05) - -**Note:** Version bump only for package @motify/core diff --git a/packages/core/package.json b/packages/core/package.json deleted file mode 100644 index a674325..0000000 --- a/packages/core/package.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "@motify/core", - "version": "0.18.1", - "private": false, - "license": "MIT", - "keywords": [ - "react-native", - "ios", - "android", - "web" - ], - "repository": { - "type": "git", - "url": "https://github.com/nandorojo/moti.git", - "directory": "packages/core" - }, - "bugs": { - "url": "https://github.com/nandorojo/moti/issues" - }, - "homepage": "https://github.com/nandorojo/moti.git#readme", - "main": "lib/commonjs/index.js", - "react-native": "src/index.ts", - "source": "src/index.ts", - "module": "lib/module/index.js", - "types": "lib/typescript/src/index.d.ts", - "files": [ - "src", - "lib", - "!**/__tests__" - ], - "dependencies": { - "framer-motion": "^6.3.0" - }, - "sideEffects": false, - "gitHead": "3f8122778be80f775d62748ad658719d38745056", - "scripts": { - "prepare": "bob build", - "clean": "del lib" - }, - "react-native-builder-bob": { - "source": "src", - "output": "lib", - "targets": [ - "commonjs", - "module", - [ - "typescript", - { - "project": "tsconfig.build.json" - } - ] - ] - }, - "devDependencies": { - "@react-spring/native": "^9.0.0-rc.3", - "@testing-library/react-native": "^7.1.0", - "@types/react": "17.0.1", - "@types/react-dom": "^16.9.8", - "@types/react-native": "^0.63.30", - "expo": "^40.0.0-beta.5", - "react": "17.0.1", - "react-dom": "17.0.1", - "react-native-builder-bob": "^0.17.0", - "react-native-gesture-handler": "~2.1.0", - "react-native-reanimated": "~2.3.1", - "react-native-web": "0.15.3", - "typescript": "^4.0.3" - } -} diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json deleted file mode 100644 index 99f24dc..0000000 --- a/packages/core/tsconfig.build.json +++ /dev/null @@ -1,7 +0,0 @@ - -{ - "extends": "./tsconfig", - "compilerOptions": { - "paths": {} - } -} diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json deleted file mode 100644 index 6167ca1..0000000 --- a/packages/core/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "./lib/typescript", - "paths": { - "@motify/*": ["../*/src"], - "moti": ["../moti/src"] - } - } -} diff --git a/packages/moti/package.json b/packages/moti/package.json index 8ba5a2b..919d822 100644 --- a/packages/moti/package.json +++ b/packages/moti/package.json @@ -44,9 +44,8 @@ "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module" }, - "dependencies": { - "@motify/components": "^0.18.1", - "@motify/core": "^0.18.1" + "peerDependencies": { + "react-native-reanimated": "*" }, "devDependencies": { "expo-linear-gradient": "^10.0.3", diff --git a/packages/moti/src/components/image.tsx b/packages/moti/src/components/image.tsx new file mode 100644 index 0000000..836a626 --- /dev/null +++ b/packages/moti/src/components/image.tsx @@ -0,0 +1,5 @@ +import { Image as RImage } from 'react-native' + +import { motify } from '../core' + +export const Image = motify(RImage)() diff --git a/packages/moti/src/components/index.ts b/packages/moti/src/components/index.ts new file mode 100644 index 0000000..a1ee43f --- /dev/null +++ b/packages/moti/src/components/index.ts @@ -0,0 +1,20 @@ +import { Image } from './image' +import { SafeAreaView } from './safe-area-view' +import { ScrollView } from './scroll-view' +import { Text } from './text' +import { View } from './view' + +export * from './progress' + +export { + View as MotiView, + Text as MotiText, + Image as MotiImage, + ScrollView as MotiScrollView, + SafeAreaView as MotiSafeAreaView, + View, + Text, + Image, + ScrollView, + SafeAreaView, +} diff --git a/packages/components/src/progress/index.tsx b/packages/moti/src/components/progress/index.tsx similarity index 99% rename from packages/components/src/progress/index.tsx rename to packages/moti/src/components/progress/index.tsx index c431201..dec0ef4 100644 --- a/packages/components/src/progress/index.tsx +++ b/packages/moti/src/components/progress/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useMemo, useRef } from 'react' import { StyleSheet, ViewStyle, View } from 'react-native' -import { MotiTransitionProp, useDynamicAnimation, motify } from '@motify/core' +import { MotiTransitionProp, useDynamicAnimation, motify } from '../../core' const MotiView = motify(View)() diff --git a/packages/moti/src/components/safe-area-view.tsx b/packages/moti/src/components/safe-area-view.tsx new file mode 100644 index 0000000..22d3f9a --- /dev/null +++ b/packages/moti/src/components/safe-area-view.tsx @@ -0,0 +1,5 @@ +import { SafeAreaView as RSafeAreaView } from 'react-native' + +import { motify } from '../core' + +export const SafeAreaView = motify(RSafeAreaView)() diff --git a/packages/moti/src/components/scroll-view.tsx b/packages/moti/src/components/scroll-view.tsx new file mode 100644 index 0000000..cb22e9c --- /dev/null +++ b/packages/moti/src/components/scroll-view.tsx @@ -0,0 +1,5 @@ +import { ScrollView as RScrollView } from 'react-native' + +import { motify } from '../core' + +export const ScrollView = motify(RScrollView)() diff --git a/packages/moti/src/components/text.tsx b/packages/moti/src/components/text.tsx new file mode 100644 index 0000000..713e1d3 --- /dev/null +++ b/packages/moti/src/components/text.tsx @@ -0,0 +1,5 @@ +import { Text as RText } from 'react-native' + +import { motify } from '../core' + +export const Text = motify(RText)() diff --git a/packages/moti/src/components/view.tsx b/packages/moti/src/components/view.tsx new file mode 100644 index 0000000..1adc8e4 --- /dev/null +++ b/packages/moti/src/components/view.tsx @@ -0,0 +1,5 @@ +import { View as RView } from 'react-native' + +import { motify } from '../core' + +export const View = motify(RView)() diff --git a/packages/core/src/constants/color-keys.ts b/packages/moti/src/core/constants/color-keys.ts similarity index 100% rename from packages/core/src/constants/color-keys.ts rename to packages/moti/src/core/constants/color-keys.ts diff --git a/packages/core/src/constants/index.ts b/packages/moti/src/core/constants/index.ts similarity index 100% rename from packages/core/src/constants/index.ts rename to packages/moti/src/core/constants/index.ts diff --git a/packages/core/src/constants/package-name.ts b/packages/moti/src/core/constants/package-name.ts similarity index 100% rename from packages/core/src/constants/package-name.ts rename to packages/moti/src/core/constants/package-name.ts diff --git a/packages/core/src/index.ts b/packages/moti/src/core/index.ts similarity index 77% rename from packages/core/src/index.ts rename to packages/moti/src/core/index.ts index 1ed7025..4d971ca 100644 --- a/packages/core/src/index.ts +++ b/packages/moti/src/core/index.ts @@ -2,8 +2,7 @@ export { default as motify } from './motify' export { AnimatePresence } from 'framer-motion' export * from './types' -// export * from './use-animator/types' export { default as useAnimationState } from './use-animator' export { default as useDynamicAnimation } from './use-dynamic-animation' -export * from './use-map-animate-to-style' +export * from './use-motify' export * from './constants' diff --git a/packages/core/src/motify.tsx b/packages/moti/src/core/motify.tsx similarity index 87% rename from packages/core/src/motify.tsx rename to packages/moti/src/core/motify.tsx index d4b98d3..00d2d5b 100644 --- a/packages/core/src/motify.tsx +++ b/packages/moti/src/core/motify.tsx @@ -1,13 +1,16 @@ import React, { forwardRef, ComponentType, FunctionComponent } from 'react' import type { ImageStyle, TextStyle, ViewStyle } from 'react-native' -import type { MotiProps } from './types' -import { useMotify } from './use-map-animate-to-style' import Animated, { BaseAnimationBuilder, EntryExitAnimationFunction, LayoutAnimationFunction, } from 'react-native-reanimated' +import type { MotiProps } from './types' +import { useMotify } from './use-motify' + +const { createAnimatedComponent } = Animated + // copied from reanimated // if we use Animated.AnimateProps // then we get this TypeScript error: @@ -37,7 +40,7 @@ export default function motify< ExtraProps, Animate = ViewStyle | ImageStyle | TextStyle >(ComponentWithoutAnimation: ComponentType) { - const Component = Animated.createAnimatedComponent( + const Component = createAnimatedComponent( ComponentWithoutAnimation as FunctionComponent ) @@ -83,14 +86,16 @@ export default function motify< return ( ) }) Motified.displayName = `Moti.${ - Component.displayName || Component.name || 'NoName' + ComponentWithoutAnimation.displayName || + ComponentWithoutAnimation.name || + 'NoName' }` return Motified diff --git a/packages/core/src/types.ts b/packages/moti/src/core/types.ts similarity index 100% rename from packages/core/src/types.ts rename to packages/moti/src/core/types.ts diff --git a/packages/core/src/use-animator/index.ts b/packages/moti/src/core/use-animator/index.ts similarity index 100% rename from packages/core/src/use-animator/index.ts rename to packages/moti/src/core/use-animator/index.ts diff --git a/packages/core/src/use-dynamic-animation/index.ts b/packages/moti/src/core/use-dynamic-animation/index.ts similarity index 100% rename from packages/core/src/use-dynamic-animation/index.ts rename to packages/moti/src/core/use-dynamic-animation/index.ts diff --git a/packages/core/src/use-map-animate-to-style.ts b/packages/moti/src/core/use-motify.ts similarity index 100% rename from packages/core/src/use-map-animate-to-style.ts rename to packages/moti/src/core/use-motify.ts diff --git a/packages/core/src/use-value.ts b/packages/moti/src/core/use-value.ts similarity index 100% rename from packages/core/src/use-value.ts rename to packages/moti/src/core/use-value.ts diff --git a/packages/core/src/use-value.web.ts b/packages/moti/src/core/use-value.web.ts similarity index 100% rename from packages/core/src/use-value.web.ts rename to packages/moti/src/core/use-value.web.ts diff --git a/packages/moti/src/index.tsx b/packages/moti/src/index.tsx index 88cdf04..69e3448 100644 --- a/packages/moti/src/index.tsx +++ b/packages/moti/src/index.tsx @@ -1,2 +1,2 @@ -export * from '@motify/core' -export * from '@motify/components' +export * from './core' +export * from './components' diff --git a/packages/moti/src/interactions/pressable/pressable.tsx b/packages/moti/src/interactions/pressable/pressable.tsx index ae4a85e..6b42705 100644 --- a/packages/moti/src/interactions/pressable/pressable.tsx +++ b/packages/moti/src/interactions/pressable/pressable.tsx @@ -1,4 +1,3 @@ -import { MotiView } from '@motify/components' import React, { useMemo, ReactNode, forwardRef } from 'react' import { Platform, Pressable } from 'react-native' import type { View } from 'react-native' @@ -9,6 +8,7 @@ import { useDerivedValue, } from 'react-native-reanimated' +import { View as MotiView } from '../../components/view' import { MotiPressableContext, useMotiPressableContext, diff --git a/packages/moti/src/interactions/pressable/types.ts b/packages/moti/src/interactions/pressable/types.ts index 65b28ae..44aafd8 100644 --- a/packages/moti/src/interactions/pressable/types.ts +++ b/packages/moti/src/interactions/pressable/types.ts @@ -1,10 +1,11 @@ -import type { MotiView } from '@motify/components' -import type { MotiAnimationProp, MotiTransition } from '@motify/core' import type { ComponentProps } from 'react' import type { ViewStyle, Insets, PressableProps } from 'react-native' import type Animated from 'react-native-reanimated' import { DerivedValue } from 'react-native-reanimated' +import type { MotiView } from '../../components' +import type { MotiAnimationProp, MotiTransition } from '../../core' + export type MotiPressableInteractionState = { hovered: boolean pressed: boolean diff --git a/packages/moti/src/interactions/pressable/use-moti-pressable-transition.ts b/packages/moti/src/interactions/pressable/use-moti-pressable-transition.ts index eb21e4a..bdaa77c 100644 --- a/packages/moti/src/interactions/pressable/use-moti-pressable-transition.ts +++ b/packages/moti/src/interactions/pressable/use-moti-pressable-transition.ts @@ -3,7 +3,7 @@ import { useDerivedValue } from 'react-native-reanimated' import type Animated from 'react-native-reanimated' import { MotiPressableInteractionIds, useMotiPressableContext } from './context' import { useFactory } from './use-validate-factory-or-id' -import type { MotiTransition } from '@motify/core' +import type { MotiTransition } from '../../core' type Factory = (interaction: MotiPressableInteractionState) => Props diff --git a/packages/moti/src/interactions/pressable/use-pressable.ts b/packages/moti/src/interactions/pressable/use-pressable.ts index 47813f4..658b3fc 100644 --- a/packages/moti/src/interactions/pressable/use-pressable.ts +++ b/packages/moti/src/interactions/pressable/use-pressable.ts @@ -1,7 +1,7 @@ import { MotiPressableInteractionIds, useMotiPressableContext } from './context' import type { MotiPressableInteractionProp } from './types' import { useDerivedValue } from 'react-native-reanimated' -import type { MotiProps } from '@motify/core' +import type { MotiProps } from '../../core' import { useMemo } from 'react' import { useFactory } from './use-validate-factory-or-id' diff --git a/packages/moti/src/interactions/pressable/use-pressables.ts b/packages/moti/src/interactions/pressable/use-pressables.ts index 1fe9951..75e3016 100644 --- a/packages/moti/src/interactions/pressable/use-pressables.ts +++ b/packages/moti/src/interactions/pressable/use-pressables.ts @@ -69,7 +69,7 @@ export function useMotiPressables( if (!deps) { console.warn( - '[@motify/interactions] useMotiPressables is missing a dependency array as the second argument. https://moti.fyi/interactions/use-pressables. You can use this hook to your ESLint plugin for hooks using the additionalHooks field: https://www.npmjs.com/package/eslint-plugin-react-hooks' + '[moti/interactions] useMotiPressables is missing a dependency array as the second argument. https://moti.fyi/interactions/use-pressables. You can use this hook to your ESLint plugin for hooks using the additionalHooks field: https://www.npmjs.com/package/eslint-plugin-react-hooks' ) } diff --git a/packages/moti/src/skeleton/skeleton.tsx b/packages/moti/src/skeleton/skeleton.tsx index a78e4ff..4e4e172 100644 --- a/packages/moti/src/skeleton/skeleton.tsx +++ b/packages/moti/src/skeleton/skeleton.tsx @@ -1,9 +1,9 @@ +import { LinearGradient } from 'expo-linear-gradient' import React, { useState } from 'react' -import { View as MotiView } from '@motify/components' import { View, StyleSheet } from 'react-native' -import { LinearGradient } from 'expo-linear-gradient' -import { AnimatePresence, MotiTransitionProp } from '@motify/core' +import { View as MotiView } from '../components' +import { AnimatePresence, MotiTransitionProp } from '../core' type Props = { /** diff --git a/packages/skeleton/CHANGELOG.md b/packages/skeleton/CHANGELOG.md deleted file mode 100644 index b3f39ea..0000000 --- a/packages/skeleton/CHANGELOG.md +++ /dev/null @@ -1,302 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.18.0](https://github.com/nandorojo/moti/compare/v0.18.1...v0.18.0) (2022-05-11) - -**Note:** Version bump only for package @motify/skeleton - - - - - -## [0.18.1](https://github.com/nandorojo/moti/compare/v0.18.0...v0.18.1) (2022-05-11) - -**Note:** Version bump only for package @motify/skeleton - - - - - - - -**Note:** Version bump only for package @motify/skeleton - - - - - -## [0.17.1](https://github.com/nandorojo/moti/compare/v0.17.0...v0.17.1) (2021-12-15) - -**Note:** Version bump only for package @motify/skeleton - - - - - -# [0.17.0](https://github.com/nandorojo/moti/compare/v0.16.1...v0.17.0) (2021-12-15) - - -### Features - -* move skeleton into moti import ([dab7a4f](https://github.com/nandorojo/moti/commit/dab7a4f8f05d206a3cafb640023965830973c792)) - - - - - -## [0.16.1](https://github.com/nandorojo/moti/compare/v0.16.0...v0.16.1) (2021-11-03) - -**Note:** Version bump only for package @motify/skeleton - - - - - - - -**Note:** Version bump only for package @motify/skeleton - - - - - - - -**Note:** Version bump only for package @motify/skeleton - - - - - - - -**Note:** Version bump only for package @motify/skeleton - - - - - -# [0.16.0](https://github.com/nandorojo/moti/compare/v0.15.4...v0.16.0) (2021-10-07) - -**Note:** Version bump only for package @motify/skeleton - - - - - -## [0.15.3](https://github.com/nandorojo/moti/compare/v0.15.2...v0.15.3) (2021-09-30) - - -### Bug Fixes - -* passing backgroundSize prop to AnimatedGradient ([dee8986](https://github.com/nandorojo/moti/commit/dee8986dc0bed765b0721bbc312c733b93f45eb4)) - - - - - -## [0.15.2](https://github.com/nandorojo/moti/compare/v0.15.1...v0.15.2) (2021-09-23) - -**Note:** Version bump only for package @motify/skeleton - - - - - -## [0.15.1](https://github.com/nandorojo/moti/compare/v0.15.0...v0.15.1) (2021-09-23) - -**Note:** Version bump only for package @motify/skeleton - - - - - -# [0.15.0](https://github.com/nandorojo/moti/compare/v0.14.2...v0.15.0) (2021-09-22) - -**Note:** Version bump only for package @motify/skeleton - - - - - -## [0.14.2](https://github.com/nandorojo/moti/compare/v0.14.1...v0.14.2) (2021-09-03) - -**Note:** Version bump only for package @motify/skeleton - - - - - -## [0.14.1](https://github.com/nandorojo/moti/compare/v0.14.0...v0.14.1) (2021-09-02) - -**Note:** Version bump only for package @motify/skeleton - - - - - -# [0.14.0](https://github.com/nandorojo/moti/compare/v0.13.0...v0.14.0) (2021-09-02) - - - -# [0.13.0-alpha.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.13.0-alpha.0) (2021-08-29) - -**Note:** Version bump only for package @motify/skeleton - - - - - -# [0.13.0-alpha.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.13.0-alpha.0) (2021-08-29) - -# [0.13.0](https://github.com/nandorojo/moti/compare/v0.12.3...v0.13.0) (2021-09-02) - -**Note:** Version bump only for package @motify/skeleton - -## [0.12.3](https://github.com/nandorojo/moti/compare/v0.12.2...v0.12.3) (2021-09-01) - -**Note:** Version bump only for package @motify/skeleton - -## [0.12.2](https://github.com/nandorojo/moti/compare/v0.12.1...v0.12.2) (2021-09-01) - -**Note:** Version bump only for package @motify/skeleton - -## [0.12.1](https://github.com/nandorojo/moti/compare/v0.12.0...v0.12.1) (2021-09-01) - -**Note:** Version bump only for package @motify/skeleton - -# [0.12.0](https://github.com/nandorojo/moti/compare/v0.11.0...v0.12.0) (2021-09-01) - -**Note:** Version bump only for package @motify/skeleton - -# [0.11.0](https://github.com/nandorojo/moti/compare/v0.10.1...v0.11.0) (2021-05-17) - -**Note:** Version bump only for package @motify/skeleton - -# [0.10.0](https://github.com/nandorojo/moti/compare/v0.9.0...v0.10.0) (2021-04-21) - -**Note:** Version bump only for package @motify/skeleton - -# [0.9.0](https://github.com/nandorojo/moti/compare/v0.8.2...v0.9.0) (2021-04-21) - -**Note:** Version bump only for package @motify/skeleton - -## [0.8.2](https://github.com/nandorojo/moti/compare/v0.8.1...v0.8.2) (2021-04-02) - -**Note:** Version bump only for package @motify/skeleton - -## [0.8.1](https://github.com/nandorojo/moti/compare/v0.8.0...v0.8.1) (2021-04-01) - -**Note:** Version bump only for package @motify/skeleton - -# [0.8.0](https://github.com/nandorojo/moti/compare/v0.7.7...v0.8.0) (2021-04-01) - -**Note:** Version bump only for package @motify/skeleton - -## [0.7.7](https://github.com/nandorojo/moti/compare/v0.7.6...v0.7.7) (2021-04-01) - -**Note:** Version bump only for package @motify/skeleton - -## [0.7.6](https://github.com/nandorojo/moti/compare/v0.7.5...v0.7.6) (2021-04-01) - -**Note:** Version bump only for package @motify/skeleton - -## [0.7.5](https://github.com/nandorojo/moti/compare/v0.7.4...v0.7.5) (2021-04-01) - -**Note:** Version bump only for package @motify/skeleton - -## [0.7.4](https://github.com/nandorojo/moti/compare/v0.7.3...v0.7.4) (2021-04-01) - -**Note:** Version bump only for package @motify/skeleton - -## [0.7.3](https://github.com/nandorojo/moti/compare/v0.7.2...v0.7.3) (2021-03-30) - -**Note:** Version bump only for package @motify/skeleton - -## [0.7.2](https://github.com/nandorojo/moti/compare/v0.7.1...v0.7.2) (2021-03-28) - -**Note:** Version bump only for package @motify/skeleton - -## [0.7.1](https://github.com/nandorojo/moti/compare/v0.7.0...v0.7.1) (2021-03-23) - -### Bug Fixes - -- [#38](https://github.com/nandorojo/moti/issues/38) skeleton web bug ([e66b7a6](https://github.com/nandorojo/moti/commit/e66b7a6f1318c337daaaa0783a2c4295f573565c)) - -# [0.7.0](https://github.com/nandorojo/moti/compare/v0.6.5...v0.7.0) (2021-03-22) - -**Note:** Version bump only for package @motify/skeleton - -## [0.6.5](https://github.com/nandorojo/moti/compare/v0.6.4...v0.6.5) (2021-03-19) - -**Note:** Version bump only for package @motify/skeleton - -## [0.6.4](https://github.com/nandorojo/moti/compare/v0.6.3...v0.6.4) (2021-03-13) - -**Note:** Version bump only for package @motify/skeleton - -## [0.6.3](https://github.com/nandorojo/moti/compare/v0.6.2...v0.6.3) (2021-03-13) - -**Note:** Version bump only for package @motify/skeleton - -## [0.6.2](https://github.com/nandorojo/moti/compare/v0.6.1...v0.6.2) (2021-03-13) - -**Note:** Version bump only for package @motify/skeleton - -## [0.6.1](https://github.com/nandorojo/moti/compare/v0.6.0...v0.6.1) (2021-03-13) - -**Note:** Version bump only for package @motify/skeleton - -# [0.6.0](https://github.com/nandorojo/moti/compare/v0.5.8...v0.6.0) (2021-03-04) - -### Features - -- [skeleton] custom transition, fade in ([1f42d28](https://github.com/nandorojo/moti/commit/1f42d28405abaaa7ae59e89b29a7bd486847bb7a)) - -## [0.5.8](https://github.com/nandorojo/moti/compare/v0.5.7...v0.5.8) (2021-03-04) - -**Note:** Version bump only for package @motify/skeleton - -## [0.5.7](https://github.com/nandorojo/moti/compare/v0.5.6...v0.5.7) (2021-03-02) - -**Note:** Version bump only for package @motify/skeleton - -## [0.5.6](https://github.com/nandorojo/moti/compare/v0.5.5...v0.5.6) (2021-03-02) - -### Features - -- defaults for skeleton ([f8f5b67](https://github.com/nandorojo/moti/commit/f8f5b6759dd964d4ed30b0c415babef8b0503552)) - -## [0.5.5](https://github.com/nandorojo/moti/compare/v0.5.4...v0.5.5) (2021-03-02) - -### Bug Fixes - -- broken types ([320f66f](https://github.com/nandorojo/moti/commit/320f66f1c0861e9ab3f47a06289183745e958d59)) -- main lib types ([65c1a32](https://github.com/nandorojo/moti/commit/65c1a3298ca374dcaeca22b7783d99ecc4c62d72)) - -## [0.5.4](https://github.com/nandorojo/moti/compare/v0.5.3...v0.5.4) (2021-03-02) - -**Note:** Version bump only for package @motify/skeleton - -## [0.5.3](https://github.com/nandorojo/moti/compare/v0.5.2...v0.5.3) (2021-03-02) - -**Note:** Version bump only for package @motify/skeleton - -## [0.5.2](https://github.com/nandorojo/moti/compare/v0.5.1...v0.5.2) (2021-03-02) - -**Note:** Version bump only for package @motify/skeleton - -## [0.5.1](https://github.com/nandorojo/moti/compare/v0.5.0...v0.5.1) (2021-03-02) - -**Note:** Version bump only for package @motify/skeleton - -# [0.5.0](https://github.com/nandorojo/moti/compare/v0.4.1...v0.5.0) (2021-03-02) - -### Features - -- skeleton basic ([f4d86dc](https://github.com/nandorojo/moti/commit/f4d86dc751fbe142cd8db0229db8a8aa8cf6127e)) -- skeleton code ([69c478d](https://github.com/nandorojo/moti/commit/69c478de4eb1204cf3cc639c7326c7d6a3bad42d)) -- skeleton color modes ([7205bbc](https://github.com/nandorojo/moti/commit/7205bbc552c18a18cf1358b04caf247e8ddae0d6)) -- skeleton props ([7547b69](https://github.com/nandorojo/moti/commit/7547b69683bd9375bc97645598b05fabb9741bed)) diff --git a/packages/skeleton/README.md b/packages/skeleton/README.md deleted file mode 100644 index 9612c65..0000000 --- a/packages/skeleton/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Moti skeleton - -First, install and setup `moti`. - -Finally, install peer dependencies: - -``` -expo install expo-linear-gradient -``` diff --git a/packages/skeleton/package.json b/packages/skeleton/package.json deleted file mode 100644 index 02255d5..0000000 --- a/packages/skeleton/package.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "@motify/skeleton", - "private": false, - "version": "0.18.1", - "keywords": [ - "react-native", - "ios", - "android", - "web" - ], - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/nandorojo/moti.git", - "directory": "packages/skeleton" - }, - "bugs": { - "url": "https://github.com/nandorojo/moti/issues" - }, - "homepage": "https://moti.fyi", - "main": "lib/commonjs/index.js", - "react-native": "src/index.ts", - "source": "src/index.ts", - "module": "lib/module/index.js", - "types": "lib/typescript/src/index.d.ts", - "files": [ - "src", - "lib", - "!**/__tests__" - ], - "sideEffects": false, - "publishConfig": { - "access": "public" - }, - "scripts": { - "prepare": "bob build", - "clean": "del lib" - }, - "dependencies": { - "@motify/components": "^0.18.1", - "@motify/core": "^0.18.1" - }, - "devDependencies": { - "expo-linear-gradient": "^9.0.0", - "typescript": "^4.0.3" - }, - "peerDependencies": { - "expo-linear-gradient": "*", - "react-native-reanimated": "*" - }, - "react-native-builder-bob": { - "source": "src", - "output": "lib", - "targets": [ - "commonjs", - "module", - [ - "typescript", - { - "project": "tsconfig.build.json" - } - ] - ] - }, - "gitHead": "3f8122778be80f775d62748ad658719d38745056" -} diff --git a/packages/skeleton/src/index.ts b/packages/skeleton/src/index.ts deleted file mode 100644 index 30e783f..0000000 --- a/packages/skeleton/src/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -export { default as Skeleton } from './skeleton' - -console.error(`@motify/skeleton is deprecated. It has moved to 'moti/skeleton'. Please uninstall @motify/skeleton, upgrade "moti", and update your imports. In the next version, this will throw an error. - -yarn remove @motify/skeleton -yarn add moti - -Finally, find and replace all your imports. - -For more info: https://github.com/nandorojo/moti/pull/136 -`) diff --git a/packages/skeleton/src/skeleton.tsx b/packages/skeleton/src/skeleton.tsx deleted file mode 100644 index 685c712..0000000 --- a/packages/skeleton/src/skeleton.tsx +++ /dev/null @@ -1,265 +0,0 @@ -import React, { useState } from 'react' -import { View as MotiView } from '@motify/components' -import { View, StyleSheet } from 'react-native' - -import { LinearGradient } from 'expo-linear-gradient' -import { AnimatePresence, MotiTransitionProp } from '@motify/core' - -type Props = { - /** - * Optional height of the container of the skeleton. If set, it will give a fixed height to the container. - * - * If not set, the container will stretch to the children. - */ - boxHeight?: number | string - /** - * Optional height of the skeleton. Defauls to a `minHeight` of `32` - */ - height?: number | string - children?: React.ReactChild | null - /** - * `boolean` specifying whether the skeleton should be visible. By default, it shows if there are no children. This way, you can conditionally display children, and automatically hide the skeleton when they exist. - * - * ```tsx - * // skeleton will hide when data exists - * - * {data ? : null} - * - * ``` - * - * // skeleton will always show - * - * {data ? : null} - * - * - * // skeleton will always hide - * - * {data ? : null} - * - */ - show?: boolean - /** - * Width of the skeleton. Defaults to `32` as the `minWidth`. Sets the container's `minWidth` to this value if defined, falling back to 32. - */ - width?: string | number - /** - * Border radius. Can be `square`, `round`, or a number. `round` makes it a circle. Defaults to `8`. - */ - radius?: number | 'square' | 'round' - /** - * Background of the box that contains the skeleton. Should match the main `colors` prop color. - * - * Default: `'rgb(51, 51, 51, 50)'` - */ - backgroundColor?: string - /** - * Gradient colors. Defaults to grayish black. - */ - colors?: string[] - /** - * Default: `6`. Similar to `600%` for CSS `background-size`. Determines how much the gradient stretches. - */ - backgroundSize?: number - /** - * `light` or `dark`. Default: `dark`. - */ - colorMode?: keyof typeof baseColors - disableExitAnimation?: boolean - transition?: MotiTransitionProp -} - -const DEFAULT_SIZE = 32 - -const baseColors = { - dark: { primary: 'rgb(17, 17, 17)', secondary: 'rgb(51, 51, 51)' }, - light: { - primary: 'rgb(250, 250, 250)', - secondary: 'rgb(205, 205, 205)', - }, -} as const - -const makeColors = (mode: keyof typeof baseColors) => [ - baseColors[mode].primary, - baseColors[mode].secondary, - baseColors[mode].secondary, - baseColors[mode].primary, - baseColors[mode].secondary, - baseColors[mode].primary, -] - -let defaultDarkColors = makeColors('dark') - -let defaultLightColors = makeColors('light') - -for (let i = 0; i++; i < 3) { - defaultDarkColors = [...defaultDarkColors, ...defaultDarkColors] - defaultLightColors = [...defaultLightColors, ...defaultLightColors] -} - -export default function Skeleton(props: Props) { - const { - radius = 8, - children, - show = !children, - width, - height = children ? undefined : DEFAULT_SIZE, - boxHeight, - colorMode = 'dark', - colors = colorMode === 'dark' ? defaultDarkColors : defaultLightColors, - backgroundColor = colors[0] ?? - colors[1] ?? - baseColors[colorMode]?.secondary, - backgroundSize = 6, - disableExitAnimation, - transition, - } = props - - const [measuredWidth, setMeasuredWidth] = useState(0) - - const getBorderRadius = () => { - if (radius === 'square') { - return 0 - } - if (radius === 'round') { - return 99999 - } - return radius - } - - const borderRadius = getBorderRadius() - - const getOuterHeight = () => { - if (boxHeight != null) return boxHeight - if (show && !children) { - return height - } - return undefined - } - - const outerHeight = getOuterHeight() - - return ( - - {children} - - {show && ( - { - if (measuredWidth === nativeEvent.layout.width) return - - setMeasuredWidth(nativeEvent.layout.width) - }} - pointerEvents="none" - > - - - )} - - - ) -} - -const AnimatedGradient = React.memo( - function AnimatedGradient({ - measuredWidth, - colors, - backgroundSize, - transition = {}, - }: { - measuredWidth: number - colors: string[] - backgroundSize: number, - transition?: MotiTransitionProp - }) { - - return ( - - - - - - ) - }, - function propsAreEqual(prev, next) { - return JSON.stringify(prev) === JSON.stringify(next) - } -) diff --git a/packages/skeleton/tsconfig.build.json b/packages/skeleton/tsconfig.build.json deleted file mode 100644 index 543a787..0000000 --- a/packages/skeleton/tsconfig.build.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig", - "compilerOptions": { - "paths": {} - } -} diff --git a/packages/skeleton/tsconfig.json b/packages/skeleton/tsconfig.json deleted file mode 100644 index e6f249d..0000000 --- a/packages/skeleton/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "./lib/typescript", - "paths": { - "@motify/*": ["../*/src"], - "moti": ["../moti/src"], - "@motify/core": ["../core/src"] - } - } -} diff --git a/yarn.lock b/yarn.lock index 4a83555..fca9e24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@alloc/types@^1.2.1": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@alloc/types/-/types-1.3.0.tgz#904245b8d3260a4b7d8a801c12501968f64fac08" - integrity sha512-mH7LiFiq9g6rX2tvt1LtwsclfG5hnsmtIfkZiauAGrm1AwXhoRS0sF2WrN9JGN7eV5vFXqNaB0eXZ3IvMsVi9g== - "@ampproject/toolbox-core@2.7.4", "@ampproject/toolbox-core@^2.4.0-alpha.1": version "2.7.4" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-2.7.4.tgz#8355136f16301458ce942acf6c55952c9a415627" @@ -283,7 +278,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.4.5", "@babel/core@^7.7.5", "@babel/core@~7.12.10": +"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5", "@babel/core@~7.12.10": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== @@ -2087,7 +2082,7 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.5" "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.12.1": +"@babel/plugin-transform-flow-strip-types@^7.0.0": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz#d85e30ecfa68093825773b7b857e5085bbd32c95" integrity sha512-0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg== @@ -2481,7 +2476,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.12.1": +"@babel/plugin-transform-react-display-name@^7.0.0": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d" integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w== @@ -2495,7 +2490,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-react-jsx-development@^7.12.7", "@babel/plugin-transform-react-jsx-development@^7.9.0": +"@babel/plugin-transform-react-jsx-development@^7.9.0": version "7.12.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7" integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg== @@ -2530,7 +2525,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.12": +"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.12": version "7.12.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e" integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw== @@ -2563,14 +2558,6 @@ "@babel/plugin-syntax-jsx" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/plugin-transform-react-pure-annotations@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42" - integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" @@ -2909,78 +2896,6 @@ levenary "^1.1.1" semver "^5.5.0" -"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.4.4", "@babel/preset-env@^7.6.3": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" - integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== - dependencies: - "@babel/compat-data" "^7.12.7" - "@babel/helper-compilation-targets" "^7.12.5" - "@babel/helper-module-imports" "^7.12.5" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.11" - "@babel/plugin-proposal-async-generator-functions" "^7.12.1" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-dynamic-import" "^7.12.1" - "@babel/plugin-proposal-export-namespace-from" "^7.12.1" - "@babel/plugin-proposal-json-strings" "^7.12.1" - "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.7" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" - "@babel/plugin-syntax-async-generators" "^7.8.0" - "@babel/plugin-syntax-class-properties" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.0" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.0" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" - "@babel/plugin-syntax-top-level-await" "^7.12.1" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-async-to-generator" "^7.12.1" - "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.11" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-computed-properties" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-dotall-regex" "^7.12.1" - "@babel/plugin-transform-duplicate-keys" "^7.12.1" - "@babel/plugin-transform-exponentiation-operator" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-function-name" "^7.12.1" - "@babel/plugin-transform-literals" "^7.12.1" - "@babel/plugin-transform-member-expression-literals" "^7.12.1" - "@babel/plugin-transform-modules-amd" "^7.12.1" - "@babel/plugin-transform-modules-commonjs" "^7.12.1" - "@babel/plugin-transform-modules-systemjs" "^7.12.1" - "@babel/plugin-transform-modules-umd" "^7.12.1" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1" - "@babel/plugin-transform-new-target" "^7.12.1" - "@babel/plugin-transform-object-super" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-property-literals" "^7.12.1" - "@babel/plugin-transform-regenerator" "^7.12.1" - "@babel/plugin-transform-reserved-words" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.7" - "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.10" - "@babel/plugin-transform-unicode-escapes" "^7.12.1" - "@babel/plugin-transform-unicode-regex" "^7.12.1" - "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.11" - core-js-compat "^3.8.0" - semver "^5.5.0" - "@babel/preset-env@^7.12.9": version "7.16.5" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.5.tgz#2e94d922f4a890979af04ffeb6a6b4e44ba90847" @@ -3061,6 +2976,78 @@ core-js-compat "^3.19.1" semver "^6.3.0" +"@babel/preset-env@^7.4.4", "@babel/preset-env@^7.6.3": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" + integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== + dependencies: + "@babel/compat-data" "^7.12.7" + "@babel/helper-compilation-targets" "^7.12.5" + "@babel/helper-module-imports" "^7.12.5" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-validator-option" "^7.12.11" + "@babel/plugin-proposal-async-generator-functions" "^7.12.1" + "@babel/plugin-proposal-class-properties" "^7.12.1" + "@babel/plugin-proposal-dynamic-import" "^7.12.1" + "@babel/plugin-proposal-export-namespace-from" "^7.12.1" + "@babel/plugin-proposal-json-strings" "^7.12.1" + "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" + "@babel/plugin-proposal-numeric-separator" "^7.12.7" + "@babel/plugin-proposal-object-rest-spread" "^7.12.1" + "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" + "@babel/plugin-proposal-private-methods" "^7.12.1" + "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" + "@babel/plugin-syntax-async-generators" "^7.8.0" + "@babel/plugin-syntax-class-properties" "^7.12.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/plugin-syntax-top-level-await" "^7.12.1" + "@babel/plugin-transform-arrow-functions" "^7.12.1" + "@babel/plugin-transform-async-to-generator" "^7.12.1" + "@babel/plugin-transform-block-scoped-functions" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.11" + "@babel/plugin-transform-classes" "^7.12.1" + "@babel/plugin-transform-computed-properties" "^7.12.1" + "@babel/plugin-transform-destructuring" "^7.12.1" + "@babel/plugin-transform-dotall-regex" "^7.12.1" + "@babel/plugin-transform-duplicate-keys" "^7.12.1" + "@babel/plugin-transform-exponentiation-operator" "^7.12.1" + "@babel/plugin-transform-for-of" "^7.12.1" + "@babel/plugin-transform-function-name" "^7.12.1" + "@babel/plugin-transform-literals" "^7.12.1" + "@babel/plugin-transform-member-expression-literals" "^7.12.1" + "@babel/plugin-transform-modules-amd" "^7.12.1" + "@babel/plugin-transform-modules-commonjs" "^7.12.1" + "@babel/plugin-transform-modules-systemjs" "^7.12.1" + "@babel/plugin-transform-modules-umd" "^7.12.1" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1" + "@babel/plugin-transform-new-target" "^7.12.1" + "@babel/plugin-transform-object-super" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-property-literals" "^7.12.1" + "@babel/plugin-transform-regenerator" "^7.12.1" + "@babel/plugin-transform-reserved-words" "^7.12.1" + "@babel/plugin-transform-shorthand-properties" "^7.12.1" + "@babel/plugin-transform-spread" "^7.12.1" + "@babel/plugin-transform-sticky-regex" "^7.12.7" + "@babel/plugin-transform-template-literals" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.10" + "@babel/plugin-transform-unicode-escapes" "^7.12.1" + "@babel/plugin-transform-unicode-regex" "^7.12.1" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.12.11" + core-js-compat "^3.8.0" + semver "^5.5.0" + "@babel/preset-env@~7.12.13": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.17.tgz#94a3793ff089c32ee74d76a3c03a7597693ebaaa" @@ -3142,14 +3129,6 @@ "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-transform-flow-strip-types" "^7.16.5" -"@babel/preset-flow@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.12.1.tgz#1a81d376c5a9549e75352a3888f8c273455ae940" - integrity sha512-UAoyMdioAhM6H99qPoKvpHMzxmNVXno8GYU/7vZmGaHk6/KqfDYL1W0NxszVbJ2EP271b7e6Ox+Vk2A9QsB3Sw== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-transform-flow-strip-types" "^7.12.1" - "@babel/preset-modules@0.1.3": version "0.1.3" resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72" @@ -3195,17 +3174,6 @@ "@babel/plugin-transform-react-jsx-self" "^7.9.0" "@babel/plugin-transform-react-jsx-source" "^7.9.0" -"@babel/preset-react@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9" - integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-transform-react-display-name" "^7.12.1" - "@babel/plugin-transform-react-jsx" "^7.12.10" - "@babel/plugin-transform-react-jsx-development" "^7.12.7" - "@babel/plugin-transform-react-pure-annotations" "^7.12.1" - "@babel/preset-typescript@7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192" @@ -3223,7 +3191,7 @@ "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-transform-typescript" "^7.16.1" -"@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.3.3": +"@babel/preset-typescript@^7.3.3": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz#fc7df8199d6aae747896f1e6c61fc872056632a3" integrity sha512-nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw== @@ -3277,7 +3245,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== @@ -6584,46 +6552,6 @@ resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-1.0.0.tgz#05bb0031533598f9458cf65a502b8df0eecae780" integrity sha512-0jbp4RxjYopTsIdLl+/Fy2TiwVYHy4mgeu07DG4b/LyM0OS/+lPP5c9sbnt/AMlnF6qz2JRZpPpGw1eMNS6A4w== -"@react-spring/animated@9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.0.0-rc.3.tgz#e792cb76aacecfc78db2be6020ac11ce96503eb5" - integrity sha512-dAvgtKhkYpzzr+EkmZ4ZuJ5CujxCW0LaT109DvO/2MQNk3EWIxcgl+ik4tSulSbgau1GN8RlkRKyDp0wISdQ3Q== - dependencies: - "@babel/runtime" "^7.3.1" - "@react-spring/shared" "9.0.0-rc.3" - react-layout-effect "^1.0.1" - -"@react-spring/core@9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.0.0-rc.3.tgz#c8e697573936c525bd0f6ca0c0869f75c86e8a83" - integrity sha512-3OzsVFxpfMJNkkQj8TwAH3NhUAX76AXu6WkslQF4EgBeEoG5eY3m+VvM9RsAsGWDuBKpscZ/wBpFt5Ih6KdGHA== - dependencies: - "@babel/runtime" "^7.3.1" - "@react-spring/animated" "9.0.0-rc.3" - "@react-spring/shared" "9.0.0-rc.3" - react-layout-effect "^1.0.1" - use-memo-one "^1.1.0" - -"@react-spring/native@^9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.0.0-rc.3.tgz#863b8278ea6064385c4fffaaed40316e4a2acaa8" - integrity sha512-7JSixJLfzg8V0IrgyGS3gGr2v8CGh4Kym15Htp3CJq74GFBJMyaQS0KaMjieXnw5alTpQoeGBESfA3v5dPlPYg== - dependencies: - "@babel/runtime" "^7.3.1" - "@react-spring/animated" "9.0.0-rc.3" - "@react-spring/core" "9.0.0-rc.3" - "@react-spring/shared" "9.0.0-rc.3" - -"@react-spring/shared@9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.0.0-rc.3.tgz#3f4c9d90accc20fef51a283a7806d78390b84161" - integrity sha512-dd50TxwwMWd+dSB0InjndUN9w17cbnMCPy+0sag6zRxxKIo7eOyWSliOtLKxvufgmdC8Prm4M3GT5dmB1yxKEQ== - dependencies: - "@alloc/types" "^1.2.1" - "@babel/runtime" "^7.3.1" - fluids "^0.1.6" - tslib "^1.11.1" - "@sideway/address@^4.1.3": version "4.1.3" resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.3.tgz#d93cce5d45c5daec92ad76db492cc2ee3c64ab27" @@ -6675,13 +6603,6 @@ "@babel/runtime" "^7.12.5" "@types/testing-library__react-hooks" "^3.4.0" -"@testing-library/react-native@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@testing-library/react-native/-/react-native-7.1.0.tgz#6b168aac21522c8a5175461b350336fd79612ac9" - integrity sha512-ljVM9KZqG7BT/NFN6CHzdF6MNmM28+k7MEybFJ7FW1wVrhpiY4+hU9ypZ+hboO+MG3KpE2aFBzP4od3gu+Zzdg== - dependencies: - pretty-format "^26.0.1" - "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -6929,14 +6850,7 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-dom@^16.9.8": - version "16.9.10" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.10.tgz#4485b0bec3d41f856181b717f45fd7831101156f" - integrity sha512-ItatOrnXDMAYpv6G8UCk2VhbYVTjZT9aorLtA/OzDN9XJ2GKcfam68jutoAcILdRjsRUO8qb7AmyObF77Q8QFw== - dependencies: - "@types/react" "^16" - -"@types/react-native@^0.63.27", "@types/react-native@^0.63.30": +"@types/react-native@^0.63.27": version "0.63.46" resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.63.46.tgz#942df5af29046c6f22227495e00d5297cc1cea73" integrity sha512-SnBnWRErpISIaWk4K8kAfIKqSPdZ8fdH6HIw7kVdz6jMl/5FAf6iXeIwRfVZg1bCMh+ymNPCpSENNNEVprxj/w== @@ -6950,7 +6864,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@17.0.1": +"@types/react@*": version "17.0.1" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.1.tgz#eb1f1407dea8da3bc741879c1192aa703ab9975b" integrity sha512-w8t9f53B2ei4jeOqf/gxtc2Sswnc3LBK5s0DyJcg5xd10tMHXts2N31cKjWfH9IC/JvEPa/YF1U4YeP1t4R6HQ== @@ -6958,20 +6872,6 @@ "@types/prop-types" "*" csstype "^3.0.2" -"@types/react@^16": - version "16.14.21" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.21.tgz#35199b21a278355ec7a3c40003bd6a334bd4ae4a" - integrity sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/scheduler@*": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== - "@types/semver@^6.0.1": version "6.2.2" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.2.tgz#5c27df09ca39e3c9beb4fae6b95f4d71426df0a9" @@ -8169,11 +8069,6 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@0.9.x: - version "0.9.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= - async@^2.4.0: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" @@ -8852,7 +8747,7 @@ browserslist@4.6.6: electron-to-chromium "^1.3.191" node-releases "^1.1.25" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.1: +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.1: version "4.16.1" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== @@ -9465,15 +9360,6 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -10101,7 +9987,7 @@ cross-spawn@^5.1.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -10636,20 +10522,6 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== - dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -10978,13 +10850,6 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" - integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== - dependencies: - jake "^10.6.1" - electron-to-chromium@^1.3.191, electron-to-chromium@^1.3.413, electron-to-chromium@^1.3.649: version "1.3.654" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.654.tgz#f1b82d59bdeafa65af75794356df54f92b41c4de" @@ -11831,7 +11696,7 @@ execa@^3.2.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^4.0.0, execa@^4.0.3: +execa@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== @@ -12097,11 +11962,6 @@ expo-linear-gradient@^10.0.3: dependencies: expo-modules-core "~0.4.4" -expo-linear-gradient@^9.0.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-9.2.0.tgz#5ae16fcb8f141b1c51dc36bd4493dfd6566a9511" - integrity sha512-LnW2u9OT6GeyC6T8qEGjFYfNSk4KIBAwU0aRSjM4Y8hckWqhtKngGDz46DqGmJBzvZMSKuZZvj5xKn794r54ag== - expo-linear-gradient@~8.4.0: version "8.4.0" resolved "https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-8.4.0.tgz#34e6f960b1971c57dacf7211c747ba490a76bf63" @@ -12242,7 +12102,7 @@ expo-status-bar@~1.2.0: resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.2.0.tgz#16e73205da563f9536f562e439081e30e318a82e" integrity sha512-pVZZ/kDCXFK79E4dCtRecs3XLC8aiwlciutSd/fFmUPJSQZ1Txia6hlKajPt0GAYft8/YnT0V3URXzWZOBniYQ== -expo@^40.0.0, expo@^40.0.0-beta.5: +expo@^40.0.0: version "40.0.1" resolved "https://registry.yarnpkg.com/expo/-/expo-40.0.1.tgz#20ae9f9c787ba1662037094dfd6982380f2c0288" integrity sha512-9NrhimvP44I1aDjGHMU4F0izCyfFTTYAQ6xZpWpuc+ZWRZqg8Zv62zNRlzBn+Ydaf1heSucnlJJ3Sp2gMdOEnQ== @@ -12582,13 +12442,6 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== -filelist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" - integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== - dependencies: - minimatch "^3.0.4" - filesize@3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -12747,11 +12600,6 @@ flow-parser@^0.121.0: resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f" integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg== -fluids@^0.1.6: - version "0.1.10" - resolved "https://registry.yarnpkg.com/fluids/-/fluids-0.1.10.tgz#0517e7a53dbce1db011dddec301b75178518ba0e" - integrity sha512-66FLmUJOrkvEHIsRVeM+88MG0bjd2TOBuR0BkM0hzyCb68W9drzqeX/AHDNp3ouZALQN7JvBvmKdVhHI+PZsdg== - flush-write-stream@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" @@ -12863,31 +12711,11 @@ framer-motion@^3.9.1: optionalDependencies: "@emotion/is-prop-valid" "^0.8.2" -framer-motion@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-6.3.0.tgz#0e50ef04b4fa070fca7d04bc32fb1d64027b7ea7" - integrity sha512-Nm6l2cemuFeSC1fmq9R32sCQs1eplOuZ3r14/PxRDewpE3NUr+ul5ulGRRzk8K0Aa5p76Tedi3sfCUaTPa5fRg== - dependencies: - framesync "6.0.1" - hey-listen "^1.0.8" - popmotion "11.0.3" - style-value-types "5.0.0" - tslib "^2.1.0" - optionalDependencies: - "@emotion/is-prop-valid" "^0.8.2" - framesync@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/framesync/-/framesync-5.2.0.tgz#f14480654cd05a6af4c72c9890cad93556841643" integrity sha512-dcl92w5SHc0o6pRK3//VBVNvu6WkYkiXmHG6ZIXrVzmgh0aDYMDAaoA3p3LH71JIdN5qmhDcfONFA4Lmq22tNA== -framesync@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/framesync/-/framesync-6.0.1.tgz#5e32fc01f1c42b39c654c35b16440e07a25d6f20" - integrity sha512-fUY88kXvGiIItgNC7wcTOl0SNRCVXMKSWW2Yzfmn7EKNc+MpCzcz9DhdHcdjbrtN3c6R4H5dTY2jiCpPdysEjA== - dependencies: - tslib "^2.1.0" - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -12952,7 +12780,7 @@ fs-extra@^8.0.1, fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -13063,7 +12891,7 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.1, get-caller-file@^2.0.5: +get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -13189,13 +13017,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -gh-got@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-8.1.0.tgz#2378d07ac293f524549c75f8dc6f3604a885ab01" - integrity sha512-Jy7+73XqsAVeAtM5zA0dd+A7mmzkQVIzFuw3xRjFbPsQVqS+aeci8v8H1heOCAPlBYWED5ZYPhlYqZVXdD3Fmg== - dependencies: - got "^9.5.0" - git-raw-commits@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5" @@ -13256,13 +13077,6 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -github-username@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/github-username/-/github-username-5.0.1.tgz#f4e8c2cd7a3247bd75ae2841f5f69347f5b4c1f0" - integrity sha512-HxFIz5tIQDoiob2ienSKLHoCSFFC6F79IcnM5E5KNAxkxMjvpuUSE7K4fU2n51fwo0idT0ZsMFZIUy4SIPXoVA== - dependencies: - gh-got "^8.1.0" - gitlog@^4.0.3: version "4.0.4" resolved "https://registry.yarnpkg.com/gitlog/-/gitlog-4.0.4.tgz#8da6c08748dc290eb6c2fc11e3c505fb73715564" @@ -13456,7 +13270,7 @@ globby@^9.2.0: pify "^4.0.1" slash "^2.0.0" -got@^9.5.0, got@^9.6.0: +got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== @@ -14200,14 +14014,6 @@ is-absolute-url@^2.0.0: resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -14422,22 +14228,6 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-git-dirty@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-git-dirty/-/is-git-dirty-2.0.1.tgz#29ca82fb0924ccbeaa0bae08de217546df593012" - integrity sha512-zn3CNLDbSR+y7+VDDw7/SwTRRuECn4OpAyelo5MDN+gVxdzM8SUDd51ZwPIOxhljED44Riu0jiiNtC8w0bcLdA== - dependencies: - execa "^4.0.3" - is-git-repository "^2.0.0" - -is-git-repository@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-git-repository/-/is-git-repository-2.0.0.tgz#fa036007fe9697198c2c89dac4dd8304a6101e1c" - integrity sha512-HDO50CG5suIAcmqG4F1buqVXEZRPn+RaXIn9pFKq/947FBo2bCRwK7ZluEVZOy99a4IQyqsjbKEpAiOXCccOHQ== - dependencies: - execa "^4.0.3" - is-absolute "^1.0.0" - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -14496,7 +14286,7 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-path-cwd@^2.0.0, is-path-cwd@^2.2.0: +is-path-cwd@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== @@ -14515,11 +14305,6 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" -is-path-inside@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" - integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== - is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -14562,13 +14347,6 @@ is-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== - dependencies: - is-unc-path "^1.0.0" - is-resolvable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" @@ -14660,13 +14438,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== - dependencies: - unc-path-regex "^0.1.2" - is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" @@ -14689,7 +14460,7 @@ is-weakset@^2.0.1: resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== -is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2: +is-windows@^1.0.0, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== @@ -14812,16 +14583,6 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jake@^10.6.1: - version "10.8.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" - integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== - dependencies: - async "0.9.x" - chalk "^2.4.2" - filelist "^1.0.1" - minimatch "^3.0.4" - java-properties@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211" @@ -15810,7 +15571,7 @@ jest@^26.6.1, jest@^26.6.3: import-local "^3.0.2" jest-cli "^26.6.3" -jetifier@^1.6.2, jetifier@^1.6.6: +jetifier@^1.6.2: version "1.6.6" resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.6.tgz#fec8bff76121444c12dc38d2dad6767c421dab68" integrity sha512-JNAkmPeB/GS2tCRqUzRPsTOHpGDah7xP18vGJfIjZC+W2sxEHbxgJxetIjIqhjQ3yYbYNEELkM/spKLtwoOSUQ== @@ -16111,7 +15872,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.1.3: +json5@^2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== @@ -18452,13 +18213,6 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - p-pipe@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9" @@ -18943,16 +18697,6 @@ pnp-webpack-plugin@1.6.4, pnp-webpack-plugin@^1.5.0: dependencies: ts-pnp "^1.1.6" -popmotion@11.0.3: - version "11.0.3" - resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-11.0.3.tgz#565c5f6590bbcddab7a33a074bb2ba97e24b0cc9" - integrity sha512-Y55FLdj3UxkR7Vl3s7Qr4e9m0onSnP8W7d/xQLsoJM40vs6UKHFdygs6SWryasTZYqugMjm3BepCF4CWXDiHgA== - dependencies: - framesync "6.0.1" - hey-listen "^1.0.8" - style-value-types "5.0.0" - tslib "^2.1.0" - popmotion@9.3.1: version "9.3.1" resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-9.3.1.tgz#134319ed4b9b8e3ec506c99064f7b2f14bc05781" @@ -19398,7 +19142,7 @@ pretty-format@^25.5.0: ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^26.0.0, pretty-format@^26.0.1, pretty-format@^26.4.0, pretty-format@^26.5.2, pretty-format@^26.6.2: +pretty-format@^26.0.0, pretty-format@^26.4.0, pretty-format@^26.5.2, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== @@ -19802,41 +19546,6 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-layout-effect@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/react-layout-effect/-/react-layout-effect-1.0.5.tgz#0dc4e24452aee5de66c93c166f0ec512dfb1be80" - integrity sha512-zdRXHuch+OBHU6bvjTelOGUCM+UDr/iCY+c0wXLEAc+G4/FlcJruD/hUOzlKH5XgO90Y/BUJPNhI/g9kl+VAsA== - -react-native-builder-bob@^0.17.0: - version "0.17.1" - resolved "https://registry.yarnpkg.com/react-native-builder-bob/-/react-native-builder-bob-0.17.1.tgz#4bb12f721acf9417d62065232d42e0201b673315" - integrity sha512-vO3PYa/vgIqUFOfXZWNEsqQfjJMiNJAfJ0Sq4ovZa4zb/bnMKF4vDbARo3uhA8eg/wA0h4W6BlceY/Kjo74+6g== - dependencies: - "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-flow" "^7.12.1" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - browserslist "^4.16.0" - chalk "^4.1.0" - cosmiconfig "^7.0.0" - cross-spawn "^7.0.3" - dedent "^0.7.0" - del "^6.0.0" - ejs "^3.1.5" - fs-extra "^9.0.1" - github-username "^5.0.1" - glob "^7.1.6" - is-git-dirty "^2.0.1" - json5 "^2.1.3" - prompts "^2.4.0" - validate-npm-package-name "^3.0.0" - which "^2.0.2" - yargs "^16.2.0" - optionalDependencies: - jetifier "^1.6.6" - react-native-codegen@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.6.tgz#b3173faa879cf71bfade8d030f9c4698388f6909" @@ -21748,14 +21457,6 @@ style-value-types@4.1.1: hey-listen "^1.0.8" tslib "^1.10.0" -style-value-types@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/style-value-types/-/style-value-types-5.0.0.tgz#76c35f0e579843d523187989da866729411fc8ad" - integrity sha512-08yq36Ikn4kx4YU6RD7jWEv27v4V+PUsOGa4n/as8Et3CuODMJQ00ENeAVXAeydX4Z2j1XHZF1K2sX4mGl18fA== - dependencies: - hey-listen "^1.0.8" - tslib "^2.1.0" - styled-jsx@3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.1.tgz#452051fe50df5e9c7c7f3dd20fa46c3060ac65b0" @@ -22311,12 +22012,12 @@ tslib@2.0.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== -tslib@^1.10.0, tslib@^1.11.1, tslib@^1.14.1, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.10.0, tslib@^1.14.1, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1, tslib@^2.1.0, tslib@^2.2.0: +tslib@^2.0.1, tslib@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== @@ -22524,11 +22225,6 @@ unbox-primitive@^1.0.1: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= - unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -22840,11 +22536,6 @@ urlgrey@0.4.4: resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f" integrity sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8= -use-memo-one@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.2.tgz#0c8203a329f76e040047a35a1197defe342fab20" - integrity sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ== - use-subscription@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.4.1.tgz#edcbcc220f1adb2dd4fa0b2f61b6cc308e620069" @@ -23533,15 +23224,6 @@ wrap-ansi@^6.0.0, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -23737,11 +23419,6 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== -y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== - yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" @@ -23778,7 +23455,7 @@ yargs-parser@^15.0.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.2, yargs-parser@^20.2.3: +yargs-parser@^20.2.3: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== @@ -23817,19 +23494,6 @@ yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From e9d35a5ba8ac1d7cb97e3189dd96a2f613ca7487 Mon Sep 17 00:00:00 2001 From: Fernando Rojo Date: Tue, 26 Jul 2022 11:50:57 -0400 Subject: [PATCH 2/7] feat: skeleton group --- packages/moti/package.json | 2 +- packages/moti/src/skeleton/skeleton.tsx | 43 +++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/packages/moti/package.json b/packages/moti/package.json index 919d822..6d78e96 100644 --- a/packages/moti/package.json +++ b/packages/moti/package.json @@ -1,7 +1,7 @@ { "name": "moti", "private": false, - "version": "0.18.1", + "version": "0.19.0", "keywords": [ "react-native", "ios", diff --git a/packages/moti/src/skeleton/skeleton.tsx b/packages/moti/src/skeleton/skeleton.tsx index 4e4e172..7631c9a 100644 --- a/packages/moti/src/skeleton/skeleton.tsx +++ b/packages/moti/src/skeleton/skeleton.tsx @@ -1,5 +1,5 @@ import { LinearGradient } from 'expo-linear-gradient' -import React, { useState } from 'react' +import React, { useState, createContext, useContext } from 'react' import { View, StyleSheet } from 'react-native' import { View as MotiView } from '../components' @@ -36,6 +36,8 @@ type Props = { * * {data ? : null} * + * + * If you have multiple skeletons, you can use the ` as a parent rather than use this prop directly. */ show?: boolean /** @@ -97,10 +99,11 @@ for (let i = 0; i++; i < 3) { } export default function Skeleton(props: Props) { + const skeletonGroupContext = useContext(SkeletonGroupContext) const { radius = 8, children, - show = !children, + show = skeletonGroupContext ?? !children, width, height = children ? undefined : DEFAULT_SIZE, boxHeight, @@ -259,6 +262,40 @@ const AnimatedGradient = React.memo( ) }, function propsAreEqual(prev, next) { - return JSON.stringify(prev) === JSON.stringify(next) + if (prev.measuredWidth !== next.measuredWidth) return false + + if (prev.backgroundSize !== next.backgroundSize) return false + + const didColorsChange = prev.colors.some((color, index) => { + return color !== next.colors[index] + }) + + if (didColorsChange) return false + + // transition changes will not be respected, but it'll be in the key + return true } ) + +const SkeletonGroupContext = createContext(undefined) + +function SkeletonGroup({ + children, + show, +}: { + children: React.ReactNode + /** + * If `true`, all `Skeleton` children components will be shown. + * + * If `false`, the `Skeleton` children will be hidden. + */ + show: boolean +}) { + return ( + + {children} + + ) +} + +Skeleton.Group = SkeletonGroup From a7a28c04296b66d8b8a2caa809cd599c84262316 Mon Sep 17 00:00:00 2001 From: Fernando Rojo Date: Tue, 26 Jul 2022 12:14:29 -0400 Subject: [PATCH 3/7] docs --- docs/docs/api/motify.md | 2 +- docs/docs/examples/dropdown.md | 2 +- docs/docs/next-js.md | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/docs/api/motify.md b/docs/docs/api/motify.md index 8350bac..127a105 100644 --- a/docs/docs/api/motify.md +++ b/docs/docs/api/motify.md @@ -30,7 +30,7 @@ Notice that `motify()` returns a function. At the moment, the function it return This is the component file in `moti`: ```tsx -import { motify } from '@motify/core' +import { motify } from '../moti' import { View as RView, Text as RText, diff --git a/docs/docs/examples/dropdown.md b/docs/docs/examples/dropdown.md index 2ed0682..954dadf 100644 --- a/docs/docs/examples/dropdown.md +++ b/docs/docs/examples/dropdown.md @@ -21,7 +21,7 @@ import { MotiPressable, useMotiPressable, useMotiPressableAnimatedProps, -} from '@motify/interactions' +} from 'moti/interactions' import { MotiView } from 'moti' import { Ionicons } from '@expo/vector-icons' diff --git a/docs/docs/next-js.md b/docs/docs/next-js.md index 29b7453..2261171 100644 --- a/docs/docs/next-js.md +++ b/docs/docs/next-js.md @@ -22,13 +22,7 @@ const withFonts = require('next-fonts') const withImages = require('next-images') const withPlugins = require('next-compose-plugins') -const withTM = require('next-transpile-modules')([ - 'moti', - '@motify/core', - '@motify/components', - // '@motify/interactions' // uncomment if you use these - // you can add other modules that need traspiling here -]) +const withTM = require('next-transpile-modules')(['moti']) module.exports = withPlugins( [withTM, withFonts, withImages, [withExpo, { projectRoot: __dirname }]], @@ -55,4 +49,3 @@ export default function App({ Component, pageProps }) { ``` We're going to use `requestAnimationFrame` with Reanimated web, so that polyfill makes it usable with server-side rendering frameworks. - From bc4b0bdfdabfee86a138529d0582bb625b0f5f0e Mon Sep 17 00:00:00 2001 From: Fernando Rojo Date: Tue, 26 Jul 2022 12:16:53 -0400 Subject: [PATCH 4/7] tree shaking support --- packages/moti/src/components/index.ts | 31 +++++++++++---------------- packages/moti/src/core/index.ts | 4 ++-- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/packages/moti/src/components/index.ts b/packages/moti/src/components/index.ts index a1ee43f..f0ee0aa 100644 --- a/packages/moti/src/components/index.ts +++ b/packages/moti/src/components/index.ts @@ -1,20 +1,13 @@ -import { Image } from './image' -import { SafeAreaView } from './safe-area-view' -import { ScrollView } from './scroll-view' -import { Text } from './text' -import { View } from './view' +export { Image } from './image' +export { Image as MotiImage } from './image' +export { SafeAreaView } from './safe-area-view' +export { SafeAreaView as MotiSafeAreaView } from './safe-area-view' +export { ScrollView } from './scroll-view' +export { ScrollView as MotiScrollView } from './scroll-view' +export { Text } from './text' +export { Text as MotiText } from './text' +export { View } from './view' +export { View as MotiView } from './view' -export * from './progress' - -export { - View as MotiView, - Text as MotiText, - Image as MotiImage, - ScrollView as MotiScrollView, - SafeAreaView as MotiSafeAreaView, - View, - Text, - Image, - ScrollView, - SafeAreaView, -} +export { MotiProgressBar } from './progress' +export type { MotiProgressBarProps } from './progress' diff --git a/packages/moti/src/core/index.ts b/packages/moti/src/core/index.ts index 4d971ca..37fb4c5 100644 --- a/packages/moti/src/core/index.ts +++ b/packages/moti/src/core/index.ts @@ -4,5 +4,5 @@ export { AnimatePresence } from 'framer-motion' export * from './types' export { default as useAnimationState } from './use-animator' export { default as useDynamicAnimation } from './use-dynamic-animation' -export * from './use-motify' -export * from './constants' +export { useMotify } from './use-motify' +export { colorKeys, PackageName } from './constants' From 778ec324f94b45c1e6185f553b2ef62c4a523564 Mon Sep 17 00:00:00 2001 From: Fernando Rojo Date: Tue, 26 Jul 2022 12:34:47 -0400 Subject: [PATCH 5/7] add worklet option for exitTransition, close #193 --- packages/moti/src/core/types.ts | 19 ++++++++++--------- packages/moti/src/core/use-motify.ts | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/moti/src/core/types.ts b/packages/moti/src/core/types.ts index 7b16a11..93a4fb2 100644 --- a/packages/moti/src/core/types.ts +++ b/packages/moti/src/core/types.ts @@ -1,11 +1,3 @@ -import type { - SharedValue, - WithDecayConfig, - WithSpringConfig, - WithTimingConfig, - DerivedValue, -} from 'react-native-reanimated' - import type { PerpectiveTransform, RotateTransform, @@ -23,6 +15,13 @@ import type { TextStyle, ViewStyle, } from 'react-native' +import type { + SharedValue, + WithDecayConfig, + WithSpringConfig, + WithTimingConfig, + DerivedValue, +} from 'react-native-reanimated' export type Transforms = PerpectiveTransform & RotateTransform & @@ -281,7 +280,9 @@ export interface MotiProps< * To see how to use this prop, see the `transition` prop docs. It is identical to that prop, except that it overrides it when exiting. * */ - exitTransition?: MotiTransitionProp + exitTransition?: + | MotiTransitionProp + | ((custom?: any) => MotiTransition) /** * Optionally delay the `animate` field. * diff --git a/packages/moti/src/core/use-motify.ts b/packages/moti/src/core/use-motify.ts index dce4aa1..8afa2c4 100644 --- a/packages/moti/src/core/use-motify.ts +++ b/packages/moti/src/core/use-motify.ts @@ -330,6 +330,8 @@ export function useMotify({ let exitTransition: MotiTransition | undefined if (exitTransitionProp && 'value' in exitTransitionProp) { exitTransition = exitTransitionProp.value + } else if (typeof exitTransitionProp == 'function') { + exitTransition = exitTransitionProp(custom()) } else { exitTransition = exitTransitionProp } From 97795bc3fd57a5f21667274b2c11430c58b06818 Mon Sep 17 00:00:00 2001 From: Fernando Rojo Date: Fri, 29 Jul 2022 10:28:57 -0400 Subject: [PATCH 6/7] fix: add framer motion; revert #152 --- packages/moti/package.json | 5 +- .../src/interactions/pressable/pressable.tsx | 2 +- yarn.lock | 97 +++++++++++++++++++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/packages/moti/package.json b/packages/moti/package.json index 6d78e96..0256a2d 100644 --- a/packages/moti/package.json +++ b/packages/moti/package.json @@ -67,5 +67,8 @@ ] ] }, - "gitHead": "3f8122778be80f775d62748ad658719d38745056" + "gitHead": "3f8122778be80f775d62748ad658719d38745056", + "dependencies": { + "framer-motion": "^6.5.1" + } } diff --git a/packages/moti/src/interactions/pressable/pressable.tsx b/packages/moti/src/interactions/pressable/pressable.tsx index 6b42705..51e7afd 100644 --- a/packages/moti/src/interactions/pressable/pressable.tsx +++ b/packages/moti/src/interactions/pressable/pressable.tsx @@ -194,7 +194,7 @@ export const MotiPressable = forwardRef( // @ts-expect-error incorrect ref types, lol ref={ref} onLayout={onContainerLayout} - style={containerStyle} + containerStyle={containerStyle} // Accessibility props accessibilityActions={accessibilityActions} accessibilityElementsHidden={accessibilityElementsHidden} diff --git a/yarn.lock b/yarn.lock index fca9e24..935c890 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6138,6 +6138,59 @@ "@motify/components" "^0.16.1" "@motify/core" "^0.16.1" +"@motionone/animation@^10.12.0": + version "10.13.1" + resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.13.1.tgz#ebacb50df4b7eb4957cf398c221ae10852f28520" + integrity sha512-dxQ+1wWxL6iFHDy1uv6hhcPjIdOg36eDT56jN4LI7Z5HZRyLpq8x1t7JFQclo/IEIb+6Bk4atmyinGFdXVECuA== + dependencies: + "@motionone/easing" "^10.13.1" + "@motionone/types" "^10.13.0" + "@motionone/utils" "^10.13.1" + tslib "^2.3.1" + +"@motionone/dom@10.12.0": + version "10.12.0" + resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.12.0.tgz#ae30827fd53219efca4e1150a5ff2165c28351ed" + integrity sha512-UdPTtLMAktHiqV0atOczNYyDd/d8Cf5fFsd1tua03PqTwwCe/6lwhLSQ8a7TbnQ5SN0gm44N1slBfj+ORIhrqw== + dependencies: + "@motionone/animation" "^10.12.0" + "@motionone/generators" "^10.12.0" + "@motionone/types" "^10.12.0" + "@motionone/utils" "^10.12.0" + hey-listen "^1.0.8" + tslib "^2.3.1" + +"@motionone/easing@^10.13.1": + version "10.13.1" + resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.13.1.tgz#7927b7fe96135989e37c2cda957e4101a4b85aa8" + integrity sha512-INEsInHHDHVgx0dp5qlXi1lMXBqYicgLMMSn3zfGzaIvcaEbI1Uz8BoyNV4BiclTupG7RYIh+T6BU83ZcEe74g== + dependencies: + "@motionone/utils" "^10.13.1" + tslib "^2.3.1" + +"@motionone/generators@^10.12.0": + version "10.13.1" + resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.13.1.tgz#d4989d887b864e0aefbbec63eed35ce298a73773" + integrity sha512-+HK5u2YcNJCckTTqfOLgSVcrWv2z1dVwrSZEMVJuAh0EnWEWGDJRvMBoPc0cFf/osbkA2Rq9bH2+vP0Ex/D8uw== + dependencies: + "@motionone/types" "^10.13.0" + "@motionone/utils" "^10.13.1" + tslib "^2.3.1" + +"@motionone/types@^10.12.0", "@motionone/types@^10.13.0": + version "10.13.0" + resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.13.0.tgz#b22c549931ebd88ed5528158b5d611dc9dbb3756" + integrity sha512-qegk4qg8U1N9ZwAJ187BG3TkZz1k9LP/pvNtCSlqdq/PMUDKlCFG4ZnjJ481P0IOH/vIw1OzIbKIuyg0A3rk9g== + +"@motionone/utils@^10.12.0", "@motionone/utils@^10.13.1": + version "10.13.1" + resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.13.1.tgz#14919dfcda36b54b184fff690bc0125d554f60cd" + integrity sha512-TjDPTIppaf3ofBXQv4ZzAketJgN0sclALXfZ6mfrkjJkOy83mLls9744F+6S+VKCpBmvbZcBY4PQfrfhAfeMtA== + dependencies: + "@motionone/types" "^10.13.0" + hey-listen "^1.0.8" + tslib "^2.3.1" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -12711,11 +12764,32 @@ framer-motion@^3.9.1: optionalDependencies: "@emotion/is-prop-valid" "^0.8.2" +framer-motion@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-6.5.1.tgz#802448a16a6eb764124bf36d8cbdfa6dd6b931a7" + integrity sha512-o1BGqqposwi7cgDrtg0dNONhkmPsUFDaLcKXigzuTFC5x58mE8iyTazxSudFzmT6MEyJKfjjU8ItoMe3W+3fiw== + dependencies: + "@motionone/dom" "10.12.0" + framesync "6.0.1" + hey-listen "^1.0.8" + popmotion "11.0.3" + style-value-types "5.0.0" + tslib "^2.1.0" + optionalDependencies: + "@emotion/is-prop-valid" "^0.8.2" + framesync@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/framesync/-/framesync-5.2.0.tgz#f14480654cd05a6af4c72c9890cad93556841643" integrity sha512-dcl92w5SHc0o6pRK3//VBVNvu6WkYkiXmHG6ZIXrVzmgh0aDYMDAaoA3p3LH71JIdN5qmhDcfONFA4Lmq22tNA== +framesync@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/framesync/-/framesync-6.0.1.tgz#5e32fc01f1c42b39c654c35b16440e07a25d6f20" + integrity sha512-fUY88kXvGiIItgNC7wcTOl0SNRCVXMKSWW2Yzfmn7EKNc+MpCzcz9DhdHcdjbrtN3c6R4H5dTY2jiCpPdysEjA== + dependencies: + tslib "^2.1.0" + fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -18697,6 +18771,16 @@ pnp-webpack-plugin@1.6.4, pnp-webpack-plugin@^1.5.0: dependencies: ts-pnp "^1.1.6" +popmotion@11.0.3: + version "11.0.3" + resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-11.0.3.tgz#565c5f6590bbcddab7a33a074bb2ba97e24b0cc9" + integrity sha512-Y55FLdj3UxkR7Vl3s7Qr4e9m0onSnP8W7d/xQLsoJM40vs6UKHFdygs6SWryasTZYqugMjm3BepCF4CWXDiHgA== + dependencies: + framesync "6.0.1" + hey-listen "^1.0.8" + style-value-types "5.0.0" + tslib "^2.1.0" + popmotion@9.3.1: version "9.3.1" resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-9.3.1.tgz#134319ed4b9b8e3ec506c99064f7b2f14bc05781" @@ -21457,6 +21541,14 @@ style-value-types@4.1.1: hey-listen "^1.0.8" tslib "^1.10.0" +style-value-types@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/style-value-types/-/style-value-types-5.0.0.tgz#76c35f0e579843d523187989da866729411fc8ad" + integrity sha512-08yq36Ikn4kx4YU6RD7jWEv27v4V+PUsOGa4n/as8Et3CuODMJQ00ENeAVXAeydX4Z2j1XHZF1K2sX4mGl18fA== + dependencies: + hey-listen "^1.0.8" + tslib "^2.1.0" + styled-jsx@3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.1.tgz#452051fe50df5e9c7c7f3dd20fa46c3060ac65b0" @@ -22022,6 +22114,11 @@ tslib@^2.0.1, tslib@^2.2.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +tslib@^2.1.0, tslib@^2.3.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + tsutils@^3.17.1: version "3.20.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.20.0.tgz#ea03ea45462e146b53d70ce0893de453ff24f698" From 3a50cd3fe0664ba2c407b96c4b53b93bd12f710a Mon Sep 17 00:00:00 2001 From: Fernando Rojo Date: Wed, 17 Aug 2022 14:31:50 -0400 Subject: [PATCH 7/7] fix docs --- docs/docs/examples/exit-before-enter.md | 2 +- docs/src/css/custom.css | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/docs/examples/exit-before-enter.md b/docs/docs/examples/exit-before-enter.md index 5976687..59e055c 100644 --- a/docs/docs/examples/exit-before-enter.md +++ b/docs/docs/examples/exit-before-enter.md @@ -11,4 +11,4 @@ Also, enable the `exitBeforeEnter` prop. See a video of this example [here](https://twitter.com/FernandoTheRojo/status/1351234878902333445). -
+
diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css index d56a06b..1f1ea04 100644 --- a/docs/src/css/custom.css +++ b/docs/src/css/custom.css @@ -59,3 +59,12 @@ .banner-show-on-hover:active { opacity: 1; } + +[data-snack-id] { + overflow:hidden; + background:#212121; + border:1px solid var(--color-border); + border-radius:4px; + height:505px; + width:100%; +}