admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed import modal content scroll bug (#9330)

Browse Source 
fixes #9297
This commit is contained in:
nitin
2025-01-03 18:35:51 +05:30
committed by GitHub
parent 8b7e4ddad1
commit 9da0a5df6f
1 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
View File

@ -25,6 +25,7 @@ import { initialComputedColumnsSelector } from '@/spreadsheet-import/steps/compo
import { UnmatchColumn } from '@/spreadsheet-import/steps/components/MatchColumnsStep/components/UnmatchColumn';
import { SpreadsheetImportStep } from '@/spreadsheet-import/steps/types/SpreadsheetImportStep';
import { SpreadsheetImportStepType } from '@/spreadsheet-import/steps/types/SpreadsheetImportStepType';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { useRecoilState } from 'recoil';
import { ColumnGrid } from './components/ColumnGrid';
import { TemplateColumn } from './components/TemplateColumn';
@ -326,37 +327,43 @@ export const MatchColumnsStep = <T extends string>({
return (
<>
<StyledContent>
<Heading
title="Match Columns"
description="Select the correct field for each column you'd like to import."
/>
<ColumnGrid
columns={columns}
renderUserColumn={(columns, columnIndex) => (
<UserTableColumn
column={columns[columnIndex]}
importedRow={dataExample.map(
(row) => row[columns[columnIndex].index],
)}
/>
)}
renderTemplateColumn={(columns, columnIndex) => (
<TemplateColumn
columns={columns}
columnIndex={columnIndex}
onChange={onChange}
/>
)}
renderUnmatchedColumn={(columns, columnIndex) => (
<UnmatchColumn
columns={columns}
columnIndex={columnIndex}
onSubChange={onSubChange}
/>
)}
/>
</StyledContent>
<ScrollWrapper
contextProviderName="modalContent"
componentInstanceId="scroll-wrapper-modal-content"
heightMode="full"
>
<StyledContent>
<Heading
title="Match Columns"
description="Select the correct field for each column you'd like to import."
/>
<ColumnGrid
columns={columns}
renderUserColumn={(columns, columnIndex) => (
<UserTableColumn
column={columns[columnIndex]}
importedRow={dataExample.map(
(row) => row[columns[columnIndex].index],
)}
/>
)}
renderTemplateColumn={(columns, columnIndex) => (
<TemplateColumn
columns={columns}
columnIndex={columnIndex}
onChange={onChange}
/>
)}
renderUnmatchedColumn={(columns, columnIndex) => (
<UnmatchColumn
columns={columns}
columnIndex={columnIndex}
onSubChange={onSubChange}
/>
)}
/>
</StyledContent>
</ScrollWrapper>
<StepNavigationButton
onClick={handleOnContinue}
isLoading={isLoading}