Skip to content

Commit

Permalink
Merge renovate/rollup into renovate/update/react-select-5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
cultureamp-renovate[bot] authored Feb 7, 2025
2 parents 05d0e8d + 6a973bb commit 4c1a350
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .buildkite/scripts/build-storybook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

# shellcheck source=setup-registry.sh
. ".buildkite/scripts/helpers/setup-registry.sh"

npm install -g [email protected]
corepack enable
pnpm install --frozen-lockfile
pnpm turbo build:docs --filter=@docs/storybook
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ runs:
using: composite
steps:
- name: Install package manager via corepack
run: corepack enable
run: |
npm install -g [email protected]
corepack enable
shell: bash

- name: Cache pnpm store
Expand Down
6 changes: 6 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @docs/storybook

## 0.0.5

### Patch Changes

- [#5498](https://github.com/cultureamp/kaizen-design-system/pull/5498) [`c1ea1de`](https://github.com/cultureamp/kaizen-design-system/commit/c1ea1de895d4c66b1a1b18c0d3084c4fc228d2dc) - Overriding transient dependency @storybook/react-vite package to fix issue

## 0.0.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@docs/storybook",
"private": true,
"version": "0.0.4",
"version": "0.0.5",
"type": "module",
"scripts": {
"lint:ts": "tsc --noEmit",
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
"react-dom": "18",
"eslint": "9"
}
},
"overrides": {
"@joshwooding/vite-plugin-react-docgen-typescript": "0.5.0"
}
}
}
20 changes: 20 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Change Log

## 1.70.17

### Patch Changes

