Skip to content

Commit 4a74a1a

Browse files
committed
Merge remote-tracking branch 'origin/main' into benelan/7531-pr-merge-failsafe
* origin/main: (29 commits) chore: release next refactor(combobox-item): drop unused variable (#7587) fix(combobox): update combobox height to follow design spec (#7558) fix(split-button): update divider and borders to follow design spec (#7568) fix(segmented-control): refresh items when added dynamically (#7567) chore: release next feat(action-bar, action-pad, action-group): Add label properties for group context (#7415) test(modal, shell): add delay to recent unstable stories (#7589) chore: release next fix(modal): handle removal of open attribute and prevent multiple beforeClose calls (#7470) fix(tree-item): move focus outline to item label area (#7581) chore: add explainers to disabled jsx-sort-props on ref prop (#7584) fix(chip-group): Add existence checks (#7586) refactor(combobox, combobox-item, combobox-group): `getElementProp` is refactored out across child components as an outdated pattern in favor of inheritable props set directly on parent (#7562) build(deps): update dependency eslint-plugin-react to v7.33.2 (#7565) build(deps): update dependency quicktype-core to v23.0.71 (#7566) chore: release next fix(date-picker): set start of week to monday in zh-CN (#7578) chore: update translations (#7542) build: update browserslist db (#7554) ...
2 parents 29da98d + 4b89dee commit 4a74a1a

File tree

190 files changed

+12121
-9162
lines changed

Some content is hidden

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

190 files changed

+12121
-9162
lines changed

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"eslint-plugin-jest": "27.2.3",
7272
"eslint-plugin-jsdoc": "46.4.6",
7373
"eslint-plugin-prettier": "4.2.1",
74-
"eslint-plugin-react": "7.33.1",
74+
"eslint-plugin-react": "7.33.2",
7575
"eslint-plugin-unicorn": "46.0.1",
7676
"husky": "8.0.3",
7777
"jest": "27.4.5",
@@ -83,7 +83,7 @@
8383
"postcss": "8.4.28",
8484
"prettier": "2.8.8",
8585
"puppeteer": "10.0.0",
86-
"quicktype-core": "23.0.48",
86+
"quicktype-core": "23.0.71",
8787
"react": "^16.13.1",
8888
"react-dom": "^16.13.1",
8989
"rimraf": "5.0.1",
@@ -94,7 +94,7 @@
9494
"storybook": "6.5.16",
9595
"storybook-addon-themes": "6.1.0",
9696
"storybook-rtl-addon": "0.3.3",
97-
"stylelint": "15.10.2",
97+
"stylelint": "15.10.3",
9898
"stylelint-config-recommended-scss": "12.0.0",
9999
"stylelint-use-logical-spec": "5.0.0",
100100
"tailwindcss": "3.3.3",

packages/calcite-components-react/CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,30 @@
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+
## [1.7.0-next.4](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-23)
7+
8+
**Note:** Version bump only for package @esri/calcite-components-react
9+
10+
## [1.7.0-next.3](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-23)
11+
12+
**Note:** Version bump only for package @esri/calcite-components-react
13+
14+
## [1.7.0-next.2](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-23)
15+
16+
**Note:** Version bump only for package @esri/calcite-components-react
17+
18+
## [1.7.0-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-22)
19+
20+
**Note:** Version bump only for package @esri/calcite-components-react
21+
22+
## [1.7.0-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-22)
23+
24+
**Note:** Version bump only for package @esri/calcite-components-react
25+
26+
## [1.6.2-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-22)
27+
28+
**Note:** Version bump only for package @esri/calcite-components-react
29+
630
## [1.6.1](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-18)
731

832
### Miscellaneous Chores

packages/calcite-components-react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@esri/calcite-components-react",
33
"sideEffects": false,
4-
"version": "1.6.1",
4+
"version": "1.7.0-next.4",
55
"description": "A set of React components that wrap calcite components",
66
"license": "SEE LICENSE.md",
77
"scripts": {
@@ -19,7 +19,7 @@
1919
"dist/"
2020
],
2121
"dependencies": {
22-
"@esri/calcite-components": "^1.6.1"
22+
"@esri/calcite-components": "^1.7.0-next.4"
2323
},
2424
"peerDependencies": {
2525
"react": ">=16.7",

packages/calcite-components/.storybook/preview-head.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
max-width: 100%;
1616
}
1717

18+
calcite-meter {
19+
width: 450px;
20+
max-width: 100%;
21+
}
22+
1823
calcite-tabs,
1924
calcite-progress {
2025
width: 900px;

packages/calcite-components/CHANGELOG.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,53 @@
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+
## [1.7.0-next.4](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-23)
7+
8+
### Bug Fixes
9+
10+
- **combobox:** update combobox height to follow design spec ([#7558](https://github.com/Esri/calcite-design-system/issues/7558)) ([ec08845](https://github.com/Esri/calcite-design-system/commit/ec088451f2b16f4970c68d552c8d8e7ee441b4be)), closes [#6421](https://github.com/Esri/calcite-design-system/issues/6421)
11+
- **segmented-control:** refresh items when added dynamically ([#7567](https://github.com/Esri/calcite-design-system/issues/7567)) ([2e36eb3](https://github.com/Esri/calcite-design-system/commit/2e36eb35d12869220a5ad4d3696ee9e72d740632)), closes [#5736](https://github.com/Esri/calcite-design-system/issues/5736)
12+
- **split-button:** update divider and borders to follow design spec ([#7568](https://github.com/Esri/calcite-design-system/issues/7568)) ([8df59ab](https://github.com/Esri/calcite-design-system/commit/8df59aba00d62a72d50cb0ad3e94ceed63f36ce3)), closes [#6364](https://github.com/Esri/calcite-design-system/issues/6364)
13+
14+
## [1.7.0-next.3](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-23)
15+
16+
### Features
17+
18+
- **action-bar, action-pad, action-group:** Add label properties for group context ([#7415](https://github.com/Esri/calcite-design-system/issues/7415)) ([b34f36d](https://github.com/Esri/calcite-design-system/commit/b34f36d53b80011e7e946cfe30d1d85d3857d12a)), closes [#6904](https://github.com/Esri/calcite-design-system/issues/6904)
19+
20+
## [1.7.0-next.2](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-23)
21+
22+
### Bug Fixes
23+
24+
- **chip-group:** Add existence checks ([#7586](https://github.com/Esri/calcite-design-system/issues/7586)) ([5ca64f1](https://github.com/Esri/calcite-design-system/commit/5ca64f1f920f869053fee24ed2c982f64a0bbb5b)), closes [#7585](https://github.com/Esri/calcite-design-system/issues/7585)
25+
- **modal:** handle removal of open attribute and prevent multiple beforeClose calls ([#7470](https://github.com/Esri/calcite-design-system/issues/7470)) ([f31588f](https://github.com/Esri/calcite-design-system/commit/f31588fb4119e5582a5bd97eb4cf9bfc6c3b5a74)), closes [#6407](https://github.com/Esri/calcite-design-system/issues/6407) [#6379](https://github.com/Esri/calcite-design-system/issues/6379)
26+
- **tree-item:** move focus outline to item label area ([#7581](https://github.com/Esri/calcite-design-system/issues/7581)) ([1327cef](https://github.com/Esri/calcite-design-system/commit/1327cef7bdd0bfc24528755cc71084aa5c505d8a)), closes [#6481](https://github.com/Esri/calcite-design-system/issues/6481)
27+
28+
## [1.7.0-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-22)
29+
30+
### Bug Fixes
31+
32+
- **date-picker:** set start of week to monday in zh-CN ([#7578](https://github.com/Esri/calcite-design-system/issues/7578)) ([7e385cb](https://github.com/Esri/calcite-design-system/commit/7e385cba6984bea34de531927b1ba9407f6a5e05)), closes [#7382](https://github.com/Esri/calcite-design-system/issues/7382)
33+
- **dropdown:** prevents navigating dropdown items with Tab key ([#7527](https://github.com/Esri/calcite-design-system/issues/7527)) ([3ea658d](https://github.com/Esri/calcite-design-system/commit/3ea658dbe0a234b8489215779bbacc2530b01a01)), closes [#6610](https://github.com/Esri/calcite-design-system/issues/6610)
34+
35+
## [1.7.0-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-22)
36+
37+
### Features
38+
39+
- **meter:** Add Meter component ([#7401](https://github.com/Esri/calcite-design-system/issues/7401)) ([47163ed](https://github.com/Esri/calcite-design-system/commit/47163ed4ba9b7a5b318fd184e470c6ffa4d1600b)), closes [#2249](https://github.com/Esri/calcite-design-system/issues/2249)
40+
41+
### Bug Fixes
42+
43+
- **input-date-picker, input-time-picker:** do not show dropdown affordance when read-only ([#7559](https://github.com/Esri/calcite-design-system/issues/7559)) ([5a3f19c](https://github.com/Esri/calcite-design-system/commit/5a3f19c13f404b0d6111e41f3204b6afdca437a2)), closes [#6899](https://github.com/Esri/calcite-design-system/issues/6899)
44+
45+
## [1.6.2-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-22)
46+
47+
### Bug Fixes
48+
49+
- **color-picker:** update value when alphaChannel is toggled ([#7563](https://github.com/Esri/calcite-design-system/issues/7563)) ([1f753dd](https://github.com/Esri/calcite-design-system/commit/1f753dd2839ed5f4372b0d7dd2452ae32af4e245)), closes [#7205](https://github.com/Esri/calcite-design-system/issues/7205)
50+
- ensure label only focuses the first labelable child ([#7553](https://github.com/Esri/calcite-design-system/issues/7553)) ([426159c](https://github.com/Esri/calcite-design-system/commit/426159c7bf34978acd19b52b9a399c6d5eceddbf)), closes [#5070](https://github.com/Esri/calcite-design-system/issues/5070)
51+
- **list:** fixes dragging nested list items ([#7555](https://github.com/Esri/calcite-design-system/issues/7555)) ([c25f7b3](https://github.com/Esri/calcite-design-system/commit/c25f7b34a6aeb68ba65021c8df33acba142d3eaf)), closes [#7540](https://github.com/Esri/calcite-design-system/issues/7540)
52+
653
## [1.6.1](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2023-08-18)
754

855
### Bug Fixes

packages/calcite-components/conventions/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Due to a [bug in Stencil](https://github.com/ionic-team/stencil/issues/4074), `r
162162
class={CSS.foo}
163163
// ...
164164
tabIndex={0}
165-
// eslint-disable-next-line react/jsx-sort-props
165+
// eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
166166
ref={this.storeSomeElementRef}
167167
/>
168168
```

packages/calcite-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@esri/calcite-components",
3-
"version": "1.6.1",
3+
"version": "1.7.0-next.4",
44
"description": "Web Components for Esri's Calcite Design System.",
55
"main": "dist/index.cjs.js",
66
"module": "dist/index.js",

packages/calcite-components/src/components/action-bar/action-bar.tsx

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ export class ActionBar
7070
//
7171
// --------------------------------------------------------------------------
7272

73+
/**
74+
* Specifies the accessible label for the last action-group.
75+
*/
76+
@Prop() actionsEndGroupLabel: string;
77+
7378
/**
7479
* When `true`, the expand-toggling behavior is disabled.
7580
*/
@@ -372,7 +377,17 @@ export class ActionBar
372377
// --------------------------------------------------------------------------
373378

374379
renderBottomActionGroup(): VNode {
375-
const { expanded, expandDisabled, el, position, toggleExpand, scale, layout, messages } = this;
380+
const {
381+
expanded,
382+
expandDisabled,
383+
el,
384+
position,
385+
toggleExpand,
386+
scale,
387+
layout,
388+
messages,
389+
actionsEndGroupLabel,
390+
} = this;
376391

377392
const expandToggleNode = !expandDisabled ? (
378393
<ExpandToggle
@@ -384,14 +399,15 @@ export class ActionBar
384399
scale={scale}
385400
toggle={toggleExpand}
386401
tooltip={this.expandTooltip}
387-
// eslint-disable-next-line react/jsx-sort-props
402+
// eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
388403
ref={this.setExpandToggleRef}
389404
/>
390405
) : null;
391406

392407
return (
393408
<calcite-action-group
394409
class={CSS.actionGroupEnd}
410+
label={actionsEndGroupLabel}
395411
hidden={this.expandDisabled && !(this.hasActionsEnd || this.hasBottomActions)}
396412
layout={layout}
397413
scale={scale}

packages/calcite-components/src/components/action-bar/usage/With-grouping.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Renders a group of `calcite-action`s contained in a `calcite-action-group`. Acti
22

33
```html
44
<calcite-action-bar>
5-
<calcite-action-group>
5+
<calcite-action-group label="Manage item">
66
<calcite-action text="Add" icon="plus"></calcite-action>
77
<calcite-action text="Save" icon="save"></calcite-action>
88
</calcite-action-group>
99

10-
<calcite-action-group>
10+
<calcite-action-group label="Item types">
1111
<calcite-action text="Layers" icon="layers"></calcite-action>
1212
<calcite-action text="Basemaps" icon="layer-basemap"></calcite-action>
1313
</calcite-action-group>

0 commit comments

Comments
 (0)