@fountain-ui/lab 2.0.0-beta.5 → 2.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fountain-ui/lab",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.8",
   "private": false,
   "author": "Fountain-UI Team",
   "description": "Incubator for Fountain-UI React components.",
@@ -15,20 +15,21 @@
     "prepare": "bob build"
   },
   "dependencies": {
-    "@emotion/react": "^11.4.1",
-    "@emotion/styled": "^11.0.0",
-    "@fountain-ui/icons": "^2.0.0-beta.5",
+    "@emotion/react": "^11.10.0",
+    "@emotion/styled": "^11.10.0",
+    "@fountain-ui/icons": "^2.0.0-beta.6",
     "@fountain-ui/utils": "^2.0.0-beta.3",
     "react-native-calendars": "1.1267.0"
   },
   "peerDependencies": {
     "@fountain-ui/core": "^2.0.0-beta.3",
     "@gorhom/bottom-sheet": "^4.1.3",
-    "@react-native-community/viewpager": "> 4.2.x",
     "date-fns": "^2.0.0",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react-native": "^0.63.0",
+    "react-native-gesture-handler": "^2.0.0",
+    "react-native-pager-view": "^5.0.0",
     "react-native-snap-carousel": "^3.9.0",
     "react-slick": "^0.25.0"
   },
@@ -36,9 +37,6 @@
     "@gorhom/bottom-sheet": {
       "optional": true
     },
-    "@react-native-community/viewpager": {
-      "optional": true
-    },
     "react-dom": {
       "optional": true
     },
@@ -48,16 +46,19 @@
     "react-slick": {
       "optional": true
     },
+    "react-native-pager-view": {
+      "optional": true
+    },
     "react-native-snap-carousel": {
       "optional": true
     }
   },
   "devDependencies": {
     "@gorhom/bottom-sheet": "4.1.3",
-    "@react-native-community/viewpager": "^4.2.2",
     "@types/react-native-snap-carousel": "^3.8.4",
     "@types/react-slick": "^0.23.5",
     "date-fns": "^2.23.0",
+    "react-native-pager-view": "^5.4.25",
     "react-native-safe-area-context": "^3.3.2",
     "react-native-snap-carousel": "^3.9.1",
     "react-slick": "^0.28.1"
@@ -84,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5ff7454430142fbdfc2f57a71ad1de83768dd0ec"
+  "gitHead": "3de48896d62f1ba687558ea11b5f527cb91b5da6"
 }

