Skip to content

Commit

Permalink
Merge branch 'main' into elijbet/8080-place-ref-last-ESLint-fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
Elijbet committed Feb 8, 2024
2 parents ef0d687 + 4a6dd34 commit 8161d5f
Show file tree
Hide file tree
Showing 23 changed files with 236 additions and 351 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/accessibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ body:
attributes:
label: Reproduction Sample
description: |
We provide the following templates to help get started: [codepen](https://codepen.io/pen?template=RwgrjEx) (just Calcite), [codesandbox](https://codesandbox.io/s/calcite-template-p95kp?file=/src/App.js) (Calcite with React wrapper), or [jsbin](https://jsbin.com/qecewik/edit?html,output) (Calcite with ArcGIS JSAPI). You can also make your own sample using one of the those websites. Alternatively, a [documentation sample](https://developers.arcgis.com/calcite-design-system/components) can be used if the issue is reproducible. If you are experiencing build or Node related errors, please provide a GitHub repo for the sample.
We provide the following templates to help get started: [codepen](https://codepen.io/pen?template=RwgrjEx) (just Calcite), [React Codesandbox](https://codesandbox.io/s/calcite-template-p95kp?file=/src/App.js) (Calcite with React wrapper), [Angular Codesandbox](https://codesandbox.io/p/sandbox/little-fire-2hx4qh?file=%2Fsrc%2Fapp%2Fapp.component.html%3A16%2C51), or [jsbin](https://jsbin.com/qecewik/edit?html,output) (Calcite with ArcGIS JSAPI). You can also make your own sample using one of the those websites. Alternatively, a [documentation sample](https://developers.arcgis.com/calcite-design-system/components) can be used if the issue is reproducible. If you are experiencing build or Node related errors, please provide a GitHub repo for the sample.
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ body:
attributes:
label: Reproduction Sample
description: |
We provide the following templates to help get started: [codepen](https://codepen.io/pen?template=RwgrjEx) (just Calcite), [codesandbox](https://codesandbox.io/s/calcite-template-p95kp?file=/src/App.js) (Calcite with React wrapper), or [jsbin](https://jsbin.com/qecewik/edit?html,output) (Calcite with ArcGIS JSAPI). You can also make your own sample using one of the those websites. Alternatively, a [documentation sample](https://developers.arcgis.com/calcite-design-system/components) can be used if the issue is reproducible. If you are experiencing build or Node related errors, please provide a GitHub repo for the sample.
We provide the following templates to help get started: [codepen](https://codepen.io/pen?template=RwgrjEx) (just Calcite), [React Codesandbox](https://codesandbox.io/s/calcite-template-p95kp?file=/src/App.js) (Calcite with React wrapper), [Angular Codesandbox](https://codesandbox.io/p/sandbox/little-fire-2hx4qh?file=%2Fsrc%2Fapp%2Fapp.component.html%3A16%2C51), or [jsbin](https://jsbin.com/qecewik/edit?html,output) (Calcite with ArcGIS JSAPI). You can also make your own sample using one of the those websites. Alternatively, a [documentation sample](https://developers.arcgis.com/calcite-design-system/components) can be used if the issue is reproducible. If you are experiencing build or Node related errors, please provide a GitHub repo for the sample.
validations:
required: true
- type: textarea
Expand Down
7 changes: 6 additions & 1 deletion .renovaterc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"extends": [
"config:base",
"npm:unpublishSafe",
"schedule:daily",
"workarounds:typesNodeVersioning",
":pinAllExceptPeerDependencies",
":widenPeerDependencies"
],
"platformCommit": true,
"enabledManagers": ["npm"],
"timezone": "America/Los_Angeles",
"schedule": ["before 5am on every weekday"],
"labels": ["dependencies"],
"ignoreDeps": [
"@types/jest",
Expand All @@ -35,6 +35,11 @@
"semanticCommitType": "build",
"semanticCommitScope": "deps",
"addLabels": ["chore"]
},
{
"matchPackagePatterns": ["^@(esri|stencil)/*"],
"schedule": ["8am", "12pm", "4pm"],
"extends": [":disableRateLimiting"]
}
]
}
20 changes: 7 additions & 13 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.4.1-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-02-07)

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

## [2.4.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-01-30)

### Miscellaneous Chores
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components-angular",
"version": "2.4.0",
"version": "2.4.1-next.0",
"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.4.0",
"@esri/calcite-components": "^2.4.1-next.0",
"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.4.1-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-02-07)

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

## [2.4.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-01-30)

### Miscellaneous Chores
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.4.0",
"version": "2.4.1-next.0",
"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.4.0"
"@esri/calcite-components": "^2.4.1-next.0"
},
"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.4.1-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-02-07)

### Bug Fixes

