Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
jcfranco committed Jun 7, 2024
2 parents 7e787de + bb45bdb commit 1a7501b
Show file tree
Hide file tree
Showing 134 changed files with 1,213 additions and 976 deletions.
52 changes: 35 additions & 17 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"@types/estree": "1.0.5",
"@types/jest": "29.5.12",
"@types/jest-axe": "3.5.9",
"@types/jsdom": "21.1.6",
"@types/lodash-es": "4.17.12",
"@types/node": "^20.12.7",
"@types/prettier": "2.7.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.10.0-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.10.0-next.0...@esri/calcite-components-angular@2.10.0-next.1) (2024-06-06)

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

## [2.10.0-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.9.1-next.3...@esri/calcite-components-angular@2.10.0-next.0) (2024-06-06)

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

## [2.9.1-next.3](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.9.1-next.2...@esri/calcite-components-angular@2.9.1-next.3) (2024-06-05)

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

## [2.9.1-next.2](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.9.1-next.1...@esri/calcite-components-angular@2.9.1-next.2) (2024-06-04)

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

## [2.9.1-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-angular@2.9.1-next.0...@esri/calcite-components-angular@2.9.1-next.1) (2024-06-04)

**Note:** Version bump only for package @esri/calcite-components-angular
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components-angular",
"version": "2.9.1-next.1",
"version": "2.10.0-next.1",
"description": "A set of Angular components that wrap Esri's Calcite Components.",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"bugs": {
Expand All @@ -20,7 +20,7 @@
"dist"
],
"dependencies": {
"@esri/calcite-components": "^2.9.1-next.1",
"@esri/calcite-components": "^2.10.0-next.1",
"tslib": "2.6.2"
},
"peerDependencies": {
Expand Down
16 changes: 16 additions & 0 deletions packages/calcite-components-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.10.0-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.10.0-next.0...@esri/calcite-components-react@2.10.0-next.1) (2024-06-06)

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

## [2.10.0-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.9.1-next.3...@esri/calcite-components-react@2.10.0-next.0) (2024-06-06)

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

## [2.9.1-next.3](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.9.1-next.2...@esri/calcite-components-react@2.9.1-next.3) (2024-06-05)

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

## [2.9.1-next.2](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.9.1-next.1...@esri/calcite-components-react@2.9.1-next.2) (2024-06-04)

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

## [2.9.1-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@2.9.1-next.0...@esri/calcite-components-react@2.9.1-next.1) (2024-06-04)

