Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into benelan/radio-validat…
Browse files Browse the repository at this point in the history
…ion-message

* origin/main:
  chore: release next
  feat: reflect validationIcon property (#8583)
  • Loading branch information
benelan committed Jan 11, 2024
2 parents a4a0687 + 5d2bfa0 commit 8be513b
Show file tree
Hide file tree
Showing 25 changed files with 149 additions and 19 deletions.
10 changes: 5 additions & 5 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,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

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

## [2.2.0-next.16](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-01-10)

**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.2.0-next.16",
"version": "2.2.0-next.17",
"sideEffects": false,
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"description": "A set of Angular components that wrap Esri's Calcite Components.",
Expand All @@ -20,7 +20,7 @@
"@angular/core": ">=16.0.0"
},
"dependencies": {
"@esri/calcite-components": "^2.2.0-next.16",
"@esri/calcite-components": "^2.2.0-next.17",
"tslib": "2.6.2"
},
"lerna": {
Expand Down
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.

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

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

## [2.2.0-next.16](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-01-10)

**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": "2.2.0-next.16",
"version": "2.2.0-next.17",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"description": "A set of React components that wrap calcite components",
"license": "SEE LICENSE.md",
Expand All @@ -23,7 +23,7 @@
"dist/"
],
"dependencies": {
"@esri/calcite-components": "^2.2.0-next.16"
"@esri/calcite-components": "^2.2.0-next.17"
},
"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.

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

### Features

- reflect validationIcon property ([#8583](https://github.com/Esri/calcite-design-system/issues/8583)) ([b3d38b3](https://github.com/Esri/calcite-design-system/commit/b3d38b3dcb699c28e36ca32f600117274a36c56b)), closes [#8057](https://github.com/Esri/calcite-design-system/issues/8057) [/github.com/Esri/calcite-design-system/pull/8561#issuecomment-1884074225](https://github.com/Esri//github.com/Esri/calcite-design-system/pull/8561/issues/issuecomment-1884074225) [/github.com/Esri/calcite-design-system/pull/8561#issuecomment-1879355882](https://github.com/Esri//github.com/Esri/calcite-design-system/pull/8561/issues/issuecomment-1879355882)

## [2.2.0-next.16](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-01-10)

### Features
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": "2.2.0-next.16",
"version": "2.2.0-next.17",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"description": "Web Components for Esri's Calcite Design System.",
"main": "dist/index.cjs.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ describe("calcite-combobox", () => {
propertyName: "scale",
defaultValue: "m",
},
{
propertyName: "status",
defaultValue: "idle",
},
{
propertyName: "validationIcon",
defaultValue: undefined,
},
{
propertyName: "validationMessage",
defaultValue: undefined,
},
]);
});

