Skip to content

Commit

Permalink
Merge branch 'dev' into dit13711/fix-missing-scale-property-in-story-…
Browse files Browse the repository at this point in the history
…for-flowItem-and-panel
  • Loading branch information
DitwanP authored Jul 16, 2024
2 parents fe52be1 + bc3a467 commit efbc206
Show file tree
Hide file tree
Showing 27 changed files with 952 additions and 85 deletions.
34 changes: 20 additions & 14 deletions package-lock.json

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

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.

## [2.11.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.11.0-next.9...@esri/calcite-components-angular@2.11.0-next.10) (2024-07-15)

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

## [2.11.0-next.9](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.11.0-next.8...@esri/calcite-components-angular@2.11.0-next.9) (2024-07-15)

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

## [2.11.0-next.8](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.11.0-next.7...@esri/calcite-components-angular@2.11.0-next.8) (2024-07-15)

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

## [2.11.0-next.7](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.11.0-next.6...@esri/calcite-components-angular@2.11.0-next.7) (2024-07-15)

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

## [2.11.0-next.6](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.11.0-next.5...@esri/calcite-components-angular@2.11.0-next.6) (2024-07-12)

**Note:** Version bump only for package @esri/calcite-components-angular
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components-angular",
"version": "2.11.0-next.6",
"version": "2.11.0-next.10",
"description": "A set of Angular components that wrap Esri's Calcite Components.",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"bugs": {
Expand All @@ -17,7 +17,7 @@
},
"sideEffects": false,
"dependencies": {
"@esri/calcite-components": "^2.11.0-next.6",
"@esri/calcite-components": "^2.11.0-next.10",
"tslib": "2.6.2"
},
"peerDependencies": {
Expand Down
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.

## [2.11.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.11.0-next.9...@esri/calcite-components-react@2.11.0-next.10) (2024-07-15)

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

## [2.11.0-next.9](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.11.0-next.8...@esri/calcite-components-react@2.11.0-next.9) (2024-07-15)

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

## [2.11.0-next.8](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.11.0-next.7...@esri/calcite-components-react@2.11.0-next.8) (2024-07-15)

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

## [2.11.0-next.7](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.11.0-next.6...@esri/calcite-components-react@2.11.0-next.7) (2024-07-15)

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

## [2.11.0-next.6](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.11.0-next.5...@esri/calcite-components-react@2.11.0-next.6) (2024-07-12)

**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,6 +1,6 @@
{
"name": "@esri/calcite-components-react",
"version": "2.11.0-next.6",
"version": "2.11.0-next.10",
"description": "A set of React components that wrap calcite components",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"repository": {
Expand Down Expand Up @@ -28,7 +28,7 @@
"tsc": "tsc"
},
"dependencies": {
"@esri/calcite-components": "^2.11.0-next.6"
"@esri/calcite-components": "^2.11.0-next.10"
},
"peerDependencies": {
"react": ">=16.7",
Expand Down
28 changes: 28 additions & 0 deletions packages/calcite-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,34 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.11.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@2.11.0-next.9...@esri/calcite-components@2.11.0-next.10) (2024-07-15)

### Features

- **chip:** enhance multi-select group affordance ([#9286](https://github.com/Esri/calcite-design-system/issues/9286)) ([93a17a1](https://github.com/Esri/calcite-design-system/commit/93a17a17c670aaa2a6f443ecc6b9d3fdfde859ac)), closes [#9055](https://github.com/Esri/calcite-design-system/issues/9055) [#7425](https://github.com/Esri/calcite-design-system/issues/7425)

### Bug Fixes

- **block:** remove top padding when no heading is defined ([#9782](https://github.com/Esri/calcite-design-system/issues/9782)) ([d71e064](https://github.com/Esri/calcite-design-system/commit/d71e0648b03f138cdef2e8e9f2868d849e1ed04a)), closes [#9753](https://github.com/Esri/calcite-design-system/issues/9753)

## [2.11.0-next.9](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@2.11.0-next.8...@esri/calcite-components@2.11.0-next.9) (2024-07-15)

### Features

- provide info message on stamped version instead of warning ([#9739](https://github.com/Esri/calcite-design-system/issues/9739)) ([6ccb12a](https://github.com/Esri/calcite-design-system/commit/6ccb12a17ec371ba13fe144f8d37fdfb607dfce2)), closes [#9721](https://github.com/Esri/calcite-design-system/issues/9721)

## [2.11.0-next.8](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@2.11.0-next.7...@esri/calcite-components@2.11.0-next.8) (2024-07-15)

### Features

- **panel, flow-item:** add beforeClose property ([#9770](https://github.com/Esri/calcite-design-system/issues/9770)) ([fe32441](https://github.com/Esri/calcite-design-system/commit/fe32441883f3c793e5994fec594325362e5bef61)), closes [#9769](https://github.com/Esri/calcite-design-system/issues/9769)

## [2.11.0-next.7](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@2.11.0-next.6...@esri/calcite-components@2.11.0-next.7) (2024-07-15)

### Bug Fixes

- **tile:** center align slot's text when alignment is equal to center ([#9773](https://github.com/Esri/calcite-design-system/issues/9773)) ([4a26398](https://github.com/Esri/calcite-design-system/commit/4a263988b72faca473e993aebe0c7f61b12a6d19)), closes [#9540](https://github.com/Esri/calcite-design-system/issues/9540)

## [2.11.0-next.6](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@2.11.0-next.5...@esri/calcite-components@2.11.0-next.6) (2024-07-12)

### Bug Fixes
Expand Down
4 changes: 2 additions & 2 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": "2.11.0-next.6",
"version": "2.11.0-next.10",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"description": "Web Components for Esri's Calcite Design System.",
"main": "dist/index.cjs.js",
Expand Down Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"@esri/calcite-ui-icons": "3.28.2",
"@floating-ui/dom": "1.6.5",
"@floating-ui/dom": "1.6.7",
"@stencil/core": "4.18.3",
"@types/color": "3.0.6",
"color": "4.2.3",
Expand Down
16 changes: 16 additions & 0 deletions packages/calcite-components/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1876,6 +1876,10 @@ export namespace Components {
* When provided, the method will be called before it is removed from its parent `calcite-flow`.
*/
"beforeBack": () => Promise<void>;
/**
* Passes a function to run before the component closes.
*/
"beforeClose": () => Promise<void>;
/**
* When `true`, displays a close button in the trailing side of the component's header.
*/
Expand Down Expand Up @@ -3672,6 +3676,10 @@ export namespace Components {
"totalItems": number;
}
interface CalcitePanel {
/**
* Passes a function to run before the component closes.
*/
"beforeClose": () => Promise<void>;
/**
* When `true`, displays a close button in the trailing side of the header.
*/
Expand Down Expand Up @@ -9733,6 +9741,10 @@ declare namespace LocalJSX {
* When provided, the method will be called before it is removed from its parent `calcite-flow`.
*/
"beforeBack"?: () => Promise<void>;
/**
* Passes a function to run before the component closes.
*/
"beforeClose"?: () => Promise<void>;
/**
* When `true`, displays a close button in the trailing side of the component's header.
*/
Expand Down Expand Up @@ -11630,6 +11642,10 @@ declare namespace LocalJSX {
"totalItems"?: number;
}
interface CalcitePanel {
/**
* Passes a function to run before the component closes.
*/
"beforeClose"?: () => Promise<void>;
/**
* When `true`, displays a close button in the trailing side of the header.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ describe("calcite-action-menu", () => {
expect(await popover.getProperty("open")).toBe(false);
});

it("should close menu if slotted action is clicked", async () => {
it.skip("should close menu if slotted action is clicked", async () => {
const page = await newE2EPage({
html: `<calcite-action-menu open>
<calcite-action id="triggerAction" slot="${SLOTS.trigger}" text="Add" icon="plus" text-enabled></calcite-action>
Expand Down
8 changes: 7 additions & 1 deletion packages/calcite-components/src/components/block/block.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

.header {
@apply justify-start;
padding: var(--calcite-spacing-md);
}

.header,
Expand Down Expand Up @@ -195,4 +194,11 @@ calcite-action-menu {
}
}

:host([heading]),
:host([description]) {
.header {
padding: var(--calcite-spacing-md);
}
}

@include base-component();
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ export const singleWithIcon_TestOnly = (): string => html`
</calcite-chip-group>
`;

export const multiple_TestOnly = (): string => html`
export const multipleClosable_TestOnly = (): string => html`
<calcite-chip-group selection-mode="multiple">
<calcite-chip value="forest">Forest</calcite-chip>
<calcite-chip selected value="tundra">Tundra</calcite-chip>
<calcite-chip value="shore">Seashore</calcite-chip>
<calcite-chip selected value="estuary">Estuary</calcite-chip>
<calcite-chip value="forest" closable>Forest</calcite-chip>
<calcite-chip selected value="tundra" closable>Tundra</calcite-chip>
<calcite-chip value="shore" closable>Seashore</calcite-chip>
<calcite-chip selected value="estuary" closable>Estuary</calcite-chip>
</calcite-chip-group>
`;

Expand All @@ -62,21 +62,21 @@ export const multipleWithIcon_TestOnly = (): string => html`
</calcite-chip-group>
`;

export const multipleWithAvatar_TestOnly = (): string => html`
export const multipleClosableWithAvatar_TestOnly = (): string => html`
<calcite-chip-group selection-mode="multiple">
<calcite-chip icon="layer" value="forest">
<calcite-chip icon="layer" value="forest" closable>
<calcite-avatar slot="image" user-id="25684463a00c449585dbb32a065f6b74" full-name="user name"></calcite-avatar>
Forest</calcite-chip
>
<calcite-chip icon="layer" value="tundra">
<calcite-chip icon="layer" value="tundra" closable>
<calcite-avatar slot="image" user-id="25684463a00c449585dbb32a065f6b74" full-name="user name"></calcite-avatar>
Tundra</calcite-chip
>
<calcite-chip icon="layer" value="shore">
<calcite-chip icon="layer" value="shore" closable>
<calcite-avatar slot="image" user-id="25684463a00c449585dbb32a065f6b74" full-name="user name"></calcite-avatar>
Seashore</calcite-chip
>
<calcite-chip icon="layer" value="estuary">
<calcite-chip icon="layer" value="estuary" closable>
<calcite-avatar slot="image" user-id="25684463a00c449585dbb32a065f6b74" full-name="user name"></calcite-avatar>
Estuary</calcite-chip
>
Expand Down
Loading

0 comments on commit efbc206

Please sign in to comment.