From 9b8dc9e9fa99d69ab21feba77fbc0ed706fc3986 Mon Sep 17 00:00:00 2001 From: Kayd Withers Date: Fri, 1 Sep 2023 08:46:37 +1000 Subject: [PATCH 01/14] fix: FilterMultiSelect margin-inline for chevron (#17) * fix: add margin-inline so that the spacing swaps in rtl * fix: add changeset --- .changeset/gentle-queens-jump.md | 5 +++++ .../Trigger/TriggerButtonBase/TriggerButtonBase.module.scss | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/gentle-queens-jump.md diff --git a/.changeset/gentle-queens-jump.md b/.changeset/gentle-queens-jump.md new file mode 100644 index 0000000..d865ce6 --- /dev/null +++ b/.changeset/gentle-queens-jump.md @@ -0,0 +1,5 @@ +--- +"@kaizen/select": patch +--- + +use margin-inline so that icon spacing swaps in rtl diff --git a/packages/select/src/FilterMultiSelect/components/Trigger/TriggerButtonBase/TriggerButtonBase.module.scss b/packages/select/src/FilterMultiSelect/components/Trigger/TriggerButtonBase/TriggerButtonBase.module.scss index c3a9452..8d9db6f 100644 --- a/packages/select/src/FilterMultiSelect/components/Trigger/TriggerButtonBase/TriggerButtonBase.module.scss +++ b/packages/select/src/FilterMultiSelect/components/Trigger/TriggerButtonBase/TriggerButtonBase.module.scss @@ -10,5 +10,5 @@ } .icon { - margin-left: $spacing-xs; + margin-inline-start: $spacing-xs; } From a8c5121f200cfba7281e1b2e1298647771cd8e71 Mon Sep 17 00:00:00 2001 From: kaydbwithers <115598563+kaydbwithers@users.noreply.github.com> Date: Fri, 1 Sep 2023 14:53:20 +1000 Subject: [PATCH 02/14] fix: add margin between label and input (#16) Add margin between label and input for DateRangePicker, DateInput, and TextField --- .changeset/famous-toes-reply.md | 6 ++++++ .../form/KaizenDraft/Form/TextField/TextField.module.scss | 4 ++++ .../form/KaizenDraft/Form/TextField/TextField.tsx | 1 + .../src/DateRangePicker/DateRangePicker.module.scss | 1 + .../src/_subcomponents/DateInput/DateInput.module.scss | 6 ++++++ .../date-picker/src/_subcomponents/DateInput/DateInput.tsx | 1 + 6 files changed, 19 insertions(+) create mode 100644 .changeset/famous-toes-reply.md diff --git a/.changeset/famous-toes-reply.md b/.changeset/famous-toes-reply.md new file mode 100644 index 0000000..c9f9c72 --- /dev/null +++ b/.changeset/famous-toes-reply.md @@ -0,0 +1,6 @@ +--- +"@kaizen/date-picker": minor +"@kaizen/draft-form": minor +--- + +add margin top to input and button to match labels from other components \ No newline at end of file diff --git a/draft-packages/form/KaizenDraft/Form/TextField/TextField.module.scss b/draft-packages/form/KaizenDraft/Form/TextField/TextField.module.scss index e28ce9b..cd705f8 100644 --- a/draft-packages/form/KaizenDraft/Form/TextField/TextField.module.scss +++ b/draft-packages/form/KaizenDraft/Form/TextField/TextField.module.scss @@ -14,6 +14,10 @@ } } +.input { + margin-top: $spacing-6; +} + $input-disabled-opacity: 0.3; /////////////////////////////////////////////////// diff --git a/draft-packages/form/KaizenDraft/Form/TextField/TextField.tsx b/draft-packages/form/KaizenDraft/Form/TextField/TextField.tsx index 5392c83..ff04276 100644 --- a/draft-packages/form/KaizenDraft/Form/TextField/TextField.tsx +++ b/draft-packages/form/KaizenDraft/Form/TextField/TextField.tsx @@ -85,6 +85,7 @@ export const TextField = ({ id={`${id}-field-input`} automationId={`${id}-field-input`} ariaDescribedBy={ariaDescribedBy} + classNameOverride={styles.input} disabled={disabled} reversed={reversed} status={status} diff --git a/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss b/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss index bc5fd01..2a4bf04 100644 --- a/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss +++ b/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss @@ -31,6 +31,7 @@ $placeholder-opacity: 0.7; background-clip: padding-box; border: $border-solid-border-width $border-solid-border-style $color-gray-500; border-radius: $border-solid-border-radius; + margin-top: $spacing-6; padding: 0 $button-base-padding-horizontal; &:focus-visible:not([disabled]), diff --git a/packages/date-picker/src/_subcomponents/DateInput/DateInput.module.scss b/packages/date-picker/src/_subcomponents/DateInput/DateInput.module.scss index 8b3a7df..4ab9add 100644 --- a/packages/date-picker/src/_subcomponents/DateInput/DateInput.module.scss +++ b/packages/date-picker/src/_subcomponents/DateInput/DateInput.module.scss @@ -1,3 +1,9 @@ +@import "~@kaizen/design-tokens/sass/spacing"; + .dateInput { width: 100%; } + +.input { + margin-top: $spacing-6; +} diff --git a/packages/date-picker/src/_subcomponents/DateInput/DateInput.tsx b/packages/date-picker/src/_subcomponents/DateInput/DateInput.tsx index 2d8311a..a7ebec4 100644 --- a/packages/date-picker/src/_subcomponents/DateInput/DateInput.tsx +++ b/packages/date-picker/src/_subcomponents/DateInput/DateInput.tsx @@ -34,6 +34,7 @@ export const DateInput = React.forwardRef( inputRef={isRefObject(ref) ? ref : undefined} id={id} autoComplete="off" + classNameOverride={styles.input} disabled={disabled} reversed={isReversed} {...inputProps} From 130cb0cc61b864fcbe2aac0291381212240be6f2 Mon Sep 17 00:00:00 2001 From: Baptiste Thieblemont Date: Fri, 1 Sep 2023 16:17:32 +1000 Subject: [PATCH 03/14] Fix checkbox focus on table header row (#19) * fix checkbox focus on table header row * Restore the overflow but only for nowrap --------- Co-authored-by: Doug MacKenzie Co-authored-by: Doug MacKenzie --- .changeset/shy-steaks-cough.md | 5 +++++ draft-packages/table/KaizenDraft/Table/Table.module.scss | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 .changeset/shy-steaks-cough.md diff --git a/.changeset/shy-steaks-cough.md b/.changeset/shy-steaks-cough.md new file mode 100644 index 0000000..7ed2a35 --- /dev/null +++ b/.changeset/shy-steaks-cough.md @@ -0,0 +1,5 @@ +--- +"@kaizen/draft-table": patch +--- + +fix checkbox focus on table header row diff --git a/draft-packages/table/KaizenDraft/Table/Table.module.scss b/draft-packages/table/KaizenDraft/Table/Table.module.scss index a3d2b0f..5f17291 100644 --- a/draft-packages/table/KaizenDraft/Table/Table.module.scss +++ b/draft-packages/table/KaizenDraft/Table/Table.module.scss @@ -70,6 +70,10 @@ $row-height-data-variant: 48px; .headerRowCell .headerRowCellTooltip { display: flex; align-items: stretch; +} + +// overflow has to be set at this level as well as on the heading for some reason ¯\_(ツ)_/¯ +.headerRowCell.headerRowCellNoWrap .headerRowCellTooltip { overflow: hidden; } From ef09e39e3d09d326e05f070b067c8eb6592618bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 06:24:49 +0000 Subject: [PATCH 04/14] version packages (#18) Co-authored-by: github-actions[bot] --- .changeset/famous-toes-reply.md | 6 ------ .changeset/gentle-queens-jump.md | 5 ----- .changeset/shy-steaks-cough.md | 5 ----- draft-packages/form/CHANGELOG.md | 6 ++++++ draft-packages/form/package.json | 2 +- draft-packages/table/CHANGELOG.md | 9 +++++++++ draft-packages/table/package.json | 4 ++-- packages/date-picker/CHANGELOG.md | 11 +++++++++++ packages/date-picker/package.json | 4 ++-- packages/select/CHANGELOG.md | 9 +++++++++ packages/select/package.json | 4 ++-- 11 files changed, 42 insertions(+), 23 deletions(-) delete mode 100644 .changeset/famous-toes-reply.md delete mode 100644 .changeset/gentle-queens-jump.md delete mode 100644 .changeset/shy-steaks-cough.md diff --git a/.changeset/famous-toes-reply.md b/.changeset/famous-toes-reply.md deleted file mode 100644 index c9f9c72..0000000 --- a/.changeset/famous-toes-reply.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@kaizen/date-picker": minor -"@kaizen/draft-form": minor ---- - -add margin top to input and button to match labels from other components \ No newline at end of file diff --git a/.changeset/gentle-queens-jump.md b/.changeset/gentle-queens-jump.md deleted file mode 100644 index d865ce6..0000000 --- a/.changeset/gentle-queens-jump.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@kaizen/select": patch ---- - -use margin-inline so that icon spacing swaps in rtl diff --git a/.changeset/shy-steaks-cough.md b/.changeset/shy-steaks-cough.md deleted file mode 100644 index 7ed2a35..0000000 --- a/.changeset/shy-steaks-cough.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@kaizen/draft-table": patch ---- - -fix checkbox focus on table header row diff --git a/draft-packages/form/CHANGELOG.md b/draft-packages/form/CHANGELOG.md index e990365..03df7c4 100644 --- a/draft-packages/form/CHANGELOG.md +++ b/draft-packages/form/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 10.5.0 + +### Minor Changes + +- [#16](https://github.com/cultureamp/kaizen-legacy/pull/16) [`a8c5121`](https://github.com/cultureamp/kaizen-legacy/commit/a8c5121f200cfba7281e1b2e1298647771cd8e71) - add margin top to input and button to match labels from other components + ## 10.4.9 ### Patch Changes diff --git a/draft-packages/form/package.json b/draft-packages/form/package.json index 0e64383..c39fa64 100644 --- a/draft-packages/form/package.json +++ b/draft-packages/form/package.json @@ -1,6 +1,6 @@ { "name": "@kaizen/draft-form", - "version": "10.4.9", + "version": "10.5.0", "description": "The draft Form component", "scripts": { "prepublishOnly": "tsc --project tsconfig.dist.json", diff --git a/draft-packages/table/CHANGELOG.md b/draft-packages/table/CHANGELOG.md index 1084919..3f9798d 100644 --- a/draft-packages/table/CHANGELOG.md +++ b/draft-packages/table/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## 5.9.5 + +### Patch Changes + +- [#19](https://github.com/cultureamp/kaizen-legacy/pull/19) [`130cb0c`](https://github.com/cultureamp/kaizen-legacy/commit/130cb0cc61b864fcbe2aac0291381212240be6f2) - fix checkbox focus on table header row + +- Updated dependencies [[`a8c5121`](https://github.com/cultureamp/kaizen-legacy/commit/a8c5121f200cfba7281e1b2e1298647771cd8e71)]: + - @kaizen/draft-form@10.5.0 + ## 5.9.4 ### Patch Changes diff --git a/draft-packages/table/package.json b/draft-packages/table/package.json index a158288..4341cd1 100644 --- a/draft-packages/table/package.json +++ b/draft-packages/table/package.json @@ -1,6 +1,6 @@ { "name": "@kaizen/draft-table", - "version": "5.9.4", + "version": "5.9.5", "description": "The draft Table component", "scripts": { "prepublishOnly": "tsc --project tsconfig.dist.json", @@ -27,7 +27,7 @@ "dependencies": { "@kaizen/component-base": "^1.1.7", "@kaizen/component-library": "^16.9.3", - "@kaizen/draft-form": "^10.4.9", + "@kaizen/draft-form": "^10.5.0", "@kaizen/draft-tooltip": "^5.4.47", "@kaizen/typography": "^2.3.11", "classnames": "^2.3.2" diff --git a/packages/date-picker/CHANGELOG.md b/packages/date-picker/CHANGELOG.md index 0c4a167..c45392b 100644 --- a/packages/date-picker/CHANGELOG.md +++ b/packages/date-picker/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## 6.3.0 + +### Minor Changes + +- [#16](https://github.com/cultureamp/kaizen-legacy/pull/16) [`a8c5121`](https://github.com/cultureamp/kaizen-legacy/commit/a8c5121f200cfba7281e1b2e1298647771cd8e71) - add margin top to input and button to match labels from other components + +### Patch Changes + +- Updated dependencies [[`a8c5121`](https://github.com/cultureamp/kaizen-legacy/commit/a8c5121f200cfba7281e1b2e1298647771cd8e71)]: + - @kaizen/draft-form@10.5.0 + ## 6.2.5 ### Patch Changes diff --git a/packages/date-picker/package.json b/packages/date-picker/package.json index 1b24332..c6c4230 100644 --- a/packages/date-picker/package.json +++ b/packages/date-picker/package.json @@ -1,6 +1,6 @@ { "name": "@kaizen/date-picker", - "version": "6.2.5", + "version": "6.3.0", "description": "Date Picker component", "scripts": { "prepublishOnly": "tsc --project tsconfig.dist.json", @@ -28,7 +28,7 @@ "@internationalized/date": "^3.4.0", "@kaizen/a11y": "^1.7.12", "@kaizen/component-base": "^1.1.7", - "@kaizen/draft-form": "^10.4.9", + "@kaizen/draft-form": "^10.5.0", "@kaizen/draft-tooltip": "^5.4.47", "@kaizen/typography": "^2.3.11", "@popperjs/core": "^2.11.8", diff --git a/packages/select/CHANGELOG.md b/packages/select/CHANGELOG.md index ff3a4c6..67e9956 100644 --- a/packages/select/CHANGELOG.md +++ b/packages/select/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## 6.19.1 + +### Patch Changes + +- [#17](https://github.com/cultureamp/kaizen-legacy/pull/17) [`9b8dc9e`](https://github.com/cultureamp/kaizen-legacy/commit/9b8dc9e9fa99d69ab21feba77fbc0ed706fc3986) - use margin-inline so that icon spacing swaps in rtl + +- Updated dependencies [[`a8c5121`](https://github.com/cultureamp/kaizen-legacy/commit/a8c5121f200cfba7281e1b2e1298647771cd8e71)]: + - @kaizen/draft-form@10.5.0 + ## 6.19.0 ### Minor Changes diff --git a/packages/select/package.json b/packages/select/package.json index e684c94..4fd69ef 100644 --- a/packages/select/package.json +++ b/packages/select/package.json @@ -1,6 +1,6 @@ { "name": "@kaizen/select", - "version": "6.19.0", + "version": "6.19.1", "description": "Select components", "scripts": { "prepublishOnly": "tsc --project tsconfig.dist.json", @@ -31,7 +31,7 @@ "@kaizen/component-library": "^16.9.3", "@kaizen/draft-badge": "^1.13.12", "@kaizen/draft-divider": "^2.2.11", - "@kaizen/draft-form": "^10.4.9", + "@kaizen/draft-form": "^10.5.0", "@kaizen/draft-menu": "^5.0.2", "@kaizen/draft-tooltip": "^5.4.47", "@kaizen/loading-skeleton": "^2.0.7", From 40474b5345f913876bf9574a5d2372d6f3d7d914 Mon Sep 17 00:00:00 2001 From: Kayd Withers Date: Mon, 4 Sep 2023 08:48:16 +1000 Subject: [PATCH 05/14] fix: DateRangePicker text align right in rtl (#20) * fix: align text right in rtl * feat: add changeset * fix: move rtl to prevent lint error --- .changeset/strange-plums-complain.md | 5 +++++ .../src/DateRangePicker/DateRangePicker.module.scss | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 .changeset/strange-plums-complain.md diff --git a/.changeset/strange-plums-complain.md b/.changeset/strange-plums-complain.md new file mode 100644 index 0000000..a47e7ad --- /dev/null +++ b/.changeset/strange-plums-complain.md @@ -0,0 +1,5 @@ +--- +"@kaizen/date-picker": patch +--- + +align text right for rtl diff --git a/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss b/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss index 2a4bf04..4bc83e0 100644 --- a/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss +++ b/packages/date-picker/src/DateRangePicker/DateRangePicker.module.scss @@ -34,6 +34,10 @@ $placeholder-opacity: 0.7; margin-top: $spacing-6; padding: 0 $button-base-padding-horizontal; + [dir="rtl"] & { + text-align: right; + } + &:focus-visible:not([disabled]), &:hover:not([disabled]) { background-color: $color-gray-200; From 1c4205897ef19bfdd988c0dc297b0fced039a3fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 3 Sep 2023 22:51:17 +0000 Subject: [PATCH 06/14] version packages (#22) Co-authored-by: github-actions[bot] --- .changeset/strange-plums-complain.md | 5 ----- packages/date-picker/CHANGELOG.md | 6 ++++++ packages/date-picker/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/strange-plums-complain.md diff --git a/.changeset/strange-plums-complain.md b/.changeset/strange-plums-complain.md deleted file mode 100644 index a47e7ad..0000000 --- a/.changeset/strange-plums-complain.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@kaizen/date-picker": patch ---- - -align text right for rtl diff --git a/packages/date-picker/CHANGELOG.md b/packages/date-picker/CHANGELOG.md index c45392b..a83ef09 100644 --- a/packages/date-picker/CHANGELOG.md +++ b/packages/date-picker/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.3.1 + +### Patch Changes + +- [#20](https://github.com/cultureamp/kaizen-legacy/pull/20) [`40474b5`](https://github.com/cultureamp/kaizen-legacy/commit/40474b5345f913876bf9574a5d2372d6f3d7d914) - align text right for rtl + ## 6.3.0 ### Minor Changes diff --git a/packages/date-picker/package.json b/packages/date-picker/package.json index c6c4230..b984731 100644 --- a/packages/date-picker/package.json +++ b/packages/date-picker/package.json @@ -1,6 +1,6 @@ { "name": "@kaizen/date-picker", - "version": "6.3.0", + "version": "6.3.1", "description": "Date Picker component", "scripts": { "prepublishOnly": "tsc --project tsconfig.dist.json", From 3f71968135c8174e7c2d442f3095faa58e9bb504 Mon Sep 17 00:00:00 2001 From: Kayd Withers Date: Mon, 4 Sep 2023 12:12:12 +1000 Subject: [PATCH 07/14] fix: add classNameOverride to MultiSelectOption (#21) * fix: add content-box to icon * feat: add changeset * fix: update comment * fix: add classNameOverride to MultiSelectOption * fix: remove style override * fix: add new changeset description * fix: remove html attributes type --- .changeset/pink-ghosts-grow.md | 5 +++++ .../components/MultiSelectOption/MultiSelectOption.tsx | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 .changeset/pink-ghosts-grow.md diff --git a/.changeset/pink-ghosts-grow.md b/.changeset/pink-ghosts-grow.md new file mode 100644 index 0000000..0673fe4 --- /dev/null +++ b/.changeset/pink-ghosts-grow.md @@ -0,0 +1,5 @@ +--- +"@kaizen/select": minor +--- + +Add classNameOverride to MultiSelectOption. diff --git a/packages/select/src/FilterMultiSelect/components/MultiSelectOption/MultiSelectOption.tsx b/packages/select/src/FilterMultiSelect/components/MultiSelectOption/MultiSelectOption.tsx index 1c6ed99..d9993db 100644 --- a/packages/select/src/FilterMultiSelect/components/MultiSelectOption/MultiSelectOption.tsx +++ b/packages/select/src/FilterMultiSelect/components/MultiSelectOption/MultiSelectOption.tsx @@ -13,10 +13,12 @@ import { useSelectionContext } from "../../provider" import styles from "./MultiSelectOption.module.scss" export interface MultiSelectOptionProps { + classNameOverride?: string item: MultiSelectItem } export const MultiSelectOption = ({ + classNameOverride, item, }: MultiSelectOptionProps): JSX.Element => { const { selectionState: state } = useSelectionContext() @@ -39,6 +41,7 @@ export const MultiSelectOption = ({ ref={ref} className={classnames( styles.option, + classNameOverride, isSelected && styles.isSelected, isFocusVisible && styles.isFocusVisible, isDisabled && styles.isDisabled From 74c5da5d7e68a9d70b462dd06e08739bb66ce531 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 02:15:28 +0000 Subject: [PATCH 08/14] version packages (#23) Co-authored-by: github-actions[bot] --- .changeset/pink-ghosts-grow.md | 5 ----- packages/select/CHANGELOG.md | 6 ++++++ packages/select/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/pink-ghosts-grow.md diff --git a/.changeset/pink-ghosts-grow.md b/.changeset/pink-ghosts-grow.md deleted file mode 100644 index 0673fe4..0000000 --- a/.changeset/pink-ghosts-grow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@kaizen/select": minor ---- - -Add classNameOverride to MultiSelectOption. diff --git a/packages/select/CHANGELOG.md b/packages/select/CHANGELOG.md index 67e9956..4ca10bc 100644 --- a/packages/select/CHANGELOG.md +++ b/packages/select/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.20.0 + +### Minor Changes + +- [#21](https://github.com/cultureamp/kaizen-legacy/pull/21) [`3f71968`](https://github.com/cultureamp/kaizen-legacy/commit/3f71968135c8174e7c2d442f3095faa58e9bb504) - Add classNameOverride to MultiSelectOption. + ## 6.19.1 ### Patch Changes diff --git a/packages/select/package.json b/packages/select/package.json index 4fd69ef..065a4c1 100644 --- a/packages/select/package.json +++ b/packages/select/package.json @@ -1,6 +1,6 @@ { "name": "@kaizen/select", - "version": "6.19.1", + "version": "6.20.0", "description": "Select components", "scripts": { "prepublishOnly": "tsc --project tsconfig.dist.json", From 948b07c671aa8c364741ee2fe1bc5aeb47d96a0a Mon Sep 17 00:00:00 2001 From: Baptiste Thieblemont Date: Wed, 6 Sep 2023 14:06:08 +1000 Subject: [PATCH 09/14] fix(TimeField): align label spacing and disabled with DatePicker (#24) * fix(TimeField): align label spacing and disabled with DatePicker * fix(TimeField): use classname for consistency * fix(TimeField): move margin to heading to fix focus style --- .changeset/fresh-keys-glow.md | 5 +++++ .../date-picker/src/TimeField/TimeField.module.scss | 4 ++++ packages/date-picker/src/TimeField/TimeField.tsx | 10 +++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .changeset/fresh-keys-glow.md diff --git a/.changeset/fresh-keys-glow.md b/.changeset/fresh-keys-glow.md new file mode 100644 index 0000000..ced6ce0 --- /dev/null +++ b/.changeset/fresh-keys-glow.md @@ -0,0 +1,5 @@ +--- +"@kaizen/date-picker": patch +--- + +Align spacing and disabled state with DatePicker diff --git a/packages/date-picker/src/TimeField/TimeField.module.scss b/packages/date-picker/src/TimeField/TimeField.module.scss index 53cae56..715a159 100644 --- a/packages/date-picker/src/TimeField/TimeField.module.scss +++ b/packages/date-picker/src/TimeField/TimeField.module.scss @@ -22,6 +22,10 @@ $story-className--timefield-focus: ":global(.story__timefield-focus)"; color: $color-purple-800; } +.heading { + margin-bottom: $spacing-6; +} + .input { display: inline-flex; align-items: center; diff --git a/packages/date-picker/src/TimeField/TimeField.tsx b/packages/date-picker/src/TimeField/TimeField.tsx index 4658356..a5c527d 100644 --- a/packages/date-picker/src/TimeField/TimeField.tsx +++ b/packages/date-picker/src/TimeField/TimeField.tsx @@ -97,7 +97,15 @@ const TimeFieldComponent = ({ ) return (
- + {label}
From 12687949b778c2468bb10b822f691213a8d38dce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 04:14:53 +0000 Subject: [PATCH 10/14] version packages (#25) Co-authored-by: github-actions[bot] --- .changeset/fresh-keys-glow.md | 5 ----- packages/date-picker/CHANGELOG.md | 6 ++++++ packages/date-picker/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/fresh-keys-glow.md diff --git a/.changeset/fresh-keys-glow.md b/.changeset/fresh-keys-glow.md deleted file mode 100644 index ced6ce0..0000000 --- a/.changeset/fresh-keys-glow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@kaizen/date-picker": patch ---- - -Align spacing and disabled state with DatePicker diff --git a/packages/date-picker/CHANGELOG.md b/packages/date-picker/CHANGELOG.md index a83ef09..c0779f1 100644 --- a/packages/date-picker/CHANGELOG.md +++ b/packages/date-picker/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.3.2 + +### Patch Changes + +- [#24](https://github.com/cultureamp/kaizen-legacy/pull/24) [`948b07c`](https://github.com/cultureamp/kaizen-legacy/commit/948b07c671aa8c364741ee2fe1bc5aeb47d96a0a) - Align spacing and disabled state with DatePicker + ## 6.3.1 ### Patch Changes diff --git a/packages/date-picker/package.json b/packages/date-picker/package.json index b984731..dbd1d7a 100644 --- a/packages/date-picker/package.json +++ b/packages/date-picker/package.json @@ -1,6 +1,6 @@ { "name": "@kaizen/date-picker", - "version": "6.3.1", + "version": "6.3.2", "description": "Date Picker component", "scripts": { "prepublishOnly": "tsc --project tsconfig.dist.json", From 1d5f8790adecd927612059b965628deb31a5ac82 Mon Sep 17 00:00:00 2001 From: Brandon Winch Date: Fri, 8 Sep 2023 13:10:34 +1000 Subject: [PATCH 11/14] fix: set disabled prop on Select label (#27) Co-authored-by: Brandon Winch --- .changeset/nervous-humans-kneel.md | 5 +++++ packages/select/src/Select/Select.tsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/nervous-humans-kneel.md diff --git a/.changeset/nervous-humans-kneel.md b/.changeset/nervous-humans-kneel.md new file mode 100644 index 0000000..b88c759 --- /dev/null +++ b/.changeset/nervous-humans-kneel.md @@ -0,0 +1,5 @@ +--- +"@kaizen/select": patch +--- + +fix Select label font colour when disabled diff --git a/packages/select/src/Select/Select.tsx b/packages/select/src/Select/Select.tsx index 752e379..80fb383 100644 --- a/packages/select/src/Select/Select.tsx +++ b/packages/select/src/Select/Select.tsx @@ -161,7 +161,7 @@ export const Select = ({ classNameOverride )} > -