Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into benelan/markdown-li…
Browse files Browse the repository at this point in the history
…nter

* origin/master:
  1.0.3
  docs: update component READMEs (#6337)
  docs: update license year (#6339)
  fix(pagination): bumping scale of chevron icon to M when host is scale L (#6338)
  ci: prepare release scripts for v1 (#6336)
  ci: add npm script to remove js files compiled by tsc (#6333)
  1.0.0-next.736
  fix(select): bumping scale of chevron icon to M when host is scale l (#6335)
  1.0.0-next.735
  • Loading branch information
benelan committed Jan 26, 2023
2 parents 9e276fa + ec396b2 commit 5b4b6dd
Show file tree
Hide file tree
Showing 13 changed files with 85 additions and 127 deletions.
12 changes: 12 additions & 0 deletions .versionrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"commitAll": true,
"noVerify": true,
"releaseCommitMessageFormat": "{{currentTag}}",
"skip": {
"changelog": true
},
"scripts": {
"precommit": "ts-node --esm ./support/prepReleaseCommit.ts"
},
"header": "# Changelog\n\nThis document maintains a list of released versions and changes introduced by them.\nThis project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)\n\n"
}
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
This document maintains a list of released versions and changes introduced by them.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)

<!--@unreleased-section-start-->

## Unreleased
## [v1.0.3](https://github.com/Esri/calcite-components/compare/v1.0.0-beta.99...v1.0.3) (2023-01-24)

### ⚠ BREAKING CHANGES

Expand Down Expand Up @@ -118,6 +116,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Bug Fixes

- **select:** bumping scale of chevron icon to M when host is scale l ([#6335](https://github.com/Esri/calcite-components/issues/6335)) ([fa91ec1](https://github.com/Esri/calcite-components/commit/fa91ec1f24957fcb67e1a9d183f24465a471678c)), closes [#5698](https://github.com/Esri/calcite-components/issues/5698)

- **input, input-number:** correctly handle '-' and '.' values when sanitizing number ([#6306](https://github.com/Esri/calcite-components/issues/6306)) ([6533366](https://github.com/Esri/calcite-components/commit/65333660001c98e078ac35548c7c92db706306d7)), closes [#6270](https://github.com/Esri/calcite-components/issues/6270)

- **tree:** expanded item renders correctly on initial load ([#6320](https://github.com/Esri/calcite-components/issues/6320)) ([ac8b517](https://github.com/Esri/calcite-components/commit/ac8b51731aaafdef24922a5fc6f6b82beb3478bb)), closes [#6284](https://github.com/Esri/calcite-components/issues/6284)

- **date-picker:** display correct day for first day of month in `ar` locale ([#6309](https://github.com/Esri/calcite-components/issues/6309)) ([ea190a7](https://github.com/Esri/calcite-components/commit/ea190a7c12994e24acb96ee7b9cab42f17d446cd)), closes [#6182](https://github.com/Esri/calcite-components/issues/6182)
Expand Down Expand Up @@ -160,8 +162,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- **tooltip:** Fix hover logic for elements within shadowRoot. ([#6119](https://github.com/Esri/calcite-components/issues/6119)) ([f490e5e](https://github.com/Esri/calcite-components/commit/f490e5ee0a4ae75f0e3b727f4ce0f7925bc8e53c))

<!--@unreleased-section-end-->

## [1.0.0-beta.99](https://github.com/Esri/calcite-components/compare/v1.0.0-beta.98...1.0.0-beta.99) (2022-12-19)

### ⚠ BREAKING CHANGES
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Licensing

COPYRIGHT © 2020 Esri
COPYRIGHT © 2023 Esri

All rights reserved under the copyright laws of the United States and applicable international laws, treaties, and conventions.

Expand Down
17 changes: 2 additions & 15 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components",
"version": "1.0.0-next.734",
"version": "1.0.3",
"description": "Web Components for Esri's Calcite Design System.",
"main": "dist/index.cjs.js",
"module": "dist/index.js",
Expand Down Expand Up @@ -37,7 +37,7 @@
"prepublishOnly": "ts-node --esm ./support/prepublish.ts",
"release:docs": "npm run docs && storybook-to-ghpages --existing-output-dir=docs",
"release:next": "npm ci && npm test && npm run util:deploy-next",
"release:prepare": "npm ci && npm test && ts-node --esm support/prepReleaseCommit.ts && npm run build",
"release:prepare": "npm ci && npm test && standard-version && npm run build",
"release:publish": "npm run util:test-types && npm run util:push-tags && npm publish && ts-node --esm ./support/releaseToGitHub.ts",
"start": "concurrently --kill-others --raw \"tsc --project ./tsconfig-demos.json --watch\" \"npm run build:watch-dev -- --serve\" \"ts-node --esm ./support/cleanOnProcessExit.ts --path ./src/demos/**/*.js \"",
"test": "npm run build && npm run test:existing-build",
Expand All @@ -56,12 +56,13 @@
"util:patch-esm-resolution": "ts-node --esm support/patchESMResolution.ts",
"util:patch-tree-shaking": "ts-node --esm support/patchTreeShaking.ts",
"util:prep-build-reqs": "npm run util:copy-icons && npm run util:generate-t9n-types",
"util:prep-next": "ts-node --esm support/prepReleaseCommit.ts --next && npm run build",
"util:prep-next": "standard-version --prerelease next && npm run build",
"util:publish-next": "npm run util:test-types && npm publish --tag next && npm run util:push-tags",
"util:check-squash-mergeable-branch": "ts-node --esm support/checkSquashMergeableBranch.ts",
"util:push-tags": "git push --atomic --follow-tags origin master",
"util:sync-t9n-en-bundles": "ts-node --esm support/syncEnT9nBundles.ts",
"util:test-types": "tsc --esModuleInterop dist/types/**/*.d.ts dist/components/*.d.ts && ! grep -rnw 'dist/types' -e '<reference types='"
"util:test-types": "tsc --esModuleInterop dist/types/**/*.d.ts dist/components/*.d.ts && ! grep -rnw 'dist/types' -e '<reference types=' && npm run util:clean-js-files",
"util:clean-js-files": "find src .storybook support -name '*.js' | xargs rm -rf && find . -maxdepth 1 -name '*.js' | xargs rm -rf"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -95,7 +96,6 @@
"@storybook/storybook-deployer": "2.8.16",
"@storybook/testing-library": "0.0.13",
"@types/dedent": "0.7.0",
"@types/git-semver-tags": "4.1.1",
"@types/jest": "27.0.3",
"@types/jest-axe": "3.5.5",
"@types/lodash-es": "4.17.6",
Expand Down
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ The most common approach for loading Calcite Components is to use the version ho
```html
<script
type="module"
src="https://unpkg.com/@esri/[email protected].0-beta.99/dist/calcite/calcite.esm.js"
src="https://unpkg.com/@esri/[email protected].3/dist/calcite/calcite.esm.js"
></script>
<link
rel="stylesheet"
type="text/css"
href="https://unpkg.com/@esri/[email protected].0-beta.99/dist/calcite/calcite.css"
href="https://unpkg.com/@esri/[email protected].3/dist/calcite/calcite.css"
/>
```

Expand Down Expand Up @@ -150,7 +150,7 @@ We welcome contributions to this project. See [CONTRIBUTING.md](./CONTRIBUTING.m

## License

COPYRIGHT © 2020 Esri
COPYRIGHT © 2023 Esri

All rights reserved under the copyright laws of the United States and applicable international laws, treaties, and conventions.

Expand Down
23 changes: 13 additions & 10 deletions src/components/pagination/pagination.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,20 @@ export const simple = (): string => html`
</calcite-pagination>
`;

export const darkModeFrenchLocale_TestOnly = (): string => html`<calcite-pagination
class="calcite-mode-dark"
start-item="1"
lang="fr"
group-separator
total-items="123456789"
page-size="10"
>
</calcite-pagination>`;
export const darkModeFrenchLocaleAndLargeScaleGetsMediumChevron_TestOnly = (): string => html`
<calcite-pagination
class="calcite-mode-dark"
start-item="1"
lang="fr"
group-separator
total-items="123456789"
page-size="10"
scale="l"
>
</calcite-pagination>
`;

darkModeFrenchLocale_TestOnly.parameters = { modes: modesDarkDefault };
darkModeFrenchLocaleAndLargeScaleGetsMediumChevron_TestOnly.parameters = { modes: modesDarkDefault };

export const arabicNumberingSystemAndRTL_TestOnly = (): string => html`<calcite-pagination
dir="rtl"
Expand Down
4 changes: 2 additions & 2 deletions src/components/pagination/pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ export class Pagination implements LocalizedComponent, LocalizedComponent, T9nCo
disabled={prevDisabled}
onClick={this.previousClicked}
>
<calcite-icon flipRtl icon="chevronLeft" scale="s" />
<calcite-icon flipRtl icon="chevronLeft" scale={this.scale === "l" ? "m" : "s"} />
</button>
{totalItems > pageSize ? this.renderPage(1) : null}
{this.renderLeftEllipsis()}
Expand All @@ -318,7 +318,7 @@ export class Pagination implements LocalizedComponent, LocalizedComponent, T9nCo
disabled={nextDisabled}
onClick={this.nextClicked}
>
<calcite-icon flipRtl icon="chevronRight" scale="s" />
<calcite-icon flipRtl icon="chevronRight" scale={this.scale === "l" ? "m" : "s"} />
</button>
</Fragment>
);
Expand Down
10 changes: 6 additions & 4 deletions src/components/select/select.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ export const darkModeRTL_TestOnly = (): string =>

darkModeRTL_TestOnly.parameters = { modes: modesDarkDefault };

export const disabled_TestOnly = (): string => html`<calcite-select disabled>
<calcite-option label="first" value="1"></calcite-option>
<calcite-option label="second" value="2"></calcite-option>
</calcite-select>`;
export const disabledAndLargeScaleGetsMediumChevron_TestOnly = (): string => html`
<calcite-select disabled scale="l">
<calcite-option label="first" value="1"></calcite-option>
<calcite-option label="second" value="2"></calcite-option>
</calcite-select>
`;
2 changes: 1 addition & 1 deletion src/components/select/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ export class Select
renderChevron(): VNode {
return (
<div class={CSS.iconContainer}>
<calcite-icon class={CSS.icon} icon="chevron-down" scale="s" />
<calcite-icon class={CSS.icon} icon="chevron-down" scale={this.scale === "l" ? "m" : "s"} />
</div>
);
}
Expand Down
21 changes: 12 additions & 9 deletions src/components/tree-item/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,21 @@

## Properties

| Property | Attribute | Description | Type | Default |
| ---------- | ---------- | ---------------------------------------------------------------------------------------- | --------- | ------- |
| `disabled` | `disabled` | When `true`, interaction is prevented and the component is displayed with lower opacity. | `boolean` | `false` |
| `expanded` | `expanded` | When `true`, the component is expanded. | `boolean` | `false` |
| `selected` | `selected` | When `true`, the component is selected. | `boolean` | `false` |
| Property | Attribute | Description | Type | Default |
| ------------- | --------------- | -------------------------------------------------------------------------------------------- | ---------------------------- | ----------- |
| `disabled` | `disabled` | When `true`, interaction is prevented and the component is displayed with lower opacity. | `boolean` | `false` |
| `expanded` | `expanded` | When `true`, the component is expanded. | `boolean` | `false` |
| `iconFlipRtl` | `icon-flip-rtl` | When `true`, the icon will be flipped when the element direction is right-to-left (`"rtl"`). | `"both" \| "end" \| "start"` | `undefined` |
| `iconStart` | `icon-start` | Specifies an icon to display at the start of the component. | `string` | `undefined` |
| `selected` | `selected` | When `true`, the component is selected. | `boolean` | `false` |

## Slots

| Slot | Description |
| ------------ | ------------------------------------------------- |
| | A slot for adding text. |
| `"children"` | A slot for adding nested `calcite-tree` elements. |
| Slot | Description |
| --------------- | ----------------------------------------------------------------------------------------------------- |
| | A slot for adding text. |
| `"actions-end"` | A slot for adding actions to the end of the component. It is recommended to use two or fewer actions. |
| `"children"` | A slot for adding nested `calcite-tree` elements. |

## Dependencies

Expand Down
6 changes: 0 additions & 6 deletions support/.eslintrc.json

This file was deleted.

Loading

0 comments on commit 5b4b6dd

Please sign in to comment.