Skip to content

Commit

Permalink
Merge branch 'main' into tests
Browse files Browse the repository at this point in the history
  • Loading branch information
kennylam authored Nov 19, 2024
2 parents f3db1bc + 5b3ad47 commit ed87938
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/metrics-merge-rate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
echo "- **Merge Rate**: $MERGE_RATE%" >> $GITHUB_STEP_SUMMARY
- name: Send message to Slack
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slack-announcement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- name: Send slack announcement
id: slack
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slack-build-notifications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack
id: slack-success
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand All @@ -42,7 +42,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack
id: slack-failure
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slack-office-hours-design.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/slack-office-hours-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
with:
payload: |
{
Expand Down
19 changes: 2 additions & 17 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -6987,9 +6987,7 @@ Map {
"type": "string",
},
"light": [Function],
"name": Object {
"type": "string",
},
"name": [Function],
"onChange": Object {
"type": "func",
},
Expand All @@ -7011,20 +7009,7 @@ Map {
"title": Object {
"type": "string",
},
"value": Object {
"args": Array [
Array [
Object {
"type": "string",
},
Object {
"type": "number",
},
],
],
"isRequired": true,
"type": "oneOfType",
},
"value": [Function],
},
"render": [Function],
},
Expand Down
33 changes: 6 additions & 27 deletions packages/react/src/components/Tile/Tile-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,7 @@ describe('Tile', () => {
const onClick = jest.fn();
render(
<div role="group" aria-label="selectable tiles">
<SelectableTile
disabled
id="tile-1"
name="tiles"
onClick={onClick}
value="value">
<SelectableTile disabled id="tile-1" onClick={onClick}>
<span role="img" aria-label="vertical traffic light">
🚦
</span>
Expand All @@ -130,25 +125,13 @@ describe('Tile', () => {
it('should cycle elements in document tab order', async () => {
render(
<div role="group" aria-label="selectable tiles">
<SelectableTile
data-testid="element"
id="tile-1"
name="tiles"
value="value">
<SelectableTile data-testid="element" id="tile-1">
tile 1
</SelectableTile>
<SelectableTile
data-testid="element"
id="tile-2"
name="tiles"
value="value">
<SelectableTile data-testid="element" id="tile-2">
tile 2
</SelectableTile>
<SelectableTile
data-testid="element"
id="tile-3"
name="tiles"
value="value">
<SelectableTile data-testid="element" id="tile-3">
tile 3
</SelectableTile>
</div>
Expand Down Expand Up @@ -180,11 +163,7 @@ describe('Tile', () => {

it('should respect slug prop', () => {
render(
<SelectableTile
slug={<AILabel />}
id="tile-1"
name="tiles"
value="value">
<SelectableTile slug={<AILabel />} id="tile-1">
Default tile
</SelectableTile>
);
Expand Down Expand Up @@ -440,7 +419,7 @@ describe('Tile', () => {

it('respect selected prop', async () => {
const { container } = render(
<SelectableTile id="selectable-tile-1" selected value={'test'}>
<SelectableTile id="selectable-tile-1" selected>
Option 1
</SelectableTile>
);
Expand Down
10 changes: 8 additions & 2 deletions packages/react/src/components/Tile/Tile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,10 @@ SelectableTile.propTypes = {
* The `name` of the `<input>`.
* @deprecated
*/
name: PropTypes.string,
name: deprecate(
PropTypes.string,
'The `name` property is no longer used. It will be removed in the next major release.'
),

/**
* The empty handler of the `<input>`.
Expand Down Expand Up @@ -602,7 +605,10 @@ SelectableTile.propTypes = {
* The value of the `<input>`.
* @deprecated
*/
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
value: deprecate(
PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
'The `value` property is no longer used. It will be removed in the next major release.`'
),
};

export interface ExpandableTileProps extends HTMLAttributes<HTMLDivElement> {
Expand Down
4 changes: 4 additions & 0 deletions packages/styles/scss/components/list-box/_list-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ $list-box-menu-width: convert.to-rem(300px);
}
}

.#{$prefix}--multi-select.#{$prefix}--multi-select--readonly.#{$prefix}--list-box {
cursor: default;
}

.#{$prefix}--list-box--lg {
block-size: convert.to-rem(48px);
max-block-size: convert.to-rem(48px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@

.#{$prefix}--multi-select.#{$prefix}--multi-select--readonly
.#{$prefix}--tag--filter {
box-shadow: 0 0 0 1px $background-inverse;
box-shadow: 0 0 0 1px $border-subtle;
}

.#{$prefix}--multi-select.#{$prefix}--multi-select--readonly
Expand Down
8 changes: 8 additions & 0 deletions packages/styles/scss/components/tag/_tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,14 @@
);
}

.#{$prefix}--multi-select--readonly
.#{$prefix}--tag--high-contrast:not(.#{$prefix}--tag--operational)
.#{$prefix}--tag__close-icon {
&:hover {
background-color: transparent;
}
}

.#{$prefix}--tag--outline:not(.#{$prefix}--tag--operational):not(span):not(
[disabled]
) {
Expand Down

0 comments on commit ed87938

Please sign in to comment.