Skip to content

Commit 84ff24f

Browse files
authored
Merge pull request #739 from Lemoncode/feature/#715-fix-date-picker-height
Feature/#715 Fix date picker height
2 parents a054a1e + 092fb8c commit 84ff24f

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/common/components/mock-components/front-components/datepickerinput-shape.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import calendarIconSrc from '/icons/calendar.svg';
1111
import disabledCalendarIconSrc from '/icons/calendar-disabled.svg';
1212

1313
const datepickerInputShapeRestrictions: ShapeSizeRestrictions = {
14-
minWidth: 100,
15-
minHeight: 30,
14+
minWidth: 38,
15+
minHeight: 38,
1616
maxWidth: -1,
17-
maxHeight: 50,
18-
defaultWidth: 180,
19-
defaultHeight: 50,
17+
maxHeight: 38,
18+
defaultWidth: BASIC_SHAPE.DEFAULT_TEXT_WIDTH,
19+
defaultHeight: BASIC_SHAPE.DEFAULT_TEXT_HEIGHT,
2020
};
2121

2222
const shapeType: ShapeType = 'datepickerinput';
@@ -113,7 +113,9 @@ export const DatepickerInputShape = forwardRef<any, ShapeProps>(
113113
x={10}
114114
y={(restrictedHeight - fontSize) / 2 + 2}
115115
width={availableWidth}
116+
fontFamily={BASIC_SHAPE.DEFAULT_FONT_FAMILY}
116117
fontSize={BASIC_SHAPE.DEFAULT_FONT_SIZE}
118+
lineHeight={BASIC_SHAPE.DEFAULT_LINE_HEIGHT}
117119
align="left"
118120
ellipsis={true}
119121
wrap="none"

src/pods/canvas/model/transformer.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export const generateTypeOfTransformer = (shapeType: ShapeType): string[] => {
4646
case 'label':
4747
case 'input':
4848
case 'combobox':
49+
case 'datepickerinput':
4950
case 'horizontalLine':
5051
case 'listbox':
5152
case 'checkbox':

0 commit comments

Comments
 (0)