Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/geekyeggo/delete-a…
Browse files Browse the repository at this point in the history
…rtifact-4
  • Loading branch information
kennylam authored Jan 19, 2024
2 parents 00abbef + 3b2149b commit eb5b592
Show file tree
Hide file tree
Showing 134 changed files with 2,478 additions and 7,822 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Install dependencies
run: yarn install --immutable --immutable-cache
- name: Build project
run: yarn lerna run --ignore build
run: yarn lerna run build

- name: Set env vars
uses: ./.github/actions/set-dotenv
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
- name: Install dependencies
run: yarn install --immutable --immutable-cache
- name: Build project
run: yarn lerna run --ignore --ignore @carbon/ibmdotcom-web-components --ignore @carbon/web-components build
run: yarn lerna run --ignore @carbon/ibmdotcom-web-components --ignore @carbon/web-components build
- name: Set env vars
uses: ./.github/actions/set-dotenv
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests-parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Download any existing cache
id: yarn-cache
with:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
name: storybook-build
path: packages/web-components/storybook-static

- uses: actions/cache@v3
- uses: actions/cache@v4
name: Retrieve yarn cache
id: yarn-cache
with:
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 4 additions & 5 deletions packages/carbon-web-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@carbon/web-components",
"private": true,
"version": "2.1.1",
"version": "2.1.2",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -69,7 +68,7 @@
],
"dependencies": {
"@babel/runtime": "^7.16.3",
"@carbon/styles": "^1.46.0",
"@carbon/styles": "1.47.0",
"flatpickr": "4.6.1",
"lit": "^2.7.6",
"lodash-es": "^4.17.21"
Expand All @@ -89,8 +88,8 @@
"@babel/preset-modules": "^0.1.5",
"@babel/template": "~7.12.0",
"@babel/traverse": "~7.23.0",
"@carbon/icon-helpers": "^10.45.1",
"@carbon/icons": "^11.31.0",
"@carbon/icon-helpers": "10.45.1",
"@carbon/icons": "11.31.0",
"@open-wc/semantic-dom-diff": "~0.18.0",
"@percy-io/in-percy": "^0.1.11",
"@percy/cli": "^1.27.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright IBM Corp. 2019, 2023
// Copyright IBM Corp. 2019, 2024
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright IBM Corp. 2019, 2023
// Copyright IBM Corp. 2019, 2024
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
Expand Down Expand Up @@ -73,9 +73,9 @@
}

:host(#{$prefix}-table-row[selected][slug]) {
.#{$prefix}--table-column-checkbox,
::slotted(#{$prefix}-table-cell),
.#{$prefix}--table-expand {
.#{$prefix}--table-expand,
.#{$prefix}--table-column-checkbox {
background-color: transparent;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2019, 2023
* Copyright IBM Corp. 2019, 2024
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -11,7 +11,7 @@
import rangePlugin, { Config } from 'flatpickr/dist/plugins/rangePlugin';
import { Instance as FlatpickrInstance } from 'flatpickr/dist/types/instance';
import { Plugin } from 'flatpickr/dist/types/options';
import on from 'carbon-components/es/globals/js/misc/on';
import on from '../../globals/mixins/on';
import Handle from '../../globals/internal/handle';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ $css--plex: true !default;
background-color: $border-subtle;
}

.#{$prefix}--number--readonly {
.#{$prefix}--number__controls {
.#{$prefix}--number__control-btn {
border-block-end: 0;
}
}
}

:host(#{$prefix}-number-input) {
::slotted(#{$prefix}-slug) {
position: absolute;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright IBM Corp. 2019, 2023
// Copyright IBM Corp. 2019, 2024
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2019, 2023
* Copyright IBM Corp. 2019, 2024
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand Down
12 changes: 10 additions & 2 deletions packages/carbon-web-components/src/components/tooltip/tooltip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ class CDSTooltip extends HostListenerMixin(CDSPopover) {
@property({ reflect: true })
size = false;

/**
* Specify the timeout reference for the tooltip
*/
@property({ reflect: true })
timeoutId = 0;

/**
* Specify whether the tooltip should be open when it first renders
*/
Expand All @@ -77,7 +83,8 @@ class CDSTooltip extends HostListenerMixin(CDSPopover) {
* Handles `mouseover` event on this element.
*/
private _handleHover = async () => {
setTimeout(async () => {
window.clearTimeout(this.timeoutId);
this.timeoutId = window.setTimeout(async () => {
this.open = true;
const { open, updateComplete } = this;
if (open) {
Expand All @@ -93,7 +100,8 @@ class CDSTooltip extends HostListenerMixin(CDSPopover) {
* Handles `mouseleave` event on this element.
*/
private _handleHoverOut = async () => {
setTimeout(async () => {
window.clearTimeout(this.timeoutId);
this.timeoutId = window.setTimeout(async () => {
const { open } = this;
if (open) {
this.open = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,3 @@
</div>
```

1 change: 0 additions & 1 deletion packages/services-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"dependencies": {
"@carbon/ibmdotcom-services": "1.53.0",
"@carbon/ibmdotcom-utilities": "1.53.0",
"carbon-components": "10.58.3",
"redux": "^4.0.0",
"redux-logger": "^3.0.0",
"redux-thunk": "^2.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,10 @@ const mockTranslation: Partial<Translation> = {
},
{
title: 'menu-title-foo',
menuSections: [
submenu: [
{
menuItems: [
{
title: 'menu-item-title-bar',
url: 'https://carbon-design-system.github.io/carbon-for-ibm-dotcom/canary/web-components/bar',
},
],
title: 'menu-item-title-bar',
url: 'https://carbon-design-system.github.io/carbon-for-ibm-dotcom/canary/web-components/bar',
},
],
},
Expand All @@ -54,7 +50,7 @@ const mockTranslation: Partial<Translation> = {
};

const endpoint =
'/common/carbon-for-ibm-dotcom/translations/masthead-footer/v2';
'/common/carbon-for-ibm-dotcom/translations/masthead-footer/v2.1';

describe('Redux actions for `TranslateAPI`', () => {
it('dispatches the action to set translation data', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,10 @@ const mockTranslation: Partial<Translation> = {
},
{
title: 'menu-title-foo',
menuSections: [
submenu: [
{
menuItems: [
{
title: 'menu-item-title-bar',
url: 'https://carbon-design-system.github.io/carbon-for-ibm-dotcom/canary/web-components/bar',
},
],
title: 'menu-item-title-bar',
url: 'https://carbon-design-system.github.io/carbon-for-ibm-dotcom/canary/web-components/bar',
},
],
},
Expand Down
Loading

0 comments on commit eb5b592

Please sign in to comment.