- [#5504](https://github.com/cultureamp/kaizen-design-system/pull/5504) [`8fe7419`](https://github.com/cultureamp/kaizen-design-system/commit/8fe7419ff0e8e2d177c101d67ced16a080ea7bf9) - ToggleSwitch: removes hover style from disabled state

## 1.70.16

### Patch Changes

- [#5501](https://github.com/cultureamp/kaizen-design-system/pull/5501) [`987a2b0`](https://github.com/cultureamp/kaizen-design-system/commit/987a2b0ad2f63d8a17e81b18046d3181d9efbf03) - Set styles to be in style condition for export

- [#5499](https://github.com/cultureamp/kaizen-design-system/pull/5499) [`236ecac`](https://github.com/cultureamp/kaizen-design-system/commit/236ecac2dc4583b7d2fe8f6a4b57fb1496ebd8ee) - Export dist styles from exports field

## 1.70.15

### Patch Changes

- [#5492](https://github.com/cultureamp/kaizen-design-system/pull/5492) [`907da4c`](https://github.com/cultureamp/kaizen-design-system/commit/907da4c38413f4d6c7239da1a147684c4b651450) - Set fields in export so that Vitest can resolve to ESM modules instead of CJS.

## 1.70.14

### Patch Changes
Expand Down
59 changes: 58 additions & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kaizen/components",
"version": "1.70.14",
"version": "1.70.17",
"description": "Kaizen component library",
"author": "Geoffrey Chong <[email protected]>",
"homepage": "https://cultureamp.design",
Expand Down Expand Up @@ -30,6 +30,63 @@
"sideEffects": [
"styles.css"
],
"exports": {
".": {
"import": "./dist/esm/index.mjs",
"require": "./dist/cjs/index.cjs",
"types": "./dist/types/index.d.ts"
},
"./future": {
"import": "./dist/esm/future.mjs",
"require": "./dist/cjs/future.cjs",
"types": "./dist/types/__rc__/index.d.ts"
},
"./v1/actions": {
"import": "./dist/esm/actionsV1.mjs",
"require": "./dist/cjs/actionsV1.cjs",
"types": "./dist/types/v1-actions.d.ts"
},
"./v1/overlays": {
"import": "./dist/esm/overlaysV1.mjs",
"main": "./dist/cjs/overlaysV1.cjs",
"types": "./dist/types/v1-overlays.d.ts"
},
"./v2/actions": {
"import": "./dist/esm/actionsV2.mjs",
"require": "./dist/cjs/actionsV2.cjs",
"types": "./dist/types/v2-actions.d.ts"
},
"./v2/overlays": {
"import": "./dist/esm/overlaysV2.mjs",
"require": "./dist/cjs/overlaysV2.cjs",
"types": "./dist/types/v2-overlays.d.ts"
},
"./v3/actions": {
"import": "./dist/esm/actionsV3.mjs",
"require": "./dist/cjs/actionsV3.cjs",
"types": "./dist/types/v3-actions.d.ts"
},
"./v3/overlays": {
"import": "./dist/esm/overlaysV3.mjs",
"require": "./dist/cjs/overlaysV3.cjs",
"types": "./dist/types/v3-overlays.d.ts"
},
"./v3/react-aria": {
"import": "./dist/esm/reactAriaV3.mjs",
"require": "./dist/cjs/reactAriaV3.cjs",
"types": "./dist/types/__react-aria__/index.d.ts"
},
"./v3/react-aria-components": {
"import": "./dist/esm/reactAriaComponentsV3.mjs",
"require": "./dist/cjs/reactAriaComponentsV3.cjs",
"types": "./dist/types/__react-aria-components__/index.d.ts"
},
"./dist/styles.css": {
"import": "./dist/styles.css",
"require": "./dist/styles.css",
"style": "./dist/styles.css"
}
},
"bin": {
"kaizen-codemod": "./bin/codemod.sh"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,20 @@ $focus-ring-offset: 1px;

/* TODO: Fix */
/* stylelint-disable no-descending-specificity */
.checkbox:focus + &,
.checkbox:hover:focus + & {
.checkbox:not(.disabled):focus + &,
.checkbox:not(.disabled):hover:focus + & {
border-color: transparent;
outline: 2px solid $color-blue-500;
outline-offset: $focus-ring-offset;
background-color: $color-gray-600;
}

.checkbox + &:hover,
.checkbox:not(.disabled) + &:hover,
label:hover .checkbox + & {
background-color: $color-purple-500;
background-color: $color-gray-600;
}

/* stylelint-enable no-descending-specificity */
}

Expand Down Expand Up @@ -86,7 +87,7 @@ $focus-ring-offset: 1px;
transition-duration: $animation-duration-fast;
}

.checkbox + .track:hover,
.checkbox:not(.disabled) + .track:hover,
label:hover & .checkbox + .track {
background-color: $color-green-600;
}
Expand Down Expand Up @@ -116,10 +117,11 @@ $focus-ring-offset: 1px;
background-color: rgba($color-white-rgb, 0.65);
}

.checkbox + .track:hover,
.checkbox:not(.disabled) + .track:hover,
label:hover & .checkbox + .track {
background-color: rgba($color-white-rgb, 0.65);
}
}
}

/* stylelint-enable no-descending-specificity */
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const ToggleSwitch = ({
toggledStatus,
onToggle,
reversed,
disabled,
...restProps
}: ToggleSwitchProps): JSX.Element => {
const isOn = toggledStatus === 'on'
Expand All @@ -27,12 +28,13 @@ export const ToggleSwitch = ({
<span className={classnames(isOn ? styles.on : styles.off, reversed && styles.reversed)}>
<input
type="checkbox"
className={styles.checkbox}
className={classnames(styles.checkbox, disabled && styles.disabled)}
checked={isOn ? true : false}
onChange={onToggle}
disabled={disabled}
{...restProps}
/>
<span className={styles.track}>
<span className={classnames(styles.track, disabled && styles.disabled)}>
<span className={styles.thumb}>
<Icon name="check" isPresentational className={styles.checkIcon} />
</span>
Expand Down
12 changes: 8 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4c1a350

Please sign in to comment.