Skip to content

Commit 4f1b461

Browse files
Sanchitv3Sanchitv3
authored
Merge pull request #3206 from gluestack/feat/web-changes
chore: removed nativebase banner
2 parents c61a54c + 63dbfd2 commit 4f1b461

File tree

7 files changed

+61
-60
lines changed

7 files changed

+61
-60
lines changed

‎apps/website/components/custom/layout/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const Layout = ({ children }: { children: React.ReactNode }) => {
4343
<div
4444
// @ts-ignore
4545
ref={docsLayoutRef}
46-
className="bg-white dark:bg-black overflow-auto w-screen h-dvh scrollbar-hide"
46+
className="bg-white dark:bg-black overflow-auto w-screen h-dvh scrollbar-hide fixed top-0"
4747
//to add handler to the container on scroll and update the active tab
4848
id="layout-content"
4949
style={{

‎apps/website/components/page-components/header/index.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import React, { useContext, useState } from 'react';
44
import { Badge, BadgeText } from '@/components/ui/badge';
5-
import { Divider } from '@/components/ui/divider';
65
import { HStack } from '@/components/ui/hstack';
7-
import { Icon, ChevronUpIcon, ChevronDownIcon,CloseIcon } from '@/components/ui/icon';
6+
import { Icon, ChevronUpIcon, ChevronDownIcon } from '@/components/ui/icon';
87
import { Link } from '@/components/ui/link';
98
import { Pressable } from '@/components/ui/pressable';
109
import { Text } from '@/components/ui/text';
@@ -31,7 +30,6 @@ import { ThemeContext } from '@/utils/context/theme-context';
3130
import { usePathname } from 'next/navigation';
3231
import { UiDocSearch } from './Docsearch';
3332
import { LayoutContext } from '@/components/custom/layout/LayoutContext';
34-
import { Button, ButtonText } from '@/components/ui/button';
3533

3634
// Updated Header component with internal state management
3735
const Header = ({
@@ -172,9 +170,8 @@ const Header = ({
172170
return (
173171
<Pressable
174172
{...triggerProps}
175-
className="flex-row items-center"
173+
className="flex-row items-center pb-0.5"
176174
>
177-
{/* <ButtonText>v3</ButtonText> */}
178175
<Text className="font-jakarta font-bold text-typography-800 text-sm">
179176
v3
180177
</Text>

‎apps/website/components/page-components/landing-page/index.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import useErrorShortcut from './SentryTestComponent';
2929
import AnimatedStars from '@/components/page-components/landing-page/AnimatedGithubCount';
3030
import Kitchensink from './Kitchensink';
3131
import VadimStream from './VadimStream';
32-
import { Banner } from './NativeBaseRedirectBanner';
3332
import { ThemeContext } from '@/utils/context/theme-context';
3433
import { useContext } from 'react';
3534
import MCPServer from './MCPServer';
@@ -67,7 +66,6 @@ const App = ({ referrer }: { referrer: string }) => {
6766
<VStack className="w-[85%] max-w-[1440px] justify-center self-center">
6867
<RapidNativeBanner />
6968
<VStack className="mx-auto max-w-[900px] pt-[80px] sm:pt-[120px] w-full my-0 items-center justify-center self-center">
70-
<Banner referrer={referrer} />
7169
<Box className="flex w-full items-start sm:items-center mt-[50px] sm:mt-0">
7270
<AwardBadge />
7371
</Box>

‎apps/website/components/page-components/sidebar/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export default function Sidebar() {
157157
}
158158
};
159159
return (
160-
<div className="ml-4 w-64 border-r border-outline-100 flex flex-col left-0 bg-white dark:bg-black h-[94vh] max-lg:hidden overflow-y-scroll fixed bottom-0 z-0">
160+
<div className="ml-4 w-64 border-r border-outline-100 flex flex-col left-0 bg-white dark:bg-black h-[94vh] max-lg:hidden overflow-y-scroll fixed top-[60px] z-0">
161161
{/* Fixed parent dropdowns at top */}
162162
<div className="flex-none py-4 border-b border-outline-100">
163163
{parentDropdowns.map((section: Section, index: number) => (

‎apps/website/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"react-native": "^0.79.2",
5151
"react-native-gesture-handler": "~2.14.0",
5252
"react-native-reanimated": "~3.6.2",
53-
"react-native-safe-area-context": "^5.4.0",
53+
"react-native-safe-area-context": "^5.6.1",
5454
"react-native-svg": "^15.12.0",
5555
"react-native-web": "^0.19.12",
5656
"react-stately": "^3.37.0",

‎packages/gluestack-core/src/toast/creator/ToastList.tsx‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useKeyboardBottomInset } from '@gluestack-ui/utils/hooks';
33
import { Overlay } from '../../overlay/creator';
44
import React from 'react';
55
import { Platform, View } from 'react-native';
6-
import { SafeAreaView } from 'react-native-safe-area-context';
6+
import { SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';
77
import { OverlayAnimatePresence } from './OverlayAnimatePresence';
88
import { ToastContext } from './ToastContext';
99
import type { IToast, ToastPlacement } from './types';
@@ -92,58 +92,57 @@ export const ToastList = () => {
9292
>
9393
{toastInfo[position].map((toast: IToast) => {
9494
return (
95-
<SafeAreaView
96-
style={{ pointerEvents: 'box-none' }}
97-
key={toast.id}
98-
>
99-
<OverlayAnimatePresence
100-
visible={visibleToasts[toast.id]}
101-
AnimatePresence={AnimatePresence}
102-
onExit={() => {
103-
removeToast(toast.id);
104-
toast.config?.onCloseComplete &&
105-
toast.config?.onCloseComplete();
106-
}}
107-
>
108-
<AnimationView
109-
initial={{
110-
opacity: 0,
111-
y: transitionConfig[position],
95+
<SafeAreaProvider key={toast.id}>
96+
<SafeAreaView style={{ pointerEvents: 'box-none' }}>
97+
<OverlayAnimatePresence
98+
visible={visibleToasts[toast.id]}
99+
AnimatePresence={AnimatePresence}
100+
onExit={() => {
101+
removeToast(toast.id);
102+
toast.config?.onCloseComplete &&
103+
toast.config?.onCloseComplete();
112104
}}
113-
animate={{
114-
opacity: 1,
115-
y: 0,
116-
}}
117-
exit={{
118-
opacity: 0,
119-
y: transitionConfig[position],
120-
}}
121-
transition={{
122-
type: 'timing',
123-
duration: 150,
124-
}}
125-
key={toast.id}
126-
{...toast.config?.containerStyle}
127-
style={{ pointerEvents: 'box-none' }}
128105
>
129-
<View
130-
style={{
131-
bottom:
132-
[
133-
'bottom',
134-
'bottom-left',
135-
'bottom-right',
136-
].includes(position) &&
137-
toast.config?.avoidKeyboard
138-
? bottomInset
139-
: undefined,
106+
<AnimationView
107+
initial={{
108+
opacity: 0,
109+
y: transitionConfig[position],
110+
}}
111+
animate={{
112+
opacity: 1,
113+
y: 0,
114+
}}
115+
exit={{
116+
opacity: 0,
117+
y: transitionConfig[position],
118+
}}
119+
transition={{
120+
type: 'timing',
121+
duration: 150,
140122
}}
123+
key={toast.id}
124+
{...toast.config?.containerStyle}
125+
style={{ pointerEvents: 'box-none' }}
141126
>
142-
{toast.component}
143-
</View>
144-
</AnimationView>
145-
</OverlayAnimatePresence>
146-
</SafeAreaView>
127+
<View
128+
style={{
129+
bottom:
130+
[
131+
'bottom',
132+
'bottom-left',
133+
'bottom-right',
134+
].includes(position) &&
135+
toast.config?.avoidKeyboard
136+
? bottomInset
137+
: undefined,
138+
}}
139+
>
140+
{toast.component}
141+
</View>
142+
</AnimationView>
143+
</OverlayAnimatePresence>
144+
</SafeAreaView>
145+
</SafeAreaProvider>
147146
);
148147
})}
149148
</View>

‎src/components/ui/toast/examples/social-media-notification/meta.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
"ToastDescription": "@/components/ui/toast",
88
"useToast": "@/components/ui/toast",
99
"Button": "@/components/ui/button",
10-
"ButtonText": "@/components/ui/button"
10+
"ButtonText": "@/components/ui/button",
11+
"Avatar": "@/components/ui/avatar",
12+
"AvatarImage": "@/components/ui/avatar",
13+
"AvatarFallbackText": "@/components/ui/avatar",
14+
"HStack": "@/components/ui/hstack",
15+
"VStack": "@/components/ui/vstack",
16+
"Heading": "@/components/ui/heading",
17+
"Text": "@/components/ui/text"
1118
}
1219
}

0 commit comments

Comments
 (0)