matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into hooks-migration

Browse Source
This commit is contained in:
marcin mikołajczak
2024-10-08 16:28:57 +02:00
parent bd73697628 aaddf124bf
commit 9f709793a4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pl-fe/src/components/scrollable-list.tsx
View File

@ -175,7 +175,7 @@ const ScrollableList = React.forwardRef<Virtualizer<any, any>, IScrollableList>(
id={'parentRef' in props ? id : undefined}
className={listClassName}
style={{
height: !showLoading && data.length ? virtualizer.getTotalSize() : undefined,
height: (!showLoading || showPlaceholder) && data.length ? virtualizer.getTotalSize() : undefined,
width: '100%',
position: 'relative',
}}

4
packages/pl-fe/src/components/status.tsx
View File

@ -410,8 +410,8 @@ const Status: React.FC<IStatus> = (props) => {
avatarSize={avatarSize}
items={(
<>
<StatusTypeIcon status={status} />
<StatusLanguagePicker status={status} />
<StatusTypeIcon status={actualStatus} />
<StatusLanguagePicker status={actualStatus} />
</>
)}
/>

2
packages/pl-fe/src/features/status/components/detailed-status.tsx
View File

@ -166,7 +166,7 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
<StatusTypeIcon status={actualStatus} />
<StatusLanguagePicker status={status} showLabel />
<StatusLanguagePicker status={actualStatus} showLabel />
</HStack>
</HStack>
</div>