Skip to content

Commit 49a992a

Browse files
benelanbenelan
committed
Merge remote-tracking branch 'origin/dev' into benelan/8065-input-time-min-max
* origin/dev: chore: release next feat(input-time-zone): add `offsetStyle` prop (#9426) chore: release next feat(panel, flow-item): add `footer-start` and `footer-end` slots (#9374)
2 parents 965f6b9 + efa9933 commit 49a992a

File tree

22 files changed

+381
-62
lines changed

22 files changed

+381
-62
lines changed

‎package-lock.json

Lines changed: 5 additions & 5 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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
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.10.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-25)
7+
8+
**Note:** Version bump only for package @esri/calcite-components-angular
9+
10+
## [2.10.0-next.9](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-25)
11+
12+
**Note:** Version bump only for package @esri/calcite-components-angular
13+
614
## [2.10.0-next.8](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-24)
715

816
**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.10.0-next.8",
3+
"version": "2.10.0-next.10",
44
"description": "A set of Angular components that wrap Esri's Calcite Components.",
55
"homepage": "https://developers.arcgis.com/calcite-design-system/",
66
"bugs": {
@@ -20,7 +20,7 @@
2020
"dist"
2121
],
2222
"dependencies": {
23-
"@esri/calcite-components": "^2.10.0-next.8",
23+
"@esri/calcite-components": "^2.10.0-next.10",
2424
"tslib": "2.6.2"
2525
},
2626
"peerDependencies": {

‎packages/calcite-components-react/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
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.10.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-25)
7+
8+
**Note:** Version bump only for package @esri/calcite-components-react
9+
10+
## [2.10.0-next.9](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-25)
11+
12+
**Note:** Version bump only for package @esri/calcite-components-react
13+
614
## [2.10.0-next.8](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-24)
715

