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

feat: Support percentage height for ui.form components #326 #2004

Closed
wants to merge 5 commits into from
Closed

feat: Support percentage height for ui.form components #326 #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a07d79
feat: support percentual height units for form elements #326
marek-mihok Jun 1, 2023
623e19f
fix: make copyable_text not to be higher than specified height #326
marek-mihok Jun 1, 2023
c693565
chore: revert copybale_height behavior since setting minWidth in form…
marek-mihok Jun 1, 2023
1703b63
fix: apply percentage height to component wrapper container #326
marek-mihok Jun 2, 2023
cc2a636
chore: remove unneccessary attribute #326
marek-mihok Jun 7, 2023
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
8 changes: 7 additions & 1 deletion ui/src/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,20 @@ export const
alignSelf = componentKey === 'links' ? 'flex-start' : undefined

if (m[componentKey].width !== width) m[componentKey].width = width
if (height?.endsWith('%')) m[componentKey].height = '100%'

return (
<div
// Recreate only if name or position within form items changed, update otherwise.
key={name || `${componentKey}-${i}`}
data-visible={visible}
className={height === '1' ? css.fullHeight : ''}
style={{ ...visibleStyles, width, alignSelf }}
style={{
...visibleStyles,
width,
minHeight: height === '1' ? undefined : height,
alignSelf
}}
>
<XComponent model={m} />
</div>
Expand Down
8 changes: 6 additions & 2 deletions ui/src/tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ const
container: {
display: 'flex',
alignItems: 'flex-start',
alignContent: 'flex-start'
alignContent: 'flex-start',
height: '100%'
},
expand: {
flexGrow: 1
Expand All @@ -40,6 +41,9 @@ const
},
preventOverflow: {
minWidth: 0
},
tooltipWrapper: {
height: 'inherit'
}
})

Expand All @@ -59,7 +63,7 @@ export const
showIcon
? (
<>
<div className={clas(css.preventOverflow, expand ? css.expand : '')}>{children}</div>
<div className={clas(css.preventOverflow, css.tooltipWrapper, expand ? css.expand : '')}>{children}</div>
<Fluent.TooltipHost tooltipProps={tooltipProps}>
<Fluent.FontIcon className={css.icon} iconName='Info' />
</Fluent.TooltipHost>
Expand Down