Skip to content

Commit

Permalink
Merge branch 'dev' into dris0000/popover-tooltip-prevented-events
Browse files Browse the repository at this point in the history
  • Loading branch information
driskull authored Jan 14, 2025
2 parents 6cf369d + 6427e5f commit e7f8fbe
Show file tree
Hide file tree
Showing 30 changed files with 346 additions and 73 deletions.
40 changes: 19 additions & 21 deletions package-lock.json

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

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

## [3.0.0-next.100](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

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

## [3.0.0-next.99](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

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

## [3.0.0-next.98](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

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

## [3.0.0-next.97](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

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

## [3.0.0-next.96](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-11)

**Note:** Version bump only for package @esri/calcite-components-react
Expand Down
6 changes: 3 additions & 3 deletions packages/calcite-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components-react",
"version": "3.0.0-next.96",
"version": "3.0.0-next.100",
"description": "A set of React components that wrap calcite components",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"repository": {
Expand All @@ -26,8 +26,8 @@
"tsc": "tsc"
},
"dependencies": {
"@esri/calcite-components": "3.0.0-next.96",
"@lit/react": "1.0.6"
"@esri/calcite-components": "3.0.0-next.100",
"@lit/react": "1.0.7"
},
"peerDependencies": {
"react": ">=18.3",
Expand Down
31 changes: 31 additions & 0 deletions packages/calcite-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,37 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.0-next.100](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

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

## [3.0.0-next.99](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

### Bug Fixes

- **list-item:** fix selection indicator placement in RTL ([#11288](https://github.com/Esri/calcite-design-system/issues/11288)) ([5bed510](https://github.com/Esri/calcite-design-system/commit/5bed51027d6a7d9e5107303f5cd7604b973eb3af)), closes [#10731](https://github.com/Esri/calcite-design-system/issues/10731)

## [3.0.0-next.98](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

### Bug Fixes

- **action:** reflect the icon property ([#11282](https://github.com/Esri/calcite-design-system/issues/11282)) ([42a4808](https://github.com/Esri/calcite-design-system/commit/42a4808fb267251a9d5c8ae64cf682e2503a9b5d)), closes [#11092](https://github.com/Esri/calcite-design-system/issues/11092)
- **sort-handle:** Fix dragging in Firefox ([#11279](https://github.com/Esri/calcite-design-system/issues/11279)) ([d4c47d8](https://github.com/Esri/calcite-design-system/commit/d4c47d8c1fb50f006d1a4a7966161a2bda54b5d5)), closes [#11220](https://github.com/Esri/calcite-design-system/issues/11220)

## [3.0.0-next.97](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

### Features

- **pagination:** add component tokens ([#11157](https://github.com/Esri/calcite-design-system/issues/11157)) ([f3973c8](https://github.com/Esri/calcite-design-system/commit/f3973c84751a308cca184fce3b353118073d4684)), closes [#7180](https://github.com/Esri/calcite-design-system/issues/7180)

### Bug Fixes

- **tile:** allow percentage inline-size on slotted content to be based on host ([#11283](https://github.com/Esri/calcite-design-system/issues/11283)) ([94ab2a5](https://github.com/Esri/calcite-design-system/commit/94ab2a59c6312e68323ee9cee5514c6b009a7108)), closes [#11199](https://github.com/Esri/calcite-design-system/issues/11199) [/github.com/Esri/calcite-design-system/issues/11199#issuecomment-2587924216](https://github.com/Esri//github.com/Esri/calcite-design-system/issues/11199/issues/issuecomment-2587924216)

### Performance Improvements

- **combobox:** fix initialization performance regression ([#11265](https://github.com/Esri/calcite-design-system/issues/11265)) ([a255c5a](https://github.com/Esri/calcite-design-system/commit/a255c5ad87b9fae9f0d9db463121ab5a0516a1a6)), closes [#10731](https://github.com/Esri/calcite-design-system/issues/10731)

## [3.0.0-next.96](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-11)

### Features
Expand Down
10 changes: 5 additions & 5 deletions packages/calcite-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components",
"version": "3.0.0-next.96",
"version": "3.0.0-next.100",
"description": "Web Components for Esri's Calcite Design System.",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"repository": {
Expand Down Expand Up @@ -52,7 +52,7 @@
"screenshot-tests": "npm run build-storybook",
"screenshot-tests:preview": "npm run util:prep-build-reqs && NODE_OPTIONS=--openssl-legacy-provider STORYBOOK_SCREENSHOT_LOCAL_BUILD=true storybook dev",
"screenshot-tests:publish": "npm run screenshot-tests && storybook-to-ghpages --existing-output-dir=docs",
"start": "npm run util:clean-js-files && concurrently --kill-others --raw \"trap 'npm run util:clean-js-files' INT TERM EXIT && tsc --project ./tsconfig-demos.json --watch\" \"npm run build:watch-dev\"",
"start": "npm run util:clean-js-files && concurrently --kill-others --raw \"trap 'npm run util:clean-js-files' INT TERM EXIT >/dev/null 2>&1 || true && tsc --project ./tsconfig-demos.json --watch\" \"npm run build:watch-dev\"",
"test": "vitest run",
"test:watch": "vitest",
"util:clean-js-files": "rimraf --glob -- *.js {src,.storybook,support}/**/*.js",
Expand All @@ -72,7 +72,7 @@
"@arcgis/components-controllers": "^4.32.0-next.75",
"@arcgis/components-utils": "^4.32.0-next.75",
"@arcgis/lumina": "^4.32.0-next.75",
"@esri/calcite-ui-icons": "4.0.0-next.7",
"@esri/calcite-ui-icons": "4.0.0-next.8",
"@floating-ui/dom": "^1.6.12",
"@floating-ui/utils": "^0.2.8",
"@types/color": "^4.2.0",
Expand All @@ -88,8 +88,8 @@
"type-fest": "^4.30.1"
},
"devDependencies": {
"@esri/calcite-design-tokens": "3.0.0-next.6",
"@esri/eslint-plugin-calcite-components": "2.0.0-next.4"
"@esri/calcite-design-tokens": "3.0.0-next.7",
"@esri/eslint-plugin-calcite-components": "2.0.0-next.5"
},
"volta": {
"extends": "../../package.json"
Expand Down
51 changes: 50 additions & 1 deletion packages/calcite-components/src/components/action/action.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { newE2EPage } from "@arcgis/lumina-compiler/puppeteerTesting";
import { describe, expect, it } from "vitest";
import { accessible, disabled, hidden, renders, slots, t9n, defaults, themed } from "../../tests/commonTests";
import { accessible, disabled, hidden, renders, slots, t9n, defaults, themed, reflects } from "../../tests/commonTests";
import { html } from "../../../support/formatting";
import { CSS, SLOTS } from "./resources";

Expand Down Expand Up @@ -42,6 +42,55 @@ describe("calcite-action", () => {
]);
});

describe("reflects", () => {
reflects("calcite-action", [
{
propertyName: "active",
value: true,
},
{
propertyName: "alignment",
value: "end",
},
{
propertyName: "appearance",
value: "solid",
},
{
propertyName: "compact",
value: true,
},
{
propertyName: "disabled",
value: true,
},
{
propertyName: "icon",
value: "hamburger",
},
{
propertyName: "iconFlipRtl",
value: true,
},
{
propertyName: "indicator",
value: true,
},
{
propertyName: "loading",
value: true,
},
{
propertyName: "scale",
value: "m",
},
{
propertyName: "textEnabled",
value: true,
},
]);
});

describe("renders", () => {
renders("calcite-action", { display: "flex" });
});
Expand Down
11 changes: 9 additions & 2 deletions packages/calcite-components/src/components/action/action.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,17 @@
:host {
@extend %component-host;
@apply flex bg-transparent cursor-pointer;
--calcite-internal-action-text-color: var(--calcite-color-text-3);
}

:host([drag-handle]) {
@apply cursor-move;
--calcite-internal-action-text-color: var(--calcite-color-border-input);
--calcite-internal-action-padding-inline: var(--calcite-spacing-xxs);
}

:host,
button {
.button {
border-radius: var(
--calcite-action-corner-radius,
var(--calcite-action-corner-radius-start-start, var(--calcite-corner-radius))
Expand Down Expand Up @@ -62,7 +69,7 @@ button {
font-sans;

background-color: var(--calcite-action-background-color, var(--calcite-color-foreground-1));
color: var(--calcite-action-text-color, var(--calcite-color-text-3));
color: var(--calcite-action-text-color, var(--calcite-internal-action-text-color));
text-align: unset;
flex: 1 0 auto;
cursor: inherit;
Expand Down
Loading

0 comments on commit e7f8fbe

Please sign in to comment.