Merge pull request #104 from lyytioy/next

Version 1.0.17
lyytioy · Aug 9, 2022 · 96d7e99 · 96d7e99
2 parents 7650136 + c2c5777
commit 96d7e99
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 44 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/general_pr_template.md b/.github/PULL_REQUEST_TEMPLATE/general_pr_template.md
@@ -0,0 +1,5 @@
+## Background
+Why are these changes needed? 
+
+## Description
+What changes are introduced?
diff --git a/.github/PULL_REQUEST_TEMPLATE/release_pr_template.md b/.github/PULL_REQUEST_TEMPLATE/release_pr_template.md
@@ -0,0 +1,12 @@
+## 💡 Feature 1
+- [Add new prop isReleased](https://github.com/lyytioy/lyyti-design-system/pull/{PR_NUMBER})
+- [Update story to describe usage](https://github.com/lyytioy/lyyti-design-system/pull/{PR_NUMBER})
+
+## 🥏 Timeline component
+- [Add new Timeline component](https://github.com/lyytioy/lyyti-design-system/pull/{PR_NUMBER})
+
+## 🛠 Fixes
+- [Fix Button ref typing](https://github.com/lyytioy/lyyti-design-system/pull/{PR_NUMBER})
+
+## ⚠️ BREAKING CHANGES ⚠️
+- Button ref is now of type HTMLButtonElement instead of HTMLDivElement
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@lyyti/design-system",
   "description": "Lyyti Design System",
   "homepage": "https://lyytioy.github.io/lyyti-design-system",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "engines": {
     "node": "^16",
     "npm": "^8"

diff --git a/src/components/TimePicker.tsx b/src/components/TimePicker.tsx
@@ -9,7 +9,7 @@ export interface TimePickerProps<TDate = unknown> extends Omit<MuiTimePickerProp
   'data-testid'?: string;
 }
 
-const TimePicker = <TDate = unknown>({ ampm = false, InputProps = {}, ...props }: TimePickerProps<TDate>): JSX.Element => {
+const TimePicker = <TDate = unknown>({ ampm = false, InputProps = {}, InputAdornmentProps = {}, OpenPickerButtonProps = {}, ...props }: TimePickerProps<TDate>): JSX.Element => {
   return (
     <MuiTimePicker
       ampm={ampm}
@@ -18,11 +18,14 @@ const TimePicker = <TDate = unknown>({ ampm = false, InputProps = {}, ...props }
         sx: {
           ml: '0px',
         },
+        ...InputAdornmentProps
       }}
       OpenPickerButtonProps={{
         sx: {
           pointerEvents: 'none',
         },
+        tabIndex: -1,
+        ...OpenPickerButtonProps
       }}
       renderInput={(params) => (
         <TextField {...(params as TextFieldProps)} {...InputProps} />