@fountain-ui/core 3.0.0-alpha.21 → 3.0.0-alpha.22

package/src/TextField/TextField.tsx

@@ -23,6 +23,20 @@ const styles = StyleSheet.create({
         alignItems: 'flex-end',
         padding: 0,
     },
+    searchIconContainer: {
+        left: 12,
+        position: 'absolute',
+    },
+    loadingSinner: {
+        height: 19,
+        width: 19,
+    },
+    clearButton: {
+        height: 36,
+        position: 'absolute',
+        right: 2,
+        width: 32,
+    },
 });
 
 const TextField = React.forwardRef<TextInput, TextFieldProps>(function TextField(props, ref) {
@@ -113,15 +127,17 @@ const TextField = React.forwardRef<TextInput, TextFieldProps>(function TextField
 
             <Row style={containerStyle}>
                 {isSearch ? (
-                    isLoading ? (
-                        <LoadingSpinner/>
-                    ) : (
-                        <Search
-                            color={'base'}
-                            height={18}
-                            width={18}
-                        />
-                    )
+                    <View style={styles.searchIconContainer}>
+                        {isLoading ? (
+                            <LoadingSpinner style={styles.loadingSinner}/>
+                        ) : (
+                            <Search
+                                color={'base'}
+                                height={19}
+                                width={19}
+                            />
+                        )}
+                    </View>
                 ) : null}
 
                 <TextInput
@@ -143,11 +159,12 @@ const TextField = React.forwardRef<TextInput, TextFieldProps>(function TextField
                         color={'base'}
                         children={
                             <Clear
-                                height={13.75}
-                                width={15}
+                                height={17.31}
+                                width={15.9}
                             />
                         }
                         onPress={handleClear}
+                        style={styles.clearButton}
                     />
                 ) : null}
 

package/src/TextField/useVariantStyleMap.ts

@@ -47,6 +47,7 @@ export default function useVariantStyleMap(variant: TextFieldVariant, status: Te
                     containerStyle: {
                         borderBottomColor: status === 'default' && isFocused ? theme.palette.border.strong : borderColor,
                         borderBottomWidth: 1,
+                        minHeight: 60,
                     },
                     inputStyle: {
                         paddingLeft: 0,
@@ -77,14 +78,11 @@ export default function useVariantStyleMap(variant: TextFieldVariant, status: Te
                         borderColor: theme.palette.border.base,
                         borderRadius: theme.shape.radius.md,
                         borderWidth: 0.5,
-                        paddingLeft: theme.spacing(3),
-                        paddingRight: theme.spacing(0.5),
+                        paddingBottom: 12,
+                        paddingHorizontal: 39,
+                        paddingTop: 11,
                     },
                     inputStyle: {
-                        paddingBottom: theme.spacing(2.5),
-                        paddingLeft: theme.spacing(2),
-                        paddingRight: theme.spacing(1),
-                        paddingTop: theme.spacing(2.25),
                         ...createFontStyle(theme, {
                             selector: (_) => typographyOf({
                                 fontSize: 16,

package/src/hooks/useCollapsibleAppBar.ts

@@ -1,14 +1,5 @@
 import { useCallback, useRef, useState } from 'react';
-import {
-    Falsy,
-    Keyboard,
-    Platform,
-    RegisteredStyle,
-    ScrollViewProps,
-    StyleSheet,
-    ViewProps,
-    ViewStyle,
-} from 'react-native';
+import { Falsy, Keyboard, Platform, RegisteredStyle, ScrollViewProps, ViewProps, ViewStyle } from 'react-native';
 import type { WithTimingConfig } from 'react-native-reanimated';
 import {
     runOnJS,
@@ -19,7 +10,6 @@ import {
     withTiming,
 } from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import { useTheme } from '@fountain-ui/styles';
 import { useHeight } from '../internal/hooks';
 import useAppbarStyles from './useAppbarStyles';
 
@@ -40,7 +30,6 @@ export interface ContentInsets {
 
 export interface Options {
     keyboardDismissMode?: 'none' | 'on-drag';
-    dividerExposureMode?: 'always' | 'overlapped';
     supportsReverseScroll?: boolean;
 }
 
@@ -56,7 +45,6 @@ export interface CollapsibleAppBar {
 
 const defaultOptions: Required<Options> = {
     keyboardDismissMode: 'none',
-    dividerExposureMode: 'overlapped',
     supportsReverseScroll: true,
 };
 
@@ -67,7 +55,7 @@ const SUPPORTS_DRAG_DETECTION = Platform.OS !== 'web';
 const dismissKeyboard = () => Keyboard.dismiss();
 
 export default function useCollapsibleAppBar(userOptions: Options = defaultOptions): CollapsibleAppBar {
-    const { keyboardDismissMode, dividerExposureMode, supportsReverseScroll }: Required<Options> = {
+    const { keyboardDismissMode, supportsReverseScroll }: Required<Options> = {
         ...defaultOptions,
         ...userOptions,
     };
@@ -88,20 +76,13 @@ export default function useCollapsibleAppBar(userOptions: Options = defaultOptio
 
     const [isScrolled, setIsScrolled] = useState<boolean>(false);
 
-    const theme = useTheme();
-
     const animatedStyle = useAnimatedStyle(() => {
         const transform = [{ translateY: translateY.value }];
 
         return {
             transform,
-            borderColor: dividerExposureMode === 'always' || overlapped.value ? theme.palette.divider : TRANSPARENT,
-            borderBottomWidth: StyleSheet.hairlineWidth,
         };
-    }, [
-        theme,
-        dividerExposureMode,
-    ]);
+    }, []);
 
     const indexRef = useRef<number>(0);
     const offsetsRef = useRef<Array<number>>([]);

package/src/hooks/useFadeInAppBar.ts

@@ -76,7 +76,7 @@ export default function useFadeInAppBar(userOptions: Options = defaultOptions):
     const lastOffsetY = useSharedValue<number>(0);
     const normalized = useSharedValue<number>(0);
 
-    const originalBackgroundColor = theme.palette.background.default;
+    const originalBackgroundColor = theme.palette.background.base;
     const rgbValues = useMemo(() => rgb(originalBackgroundColor), [originalBackgroundColor]);
 
     const animatedAppBarStyle = useAnimatedStyle(() => {

package/src/internal/icons/Clear.tsx

@@ -7,14 +7,14 @@ export default createSvgIcon(
         <Path
             fillRule="evenodd"
             clipRule="evenodd"
-            d="M4.68306 5.68306C4.92714 5.43898 5.32286 5.43898 5.56694 5.68306L7 7.11612L8.43306 5.68306C8.67714 5.43898 9.07286 5.43898 9.31694 5.68306C9.56102 5.92714 9.56102 6.32286 9.31694 6.56694L7.88388 8L9.31694 9.43306C9.56102 9.67714 9.56102 10.0729 9.31694 10.3169C9.07286 10.561 8.67714 10.561 8.43306 10.3169L7 8.88388L5.56694 10.3169C5.32286 10.561 4.92714 10.561 4.68306 10.3169C4.43898 10.0729 4.43898 9.67714 4.68306 9.43306L6.11612 8L4.68306 6.56694C4.43898 6.32286 4.43898 5.92714 4.68306 5.68306Z"
+            d="M5.32076 6.32681C5.603 6.04521 6.06061 6.04521 6.34285 6.32681L7.99999 7.98019L9.65712 6.32681C9.93937 6.04521 10.397 6.04521 10.6792 6.32681C10.9615 6.60842 10.9615 7.06498 10.6792 7.34659L9.02208 8.99997L10.6792 10.6533C10.9615 10.9349 10.9615 11.3915 10.6792 11.6731C10.397 11.9547 9.93937 11.9547 9.65712 11.6731L7.99999 10.0197L6.34285 11.6731C6.06061 11.9547 5.603 11.9547 5.32076 11.6731C5.03852 11.3915 5.03852 10.9349 5.32076 10.6533L6.9779 8.99997L5.32076 7.34659C5.03852 7.06498 5.03852 6.60842 5.32076 6.32681Z"
         />
         <Path
             fillRule="evenodd"
             clipRule="evenodd"
-            d="M7 2.375C3.8934 2.375 1.375 4.8934 1.375 8C1.375 11.1066 3.8934 13.625 7 13.625C10.1066 13.625 12.625 11.1066 12.625 8C12.625 4.8934 10.1066 2.375 7 2.375ZM0.125 8C0.125 4.20304 3.20304 1.125 7 1.125C10.797 1.125 13.875 4.20304 13.875 8C13.875 11.797 10.797 14.875 7 14.875C3.20304 14.875 0.125 11.797 0.125 8Z"
+            d="M7.99999 2.51017C4.40763 2.51017 1.49544 5.41575 1.49544 8.99997C1.49544 12.5842 4.40763 15.4898 7.99999 15.4898C11.5923 15.4898 14.5045 12.5842 14.5045 8.99997C14.5045 5.41575 11.5923 2.51017 7.99999 2.51017ZM0.0499878 8.99997C0.0499878 4.61926 3.60932 1.06799 7.99999 1.06799C12.3907 1.06799 15.95 4.61926 15.95 8.99997C15.95 13.3807 12.3907 16.9319 7.99999 16.9319C3.60932 16.9319 0.0499878 13.3807 0.0499878 8.99997Z"
         />
     </React.Fragment>,
     'Clear',
-    '0 0 14 16',
+    '0 0 16 18',
 );

package/src/internal/icons/Search.tsx

@@ -7,9 +7,9 @@ export default createSvgIcon(
         <Path
             fillRule="evenodd"
             clipRule="evenodd"
-            d="M8.25 3.5C5.3505 3.5 3 5.8505 3 8.75C3 11.6495 5.3505 14 8.25 14C9.66548 14 10.9501 13.4398 11.8943 12.5291C11.9136 12.5042 11.9346 12.4803 11.9575 12.4575C11.9803 12.4346 12.0042 12.4136 12.0291 12.3943C12.9398 11.4501 13.5 10.1655 13.5 8.75C13.5 5.8505 11.1495 3.5 8.25 3.5ZM13.5239 12.9633C14.4476 11.8085 15 10.3438 15 8.75C15 5.02208 11.9779 2 8.25 2C4.52208 2 1.5 5.02208 1.5 8.75C1.5 12.4779 4.52208 15.5 8.25 15.5C9.84376 15.5 11.3085 14.9476 12.4633 14.0239L15.22 16.7806C15.5129 17.0735 15.9877 17.0735 16.2806 16.7806C16.5735 16.4877 16.5735 16.0129 16.2806 15.72L13.5239 12.9633Z"
+            d="M8.70834 3.16665C5.64776 3.16665 3.16667 5.64774 3.16667 8.70831C3.16667 11.7689 5.64776 14.25 8.70834 14.25C10.2024 14.25 11.5585 13.6587 12.5551 12.6973C12.5755 12.6711 12.5977 12.6458 12.6218 12.6217C12.6459 12.5977 12.6711 12.5754 12.6974 12.5551C13.6587 11.5584 14.25 10.2024 14.25 8.70831C14.25 5.64774 11.7689 3.16665 8.70834 3.16665ZM14.2753 13.1556C15.2503 11.9367 15.8333 10.3906 15.8333 8.70831C15.8333 4.77328 12.6434 1.58331 8.70834 1.58331C4.77331 1.58331 1.58334 4.77328 1.58334 8.70831C1.58334 12.6433 4.77331 15.8333 8.70834 15.8333C10.3906 15.8333 11.9368 15.2503 13.1557 14.2752L16.0655 17.1851C16.3747 17.4942 16.8759 17.4942 17.1851 17.1851C17.4943 16.8759 17.4943 16.3747 17.1851 16.0655L14.2753 13.1556Z"
         />
     </React.Fragment>,
     'Search',
-    '0 0 18 19',
+    '0 0 19 19',
 );