Skip to content

Commit 610d68d

Browse files
committed
Merge remote-tracking branch 'origin/dev' into benelan/8359-estimate-tracking
* origin/dev: (40 commits) feat: add parcel parameter (#10384) feat(alert): apply --calcite-alert-corner-radius to internal close button (#10388) feat(dialog, panel): Add css properties for background-color (#10387) fix: remove aria-disabled from components where necessary (#10374) feat(action-group, block, panel): add `menuPlacement` and `menuFlipPlacements` properties (#10249) fix(list, filter): fix sync between list items and filtered data (#10342) feat(popover): apply component tokens to arrow (#10386) feat(list-item): add `unavailable` property (#10377) fix(segmented-control): honor appearance, layout and scale when items are added after initialization (#10368) fix(action-pad): fix horizontal action group alignment (#10359) fix(combobox): selection-mode="single-persist" correctly selects an item when items have same values (#10366) fix(input-time-zone): fix region mode labeling and value mapping (#10345) fix(dropdown): open dropdown on `ArrowDown` & `ArrowUp` keys (#10264) refactor(components): reduce post-migration TypeScript errors (#10356) refactor: do not use Host in functional components (#10352) refactor(tests): reduce TypeScript errors (#10344) feat(alert): add component tokens (#10218) fix(card): properly handle slotted elements (#10378) refactor(panel): remove duplicate tailwind class (#10379) feat(popover, action): add component tokens (#10253) ...
2 parents b9a18cb + c99be67 commit 610d68d

File tree

205 files changed

+3693
-1250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+3693
-1250
lines changed

.github/ISSUE_TEMPLATE/accessibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
label: Check existing issues
99
description: If someone has already opened an issue for what you are experiencing, please add a 👍 reaction to the existing issue instead of creating a new one. For support, please check the [community forum](https://developers.arcgis.com/calcite-design-system/community/).
1010
options:
11-
- label: I have [checked for existing issues](https://github.com/Esri/calcite-design-system/issues) to avoid duplicates
11+
- label: I have [checked for existing issues](https://github.com/Esri/calcite-design-system/issues) to avoid duplicates and reviewed the [Accessibility page](https://developers.arcgis.com/calcite-design-system/foundations/accessibility) for guidance.
1212
validations:
1313
required: true
1414
- type: textarea

.husky/pre-commit

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,62 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
ensure_types_are_up_to_date() {
44
types_path="packages/calcite-components/src/components.d.ts"
55

66
if [ -n "$(git diff --name-only -- "$types_path")" ]; then
77
echo "Automatically staging changes to \"$types_path\""
8-
git add "$types_path"
8+
git add "$types_path" >/dev/null 2>&1 || true
99
fi
1010
}
1111

1212
update_stylelint_config_if_sass_file_edited() {
13-
staged_files="$(git diff --cached --name-only --diff-filter=ACM)"
13+
staged_files="$(
14+
git diff --cached --name-only --diff-filter=ACM -- packages/**/*.scss
15+
)"
1416

15-
for file in $staged_files; do
16-
if [[ "$file" == *.scss ]]; then
17-
npm run util:update-stylelint-custom-sass-functions
18-
break
19-
fi
20-
done
21-
22-
if [ -n "$(git diff --name-only -- "packages/calcite-components/.stylelintrc.json")" ]; then
23-
git add "packages/calcite-components/.stylelintrc.json"
17+
if [ -n "$staged_files" ]; then
18+
npm run util:update-stylelint-custom-sass-functions
19+
git add "packages/calcite-components/.stylelintrc.cjs" >/dev/null 2>&1 || true
2420
fi
21+
22+
unset staged_files
2523
}
2624

2725
check_ui_icon_name_consistency() {
28-
svg_icon_dir="packages/calcite-ui-icons/icons"
29-
3026
# this pattern checks for `<iconName>-<size>.svg` or `<iconName>-<size>-f.svg` for filled icons
3127
# where `<iconName>` is kebab-case, `<size>` is 16, 24, or 32
3228
valid_pattern="^[a-z0-9-]+-(16|24|32)(-f)?\\.svg$"
3329

3430
# this pattern will check for invalid use of "-f-" anywhere except right before the size
3531
invalid_pattern="-[a-z0-9]+-f-"
3632

37-
staged_files="$(git diff --cached --name-only --diff-filter=ACM)"
33+
staged_files="$(
34+
git diff --cached --name-only --diff-filter=ACM -- packages/calcite-ui-icons/icons/*.svg
35+
)"
3836

39-
for file in $staged_files; do
40-
if [[ "$file" == "$svg_icon_dir"* ]]; then
41-
if [[ "$file" == *.svg ]]; then
42-
filename="$(basename "$file")"
37+
if [ -n "$staged_files" ]; then
38+
for file in $staged_files; do
39+
filename="$(basename "$file")"
4340

44-
# first, ensure the filename follows the valid pattern
45-
if ! [[ "$filename" =~ $valid_pattern ]]; then
46-
echo "Error: File '$file' does not follow the naming convention (<iconName>-<size>.svg or <iconName>-<size>-f.svg)."
47-
exit 1
48-
fi
41+
# first, ensure the filename follows the valid pattern
42+
if ! echo "$filename" | grep -qE "$valid_pattern"; then
43+
printf "%s\n%s" \
44+
"error: file '$file' does not follow the naming convention:" \
45+
"(<iconname>-<size>.svg | <iconname>-<size>-f.svg)"
46+
exit 1
47+
fi
4948

50-
# then, ensure there's no invalid use of "-f-" anywhere except right before the size
51-
if [[ "$filename" =~ $invalid_pattern ]]; then
52-
echo "Error: File '$file' has an invalid '-f-' and does not follow the naming convention (<iconName>-<size>.svg or <iconName>-<size>-f.svg)."
53-
exit 1
54-
fi
49+
# then, ensure there's no invalid use of "-f-" anywhere except right before the size
50+
if echo "$filename" | grep -qE "$invalid_pattern"; then
51+
printf '%s\n%s' \
52+
"error: file '$file' has an invalid '-f-' and does not follow the naming convention:" \
53+
"(<iconname>-<size>.svg | <iconname>-<size>-f.svg)"
54+
exit 1
5555
fi
56-
fi
57-
done
56+
done
57+
fi
58+
59+
unset staged_files
5860
}
5961

6062
lint-staged

.husky/pre-push

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
#!/usr/bin/env bash
2-
# from https://riptutorial.com/git/example/16164/pre-push
3-
4-
protected_branch="main"
5-
current_branch=$(git rev-parse --abbrev-ref HEAD)
6-
7-
if [ "$protected_branch" = "$current_branch" ] && bash -c ': >/dev/tty'; then
8-
read -p "You're about to push main, is that what you intended? [y|n] " -n 1 -r </dev/tty
9-
echo
10-
if echo "$REPLY" | grep -E "^[Yy]$" >/dev/null; then
11-
exit 0
12-
fi
13-
exit 1
1+
#!/usr/bin/env sh
2+
3+
if ! bash -c ': >/dev/tty'; then
4+
exit 0
145
fi
6+
7+
current_branch="$(git rev-parse --abbrev-ref HEAD)"
8+
9+
case "$current_branch" in
10+
dev | main | rc)
11+
printf "You're about to push a protected branch, is that what you intended? [y|n] "
12+
read -r response
13+
14+
case "$response" in
15+
y | Y) exit 0 ;;
16+
*) exit 1 ;;
17+
esac
18+
;;
19+
*) exit 0 ;;
20+
esac

package-lock.json

Lines changed: 22 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/calcite-components-angular/projects/component-library/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.13.0-next.15](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-09-18)
7+
8+
**Note:** Version bump only for package @esri/calcite-components-angular
9+
610
## [2.13.0-next.14](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-09-13)
711

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

packages/calcite-components-angular/projects/component-library/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@esri/calcite-components-angular",
3-
"version": "2.13.0-next.14",
3+
"version": "2.13.0-next.15",
44
"description": "A set of Angular components that wrap Esri's Calcite Components.",
55
"homepage": "https://developers.arcgis.com/calcite-design-system/",
66
"bugs": {
@@ -17,7 +17,7 @@
1717
},
1818
"sideEffects": false,
1919
"dependencies": {
20-
"@esri/calcite-components": "2.13.0-next.14",
20+
"@esri/calcite-components": "2.13.0-next.15",
2121
"tslib": "2.6.3"
2222
},
2323
"peerDependencies": {

packages/calcite-components-react/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.13.0-next.15](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-09-18)
7+
8+
**Note:** Version bump only for package @esri/calcite-components-react
9+
610
## [2.13.0-next.14](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-09-13)
711

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

packages/calcite-components-react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@esri/calcite-components-react",
3-
"version": "2.13.0-next.14",
3+
"version": "2.13.0-next.15",
44
"description": "A set of React components that wrap calcite components",
55
"homepage": "https://developers.arcgis.com/calcite-design-system/",
66
"repository": {
@@ -28,7 +28,7 @@
2828
"tsc": "tsc"
2929
},
3030
"dependencies": {
31-
"@esri/calcite-components": "2.13.0-next.14"
31+
"@esri/calcite-components": "2.13.0-next.15"
3232
},
3333
"peerDependencies": {
3434
"react": ">=16.7",

packages/calcite-components/.stylelintrc.cjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
// ⚠️ AUTO-GENERATED CODE - DO NOT EDIT
44
const customFunctions = [
55
"get-trailing-text-input-padding",
6-
"scale-duration"
6+
"medium-modular-scale",
7+
"modular-scale",
8+
"scale-duration",
9+
"small-modular-scale"
710
];
811
// ⚠️ END OF AUTO-GENERATED CODE
912

packages/calcite-components/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.13.0-next.15](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-09-18)
7+
8+
### Features
9+
10+
- **carousel:** Improve support for high item counts ([#10315](https://github.com/Esri/calcite-design-system/issues/10315)) ([6ad2612](https://github.com/Esri/calcite-design-system/commit/6ad261276c2a1ece4ce8f23cc29234becd4869c1)), closes [#9121](https://github.com/Esri/calcite-design-system/issues/9121)
11+
12+
### Bug Fixes
13+
14+
- **panel:** initially closed panel should be hidden ([#10308](https://github.com/Esri/calcite-design-system/issues/10308)) ([46de96b](https://github.com/Esri/calcite-design-system/commit/46de96b24926415ea71cf77d23699269be83d258)), closes [#10320](https://github.com/Esri/calcite-design-system/issues/10320)
15+
616
## [2.13.0-next.14](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-09-13)
717

818
### Features

packages/calcite-components/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@esri/calcite-components",
3-
"version": "2.13.0-next.14",
3+
"version": "2.13.0-next.15",
44
"homepage": "https://developers.arcgis.com/calcite-design-system/",
55
"description": "Web Components for Esri's Calcite Design System.",
66
"main": "dist/index.cjs.js",
@@ -60,8 +60,8 @@
6060
"directory": "packages/calcite-components"
6161
},
6262
"dependencies": {
63-
"@esri/calcite-ui-icons": "3.32.0-next.4",
64-
"@floating-ui/dom": "1.6.10",
63+
"@esri/calcite-ui-icons": "3.32.0-next.5",
64+
"@floating-ui/dom": "1.6.11",
6565
"@stencil/core": "4.20.0",
6666
"@types/color": "3.0.6",
6767
"@types/sortablejs": "1.15.8",
@@ -72,12 +72,12 @@
7272
"interactjs": "1.10.27",
7373
"lodash-es": "4.17.21",
7474
"sortablejs": "1.15.3",
75-
"timezone-groups": "0.9.1",
75+
"timezone-groups": "0.10.2",
7676
"type-fest": "4.18.2"
7777
},
7878
"devDependencies": {
7979
"@esri/calcite-design-tokens": "2.2.1-next.4",
80-
"@esri/eslint-plugin-calcite-components": "^1.2.1-next.3",
80+
"@esri/eslint-plugin-calcite-components": "1.2.1-next.4",
8181
"@stencil-community/eslint-plugin": "0.8.0",
8282
"@stencil-community/postcss": "2.2.0",
8383
"@stencil/angular-output-target": "0.8.4",

0 commit comments

Comments
 (0)