Skip to content

Commit

Permalink
Merge branch 'main' into renovate/lerna-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
alisonailea authored Aug 14, 2023
2 parents d692195 + c1584a1 commit 2d681f9
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 9 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

4 changes: 4 additions & 0 deletions packages/calcite-components-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.6.0-next.6](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@1.6.0-next.5...@esri/calcite-components-react@1.6.0-next.6) (2023-08-14)

**Note:** Version bump only for package @esri/calcite-components-react

## [1.6.0-next.5](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@1.6.0-next.4...@esri/calcite-components-react@1.6.0-next.5) (2023-08-11)

**Note:** Version bump only for package @esri/calcite-components-react
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@esri/calcite-components-react",
"sideEffects": false,
"version": "1.6.0-next.5",
"version": "1.6.0-next.6",
"description": "A set of React components that wrap calcite components",
"license": "SEE LICENSE.md",
"scripts": {
Expand All @@ -17,7 +17,7 @@
"dist/"
],
"dependencies": {
"@esri/calcite-components": "^1.6.0-next.5"
"@esri/calcite-components": "^1.6.0-next.6"
},
"peerDependencies": {
"react": ">=16.7",
Expand Down
6 changes: 6 additions & 0 deletions packages/calcite-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.6.0-next.6](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@1.6.0-next.5...@esri/calcite-components@1.6.0-next.6) (2023-08-14)

### Bug Fixes

- **progress:** completes animation for `dir='rtl'` ([#7511](https://github.com/Esri/calcite-design-system/issues/7511)) ([c5d6ada](https://github.com/Esri/calcite-design-system/commit/c5d6adacadf85ab12bfff5351fc0d448c153dae5)), closes [#6569](https://github.com/Esri/calcite-design-system/issues/6569)

## [1.6.0-next.5](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@1.6.0-next.4...@esri/calcite-components@1.6.0-next.5) (2023-08-11)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components",
"version": "1.6.0-next.5",
"version": "1.6.0-next.6",
"description": "Web Components for Esri's Calcite Design System.",
"main": "dist/index.cjs.js",
"module": "dist/index.js",
Expand Down
15 changes: 15 additions & 0 deletions packages/calcite-components/src/components/progress/progress.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
.indeterminate {
@apply w-1/5;
animation: looping-progress-bar-ani scaleDuration(--calcite-internal-animation-timing-medium, 11) linear infinite;
&.calcite--rtl {
animation-name: looping-progress-bar-ani-rtl;
}
}

.reversed {
Expand All @@ -54,4 +57,16 @@
}
}

@keyframes looping-progress-bar-ani-rtl {
0% {
transform: translate3d(100%, 0, 0);
}
50% {
inline-size: 40%;
}
100% {
transform: translate3d(-600%, 0, 0);
}
}

@include base-component();
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Component, Element, h, Prop, VNode } from "@stencil/core";
import { getElementDir } from "../../utils/dom";
import { CSS_UTILITY } from "../../utils/resources";
@Component({
tag: "calcite-progress",
styleUrl: "progress.scss",
Expand Down Expand Up @@ -30,6 +32,7 @@ export class Progress {
render(): VNode {
const isDeterminate = this.type === "determinate";
const barStyles = isDeterminate ? { width: `${this.value * 100}%` } : {};
const dir = getElementDir(this.el);
return (
<div
aria-label={this.label || this.text}
Expand All @@ -43,6 +46,7 @@ export class Progress {
class={{
bar: true,
indeterminate: this.type === "indeterminate",
[CSS_UTILITY.rtl]: dir === "rtl",
reversed: this.reversed,
}}
style={barStyles}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ describe("calcite-tooltip", () => {
});
});

it.skip("should open hovered tooltip while pointer is moving", async () => {
it("should open hovered tooltip while pointer is moving", async () => {
const page = await newE2EPage();
await page.setContent(
html`
Expand Down Expand Up @@ -908,7 +908,7 @@ describe("calcite-tooltip", () => {
}
});

it.skip("should close non hovered tooltip while pointer is moving", async () => {
it("should close non hovered tooltip while pointer is moving", async () => {
const page = await newE2EPage();
await page.setContent(
html`
Expand Down

0 comments on commit 2d681f9

Please sign in to comment.