Merge pull request #5088 from GeekyAnts/release/3.4.7-rc.0

release 3.4.7-rc.0
GeekyAnts · Jun 20, 2022 · db6cf39 · db6cf39
2 parents 36bc3b6 + 7e94371
commit db6cf39
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.6",
+  "version": "3.4.7-rc.0",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",
@@ -189,12 +189,12 @@
     "@react-native-aria/tabs": "^0.2.7",
     "@react-native-aria/utils": "^0.2.8",
     "@react-stately/checkbox": "3.0.3",
-    "@react-stately/collections": "^3.3.0",
-    "@react-stately/combobox": "^3.0.0-alpha.1",
-    "@react-stately/radio": "^3.2.1",
-    "@react-stately/slider": "^3.0.1",
-    "@react-stately/tabs": "^3.0.0-alpha.1",
-    "@react-stately/toggle": "^3.2.1",
+    "@react-stately/collections": "3.3.0",
+    "@react-stately/combobox": "3.0.0-alpha.1",
+    "@react-stately/radio": "3.2.1",
+    "@react-stately/slider": "3.0.1",
+    "@react-stately/tabs": "3.0.0-alpha.1",
+    "@react-stately/toggle": "3.2.1",
     "@types/lodash.has": "^4.5.6",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",

diff --git a/src/components/composites/Actionsheet/ActionsheetContent.tsx b/src/components/composites/Actionsheet/ActionsheetContent.tsx
@@ -51,12 +51,12 @@ const Content = memo(
               }).start(handleClose);
 
               setTimeout(() => {
-                Animated.spring(pan, {
+                Animated.timing(pan, {
                   toValue: { x: 0, y: 0 },
-                  overshootClamping: true,
+                  duration: 150,
                   useNativeDriver: true,
                 }).start();
-              });
+              }, 300);
             } else {
               Animated.spring(pan, {
                 toValue: { x: 0, y: 0 },

diff --git a/src/components/composites/Fab/Fab.tsx b/src/components/composites/Fab/Fab.tsx
@@ -4,9 +4,23 @@ import type { IFabProps } from './types';
 import { usePropsResolution } from '../../../hooks/useThemeProps';
 import { OverlayContainer } from '@react-native-aria/overlays';
 import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
+import { extractInObject } from '../../../theme/tools/utils';
+
+const Fab = ({ ...props }: IFabProps, ref: any) => {
+  /** Extracting Button Specific Props */
+  const [buttonProps, remainingProps] = extractInObject(props, [
+    'variant',
+    '_pressed',
+    '_hover',
+    '_text',
+    '_focus',
+    '_stack',
+    '_loading',
+    '_disabled',
+    '_spinner',
+  ]);
+  const themeProps = usePropsResolution('FAB', remainingProps);
 
-const Fab = ({ variant, ...props }: IFabProps, ref: any) => {
-  const themeProps = usePropsResolution('FAB', props);
   const {
     label,
     icon,
@@ -18,7 +32,7 @@ const Fab = ({ variant, ...props }: IFabProps, ref: any) => {
 
   const fabComponent = (
     <Button
-      variant={variant}
+      {...buttonProps}
       {...placementProps[placement]}
       ref={ref}
       startIcon={icon}

diff --git a/src/factory/component.tsx b/src/factory/component.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { usePropsWithComponentTheme } from '../hooks/useThemeProps/usePropsWithComponentTheme';
 import type { ComponentTheme } from '../theme';
 import type { FactoryComponentProps } from './types';
@@ -10,7 +10,7 @@ export default function Factory<P>(
 ) {
   return React.forwardRef(
     ({ children, ...props }: P & FactoryComponentProps, ref: any) => {
-      const StyledComponent = makeStyledComponent(Component);
+      const StyledComponent = useMemo(() => makeStyledComponent(Component), []);
       const calculatedProps = usePropsWithComponentTheme(
         componentTheme ?? {},
         props

diff --git a/src/theme/components/select.ts b/src/theme/components/select.ts
@@ -1,14 +1,16 @@
 export const Select = {
   baseStyle: () => {
     return {
+      selection: {
+        start: 0,
+      },
       _light: {
         customDropdownIconProps: { color: 'muted.500', mr: '3' },
         _hover: {
           borderColor: 'primary.600',
         },
         _focus: {
           borderColor: 'primary.600',
-          // bg: transparentize('primary.600', 0.1)(theme),
         },
         _disabled: {
           bg: 'muted.100',
@@ -26,7 +28,6 @@ export const Select = {
         },
         _focus: {
           borderColor: 'primary.500',
-          // bg: transparentize('primary.500', 0.1)(theme),
         },
         _disabled: {
           bg: 'muted.800',

diff --git a/src/theme/styled-system.ts b/src/theme/styled-system.ts
@@ -531,6 +531,10 @@ export const typography = {
   fontFamily: {
     property: 'fontFamily',
     scale: 'fonts',
+    transformer: (val: any, scale: any) => {
+      const value = get(scale, val);
+      return value ? value.toString() : undefined;
+    },
   },
   fontSize: {
     property: 'fontSize',

diff --git a/src/utils/useKeyboardBottomInset.ts b/src/utils/useKeyboardBottomInset.ts
@@ -9,7 +9,7 @@ export const useKeyboardBottomInset = () => {
     function onKeyboardChange(e: KeyboardEvent) {
       if (
         e.startCoordinates &&
-        e.endCoordinates.screenY < e.startCoordinates.screenY
+        e.endCoordinates.screenY <= e.startCoordinates.screenY
       )
         setBottom(e.endCoordinates.height / 2);
       else setBottom(0);

diff --git a/yarn.lock b/yarn.lock
@@ -2618,15 +2618,15 @@
     "@react-stately/utils" "^3.1.1"
     "@react-types/checkbox" "^3.2.1"
 
-"@react-stately/collections@^3.2.1", "@react-stately/collections@^3.3.0":
+"@react-stately/collections@3.3.0", "@react-stately/collections@^3.2.1", "@react-stately/collections@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@react-stately/collections/-/collections-3.3.0.tgz#d1e66077b47a8b6a9abcac66f1052d4b8851ce47"
   integrity sha512-Y8Pfugw/tYbcR9F6GTiTkd9O4FiXErxi5aDLSZ/knS6v0pvr3EHsC3T7jLW+48dSNrwl+HkMe5ECMhWSUA1jRQ==
   dependencies:
     "@babel/runtime" "^7.6.2"
     "@react-types/shared" "^3.2.1"
 
-"@react-stately/combobox@3.0.0-alpha.1", "@react-stately/combobox@^3.0.0-alpha.1":
+"@react-stately/combobox@3.0.0-alpha.1":
   version "3.0.0-alpha.1"
   resolved "https://registry.yarnpkg.com/@react-stately/combobox/-/combobox-3.0.0-alpha.1.tgz#d3240ba528b021965998950a615e715c2eccbcee"
   integrity sha512-v0DNGLx0KGvNgBbXoSKzfHGcy65eP0Wx4uY3dqj+u9k3ru2BEvIqB8fo6CWhQqu8VHBX4AlhoxcyrloIKvjD/g==
@@ -2690,7 +2690,7 @@
     "@react-stately/utils" "^3.2.2"
     "@react-types/overlays" "^3.5.1"
 
-"@react-stately/radio@^3.2.1":
+"@react-stately/radio@3.2.1", "@react-stately/radio@^3.2.1":
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/@react-stately/radio/-/radio-3.2.1.tgz#d3fb0b28c2e7accdee47912c9802ab4a886a3092"
   integrity sha512-WGYMWCDJQOicFLf+bW2CbAnlRWaqsUd028WpsS41GWyIx/w7DVpUeGFwTSvyCXC5SCQZuambsWHgXNz8Ng5WIA==
@@ -2732,7 +2732,7 @@
     "@react-stately/utils" "^3.1.1"
     "@react-types/shared" "^3.3.0"
 
-"@react-stately/slider@^3.0.1":
+"@react-stately/slider@3.0.1", "@react-stately/slider@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@react-stately/slider/-/slider-3.0.1.tgz#076c149947ae45f5eda30178b368ad0c4052f2a3"
   integrity sha512-gGpfdVbTmdsOvrmZvFx4hJ5b7nczvAWdHR/tFFJKfxH0/V8NudZ5hGnawY84R3x+OvgV+tKUfifEUKA+oJyG5w==
@@ -2753,7 +2753,7 @@
     "@react-stately/utils" "^3.0.0-alpha.1"
     "@react-types/tabs" "3.0.0-alpha.2"
 
-"@react-stately/tabs@3.0.0-alpha.1", "@react-stately/tabs@^3.0.0-alpha.1":
+"@react-stately/tabs@3.0.0-alpha.1":
   version "3.0.0-alpha.1"
   resolved "https://registry.yarnpkg.com/@react-stately/tabs/-/tabs-3.0.0-alpha.1.tgz#b166ca9733ebebcc3bb2223116b8b070af104812"
   integrity sha512-aEG5lVLqmfx7A/dS5gkPXmD2ERAo69RtC0aHPo/Dw1XjzalYyo6QbQ5WtiuQxsCVx/naWGEJCcMEAD5/vt+cUQ==
@@ -2763,7 +2763,7 @@
     "@react-stately/utils" "^3.2.0"
     "@react-types/tabs" "3.0.0-alpha.2"
 
-"@react-stately/toggle@^3.2.1":
+"@react-stately/toggle@3.2.1", "@react-stately/toggle@^3.2.1":
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/@react-stately/toggle/-/toggle-3.2.1.tgz#8b10b5eb99c3c4df2c36d17a5f23b77773ed7722"
   integrity sha512-gZVuJ8OYoATUoXzdprsyx6O1w3wCrN+J0KnjhrjjKTrBG68n3pZH0p6dM0XpsaCzlSv0UgNa4fhHS3dYfr/ovw==