- don't override existing validationMessage when displaying after form submission ([#8690](https://github.com/Esri/calcite-design-system/issues/8690)) ([3076220](https://github.com/Esri/calcite-design-system/commit/3076220bf9d463bafe5c00cd14e7246a7995ab66)), closes [#8000](https://github.com/Esri/calcite-design-system/issues/8000) [/github.com/Esri/calcite-design-system/pull/8574#discussion_r1453899164](https://github.com/Esri//github.com/Esri/calcite-design-system/pull/8574/issues/discussion_r1453899164)

## [2.4.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-01-30)

### Features
Expand Down
7 changes: 3 additions & 4 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.4.0",
"version": "2.4.1-next.0",
"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 @@ -40,7 +40,7 @@
"test": "stencil test --no-docs --no-build --spec --e2e",
"test:prerender": "npm run build -- --prerender",
"test:watch": "npm run build && npm run test -- -- --watchAll",
"util:build-docs": "npm run util:prep-build-reqs && stencil build --docs --config stencil.storybook.config.ts",
"util:build-docs": "npm run util:prep-build-reqs && stencil build --docs --config stencil.storybook.config.ts && npm run lint:md",
"util:clean-tested-build": "npm ci && npm test && npm run build",
"util:copy-assets": "npm run util:copy-icons",
"util:copy-icons": "cpy \"../../node_modules/@esri/calcite-ui-icons/js/*.json\" \"./src/components/icon/assets/icon/\" --flat",
Expand Down Expand Up @@ -69,15 +69,14 @@
"composed-offset-position": "0.0.4",
"dayjs": "1.11.10",
"focus-trap": "7.5.4",
"form-request-submit-polyfill": "2.0.0",
"lodash-es": "4.17.21",
"sortablejs": "1.15.1",
"timezone-groups": "0.8.0"
},
"devDependencies": {
"@esri/calcite-design-tokens": "^2.1.2-next.0",
"@esri/calcite-ui-icons": "3.25.6",
"@esri/eslint-plugin-calcite-components": "^1.1.0",
"@esri/eslint-plugin-calcite-components": "^1.1.1-next.0",
"@stencil-community/eslint-plugin": "0.7.1",
"@stencil-community/postcss": "2.2.0",
"@stencil/angular-output-target": "0.8.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,7 @@ describe("calcite-combobox", () => {
<calcite-combobox-item id="two" icon="beaker" value="two" text-label="Two" selected></calcite-combobox-item>
<calcite-combobox-item id="three" value="three" text-label="Three"></calcite-combobox-item>
</calcite-combobox>`,
{ testValue: "two", submitsOnEnter: true },
{ testValue: "two", submitsOnEnter: true, validation: true, changeValueKeys: ["Space", "Enter"] },
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ describe("calcite-input-date-picker", () => {

describe("is form-associated", () => {
describe("supports single value", () => {
formAssociated("calcite-input-date-picker", { testValue: "1985-03-23", submitsOnEnter: true });
formAssociated("calcite-input-date-picker", { testValue: "1985-03-23", submitsOnEnter: true, validation: true });
});

describe("supports range", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1746,9 +1746,10 @@ describe("calcite-input-number", () => {

describe("is form-associated", () => {
formAssociated("calcite-input-number", {
testValue: 5,
testValue: "5",
submitsOnEnter: true,
inputType: "number",
validation: true,
});

testPostValidationFocusing("calcite-input-number");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ describe("calcite-input-text", () => {
});

describe("is form-associated", () => {
formAssociated("calcite-input-text", { testValue: "test", submitsOnEnter: true });
formAssociated("calcite-input-text", { testValue: "test", submitsOnEnter: true, validation: true });

testPostValidationFocusing("calcite-input-text");
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,12 @@ describe("calcite-input-time-picker", () => {
});

describe("is form-associated", () => {
formAssociated("calcite-input-time-picker", { testValue: "03:23", submitsOnEnter: true });
formAssociated("calcite-input-time-picker", {
testValue: "03:23",
submitsOnEnter: true,
validation: true,
validUserInputTestValue: "03:23 AM",
});
});

it("updates value appropriately as step changes", async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2053,6 +2053,7 @@ describe("calcite-input", () => {
testValue: value,
submitsOnEnter: true,
inputType: type,
validation: true,
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,12 +406,13 @@ describe("calcite-select", () => {
formAssociated(
html`
<calcite-select>
<calcite-option id="0"></calcite-option>
<calcite-option id="1">uno</calcite-option>
<calcite-option id="2">dos</calcite-option>
<calcite-option id="3">tres</calcite-option>
</calcite-select>
`,
{ testValue: "dos" },
{ testValue: "dos", validation: true, changeValueKeys: ["ArrowDown"] },
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ describe("calcite-text-area", () => {
testValue: "zion national park",
expectedSubmitValue: "zion national park",
submitsOnEnter: false,
validation: true,
});
});

Expand Down
Loading

0 comments on commit 8161d5f

Please sign in to comment.