package/src/AnimatedY/AnimatedY.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import Animated, { Easing } from 'react-native-reanimated';
+import Animated, { Easing, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
 import type AnimatedYProps from './AnimatedYProps';
 
 export default function AnimatedY(props: AnimatedYProps) {
@@ -9,14 +9,14 @@ export default function AnimatedY(props: AnimatedYProps) {
         style,
     } = props;
 
-    const animatedY = Animated.useSharedValue(translateY);
-    const animatedStyle = Animated.useAnimatedStyle(() => ({
+    const animatedY = useSharedValue(translateY);
+    const animatedStyle = useAnimatedStyle(() => ({
         transform: [{ translateY: animatedY.value }],
     }));
 
     React.useEffect(() => {
         if (translateY >= 0) {
-            animatedY.value = Animated.withTiming(translateY, {
+            animatedY.value = withTiming(translateY, {
                 duration: 150,
                 easing: Easing.out(Easing.exp),
             });

package/src/FlipCard/FlipCard.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { StyleSheet, View } from 'react-native';
-import Animated from 'react-native-reanimated';
+import Animated, { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
 import type FlipCardProps from './FlipCardProps';
 
 const styles = StyleSheet.create({
@@ -27,9 +27,9 @@ export default function FlipCard(props: FlipCardProps) {
         style,
     } = props;
 
-    const sharedAngle = Animated.useSharedValue(0);
+    const sharedAngle = useSharedValue(0);
 
-    const animatedFrontCardStyle = Animated.useAnimatedStyle(() => {
+    const animatedFrontCardStyle = useAnimatedStyle(() => {
         return {
             zIndex: sharedAngle.value < Z_INDEX_CHANGE_ANGLE ? 2 : 1,
             transform: [
@@ -39,7 +39,7 @@ export default function FlipCard(props: FlipCardProps) {
         };
     });
 
-    const animatedBackCardStyle = Animated.useAnimatedStyle(() => {
+    const animatedBackCardStyle = useAnimatedStyle(() => {
         return {
             zIndex: sharedAngle.value <= Z_INDEX_CHANGE_ANGLE ? 1 : 2,
             transform: [
@@ -51,7 +51,7 @@ export default function FlipCard(props: FlipCardProps) {
 
     useEffect(() => {
         sharedAngle.value = 0;
-        sharedAngle.value = Animated.withTiming(180, { duration: 500 });
+        sharedAngle.value = withTiming(180, { duration: 500 });
     }, [reanimationKey]);
 
     return (
@@ -65,4 +65,4 @@ export default function FlipCard(props: FlipCardProps) {
             </Animated.View>
         </View>
     );
-};
+};

package/src/ViewPager/ViewPagerNative.tsx

@@ -1,5 +1,6 @@
-import React from 'react';
-import RNViewPager, { ViewPagerOnPageSelectedEvent } from '@react-native-community/viewpager';
+import React, { useCallback, useEffect, useRef } from 'react';
+import type { PagerViewOnPageSelectedEvent } from 'react-native-pager-view';
+import RNPagerView from 'react-native-pager-view';
 import type ViewPagerProps from './ViewPagerProps';
 import {
     defaultEnableNeighborPageRerender,
@@ -24,8 +25,8 @@ export default function ViewPager(props: ViewPagerProps) {
         style,
     } = props;
 
-    const indexRef = React.useRef<number>(index);
-    const pagerRef = React.useRef<RNViewPager | null>(null);
+    const indexRef = useRef<number>(index);
+    const pagerRef = useRef<RNPagerView | null>(null);
 
     const renderer = usePageRenderer({
         enableVisibleHint,
@@ -36,7 +37,7 @@ export default function ViewPager(props: ViewPagerProps) {
         enableNeighborPageRerender,
     });
 
-    const handlePageSelected = React.useCallback((e: ViewPagerOnPageSelectedEvent) => {
+    const handlePageSelected = useCallback((e: PagerViewOnPageSelectedEvent) => {
         indexRef.current = e.nativeEvent.position;
 
         if (onChange) {
@@ -44,14 +45,20 @@ export default function ViewPager(props: ViewPagerProps) {
         }
     }, [onChange]);
 
-    React.useEffect(() => {
-        if (index !== indexRef.current) {
-            pagerRef.current?.setPage(index);
-        }
+    useEffect(() => {
+        const handleNumber = index !== indexRef.current
+            ? requestAnimationFrame(() => pagerRef.current?.setPage(index))
+            : undefined;
+
+        return () => {
+            if (handleNumber) {
+                cancelAnimationFrame(handleNumber);
+            }
+        };
     }, [index]);
 
     return (
-        <RNViewPager
+        <RNPagerView
             initialPage={index}
             keyboardDismissMode={keyboardDismissMode}
             onPageSelected={handlePageSelected}
@@ -61,6 +68,6 @@ export default function ViewPager(props: ViewPagerProps) {
             style={style}
         >
             {renderer(children)}
-        </RNViewPager>
+        </RNPagerView>
     );
 };

package/src/hooks/useHeight.ts

@@ -1,13 +1,13 @@
 import React from 'react';
 import { ViewProps } from 'react-native';
-import Animated from 'react-native-reanimated';
+import { useWorkletCallback } from 'react-native-reanimated';
 
 type OnLayoutCallback = ViewProps['onLayout'];
 
 export default function useHeight(initialHeight = 0): [number, OnLayoutCallback] {
     const [height, setHeight] = React.useState<number>(initialHeight);
 
-    const onLayout = Animated.useWorkletCallback((e) => {
+    const onLayout = useWorkletCallback((e) => {
         setHeight(e.nativeEvent.layout.height);
     }, []);
 

package/src/hooks/useUnstableCollapsibleAppBar.ts

@@ -1,6 +1,13 @@
 import React, { useRef } from 'react';
 import { Falsy, Platform, RegisteredStyle, ScrollViewProps, ViewProps, ViewStyle } from 'react-native';
-import Animated from 'react-native-reanimated';
+import type { SharedValue } from 'react-native-reanimated';
+import {
+    useAnimatedScrollHandler,
+    useAnimatedStyle,
+    useDerivedValue,
+    useSharedValue,
+    withTiming,
+} from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import useAppbarStyles from './useAppbarStyles';
 import useElevationStyle from './useElevationStyle';
@@ -22,13 +29,12 @@ export interface ContentInsets {
 }
 
 export interface Options {
-    translucent?: boolean;
     shouldTranslateYReset?: boolean;
 }
 
 export interface CollapsibleAppBar {
     appBarStyle: ViewStyleProp;
-    vectorY: Animated.SharedValue<number>;
+    vectorY: SharedValue<number>;
     onAppBarLayout: OnLayoutCallback;
     onCollapsibleToolbarLayout: OnLayoutCallback;
     onScroll: OnScroll;
@@ -37,7 +43,6 @@ export interface CollapsibleAppBar {
 }
 
 const defaultOptions: Required<Options> = {
-    translucent: false,
     shouldTranslateYReset: false,
 };
 
@@ -57,10 +62,7 @@ function useLargerValueOfLastTwoValues(value: number) {
 
 
 export default function useUnstableCollapsibleAppBar(userOptions: Options = defaultOptions): CollapsibleAppBar {
-    const {
-        translucent,
-        shouldTranslateYReset,
-    }: Required<Options> = {
+    const { shouldTranslateYReset }: Required<Options> = {
         ...defaultOptions,
         ...userOptions,
     };
@@ -73,28 +75,39 @@ export default function useUnstableCollapsibleAppBar(userOptions: Options = defa
     const appBarMaxHeight = useLargerValueOfLastTwoValues(appBarHeight);
     const [collapsibleToolbarHeight, onCollapsibleToolbarLayout] = useHeight();
 
-    const maxTranslateY = Animated.useDerivedValue(() => -collapsibleToolbarHeight);
+    const maxTranslateY = useDerivedValue(() => -collapsibleToolbarHeight);
 
-    const translateY = Animated.useSharedValue<number>(0);
-    const lastTranslateY = Animated.useSharedValue<number>(0);
-    const lastOffsetY = Animated.useSharedValue<number>(0);
-    const prevOffsetY = Animated.useSharedValue<number>(0);
-    const overlapped = Animated.useSharedValue<boolean>(false);
-    const vectorY = Animated.useSharedValue<number>(0);
+    const translateY = useSharedValue<number>(0);
+    const lastTranslateY = useSharedValue<number>(0);
+    const lastOffsetY = useSharedValue<number>(0);
+    const prevOffsetY = useSharedValue<number>(0);
+    const overlapped = useSharedValue<boolean>(false);
+    const vectorY = useSharedValue<number>(0);
 
     const elevationStyle = useElevationStyle(4);
-    const animatedStyle = Animated.useAnimatedStyle(() => {
-        return Platform.OS === 'web' ? ({
-            transform: [{ translateY: translateY.value }],
-            boxShadow: overlapped.value ? elevationStyle?.boxShadow : 0,
-        }) : ({
-            transform: [{ translateY: translateY.value }],
-            elevation: overlapped.value ? elevationStyle?.elevation : 0,
-            shadowColor: elevationStyle?.shadowColor,
-            shadowOffset: elevationStyle?.shadowOffset,
-            shadowRadius: elevationStyle?.shadowRadius,
-            shadowOpacity: overlapped.value ? elevationStyle?.shadowOpacity : 0,
-        });
+    const animatedStyle = useAnimatedStyle(() => {
+        if (Platform.OS === 'web') {
+            return {
+                transform: [{ translateY: translateY.value }],
+                boxShadow: overlapped.value ? elevationStyle?.boxShadow : 0,
+            };
+        }
+        if (Platform.OS === 'android') {
+            return {
+                transform: [{ translateY: translateY.value }],
+                elevation: overlapped.value ? elevationStyle?.elevation : 0,
+            };
+        }
+        if (Platform.OS === 'ios') {
+            return {
+                transform: [{ translateY: translateY.value }],
+                shadowColor: elevationStyle?.shadowColor,
+                shadowOffset: elevationStyle?.shadowOffset,
+                shadowRadius: elevationStyle?.shadowRadius,
+                shadowOpacity: overlapped.value ? elevationStyle?.shadowOpacity : 0,
+            };
+        }
+        return {};
     });
 
     const indexRef = React.useRef<number>(0);
@@ -104,7 +117,7 @@ export default function useUnstableCollapsibleAppBar(userOptions: Options = defa
         const prevIndex = indexRef.current;
         if (prevIndex === nextIndex) {
             if (shouldTranslateYReset) {
-                translateY.value = Animated.withTiming(0, {
+                translateY.value = withTiming(0, {
                     duration: ANIMATION_DURATION_MILLIS,
                 });
 
@@ -128,7 +141,7 @@ export default function useUnstableCollapsibleAppBar(userOptions: Options = defa
 
         // If next ScrollView's offset is too short, expand app bar.
         if (translateY.value < 0 && savedOffsetY < appBarHeight) {
-            translateY.value = Animated.withTiming(0, {
+            translateY.value = withTiming(0, {
                 duration: ANIMATION_DURATION_MILLIS,
             });
 
@@ -136,7 +149,7 @@ export default function useUnstableCollapsibleAppBar(userOptions: Options = defa
         }
     };
 
-    const scrollHandler = Animated.useAnimatedScrollHandler({
+    const scrollHandler = useAnimatedScrollHandler({
         onBeginDrag: () => {
             lastTranslateY.value = translateY.value;
         },
@@ -162,13 +175,13 @@ export default function useUnstableCollapsibleAppBar(userOptions: Options = defa
             } else {
                 if (offsetY > -maxTy) {
                     if (ty === 0) {
-                        translateY.value = Animated.withTiming(Math.min(Math.max(-offsetY, maxTy), 0), {
+                        translateY.value = withTiming(Math.min(Math.max(-offsetY, maxTy), 0), {
                             duration: ANIMATION_DURATION_MILLIS,
                         });
                     }
                 } else {
                     if (ty === maxTy) {
-                        translateY.value = Animated.withTiming(0, {
+                        translateY.value = withTiming(0, {
                             duration: ANIMATION_DURATION_MILLIS,
                         });
                     }
@@ -201,7 +214,7 @@ export default function useUnstableCollapsibleAppBar(userOptions: Options = defa
 
             overlapped.value = offsetY + nextTranslateY > 0;
 
-            translateY.value = Animated.withTiming(nextTranslateY, {
+            translateY.value = withTiming(nextTranslateY, {
                 duration: ANIMATION_DURATION_MILLIS,
             });
         },
@@ -211,7 +224,7 @@ export default function useUnstableCollapsibleAppBar(userOptions: Options = defa
 
     const appBarStyle = [
         animatedStyle,
-        translucent ? { paddingTop: safeAreaInsets.top } : undefined,
+        { paddingTop: safeAreaInsets.top },
         hasCollapsible ? styles.floating : undefined,
     ];
 

package/src/hooks/useUnstableToggleDisplayStyle.ts

@@ -1,13 +1,14 @@
-import Animated from 'react-native-reanimated';
+import type { SharedValue } from 'react-native-reanimated';
+import { useAnimatedReaction, useAnimatedStyle, useSharedValue } from 'react-native-reanimated';
 
 export default function useAnimatedDisplayStyle(
-    vectorY: Animated.SharedValue<number>,
+    vectorY: SharedValue<number>,
     threshold: number = 200,
     defaultDisplay: 'flex' | 'none' = 'flex',
 ) {
-    const display = Animated.useSharedValue(defaultDisplay);
+    const display = useSharedValue(defaultDisplay);
 
-    Animated.useAnimatedReaction(
+    useAnimatedReaction(
         () => vectorY.value,
         (vy) => {
             if (vy >= threshold) {
@@ -18,7 +19,7 @@ export default function useAnimatedDisplayStyle(
         },
     );
 
-    return Animated.useAnimatedStyle(() => ({
+    return useAnimatedStyle(() => ({
         display: display.value,
     }));
 };

package/build/commonjs/hooks/useWidth.js

@@ -1,29 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = useWidth;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _reactNative = require("react-native");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function useWidth() {
-  const window = (0, _reactNative.useWindowDimensions)();
-
-  const [width, setWidth] = _react.default.useState(window.width);
-
-  const onLayout = _react.default.useCallback(e => {
-    const newWidth = e.nativeEvent.layout.width;
-
-    if (newWidth > 0 && Math.round(newWidth) !== Math.round(width)) {
-      setWidth(newWidth);
-    }
-  }, []);
-
-  return [width, onLayout];
-}
-//# sourceMappingURL=useWidth.js.map

package/build/commonjs/hooks/useWidth.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["useWidth.ts"],"names":["useWidth","window","width","setWidth","React","useState","onLayout","useCallback","e","newWidth","nativeEvent","layout","Math","round"],"mappings":";;;;;;;AAAA;;AACA;;;;AAEe,SAASA,QAAT,GAAqD;AAChE,QAAMC,MAAM,GAAG,uCAAf;;AACA,QAAM,CAACC,KAAD,EAAQC,QAAR,IAAoBC,eAAMC,QAAN,CAAeJ,MAAM,CAACC,KAAtB,CAA1B;;AAEA,QAAMI,QAAQ,GAAGF,eAAMG,WAAN,CAAmBC,CAAD,IAA0B;AACzD,UAAMC,QAAQ,GAAGD,CAAC,CAACE,WAAF,CAAcC,MAAd,CAAqBT,KAAtC;;AAEA,QAAIO,QAAQ,GAAG,CAAX,IAAgBG,IAAI,CAACC,KAAL,CAAWJ,QAAX,MAAyBG,IAAI,CAACC,KAAL,CAAWX,KAAX,CAA7C,EAAgE;AAC5DC,MAAAA,QAAQ,CAACM,QAAD,CAAR;AACH;AACJ,GANgB,EAMd,EANc,CAAjB;;AAQA,SAAO,CAACP,KAAD,EAAQI,QAAR,CAAP;AACH","sourcesContent":["import React from 'react';\nimport { LayoutChangeEvent, useWindowDimensions, ViewProps } from 'react-native';\n\nexport default function useWidth(): [number, ViewProps['onLayout']] {\n    const window = useWindowDimensions();\n    const [width, setWidth] = React.useState(window.width);\n\n    const onLayout = React.useCallback((e: LayoutChangeEvent) => {\n        const newWidth = e.nativeEvent.layout.width;\n\n        if (newWidth > 0 && Math.round(newWidth) !== Math.round(width)) {\n            setWidth(newWidth);\n        }\n    }, []);\n\n    return [width, onLayout];\n}"]}

package/build/module/hooks/useWidth.js

@@ -1,15 +0,0 @@
-import React from 'react';
-import { useWindowDimensions } from 'react-native';
-export default function useWidth() {
-  const window = useWindowDimensions();
-  const [width, setWidth] = React.useState(window.width);
-  const onLayout = React.useCallback(e => {
-    const newWidth = e.nativeEvent.layout.width;
-
-    if (newWidth > 0 && Math.round(newWidth) !== Math.round(width)) {
-      setWidth(newWidth);
-    }
-  }, []);
-  return [width, onLayout];
-}
-//# sourceMappingURL=useWidth.js.map

package/build/module/hooks/useWidth.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["useWidth.ts"],"names":["React","useWindowDimensions","useWidth","window","width","setWidth","useState","onLayout","useCallback","e","newWidth","nativeEvent","layout","Math","round"],"mappings":"AAAA,OAAOA,KAAP,MAAkB,OAAlB;AACA,SAA4BC,mBAA5B,QAAkE,cAAlE;AAEA,eAAe,SAASC,QAAT,GAAqD;AAChE,QAAMC,MAAM,GAAGF,mBAAmB,EAAlC;AACA,QAAM,CAACG,KAAD,EAAQC,QAAR,IAAoBL,KAAK,CAACM,QAAN,CAAeH,MAAM,CAACC,KAAtB,CAA1B;AAEA,QAAMG,QAAQ,GAAGP,KAAK,CAACQ,WAAN,CAAmBC,CAAD,IAA0B;AACzD,UAAMC,QAAQ,GAAGD,CAAC,CAACE,WAAF,CAAcC,MAAd,CAAqBR,KAAtC;;AAEA,QAAIM,QAAQ,GAAG,CAAX,IAAgBG,IAAI,CAACC,KAAL,CAAWJ,QAAX,MAAyBG,IAAI,CAACC,KAAL,CAAWV,KAAX,CAA7C,EAAgE;AAC5DC,MAAAA,QAAQ,CAACK,QAAD,CAAR;AACH;AACJ,GANgB,EAMd,EANc,CAAjB;AAQA,SAAO,CAACN,KAAD,EAAQG,QAAR,CAAP;AACH","sourcesContent":["import React from 'react';\nimport { LayoutChangeEvent, useWindowDimensions, ViewProps } from 'react-native';\n\nexport default function useWidth(): [number, ViewProps['onLayout']] {\n    const window = useWindowDimensions();\n    const [width, setWidth] = React.useState(window.width);\n\n    const onLayout = React.useCallback((e: LayoutChangeEvent) => {\n        const newWidth = e.nativeEvent.layout.width;\n\n        if (newWidth > 0 && Math.round(newWidth) !== Math.round(width)) {\n            setWidth(newWidth);\n        }\n    }, []);\n\n    return [width, onLayout];\n}"]}

package/build/typescript/hooks/useWidth.d.ts

@@ -1,2 +0,0 @@
-import { ViewProps } from 'react-native';
-export default function useWidth(): [number, ViewProps['onLayout']];

package/src/hooks/useWidth.ts

@@ -1,17 +0,0 @@
-import React from 'react';
-import { LayoutChangeEvent, useWindowDimensions, ViewProps } from 'react-native';
-
-export default function useWidth(): [number, ViewProps['onLayout']] {
-    const window = useWindowDimensions();
-    const [width, setWidth] = React.useState(window.width);
-
-    const onLayout = React.useCallback((e: LayoutChangeEvent) => {
-        const newWidth = e.nativeEvent.layout.width;
-
-        if (newWidth > 0 && Math.round(newWidth) !== Math.round(width)) {
-            setWidth(newWidth);
-        }
-    }, []);
-
-    return [width, onLayout];
-}