Skip to content

Commit 3d2dfce

Browse files
committed
input updates
1 parent 846a652 commit 3d2dfce

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

packages/sn-controls-react/src/fieldcontrols/date-picker.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ const useStyles = makeStyles((theme: Theme) => {
3535
})
3636
})
3737

38+
const disabledDateTimes: string[] = ['CreationDate', 'ModificationDate']
39+
3840
const initialValueState = ({
3941
fieldValue,
4042
actionName,
@@ -78,6 +80,8 @@ export const DatePicker: React.FC<ReactClientFieldSetting<DateTimeFieldSetting>>
7880

7981
const localeCode = locale?.code || window.navigator.language
8082

83+
const isDisabled = settings.ReadOnly || disabledDateTimes.includes(settings.Name)
84+
8185
const dateFieldValue: Date = new Date(fieldValue as string)
8286

8387
switch (actionName) {
@@ -97,7 +101,7 @@ export const DatePicker: React.FC<ReactClientFieldSetting<DateTimeFieldSetting>>
97101
onChange={handleDateChange}
98102
name={settings.Name}
99103
id={settings.Name}
100-
disabled={settings.ReadOnly}
104+
disabled={isDisabled}
101105
InputLabelProps={{ shrink: true }}
102106
required={settings.Compulsory}
103107
format="yyyy MMMM dd"
@@ -113,7 +117,7 @@ export const DatePicker: React.FC<ReactClientFieldSetting<DateTimeFieldSetting>>
113117
onChange={handleDateChange}
114118
name={settings.Name}
115119
id={settings.Name}
116-
disabled={settings.ReadOnly}
120+
disabled={isDisabled}
117121
InputLabelProps={{ shrink: true }}
118122
required={settings.Compulsory}
119123
format="yyyy MMMM dd hh:mm aaaa"

packages/sn-controls-react/src/fieldcontrols/textarea.tsx

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @module FieldControls
33
*/
4-
import { TextField, Typography } from '@material-ui/core'
4+
import { FormHelperText, TextField, Typography } from '@material-ui/core'
55
import { deepMerge } from '@sensenet/client-utils'
66
import { LongTextFieldSetting } from '@sensenet/default-content-types'
77
import React, { useState } from 'react'
@@ -29,23 +29,26 @@ export const Textarea: React.FC<ReactClientFieldSetting<LongTextFieldSetting>> =
2929
case 'edit':
3030
case 'new':
3131
return (
32-
<TextField
33-
variant="outlined"
34-
rows={3}
35-
autoFocus={props.autoFocus}
36-
onChange={handleChange}
37-
name={props.settings.Name}
38-
id={props.settings.Name}
39-
label={props.settings.DisplayName}
40-
placeholder={props.settings.DisplayName}
41-
value={value}
42-
required={props.settings.Compulsory}
43-
disabled={props.settings.ReadOnly}
44-
multiline={true}
45-
fullWidth={true}
46-
helperText={props.hideDescription ? undefined : props.settings.Description}
47-
InputLabelProps={{ shrink: true }}
48-
/>
32+
<>
33+
<label htmlFor={props.settings.Name} style={{ fontSize: '15px' }}>
34+
{`${props.settings.DisplayName} (${props.settings.Name})`}
35+
</label>
36+
<TextField
37+
variant="outlined"
38+
autoFocus={props.autoFocus}
39+
onChange={handleChange}
40+
name={props.settings.Name}
41+
id={props.settings.Name}
42+
placeholder={props.settings.DisplayName}
43+
value={value}
44+
required={props.settings.Compulsory}
45+
disabled={props.settings.ReadOnly}
46+
multiline={true}
47+
fullWidth={true}
48+
helperText={props.hideDescription ? undefined : props.settings.Description}
49+
/>
50+
{!props.hideDescription && <FormHelperText>{props.settings.Description}</FormHelperText>}
51+
</>
4952
)
5053
case 'browse':
5154
default:

0 commit comments

Comments
 (0)