Skip to content

Commit 7c0d3d2

Browse files
committed
fix(*): timepicker align fix
1 parent 30a613e commit 7c0d3d2

6 files changed

+8
-3
lines changed
Loading
Loading
Loading

packages/plasma-new-hope/src/components/TimePicker/TimePicker.styles.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,15 @@ export const base = css`
170170
&.${classes.timePickerPlacementRight} {
171171
justify-content: flex-end;
172172
}
173+
174+
&.${classes.timePickerFixed} {
175+
width: var(${tokens.timePickerWidth});
176+
}
173177
`;
174178

175179
export const StyledTimePicker = styled.div<{ width?: string | number }>`
176180
background: var(${tokens.timePickerBackground});
177181
border-radius: var(${tokens.timePickerBorderRadius});
178-
width: ${({ width }) =>
179-
(width === 'fullWidth' ? `var(${tokens.width})` : width) || `var(${tokens.timePickerWidth})`};
180182
display: flex;
181183
padding: var(${tokens.timePickerPadding});
182184
flex: 1 1 1;

packages/plasma-new-hope/src/components/TimePicker/TimePicker.tokens.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export const classes = {
66
timeColumnLabel: 'plasma-time-picker-column-label',
77
timeItemActive: 'plasma-time-picker-item-active',
88
timePickerFullWidth: 'plasma-time-picker-full-width',
9+
timePickerFixed: 'plasma-time-picker-fixed',
910
timePickerActive: 'plasma-time-picker-active',
1011
timeColumnActive: 'plasma-time-picker-column-active',
1112
timeColumn: 'plasma-time-picker-column',

packages/plasma-new-hope/src/components/TimePicker/TimePicker.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ export const timePickerRoot = (
289289
view={view}
290290
size={size}
291291
className={cls(classes.timePickerRoot, className, {
292-
[classes.timePickerstretched]: stretched,
292+
[classes.timePickerFullWidth]: dropdownWidth === 'fullWidth',
293+
[classes.timePickerFixed]: dropdownWidth !== 'fullWidth',
293294
})}
294295
disabled={disabled}
295296
readonly={readonly}
@@ -304,6 +305,7 @@ export const timePickerRoot = (
304305
view={view}
305306
size={size}
306307
disabled={disabled}
308+
width={getDropdownWidth()}
307309
/>
308310
</Root>
309311
</StyledPopover>

0 commit comments

Comments
 (0)