Expand Down Expand Up @@ -101,6 +113,14 @@ describe("calcite-combobox", () => {
propertyName: "selectionMode",
value: "single",
},
{
propertyName: "status",
value: "invalid",
},
{
propertyName: "validationIcon",
value: true,
},
]);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class Combobox
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/**
* Specifies the name of the component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ describe("calcite-input-date-picker", () => {
propertyName: "flipPlacements",
defaultValue: undefined,
},
{
propertyName: "status",
defaultValue: "idle",
},
{
propertyName: "validationIcon",
defaultValue: undefined,
},
{
propertyName: "validationMessage",
defaultValue: undefined,
},
]);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ export class InputDatePicker
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/**
* Specifies the name of the component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ describe("calcite-input-number", () => {
propertyName: "scale",
value: "s",
},
{
propertyName: "validationIcon",
value: true,
},
]);
});

Expand All @@ -85,6 +89,14 @@ describe("calcite-input-number", () => {
propertyName: "value",
defaultValue: "",
},
{
propertyName: "validationIcon",
defaultValue: undefined,
},
{
propertyName: "validationMessage",
defaultValue: undefined,
},
]);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export class InputNumber
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/**
* Specifies the name of the component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ describe("calcite-input-text", () => {
propertyName: "scale",
value: "s",
},
{
propertyName: "validationIcon",
value: true,
},
]);
});

Expand All @@ -62,6 +66,14 @@ describe("calcite-input-text", () => {
propertyName: "value",
defaultValue: "",
},
{
propertyName: "validationIcon",
defaultValue: undefined,
},
{
propertyName: "validationMessage",
defaultValue: undefined,
},
]);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export class InputText
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/**
* Specifies the name of the component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ describe("calcite-input-time-picker", () => {
{ propertyName: "scale", defaultValue: "m" },
{ propertyName: "step", defaultValue: 60 },
{ propertyName: "overlayPositioning", defaultValue: "absolute" },
{ propertyName: "status", defaultValue: "idle" },
{ propertyName: "validationIcon", defaultValue: undefined },
{ propertyName: "validationMessage", defaultValue: undefined },
]);
});

Expand All @@ -75,6 +78,8 @@ describe("calcite-input-time-picker", () => {
{ propertyName: "open", value: true },
{ propertyName: "disabled", value: true },
{ propertyName: "scale", value: "m" },
{ propertyName: "status", value: "invalid" },
{ propertyName: "validationIcon", value: true },
]);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ export class InputTimePicker
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/** Specifies the name of the component on form submission. */
@Prop() name: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ describe("calcite-input-time-zone", () => {
{ propertyName: "open", value: true },
{ propertyName: "scale", value: "m" },
{ propertyName: "overlayPositioning", value: "absolute" },
{ propertyName: "status", value: "invalid" },
{ propertyName: "validationIcon", value: true },
]);
});

Expand All @@ -94,6 +96,9 @@ describe("calcite-input-time-zone", () => {
{ propertyName: "open", defaultValue: false },
{ propertyName: "overlayPositioning", defaultValue: "absolute" },
{ propertyName: "scale", defaultValue: "m" },
{ propertyName: "status", defaultValue: "idle" },
{ propertyName: "validationIcon", defaultValue: undefined },
{ propertyName: "validationMessage", defaultValue: undefined },
]);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class InputTimeZone
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/**
* Specifies the name of the component.
Expand Down
12 changes: 12 additions & 0 deletions packages/calcite-components/src/components/input/input.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ describe("calcite-input", () => {
propertyName: "scale",
value: "s",
},
{
propertyName: "validationIcon",
value: true,
},
]);
});

Expand Down Expand Up @@ -93,6 +97,14 @@ describe("calcite-input", () => {
propertyName: "value",
defaultValue: "",
},
{
propertyName: "validationIcon",
defaultValue: undefined,
},
{
propertyName: "validationMessage",
defaultValue: undefined,
},
]);
});

Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/input/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export class Input
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/**
* Specifies the name of the component.
Expand Down
18 changes: 18 additions & 0 deletions packages/calcite-components/src/components/select/select.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { E2EElement, E2EPage, newE2EPage } from "@stencil/core/testing";
import {
accessible,
disabled,
defaults,
focusable,
formAssociated,
labelable,
Expand Down Expand Up @@ -37,6 +38,15 @@ describe("calcite-select", () => {
focusable(simpleTestMarkup);
});

describe("defaults", () => {
defaults("calcite-select", [
{ propertyName: "scale", defaultValue: "m" },
{ propertyName: "status", defaultValue: "idle" },
{ propertyName: "validationIcon", defaultValue: undefined },
{ propertyName: "validationMessage", defaultValue: undefined },
]);
});

describe("reflects", () => {
reflects(simpleTestMarkup, [
{
Expand All @@ -47,6 +57,14 @@ describe("calcite-select", () => {
propertyName: "scale",
value: "m",
},
{
propertyName: "status",
value: "invalid",
},
{
propertyName: "validationIcon",
value: true,
},
]);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class Select
@Prop() validationMessage: string;

/** Specifies the validation icon to display under the component. */
@Prop() validationIcon: string | boolean;
@Prop({ reflect: true }) validationIcon: string | boolean;

/**
* Specifies the name of the component.
Expand Down
Loading

0 comments on commit 8be513b

Please sign in to comment.