Merge branch 'webapp' into webapp-fix

Author: Karthik-B-06

src/components/avatar-group/AvatarGroup.tsx

@@ -77,6 +77,7 @@ export const AvatarGroup: React.FC<Partial<AvatarGroupProps>> = props => {
               showRing
                 ? { borderColor: ringColor, backgroundColor: ringColor }
                 : {},
+              { zIndex: childrenWithinMax.length - index },
             ]}
             key={index}
           >

src/components/input/Input.tsx

@@ -2,7 +2,7 @@ import React, { forwardRef, ReactNode, useMemo, useRef, useState } from "react";
 import { Platform, TextInputProps } from "react-native";
 
 import { Box, BoxProps, RNTextInput, TouchableProps } from "../../primitives";
-import { useTailwind, useTheme } from "../../theme";
+import { getTextFontFamily, useTailwind, useTheme } from "../../theme";
 import {
   cx,
   generateBoxShadow,
@@ -286,6 +286,7 @@ const RNInput: React.FC<Partial<InputProps>> = forwardRef<
               _suffix ? `pr-[${suffixWidth}px]` : "",
             ),
           ),
+          getTextFontFamily(inputTheme.size[size]?.base?.default),
           isFocussedWeb.value
             ? Platform.select({
                 web: {

src/components/text-area/TextArea.tsx

@@ -2,7 +2,7 @@ import React, { forwardRef, useMemo, useRef, useState } from "react";
 import { Platform, TextInputProps } from "react-native";
 
 import { Box, BoxProps, RNTextInput, TouchableProps } from "../../primitives";
-import { useTailwind, useTheme } from "../../theme";
+import { getTextFontFamily, useTailwind, useTheme } from "../../theme";
 import {
   cx,
   generateBoxShadow,
@@ -235,6 +235,7 @@ const RNTextArea: React.FC<Partial<TextAreaProps>> = forwardRef<
               _suffix ? `pr-[${suffixWidth}px]` : "",
             ),
           ),
+          getTextFontFamily(textAreaTheme.size[size]?.base?.default),
           isFocussedWeb.value
             ? Platform.select({
                 web: {

src/theme/defaultTheme/avatar.ts

@@ -117,7 +117,7 @@ export const avatar = {
     },
   },
   group: {
-    base: "flex-row items-center",
+    base: "relative flex-row items-center",
     avatarWrapper: {
       ringStyle: "border-2",
       circular: "rounded-full",

src/theme/defaultTheme/divider.ts

@@ -1,7 +1,7 @@
 export const divider = {
   horizontal: {
     orientaion: "w-full items-center justify-center",
-    lines: "border border-gray-400 w-full",
+    lines: "border-[1px] border-gray-400 w-full",
     label: {
       start: "z-1 absolute left-4",
       center: "z-1 absolute",
@@ -10,7 +10,7 @@ export const divider = {
   },
   vertical: {
     orientaion: "h-full items-center justify-center",
-    lines: "border border-gray-400 h-full",
+    lines: "border-[1px] border-gray-400 h-full",
     label: {
       start: "z-1 absolute top-4",
       center: "z-1 absolute",

src/theme/defaultTheme/radio.ts

@@ -94,7 +94,7 @@ export const radio = {
           },
         },
         checked: {
-          default: "bg-gray-900 border-gray-900",
+          default: "bg-gray-900 border-gray-900 border-0",
           hover: "bg-gray-800 border-gray-800 shadow shadow-color-opacity-10",
           press: "bg-gray-700 border-gray-700",
           disabled: "bg-gray-200 border-gray-200",
@@ -146,7 +146,7 @@ export const radio = {
           },
         },
         checked: {
-          default: "bg-blue-600 border-blue-600",
+          default: "bg-blue-600 border-blue-600 border-0",
           hover: "bg-blue-700 border-blue-700 shadow shadow-color-opacity-10",
           press: "bg-blue-800 border-blue-800",
           disabled: "bg-blue-100 border-blue-100",
@@ -198,7 +198,7 @@ export const radio = {
           },
         },
         checked: {
-          default: "bg-red-600 border-red-600",
+          default: "bg-red-600 border-red-600 border-0",
           hover: "bg-red-700 border-red-700 shadow shadow-color-opacity-10",
           press: "bg-red-800 border-red-800",
           disabled: "bg-red-100 border-red-100",