Data Skeleton Loading on Indexes #5828
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| import Skeleton, { SkeletonTheme } from 'react-loading-skeleton'; | ||
| import { useTheme } from '@emotion/react'; | ||
| import styled from '@emotion/styled'; | ||
|
|
||
| import { | ||
| StyledBoardCardBody, | ||
| StyledBoardCardHeader, | ||
| } from '@/object-record/record-board/record-board-card/components/RecordBoardCard'; | ||
|
|
||
| const StyledSkeletonIconAndText = styled.div` | ||
| display: flex; | ||
| gap: ${({ theme }) => theme.spacing(1)}; | ||
| `; | ||
|
|
||
| const StyledSkeletonTitle = styled.div` | ||
| padding-left: ${({ theme }) => theme.spacing(2)}; | ||
| `; | ||
|
|
||
| const StyledSeparator = styled.div` | ||
| height: ${({ theme }) => theme.spacing(2)}; | ||
| `; | ||
|
|
||
| export const RecordBoardColumnCardContainerSkeletonLoader = ({ | ||
| titleSkeletonWidth, | ||
| isCompactModeActive, | ||
| }: { | ||
| titleSkeletonWidth: number; | ||
| isCompactModeActive: boolean; | ||
| }) => { | ||
| const theme = useTheme(); | ||
| const skeletonItems = Array.from({ length: 6 }).map((_, index) => ({ | ||
| id: `skeleton-item-${index}`, | ||
| })); | ||
| return ( | ||
| <SkeletonTheme | ||
| baseColor={theme.background.tertiary} | ||
| highlightColor={theme.background.transparent.lighter} | ||
| borderRadius={4} | ||
| > | ||
| <StyledBoardCardHeader showCompactView={isCompactModeActive}> | ||
| <StyledSkeletonTitle> | ||
| <Skeleton width={titleSkeletonWidth} height={16} /> | ||
| </StyledSkeletonTitle> | ||
| </StyledBoardCardHeader> | ||
| <StyledSeparator /> | ||
| {!isCompactModeActive && | ||
| skeletonItems.map(({ id }) => ( | ||
| <StyledBoardCardBody key={id}> | ||
| <StyledSkeletonIconAndText> | ||
| <Skeleton width={16} height={16} /> | ||
| <Skeleton width={151} height={16} /> | ||
| </StyledSkeletonIconAndText> | ||
| </StyledBoardCardBody> | ||
| ))} | ||
| </SkeletonTheme> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| import React, { ReactElement, useContext, useEffect, useState } from 'react'; | ||
| import Skeleton, { SkeletonTheme } from 'react-loading-skeleton'; | ||
| import { useTheme } from '@emotion/react'; | ||
| import styled from '@emotion/styled'; | ||
| import { clsx } from 'clsx'; | ||
| import { useRecoilValue } from 'recoil'; | ||
|
|
||
| import { FieldContext } from '@/object-record/record-field/contexts/FieldContext'; | ||
| import { useFieldFocus } from '@/object-record/record-field/hooks/useFieldFocus'; | ||
| import { RecordTableContext } from '@/object-record/record-table/contexts/RecordTableContext'; | ||
| import { RecordTableRowContext } from '@/object-record/record-table/contexts/RecordTableRowContext'; | ||
| import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates'; | ||
| import { RecordTableCellSoftFocusMode } from '@/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode'; | ||
| import { useCurrentTableCellPosition } from '@/object-record/record-table/record-table-cell/hooks/useCurrentCellPosition'; | ||
| import { useOpenRecordTableCellFromCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellFromCell'; | ||
|
|
@@ -18,6 +23,28 @@ import { RecordTableCellEditMode } from './RecordTableCellEditMode'; | |
|
|
||
| import styles from './RecordTableCellContainer.module.css'; | ||
|
|
||
| const StyledSkeletonContainer = styled.div` | ||
| padding-left: ${({ theme }) => theme.spacing(2)}; | ||
| padding-right: ${({ theme }) => theme.spacing(1)}; | ||
| `; | ||
|
|
||
| const StyledRecordTableCellContainerLoader = ({ | ||
|
There was a problem hiding this comment. Could you extract all of this logic outside of RecordTableCellContainer ? Because RecordTableCellContainer is a very optimized component used for displaying FieldDisplay component fast. Here we just want to fill a table with skeletons, so we might as well put this logic in another RecordTableCellLoading and use it directly in the new RecordTableBodyLoading that should also be extracted. There was a problem hiding this comment. Looking into this @lucasbordeau |
||
| skeletonWidth = 132, | ||
| }: { | ||
| skeletonWidth?: number; | ||
| }) => { | ||
| const theme = useTheme(); | ||
| return ( | ||
| <SkeletonTheme | ||
| baseColor={theme.background.tertiary} | ||
| highlightColor={theme.background.transparent.lighter} | ||
| borderRadius={4} | ||
| > | ||
| <Skeleton width={skeletonWidth} height={16} /> | ||
| </SkeletonTheme> | ||
| ); | ||
| }; | ||
|
|
||
| export type RecordTableCellContainerProps = { | ||
| editModeContent: ReactElement; | ||
| nonEditModeContent: ReactElement; | ||
|
|
@@ -26,6 +53,7 @@ export type RecordTableCellContainerProps = { | |
| maxContentWidth?: number; | ||
| onSubmit?: () => void; | ||
| onCancel?: () => void; | ||
| skeletonWidth?: number; | ||
| }; | ||
|
|
||
| const DEFAULT_CELL_SCOPE: HotkeyScope = { | ||
|
|
@@ -36,9 +64,11 @@ export const RecordTableCellContainer = ({ | |
| editModeContent, | ||
| nonEditModeContent, | ||
| editHotkeyScope, | ||
| skeletonWidth, | ||
| }: RecordTableCellContainerProps) => { | ||
| const { setIsFocused } = useFieldFocus(); | ||
| const { openTableCell } = useOpenRecordTableCellFromCell(); | ||
| const { isRecordTableInitialLoadingState } = useRecordTableStates(); | ||
|
|
||
| const { isSelected, recordId, isPendingRow } = useContext( | ||
| RecordTableRowContext, | ||
|
|
@@ -53,7 +83,9 @@ export const RecordTableCellContainer = ({ | |
| const [isInEditMode, setIsInEditMode] = useState(shouldBeInitiallyInEditMode); | ||
|
|
||
| const cellPosition = useCurrentTableCellPosition(); | ||
| const isRecordTableInitialLoading = useRecoilValue( | ||
| isRecordTableInitialLoadingState, | ||
| ); | ||
| const handleContextMenu = (event: React.MouseEvent) => { | ||
| onContextMenu(event, recordId); | ||
| }; | ||
|
|
@@ -151,7 +183,13 @@ export const RecordTableCellContainer = ({ | |
| [styles.cellBaseContainerSoftFocus]: hasSoftFocus, | ||
| })} | ||
| > | ||
| {isRecordTableInitialLoading ? ( | ||
| <StyledSkeletonContainer> | ||
| <StyledRecordTableCellContainerLoader | ||
| skeletonWidth={skeletonWidth} | ||
| /> | ||
| </StyledSkeletonContainer> | ||
| ) : isInEditMode ? ( | ||
| <RecordTableCellEditMode>{editModeContent}</RecordTableCellEditMode> | ||
| ) : hasSoftFocus ? ( | ||
| <> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState'; | ||
|
|
||
| export const isRecordIndexLoadingFamilyState = createFamilyState< | ||
| boolean, | ||
| string | undefined | ||
| >({ | ||
| key: 'isRecordIndexLoadingFamilyState', | ||
| defaultValue: false, | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ensure loading state is updated based on
loadingandrecords.length.