From 20dc2ded09fd7891a97678cf5a997956814c9d3e Mon Sep 17 00:00:00 2001 From: truph01 Date: Thu, 13 Jun 2024 18:51:54 +0700 Subject: [PATCH 01/11] Feat: Implement loading skeleton small screen width --- src/CONST.ts | 1 + .../Skeletons/ItemListSkeletonView.tsx | 29 +++--- .../Skeletons/TableListItemSkeleton.tsx | 88 ++++++++++++++++++- 3 files changed, 104 insertions(+), 14 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 6a936bc97087..8423df11739a 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1252,6 +1252,7 @@ const CONST = { }, CENTRAL_PANE_ANIMATION_HEIGHT: 200, LHN_SKELETON_VIEW_ITEM_HEIGHT: 64, + SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 90, EXPENSIFY_PARTNER_NAME: 'expensify.com', EMAIL: { ACCOUNTING: 'accounting@expensify.com', diff --git a/src/components/Skeletons/ItemListSkeletonView.tsx b/src/components/Skeletons/ItemListSkeletonView.tsx index 5c46dbdddbfc..52501113d1d1 100644 --- a/src/components/Skeletons/ItemListSkeletonView.tsx +++ b/src/components/Skeletons/ItemListSkeletonView.tsx @@ -1,5 +1,5 @@ import React, {useMemo, useState} from 'react'; -import {View} from 'react-native'; +import {StyleProp, View, ViewStyle} from 'react-native'; import SkeletonViewContentLoader from '@components/SkeletonViewContentLoader'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -9,9 +9,11 @@ type ListItemSkeletonProps = { shouldAnimate?: boolean; renderSkeletonItem: (args: {itemIndex: number}) => React.ReactNode; fixedNumItems?: number; + itemViewStyle?: StyleProp; + itemViewHeight?: number; }; -function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem, fixedNumItems}: ListItemSkeletonProps) { +function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem, fixedNumItems, itemViewStyle = {}, itemViewHeight = CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT}: ListItemSkeletonProps) { const theme = useTheme(); const themeStyles = useThemeStyles(); @@ -20,16 +22,17 @@ function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem, fixedNu const items = []; for (let i = 0; i < numItems; i++) { items.push( - - {renderSkeletonItem({itemIndex: i})} - , + + + {renderSkeletonItem({itemIndex: i})} + + , ); } return items; @@ -43,7 +46,7 @@ function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem, fixedNu return; } - const newNumItems = Math.ceil(event.nativeEvent.layout.height / CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT); + const newNumItems = Math.ceil(event.nativeEvent.layout.height / itemViewHeight); if (newNumItems === numItems) { return; } diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx index 4b2c214921d0..62116f063d64 100644 --- a/src/components/Skeletons/TableListItemSkeleton.tsx +++ b/src/components/Skeletons/TableListItemSkeleton.tsx @@ -1,5 +1,8 @@ import React from 'react'; -import {Rect} from 'react-native-svg'; +import {Circle, Rect} from 'react-native-svg'; +import useThemeStyles from '@hooks/useThemeStyles'; +import useWindowDimensions from '@hooks/useWindowDimensions'; +import CONST from '@src/CONST'; import ItemListSkeletonView from './ItemListSkeletonView'; type TableListItemSkeletonProps = { @@ -7,11 +10,94 @@ type TableListItemSkeletonProps = { fixedNumItems?: number; }; +const circleRadius = 8; +const padding = 12; const barHeight = '10'; const shortBarWidth = '40'; const longBarWidth = '120'; function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListItemSkeletonProps) { + const styles = useThemeStyles(); + const {windowWidth, isSmallScreenWidth} = useWindowDimensions(); + if (isSmallScreenWidth) { + return ( + ( + <> + + + + + + + + + + + + + + + )} + /> + ); + } return ( Date: Thu, 13 Jun 2024 19:04:53 +0700 Subject: [PATCH 02/11] Fix: Lint --- src/components/Skeletons/ItemListSkeletonView.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Skeletons/ItemListSkeletonView.tsx b/src/components/Skeletons/ItemListSkeletonView.tsx index 52501113d1d1..43df591000c1 100644 --- a/src/components/Skeletons/ItemListSkeletonView.tsx +++ b/src/components/Skeletons/ItemListSkeletonView.tsx @@ -1,5 +1,6 @@ import React, {useMemo, useState} from 'react'; -import {StyleProp, View, ViewStyle} from 'react-native'; +import {View} from 'react-native'; +import type {StyleProp, ViewStyle} from 'react-native'; import SkeletonViewContentLoader from '@components/SkeletonViewContentLoader'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; From db3f19ea25ef9201edda62964c8723093b7c5e3b Mon Sep 17 00:00:00 2001 From: truph01 Date: Thu, 13 Jun 2024 19:13:58 +0700 Subject: [PATCH 03/11] Fix: Lint --- src/components/Skeletons/ItemListSkeletonView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Skeletons/ItemListSkeletonView.tsx b/src/components/Skeletons/ItemListSkeletonView.tsx index 43df591000c1..7df68a943a9f 100644 --- a/src/components/Skeletons/ItemListSkeletonView.tsx +++ b/src/components/Skeletons/ItemListSkeletonView.tsx @@ -37,7 +37,7 @@ function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem, fixedNu ); } return items; - }, [numItems, shouldAnimate, theme, themeStyles, renderSkeletonItem]); + }, [numItems, shouldAnimate, theme, themeStyles, renderSkeletonItem, itemViewHeight, itemViewStyle]); return ( Date: Fri, 14 Jun 2024 18:32:13 +0700 Subject: [PATCH 04/11] Fix: Update SEARCH_SKELETON_VIEW_ITEM_HEIGHT to 100 --- src/CONST.ts | 2 +- src/components/Skeletons/TableListItemSkeleton.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 8423df11739a..5ff88365b70e 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1252,7 +1252,7 @@ const CONST = { }, CENTRAL_PANE_ANIMATION_HEIGHT: 200, LHN_SKELETON_VIEW_ITEM_HEIGHT: 64, - SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 90, + SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 100, EXPENSIFY_PARTNER_NAME: 'expensify.com', EMAIL: { ACCOUNTING: 'accounting@expensify.com', diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx index 62116f063d64..d3491fcb717c 100644 --- a/src/components/Skeletons/TableListItemSkeleton.tsx +++ b/src/components/Skeletons/TableListItemSkeleton.tsx @@ -37,7 +37,7 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI Date: Fri, 14 Jun 2024 19:00:30 +0700 Subject: [PATCH 05/11] Fix: Update row gap to 12px --- src/components/Skeletons/TableListItemSkeleton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx index d3491fcb717c..7b1b364930f2 100644 --- a/src/components/Skeletons/TableListItemSkeleton.tsx +++ b/src/components/Skeletons/TableListItemSkeleton.tsx @@ -23,7 +23,7 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI return ( ( From 284e32ae1aca15f9a64c07df8ebaee9af07ade06 Mon Sep 17 00:00:00 2001 From: truph01 Date: Mon, 17 Jun 2024 22:43:28 +0700 Subject: [PATCH 06/11] Fix: Comment --- .../Skeletons/TableListItemSkeleton.tsx | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx index 7b1b364930f2..5f2a3096c0be 100644 --- a/src/components/Skeletons/TableListItemSkeleton.tsx +++ b/src/components/Skeletons/TableListItemSkeleton.tsx @@ -10,8 +10,6 @@ type TableListItemSkeletonProps = { fixedNumItems?: number; }; -const circleRadius = 8; -const padding = 12; const barHeight = '10'; const shortBarWidth = '40'; const longBarWidth = '120'; @@ -29,69 +27,69 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI renderSkeletonItem={() => ( <> )} From fc1a1fa1e6f1c6a9ef8848330c5b7ee8a02ea1bb Mon Sep 17 00:00:00 2001 From: truph01 Date: Mon, 17 Jun 2024 22:55:49 +0700 Subject: [PATCH 07/11] Fix: Update radius --- src/components/Skeletons/TableListItemSkeleton.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx index 5f2a3096c0be..4cfbe902f830 100644 --- a/src/components/Skeletons/TableListItemSkeleton.tsx +++ b/src/components/Skeletons/TableListItemSkeleton.tsx @@ -64,8 +64,8 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI y={48} width={36} height={40} - rx={6} - ry={6} + rx={4} + ry={4} /> Date: Thu, 20 Jun 2024 15:30:27 +0700 Subject: [PATCH 08/11] Fix: Change gap to 8 --- src/components/Skeletons/TableListItemSkeleton.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx index 4cfbe902f830..cd0f00872325 100644 --- a/src/components/Skeletons/TableListItemSkeleton.tsx +++ b/src/components/Skeletons/TableListItemSkeleton.tsx @@ -33,7 +33,7 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI /> Date: Sat, 22 Jun 2024 00:45:17 +0700 Subject: [PATCH 09/11] Fix: Update height to 108 --- src/CONST.ts | 2 +- src/components/Search.tsx | 2 +- src/components/Skeletons/TableListItemSkeleton.tsx | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index c73032802fd1..d5e40b37666d 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1262,7 +1262,7 @@ const CONST = { }, CENTRAL_PANE_ANIMATION_HEIGHT: 200, LHN_SKELETON_VIEW_ITEM_HEIGHT: 64, - SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 100, + SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 108, EXPENSIFY_PARTNER_NAME: 'expensify.com', EMAIL: { ACCOUNTING: 'accounting@expensify.com', diff --git a/src/components/Search.tsx b/src/components/Search.tsx index 2de6aa8cfcef..6a99904a3ae5 100644 --- a/src/components/Search.tsx +++ b/src/components/Search.tsx @@ -69,7 +69,7 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) { const isLoadingMoreItems = !isLoadingItems && searchResults?.search?.isLoading && searchResults?.search?.offset > 0; const shouldShowEmptyState = !isLoadingItems && isEmptyObject(searchResults?.data); - if (isLoadingItems) { + if (true) { return ; } diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx index cd0f00872325..6ff3a3aedbb9 100644 --- a/src/components/Skeletons/TableListItemSkeleton.tsx +++ b/src/components/Skeletons/TableListItemSkeleton.tsx @@ -61,7 +61,7 @@ function TableListItemSkeleton({shouldAnimate = true, fixedNumItems}: TableListI From 1c6105360bd1493902f61338657193e3eca699cd Mon Sep 17 00:00:00 2001 From: truph01 Date: Sat, 22 Jun 2024 00:46:52 +0700 Subject: [PATCH 10/11] Fix: Remove test logic --- src/components/Search.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Search.tsx b/src/components/Search.tsx index 6a99904a3ae5..2de6aa8cfcef 100644 --- a/src/components/Search.tsx +++ b/src/components/Search.tsx @@ -69,7 +69,7 @@ function Search({query, policyIDs, sortBy, sortOrder}: SearchProps) { const isLoadingMoreItems = !isLoadingItems && searchResults?.search?.isLoading && searchResults?.search?.offset > 0; const shouldShowEmptyState = !isLoadingItems && isEmptyObject(searchResults?.data); - if (true) { + if (isLoadingItems) { return ; } From 5172df9c900e7108088d8e7def858f7dc1b206f3 Mon Sep 17 00:00:00 2001 From: truph01 Date: Sat, 22 Jun 2024 09:46:57 +0700 Subject: [PATCH 11/11] Fix: Add key prop to view --- src/components/Skeletons/ItemListSkeletonView.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/Skeletons/ItemListSkeletonView.tsx b/src/components/Skeletons/ItemListSkeletonView.tsx index 7df68a943a9f..1ee2da8a8019 100644 --- a/src/components/Skeletons/ItemListSkeletonView.tsx +++ b/src/components/Skeletons/ItemListSkeletonView.tsx @@ -23,9 +23,11 @@ function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem, fixedNu const items = []; for (let i = 0; i < numItems; i++) { items.push( - +