Skip to content

Commit

Permalink
Merge branch 'develop' into feature/edit-page-single-column-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
VargaJoe committed Sep 29, 2023
2 parents cde78c7 + 0f91ffc commit 2a13934
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
5 changes: 5 additions & 0 deletions apps/sensenet/src/context/ThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ export const ThemeProvider: React.FunctionComponent = (props) => {
'@font-face': [larsseit],
},
},
MuiInputLabel: {
root: {
fontSize: '1.3rem',
},
},
},
})

Expand Down
1 change: 1 addition & 0 deletions packages/sn-controls-react/src/fieldcontrols/textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const Textarea: React.FC<ReactClientFieldSetting<LongTextFieldSetting>> =
multiline={true}
fullWidth={true}
helperText={props.hideDescription ? undefined : props.settings.Description}
InputLabelProps={{ shrink: true }}
/>
)
case 'browse':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ exports[`Textarea field control in browse view should show the displayname and f

exports[`Textarea field control in edit/new view should set all the props 1`] = `
<WithStyles(ForwardRef(TextField))
InputLabelProps={
Object {
"shrink": true,
}
}
disabled={true}
fullWidth={true}
helperText="description"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function TreePicker<T extends GenericContentWithIsParent = GenericContent
})

const onCheckedChangeHandler = useCallback(
(_event: React.ChangeEvent<HTMLInputElement>, node: T) => {
(_event: unknown, node: T) => {
if (!node.isParent) {
const newSelection = props.allowMultiple ? selection.filter((item) => item.Id !== node.Id) : []
if (newSelection.length === selection.length || (!props.allowMultiple && selection[0].Id !== node.Id)) {
Expand Down Expand Up @@ -106,7 +106,10 @@ export function TreePicker<T extends GenericContentWithIsParent = GenericContent
return (
<List>
{items?.map((item) => (
<div onDoubleClick={(e) => onDoubleClickHandler(e, item as any)} key={item.Id}>
<div
onClick={(e) => onCheckedChangeHandler(e, item as any)}
onDoubleClick={(e) => onDoubleClickHandler(e, item as any)}
key={item.Id}>
{renderItem(item as any)}
</div>
))}
Expand Down

0 comments on commit 2a13934

Please sign in to comment.