Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

James/b/1486 #1508

Merged
merged 3 commits into from
May 17, 2024
Merged

James/b/1486 #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddcd4fa
fixed horizontal orientation
James-Baloyi May 10, 2024
34fbb78
updated horizontal orientation fix
James-Baloyi May 13, 2024
d32328f
fixed build issues
James-Baloyi May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions shesha-reactjs/src/components/dataList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,13 @@ export const DataList: FC<Partial<IDataListProps>> = ({
useEffect(() => {
if (measured?.width === 0) return;
let res = null;
if (orientation === 'vertical' || !listItemWidth || (listItemWidth === 'custom' && !customListItemWidth)) {
if(orientation === "horizontal" && listItemWidth !== 'custom'){
res = ({ width: '100%', minWidth: listItemWidth as unknown as number * 100 + '%' } as React.CSSProperties);

}else if (orientation === "horizontal" && listItemWidth === "custom") {
res = ({width: `${customListItemWidth}px`} as React.CSSProperties);

}else if (orientation === 'vertical' || !listItemWidth || (listItemWidth === 'custom' && !customListItemWidth)) {
res =
selectionMode === 'none'
? ({ width: '100%' } as React.CSSProperties)
Expand Down Expand Up @@ -555,11 +561,31 @@ if (orientation === 'vertical' || !listItemWidth || (listItemWidth === 'custom'
<EmptyState noDataIcon={noDataIcon} noDataSecondaryText={noDataSecondaryText} noDataText={noDataText} />
</Show>


<Show when={records?.length > 0}>
<div className={orientation === "wrap" ? `${styles.shaDatalistWrapParent} ` : ""} style={{gap: `${cardSpacing}`, gridTemplateColumns: `repeat(auto-fit, minmax(${cardMinWidth}, 1fr))`}}>
{ content }
</div>
{orientation === "wrap" &&
<div className={styles.shaDatalistWrapParent} style={{gap: `${cardSpacing}`, gridTemplateColumns: `repeat(auto-fit, minmax(${cardMinWidth}, 1fr))`}}>
{content}
</div>
}


{orientation === "horizontal" &&
<div className={styles.shaDatalistHorizontal}>
{React.Children.map(content, child => {
return React.cloneElement(child, { style: itemWidthCalc });
})}
</div>
}

{orientation === "vertical" &&
<div style={itemWidthCalc}>
{React.Children.map(content, child => {
return React.cloneElement(child, { style: itemWidthCalc });
})}
</div>
}


</Show>
</div>
</ShaSpin>
Expand Down
11 changes: 10 additions & 1 deletion shesha-reactjs/src/components/dataList/styles/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const useStyles = createStyles(({ css, cx, token, prefixCls }) => {
const shaDatalistCard = "sha-datalist-card";
const shaDatalistActions = "sha-datalist-actions";
const shaDatalistCell = "sha-datalist-cell";
const shaDatalistHorizontal = "sha-datalist-horizontal";


const shaDatalistComponent = cx("sha-datalist-component", css`
Expand Down Expand Up @@ -128,6 +129,13 @@ export const useStyles = createStyles(({ css, cx, token, prefixCls }) => {
overflow: auto;
}

.${shaDatalistHorizontal} {
display: flex;
flex-direction: row;
width: 100%;
overflow-x: scroll;
}

.${shaDatalistComponentItem} {
position: relative;
padding-top: 5px;
Expand Down Expand Up @@ -162,6 +170,7 @@ export const useStyles = createStyles(({ css, cx, token, prefixCls }) => {
shaDatalistActions,
shaDatalistCell,
shaDatalistWrapParent,
shaDatalistCard
shaDatalistCard,
shaDatalistHorizontal
};
});