Skip to content

Commit

Permalink
Merge pull request #1284 from dequelabs/release-v5.11.0
Browse files Browse the repository at this point in the history
chore(cauldron): Release 5.11.0
  • Loading branch information
scurker committed Nov 9, 2023
2 parents f61794d + e0828c3 commit 36de25e
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 93 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
- run: yarn
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/preview-cleanup.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/preview.yml

This file was deleted.

26 changes: 4 additions & 22 deletions .github/workflows/semantic-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,12 @@ on:
pull_request:
types:
- opened
- synchronize
- reopened
- edited
- synchronize

jobs:
validate:
semantic-pr-title:
runs-on: ubuntu-latest
steps:
- name: Check PR title
run: |
set -e
Title='${{ github.event.pull_request.title }}'
CommitTypes="feat fix perf style docs refactor test build ci chore Merge Revert"
echo "Validating PR title: \"$Title\""
echo
for Type in $CommitTypes; do
if [[ "$Title" =~ ^"$Type" ]]; then
echo "Title matches conventional commits."
exit 0
fi
done
echo "PR title does not follow conventional commits."
echo "Please refer to https://www.conventionalcommits.org/en/v1.0.0"
exit 1
- uses: dequelabs/semantic-pr-title@v1
2 changes: 1 addition & 1 deletion .github/workflows/tag-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: 'master'
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
- run: |
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [5.11.0](https://github.com/dequelabs/cauldron/compare/v5.10.0...v5.11.0) (2023-11-09)


### Features

* **react:** sync alert modals with uxpin ([5cfcb57](https://github.com/dequelabs/cauldron/commit/5cfcb5756051d09578f78fb60b49b4ef073504ae))


### Bug Fixes

* review comments ([5e22461](https://github.com/dequelabs/cauldron/commit/5e2246189d32c042a5f5c0d80c31fd2fdb36c801))

## [5.10.0](https://github.com/dequelabs/cauldron/compare/v5.9.1...v5.10.0) (2023-11-07)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cauldron",
"private": true,
"version": "5.10.0",
"version": "5.11.0",
"license": "MPL-2.0",
"scripts": {
"clean": "rimraf dist docs/dist",
Expand Down
17 changes: 13 additions & 4 deletions packages/react/__tests__/src/components/Alert/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,31 @@ import axe from '../../../axe';
const defaults = { show: false, heading: { text: 'hi' } };

test('returns null if passed a falsey "show" prop', () => {
const alert = mount(<Alert {...defaults}>{'hello'}</Alert>);
const alert = mount(<Alert {...defaults}>hello</Alert>);
expect(alert.html()).toBe('');
});

test('shows modal if passed a truthy "show" prop', () => {
const alert = mount(
<Alert {...defaults} show={true}>
{'hello'}
<Alert {...defaults} show>
hello
</Alert>
);
expect(alert.find('.Alert').exists()).toBe(true);
});

test('should return no axe violations', async () => {
const alert = mount(
<Alert show={true} heading={'title'}>
<Alert show heading="title">
Hello!
</Alert>
);
expect(await axe(alert.html())).toHaveNoViolations();
});

test('should return no axe violations warning variant', async () => {
const alert = mount(
<Alert show variant="warning" heading="title">
Hello!
</Alert>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deque/cauldron-react",
"version": "5.10.0",
"version": "5.11.0",
"license": "MPL-2.0",
"description": "Fully accessible react components library for Deque Cauldron",
"homepage": "https://cauldron.dequelabs.com/",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Alert/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Alert = ({
heading={{
text: (
<React.Fragment>
<Icon type={variant === 'default' ? 'info-circle-alt' : 'caution'} />
<Icon type={variant === 'default' ? 'info-circle' : 'caution'} />
{typeof heading === 'object' && 'text' in heading
? heading.text
: heading}
Expand Down
32 changes: 24 additions & 8 deletions packages/styles/alert.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,37 @@
:root {
--alert-warning-background-color: #d93251;
--alert-warning-header-text-color: #fff;

--alert-border-color: var(--accent-primary);
--alert-warning-border-color: var(--accent-error);

--alert-icon-color: var(--accent-primary);
--alert-warning-icon-color: var(--accent-error);
}

.cauldron--theme-dark {
--alert-border-color: var(--accent-info);
--alert-warning-border-color: var(--accent-danger);

--alert-icon-color: var(--accent-info);
--alert-warning-icon-color: var(--accent-danger);
}

.Alert .Dialog__header .Icon {
padding-right: var(--space-smallest);
color: var(--alert-icon-color);
}

.Alert__warning .Dialog__inner {
border: 3px solid var(--alert-warning-background-color);
.Alert .Dialog__inner {
border: 3px solid var(--alert-border-color);
}

.Alert__warning .Dialog__header {
background-color: var(--alert-warning-background-color);
.Alert__warning .Dialog__header .Icon {
color: var(--alert-warning-icon-color);
}

.Alert__warning .Dialog__heading {
color: var(--alert-warning-header-text-color);
.Alert__warning .Dialog__inner {
border: 3px solid var(--alert-warning-border-color);
}

.Alert .Dialog__footer {
Expand All @@ -27,6 +42,7 @@
background-color: transparent;
}

.Alert__warning .Dialog__heading:focus {
border-bottom-color: var(--alert-warning-header-text-color);
.cauldron--theme-dark .Alert .Dialog__footer {
border-top: none;
background: transparent;
}
8 changes: 5 additions & 3 deletions packages/styles/dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
}

.cauldron--theme-dark {
--dialog-background-color: var(--accent-medium);
--dialog-border-color: var(--gray-20);
--dialog-header-background-color: var(--accent-dark);
--dialog-footer-background-color: var(--accent-dark);
--dialog-heading-text-color: #fff;
}

Expand Down Expand Up @@ -157,9 +161,8 @@
/* Dark Theme */

.cauldron--theme-dark .Dialog__inner {
background-color: var(--accent-medium);
color: var(--white);
border: 4px solid var(--gray-20);
border-width: 4px;
}

.cauldron--theme-dark .Dialog__header {
Expand All @@ -172,7 +175,6 @@

.cauldron--theme-dark .Dialog__header,
.cauldron--theme-dark .Dialog__footer {
background-color: var(--accent-dark);
color: var(--gray-20);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/styles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deque/cauldron-styles",
"version": "5.10.0",
"version": "5.11.0",
"license": "MPL-2.0",
"description": "deque cauldron pattern library styles",
"repository": "https://github.com/dequelabs/cauldron",
Expand Down

0 comments on commit 36de25e

Please sign in to comment.