816
**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.10.0-next.8",
3+
"version": "2.10.0-next.10",
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.10.0-next.8"
31+
"@esri/calcite-components": "^2.10.0-next.10"
3232
},
3333
"peerDependencies": {
3434
"react": ">=16.7",

‎packages/calcite-components/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.10.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-25)
7+
8+
### Features
9+
10+
- **input-time-zone:** add `offsetStyle` prop ([#9426](https://github.com/Esri/calcite-design-system/issues/9426)) ([dbc6c81](https://github.com/Esri/calcite-design-system/commit/dbc6c81ed087fa3ce05c4f2f4eaefc045ef05e9b)), closes [#8716](https://github.com/Esri/calcite-design-system/issues/8716)
11+
12+
## [2.10.0-next.9](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-25)
13+
14+
### Features
15+
16+
- **panel, flow-item:** add `footer-start` and `footer-end` slots ([#9374](https://github.com/Esri/calcite-design-system/issues/9374)) ([3def3ea](https://github.com/Esri/calcite-design-system/commit/3def3ea51bc69dfd1ebefc6a1ef2bcfe0bdc943c)), closes [#8981](https://github.com/Esri/calcite-design-system/issues/8981)
17+
18+
### Bug Fixes
19+
20+
- **list-item:** improve list item outline ([#9675](https://github.com/Esri/calcite-design-system/issues/9675)) ([b8c2fff](https://github.com/Esri/calcite-design-system/commit/b8c2fffab447ac47c2e4fedab07cafc33b1fe2d9)), closes [#7538](https://github.com/Esri/calcite-design-system/issues/7538)
21+
622
## [2.10.0-next.8](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-06-24)
723

824
### Features

‎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": "2.10.0-next.8",
3+
"version": "2.10.0-next.10",
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",

‎packages/calcite-components/src/components.d.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import { InputTextMessages } from "./components/input-text/assets/input-text/t9n
5353
import { InputTimePickerMessages } from "./components/input-time-picker/assets/input-time-picker/t9n";
5454
import { TimePickerMessages } from "./components/time-picker/assets/time-picker/t9n";
5555
import { InputTimeZoneMessages } from "./components/input-time-zone/assets/input-time-zone/t9n";
56-
import { TimeZoneMode } from "./components/input-time-zone/interfaces";
56+
import { OffsetStyle, TimeZoneMode } from "./components/input-time-zone/interfaces";
5757
import { ListDragDetail } from "./components/list/interfaces";
5858
import { ItemData } from "./components/list-item/interfaces";
5959
import { ListMessages } from "./components/list/assets/list/t9n";
@@ -144,7 +144,7 @@ export { InputTextMessages } from "./components/input-text/assets/input-text/t9n
144144
export { InputTimePickerMessages } from "./components/input-time-picker/assets/input-time-picker/t9n";
145145
export { TimePickerMessages } from "./components/time-picker/assets/time-picker/t9n";
146146
export { InputTimeZoneMessages } from "./components/input-time-zone/assets/input-time-zone/t9n";
147-
export { TimeZoneMode } from "./components/input-time-zone/interfaces";
147+
export { OffsetStyle, TimeZoneMode } from "./components/input-time-zone/interfaces";
148148
export { ListDragDetail } from "./components/list/interfaces";
149149
export { ItemData } from "./components/list-item/interfaces";
150150
export { ListMessages } from "./components/list/assets/list/t9n";
@@ -2862,6 +2862,11 @@ export namespace Components {
28622862
* Specifies the name of the component. Required to pass the component's `value` on form submission.
28632863
*/
28642864
"name": string;
2865+
/**
2866+
* Specifies how the offset will be displayed, where `"user"` uses `UTC` or `GMT` depending on the user's locale, `"gmt"` always uses `GMT`, and `"utc"` always uses `UTC`. This only applies to the `offset` mode.
2867+
* @default "user"
2868+
*/
2869+
"offsetStyle": OffsetStyle;
28652870
/**
28662871
* When `true`, displays and positions the component.
28672872
*/
@@ -10754,6 +10759,11 @@ declare namespace LocalJSX {
1075410759
* Specifies the name of the component. Required to pass the component's `value` on form submission.
1075510760
*/
1075610761
"name"?: string;
10762+
/**
10763+
* Specifies how the offset will be displayed, where `"user"` uses `UTC` or `GMT` depending on the user's locale, `"gmt"` always uses `GMT`, and `"utc"` always uses `UTC`. This only applies to the `offset` mode.
10764+
* @default "user"
10765+
*/
10766+
"offsetStyle"?: OffsetStyle;
1075710767
/**
1075810768
* Fires when the component is requested to be closed and before the closing transition begins.
1075910769
*/

‎packages/calcite-components/src/components/flow-item/flow-item.stories.ts

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,17 @@ const contentHTML = html`
6565
`;
6666

6767
const footerHTML = html`
68-
<calcite-button slot="${SLOTS.footer}" width="half" appearance="outline">Naw.</calcite-button>
69-
<calcite-button slot="${SLOTS.footer}" width="half">Yeah!</calcite-button>
68+
<calcite-button slot="${SLOTS.footerStart}" width="half" appearance="outline">Naw.</calcite-button>
69+
<calcite-button slot="${SLOTS.footerEnd}" width="half">Yeah!</calcite-button>
7070
`;
7171

7272
const flowItemContent = `${headerHTML}
7373
<calcite-action text="Action" label="Action" slot="${SLOTS.headerActionsStart}" icon="bluetooth"></calcite-action>
7474
<calcite-action text="Action" label="Action" slot="${SLOTS.headerActionsEnd}" icon="attachment"></calcite-action>
7575
${contentHTML}
76-
${footerHTML}`;
76+
<calcite-button slot="${SLOTS.footer}" width="half" appearance="outline">Naw.</calcite-button>
77+
<calcite-button slot="${SLOTS.footer}" width="half">Yeah!</calcite-button>
78+
`;
7779

7880
export const simple = (args: FlowItemStoryArgs): string => html`
7981
<calcite-flow-item
@@ -91,7 +93,8 @@ export const simple = (args: FlowItemStoryArgs): string => html`
9193
<calcite-action text="Action" label="Action" slot="${SLOTS.headerActionsEnd}" icon="attachment"></calcite-action>
9294
${contentHTML}
9395
<calcite-fab slot="fab"></calcite-fab>
94-
${footerHTML}
96+
<calcite-button slot="${SLOTS.footer}" width="half" appearance="outline">Naw.</calcite-button>
97+
<calcite-button slot="${SLOTS.footer}" width="half">Yeah!</calcite-button>
9598
</calcite-flow-item>
9699
`;
97100

@@ -218,13 +221,34 @@ export const withActionBarAndContentTop_TestOnly = (): string =>
218221
</calcite-flow-item>
219222
</div>`;
220223

221-
export const footerPaddingAndContentBottom_TestOnly = (): string =>
224+
export const footerPaddingAndContentBottom = (): string =>
225+
html` <div style="width: 300px;">
226+
<calcite-flow-item height-scale="s" style="--calcite-flow-item-footer-padding: 20px;">
227+
<div slot="header-content">Header!</div>
228+
<p>Slotted content!</p>
229+
<div slot="content-bottom">Content bottom!</div>
230+
<div slot="footer">Footer!</div>
231+
</calcite-flow-item>
232+
</div>`;
233+
234+
export const footerStartEndAndContentBottom = (): string =>
235+
html`<div style="width: 300px; height: 300px;">
236+
<calcite-flow-item height-scale="s" style="--calcite-flow-item-footer-padding: 20px;">
237+
<div slot="header-content">Header!</div>
238+
<p>Slotted content!</p>
239+
<div slot="content-bottom">Content bottom!</div>
240+
${footerHTML}
241+
</calcite-flow-item>
242+
</div>`;
243+
244+
export const footerSlotPrecedence = (): string =>
222245
html`<div style="width: 300px;">
223246
<calcite-flow-item height-scale="s" style="--calcite-flow-item-footer-padding: 20px;">
224247
<div slot="header-content">Header!</div>
225248
<p>Slotted content!</p>
226249
<div slot="content-bottom">Content bottom!</div>
227250
<div slot="footer">Footer!</div>
251+
${footerHTML}
228252
</calcite-flow-item>
229253
</div>`;
230254

‎packages/calcite-components/src/components/flow-item/flow-item.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ import { CSS, ICONS, SLOTS } from "./resources";
5050
* @slot header-content - A slot for adding custom content to the component's header.
5151
* @slot header-menu-actions - A slot for adding an overflow menu with `calcite-action`s inside a `calcite-dropdown`.
5252
* @slot fab - A slot for adding a `calcite-fab` (floating action button) to perform an action.
53-
* @slot footer-actions - [Deprecated] Use the `"footer"` slot instead. A slot for adding `calcite-button`s to the component's footer.
5453
* @slot footer - A slot for adding custom content to the component's footer.
54+
* @slot footer-actions - [Deprecated] Use the `"footer"` slot instead. A slot for adding `calcite-button`s to the component's footer.
55+
* @slot footer-end - A slot for adding a trailing footer custom content.
56+
* @slot footer-start - A slot for adding a leading footer custom content.
5557
*/
5658
@Component({
5759
tag: "calcite-flow-item",
@@ -390,8 +392,11 @@ export class FlowItem
390392
<slot name={SLOTS.fab} slot={PANEL_SLOTS.fab} />
391393
<slot name={SLOTS.contentTop} slot={PANEL_SLOTS.contentTop} />
392394
<slot name={SLOTS.contentBottom} slot={PANEL_SLOTS.contentBottom} />
395+
<slot name={SLOTS.footer} slot={PANEL_SLOTS.footer}>
396+
<slot name={SLOTS.footerEnd} slot={PANEL_SLOTS.footerEnd} />
397+
<slot name={SLOTS.footerStart} slot={PANEL_SLOTS.footerStart} />
398+
</slot>
393399
<slot name={SLOTS.footerActions} slot={PANEL_SLOTS.footerActions} />
394-
<slot name={SLOTS.footer} slot={PANEL_SLOTS.footer} />
395400
<slot />
396401
</calcite-panel>
397402
</InteractiveContainer>

0 commit comments

Comments
 (0)