fix(TimePicker): guard against null pointer (#14506)

* fix(TimePicker): guard against null pointer * chore(storybook): remove test story
carbon-design-system · Aug 25, 2023 · 86ece85 · 86ece85
1 parent 639c29c
commit 86ece85
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git 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
@@ -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 {