**Note:** Version bump only for package @esri/calcite-components-react
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,6 +1,6 @@
{
"name": "@esri/calcite-components-react",
"version": "2.9.1-next.1",
"version": "2.10.0-next.1",
"description": "A set of React components that wrap calcite components",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"repository": {
Expand Down Expand Up @@ -28,7 +28,7 @@
"tsc": "tsc"
},
"dependencies": {
"@esri/calcite-components": "^2.9.1-next.1"
"@esri/calcite-components": "^2.10.0-next.1"
},
"peerDependencies": {
"react": ">=16.7",
Expand Down
56 changes: 0 additions & 56 deletions packages/calcite-components/.storybook/interfaces.ts

This file was deleted.

62 changes: 34 additions & 28 deletions packages/calcite-components/.storybook/resources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ import {
Kind,
Width,
SelectionMode,
ArrowType,
DisplayMode,
ToggleDisplay,
Layout,
Dir,
ButtonType,
InteractionMode,
IconType,
DeterminateType,
FillType,
LabelType,
ClickType,
CollapseDirection,
TextType,
Mode,
SelectionAppearance,
} from "./interfaces";
} from "../../calcite-components/src/components/interfaces.ts";
import { ArrowType } from "../src/components/carousel/interfaces.ts";
import { BlockSectionToggleDisplay } from "../src/components/block-section/interfaces.ts";
import { TileSelectType } from "../src/components/tile-select/interfaces.ts";
import { TableInteractionMode } from "../src/components/table/interfaces.ts";
import { DeterminateType } from "../src/components/loader/interfaces.ts";
import { MeterFillType, MeterLabelType } from "../src/components/meter/interfaces.ts";
import { DropdownClickType } from "../src/components/dropdown/interfaces.ts";
import { TextType } from "../src/components/input/interfaces.ts";
import { TimeZoneMode } from "../src/components/input-time-zone/interfaces.ts";
import { DisplayMode } from "../src/components/sheet/interfaces.ts";
import { ShellDisplayMode } from "../src/components/shell/interfaces.ts";

interface AttributeMetadata<T> {
values: T[];
Expand All @@ -43,20 +43,21 @@ interface CommonAttributes {
selectionMode: AttributeMetadata<SelectionMode>;
arrowType: AttributeMetadata<ArrowType>;
displayMode: AttributeMetadata<DisplayMode>;
toggleDisplay: AttributeMetadata<ToggleDisplay>;
toggleDisplay: AttributeMetadata<BlockSectionToggleDisplay>;
layout: AttributeMetadata<Layout>;
dir: AttributeMetadata<Dir>;
buttonType: AttributeMetadata<ButtonType>;
interactionMode: AttributeMetadata<InteractionMode>;
buttonType: AttributeMetadata<TileSelectType>;
interactionMode: AttributeMetadata<TableInteractionMode>;
iconType: AttributeMetadata<IconType>;
determinateType: AttributeMetadata<DeterminateType>;
fillType: AttributeMetadata<FillType>;
labelType: AttributeMetadata<LabelType>;
clickType: AttributeMetadata<ClickType>;
fillType: AttributeMetadata<MeterFillType>;
labelType: AttributeMetadata<MeterLabelType>;
clickType: AttributeMetadata<DropdownClickType>;
collapseDirection: AttributeMetadata<CollapseDirection>;
textType: AttributeMetadata<TextType>;
mode: AttributeMetadata<Mode>;
mode: AttributeMetadata<TimeZoneMode>;
selectionAppearance: AttributeMetadata<SelectionAppearance>;
shellDisplayMode: AttributeMetadata<ShellDisplayMode>;
}

const logicalFlowPositionOptions: LogicalFlowPosition[] = ["inline-start", "inline-end", "block-start", "block-end"];
Expand All @@ -77,8 +78,8 @@ const selectionModeOptions: SelectionMode[] = [
"multiple",
];
const arrowTypeOptions: ArrowType[] = ["inline", "edge", "none"];
const displayModeOptions: DisplayMode[] = ["dock", "float", "overlay"];
const toggleDisplayOptions: ToggleDisplay[] = ["button", "switch"];
const displayModeOptions: DisplayMode[] = ["float", "overlay"];
const toggleDisplayOptions: BlockSectionToggleDisplay[] = ["button", "switch"];
const layoutOptions: Layout[] = [
"horizontal",
"vertical",
Expand All @@ -91,13 +92,13 @@ const layoutOptions: Layout[] = [
"horizontal-single",
];
const dirOptions: Dir[] = ["ltr", "rtl"];
const buttonTypeOptions: ButtonType[] = ["radio", "checkbox"];
const interactionModeOptions: InteractionMode[] = ["interactive", "static"];
const iconTypeOptions: IconType[] = ["chevron", "caret", "ellipsis", "overflow"];
const buttonTypeOptions: TileSelectType[] = ["radio", "checkbox"];
const interactionModeOptions: TableInteractionMode[] = ["interactive", "static"];
const iconTypeOptions: IconType[] = ["chevron", "caret", "ellipsis", "overflow", "plus-minus"];
const determinateTypeOptions: DeterminateType[] = ["determinate", "indeterminate"];
const fillTypeOptions: FillType[] = ["single", "range"];
const labelTypeOptions: LabelType[] = ["percent", "units"];
const clickTypeOptions: ClickType[] = ["click", "hover"];
const fillTypeOptions: MeterFillType[] = ["single", "range"];
const labelTypeOptions: MeterLabelType[] = ["percent", "units"];
const clickTypeOptions: DropdownClickType[] = ["click", "hover"];
const collapseDirectionOptions: CollapseDirection[] = ["down", "up"];
const textTypeOptions: TextType[] = [
"text",
Expand All @@ -111,8 +112,9 @@ const textTypeOptions: TextType[] = [
"time",
"date",
];
const modeOptions: Mode[] = ["offset", "name"];
const modeOptions: TimeZoneMode[] = ["offset", "name"];
const selectionAppearanceOptions: SelectionAppearance[] = ["icon", "border"];
const shellDisplayModeOptions: ShellDisplayMode[] = ["dock", "float", "overlay"];

export const ATTRIBUTES: CommonAttributes = {
alignment: {
Expand Down Expand Up @@ -215,4 +217,8 @@ export const ATTRIBUTES: CommonAttributes = {
values: selectionAppearanceOptions,
defaultValue: selectionAppearanceOptions[0],
},
shellDisplayMode: {
values: shellDisplayModeOptions,
defaultValue: shellDisplayModeOptions[0],
},
};
Loading

0 comments on commit 1a7501b

Please sign in to comment.