diff --git a/packages/react/src/components/TimePicker/TimePicker.tsx b/packages/react/src/components/TimePicker/TimePicker.tsx index 556777f97261..04f9cb5958da 100644 --- a/packages/react/src/components/TimePicker/TimePicker.tsx +++ b/packages/react/src/components/TimePicker/TimePicker.tsx @@ -252,12 +252,14 @@ const TimePicker: TimePickerComponent = React.forwardRef< const mappedChildren = React.Children.map(children, (pickerSelect) => { const item = pickerSelect as any; - return React.cloneElement(item, { - ...item.props, - disabled: disabled, - readOnly: readOnly, - ...readOnlyEventHandlers, - }); + if (item) { + return React.cloneElement(item, { + ...item.props, + disabled: disabled, + readOnly: readOnly, + ...readOnlyEventHandlers, + }); + } }); return mappedChildren; diff --git a/packages/styles/scss/components/time-picker/_time-picker.scss b/packages/styles/scss/components/time-picker/_time-picker.scss index dd491d8e9b7c..e752f65cfada 100644 --- a/packages/styles/scss/components/time-picker/_time-picker.scss +++ b/packages/styles/scss/components/time-picker/_time-picker.scss @@ -27,10 +27,7 @@ .#{$prefix}--time-picker__select { justify-content: center; - - &:not(:last-of-type) { - margin: 0 $spacing-01; - } + margin-left: $spacing-01; } .#{$prefix}--time-picker__input {