Merge branch 'master' into benelan/6035-accordion-appearance-breaking

* master: 1.0.0-next.719 fix(combobox-item): bumping the scale of icon to M when parent combobox is scale L (#6253) 1.0.0-next.718 fix(button): neutral and outline button now has correct border color (#6269) style: lint and use tsserver LSP to organize imports (#6260) build(deps): Bump axe-core from 4.6.1 to 4.6.2 (#6264)
Esri · Jan 11, 2023 · b6ba3e6 · b6ba3e6
2 parents 9401dfa + bd10964
commit b6ba3e6
Show file tree

Hide file tree

Showing 183 changed files with 1,866 additions and 1,795 deletions.
diff --git a/.storybook/helpers.ts b/.storybook/helpers.ts
@@ -1,8 +1,8 @@
 import * as icons from "@esri/calcite-ui-icons";
 import { boolean as booleanKnob } from "@storybook/addon-knobs";
-import { MODES } from "../src/utils/resources";
-import { ModeName } from "../src/components/interfaces";
 import { Parameters } from "@storybook/api";
+import { ModeName } from "../src/components/interfaces";
+import { MODES } from "../src/utils/resources";
 
 // we can get all unique icon names from all size 16 non-filled icons.
 export const iconNames = Object.keys(icons)

diff --git a/.storybook/preview.ts b/.storybook/preview.ts
@@ -1,6 +1,6 @@
-import { modes, globalDocsPage, parseReadme } from "./utils";
-import { withDirection } from "storybook-rtl-addon";
 import { Theme as Mode } from "storybook-addon-themes/dist/models/Theme";
+import { withDirection } from "storybook-rtl-addon";
+import { globalDocsPage, modes, parseReadme } from "./utils";
 
 declare global {
   interface Window {}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -78,6 +78,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Bug Fixes
 
+- **combobox-item:** bumping the scale of icon to M when parent combobox is scale L ([#6253](https://github.com/Esri/calcite-components/issues/6253)) ([051cb3f](https://github.com/Esri/calcite-components/commit/051cb3f498b2f43339aa2d973dcd257098d84fd6)), closes [#5698](https://github.com/Esri/calcite-components/issues/5698)
+
+* **button:** neutral and outline button now has correct border color ([#6269](https://github.com/Esri/calcite-components/issues/6269)) ([24e6d32](https://github.com/Esri/calcite-components/commit/24e6d3268855bd5f00f04b5c52bc62c8cb6724e0)), closes [#5331](https://github.com/Esri/calcite-components/issues/5331)
+
 - **input, input-number, input-text:** allow slotted action to be independently disabled ([#6250](https://github.com/Esri/calcite-components/issues/6250)) ([8197c18](https://github.com/Esri/calcite-components/commit/8197c185c1fb23ebc5e7b0ff3bb6594c445d8736)), closes [#6241](https://github.com/Esri/calcite-components/issues/6241)
 
 * **input, input-number:** nudge buttons increment/decrement once per interaction ([#6240](https://github.com/Esri/calcite-components/issues/6240)) ([fd10ac5](https://github.com/Esri/calcite-components/commit/fd10ac5976e00c30b9acbbe9ea19b2ab284eac6d)), closes [#5785](https://github.com/Esri/calcite-components/issues/5785)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@esri/calcite-components",
-  "version": "1.0.0-next.717",
+  "version": "1.0.0-next.719",
   "description": "Web Components for Esri's Calcite Design System.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
@@ -110,7 +110,7 @@
     "@typescript-eslint/parser": "5.47.1",
     "@whitespace/storybook-addon-html": "5.0.0",
     "autoprefixer": "10.4.13",
-    "axe-core": "4.6.1",
+    "axe-core": "4.6.2",
     "babel-loader": "8.2.5",
     "chalk": "4.1.2",
     "cheerio": "1.0.0-rc.10",

diff --git a/src/components/accordion-item/accordion-item.tsx b/src/components/accordion-item/accordion-item.tsx
@@ -9,16 +9,16 @@ import {
   Prop,
   VNode
 } from "@stencil/core";
-import { getElementDir, getElementProp, getSlotted, toAriaBoolean } from "../../utils/dom";
 import {
+  ConditionalSlotComponent,
   connectConditionalSlotComponent,
-  disconnectConditionalSlotComponent,
-  ConditionalSlotComponent
+  disconnectConditionalSlotComponent
 } from "../../utils/conditionalSlot";
+import { getElementDir, getElementProp, getSlotted, toAriaBoolean } from "../../utils/dom";
 import { CSS_UTILITY } from "../../utils/resources";
-import { SLOTS, CSS } from "./resources";
 import { FlipContext, Position } from "../interfaces";
 import { RegistryEntry, RequestedItem } from "./interfaces";
+import { CSS, SLOTS } from "./resources";
 
 /**
  * @slot - A slot for adding custom content, including nested `calcite-accordion-item`s.

diff --git a/src/components/accordion/accordion.tsx b/src/components/accordion/accordion.tsx
@@ -1,7 +1,6 @@
 import { Component, Element, Event, EventEmitter, h, Listen, Prop, VNode } from "@stencil/core";
+import { Appearance, Position, Scale, SelectionMode } from "../interfaces";
 import { RequestedItem } from "./interfaces";
-import { Appearance, Position, Scale } from "../interfaces";
-import { SelectionMode } from "../interfaces";
 /**
  * @slot - A slot for adding `calcite-accordion-item`s. `calcite-accordion` cannot be nested, however `calcite-accordion-item`s can.
  */

diff --git a/src/components/action-bar/action-bar.e2e.ts b/src/components/action-bar/action-bar.e2e.ts
@@ -1,8 +1,8 @@
 import { newE2EPage } from "@stencil/core/testing";
+import { html } from "../../../support/formatting";
 import { accessible, defaults, focusable, hidden, reflects, renders, slots, t9n } from "../../tests/commonTests";
 import { CSS, SLOTS } from "./resources";
 import { overflowActionsDebounceInMs } from "./utils";
-import { html } from "../../../support/formatting";
 
 describe("calcite-action-bar", () => {
   it("renders", async () => renders("calcite-action-bar", { display: "inline-flex" }));

diff --git a/src/components/action-bar/action-bar.stories.ts b/src/components/action-bar/action-bar.stories.ts
@@ -1,15 +1,15 @@
-import { boolean, select, text } from "@storybook/addon-knobs";
+import { boolean, select } from "@storybook/addon-knobs";
+import { storyFilters } from "../../../.storybook/helpers";
+import { ATTRIBUTES } from "../../../.storybook/resources";
 import {
-  Attributes,
   Attribute,
-  filterComponentAttributes,
+  Attributes,
   createComponentHTML as create,
+  filterComponentAttributes,
   modesDarkDefault
 } from "../../../.storybook/utils";
-import readme from "./readme.md";
-import { ATTRIBUTES } from "../../../.storybook/resources";
 import { html } from "../../../support/formatting";
-import { storyFilters } from "../../../.storybook/helpers";
+import readme from "./readme.md";
 
 export default {
   title: "Components/Action Bar",

diff --git a/src/components/action-bar/action-bar.tsx b/src/components/action-bar/action-bar.tsx
@@ -3,47 +3,47 @@ import {
   Element,
   Event,
   EventEmitter,
+  h,
   Host,
+  Method,
   Prop,
-  Watch,
-  h,
+  State,
   VNode,
-  Method,
-  State
+  Watch
 } from "@stencil/core";
-import { Position, Scale, Layout } from "../interfaces";
-import { ExpandToggle, toggleChildActionText } from "../functional/ExpandToggle";
-import { CSS, SLOTS } from "./resources";
-import { getSlotted } from "../../utils/dom";
-import {
-  geActionDimensions,
-  getOverflowCount,
-  overflowActions,
-  queryActions,
-  overflowActionsDebounceInMs
-} from "./utils";
-import { createObserver } from "../../utils/observers";
 import { debounce } from "lodash-es";
 import {
+  ConditionalSlotComponent,
   connectConditionalSlotComponent,
-  disconnectConditionalSlotComponent,
-  ConditionalSlotComponent
+  disconnectConditionalSlotComponent
 } from "../../utils/conditionalSlot";
+import { getSlotted } from "../../utils/dom";
+import {
+  componentLoaded,
+  LoadableComponent,
+  setComponentLoaded,
+  setUpLoadableComponent
+} from "../../utils/loadable";
 import { connectLocalized, disconnectLocalized, LocalizedComponent } from "../../utils/locale";
+import { createObserver } from "../../utils/observers";
 import {
   connectMessages,
   disconnectMessages,
   setUpMessages,
   T9nComponent,
   updateMessages
 } from "../../utils/t9n";
+import { ExpandToggle, toggleChildActionText } from "../functional/ExpandToggle";
+import { Layout, Position, Scale } from "../interfaces";
 import { ActionBarMessages } from "./assets/action-bar/t9n";
+import { CSS, SLOTS } from "./resources";
 import {
-  setUpLoadableComponent,
-  setComponentLoaded,
-  LoadableComponent,
-  componentLoaded
-} from "../../utils/loadable";
+  geActionDimensions,
+  getOverflowCount,
+  overflowActions,
+  overflowActionsDebounceInMs,
+  queryActions
+} from "./utils";
 
 /**
  * @slot - A slot for adding `calcite-action`s that will appear at the top of the component.

diff --git a/src/components/action-bar/utils.ts b/src/components/action-bar/utils.ts
@@ -1,6 +1,6 @@
 import { forceUpdate } from "@stencil/core";
-import { SLOTS as ACTION_MENU_SLOTS } from "../action-menu/resources";
 import { SLOTS as ACTION_GROUP_SLOTS } from "../action-group/resources";
+import { SLOTS as ACTION_MENU_SLOTS } from "../action-menu/resources";
 import { Layout } from "../interfaces";
 
 export const overflowActionsDebounceInMs = 150;

diff --git a/src/components/action-group/action-group.tsx b/src/components/action-group/action-group.tsx
@@ -1,15 +1,12 @@
 import { Component, Element, h, Prop, Watch } from "@stencil/core";
-import { ICONS, SLOTS } from "./resources";
 import { Fragment, State, VNode } from "@stencil/core/internal";
-import { getSlotted } from "../../utils/dom";
-import { SLOTS as ACTION_MENU_SLOTS } from "../action-menu/resources";
-import { Columns, Layout, Scale } from "../interfaces";
+import { CalciteActionMenuCustomEvent } from "../../components";
 import {
   ConditionalSlotComponent,
   connectConditionalSlotComponent,
   disconnectConditionalSlotComponent
 } from "../../utils/conditionalSlot";
-import { CalciteActionMenuCustomEvent } from "../../components";
+import { getSlotted } from "../../utils/dom";
 import { connectLocalized, disconnectLocalized, LocalizedComponent } from "../../utils/locale";
 import {
   connectMessages,
@@ -18,7 +15,10 @@ import {
   T9nComponent,
   updateMessages
 } from "../../utils/t9n";
+import { SLOTS as ACTION_MENU_SLOTS } from "../action-menu/resources";
+import { Columns, Layout, Scale } from "../interfaces";
 import { ActionGroupMessages } from "./assets/action-group/t9n";
+import { ICONS, SLOTS } from "./resources";
 
 /**
  * @slot - A slot for adding a group of `calcite-action`s.

diff --git a/src/components/action-menu/action-menu.e2e.ts b/src/components/action-menu/action-menu.e2e.ts
@@ -1,8 +1,8 @@
-import { accessible, hidden, renders, defaults, reflects, focusable, slots } from "../../tests/commonTests";
 import { newE2EPage } from "@stencil/core/testing";
-import { SLOTS, CSS } from "./resources";
 import { html } from "../../../support/formatting";
+import { accessible, defaults, focusable, hidden, reflects, renders, slots } from "../../tests/commonTests";
 import { TOOLTIP_DELAY_MS } from "../tooltip/resources";
+import { CSS, SLOTS } from "./resources";
 
 describe("calcite-action-menu", () => {
   it("renders", async () => renders("calcite-action-menu", { display: "flex" }));

diff --git a/src/components/action-menu/action-menu.stories.ts b/src/components/action-menu/action-menu.stories.ts
@@ -1,6 +1,6 @@
+import { storyFilters } from "../../../.storybook/helpers";
 import { html } from "../../../support/formatting";
 import readme from "./readme.md";
-import { storyFilters } from "../../../.storybook/helpers";
 
 export default {
   title: "Components/Action Menu",

diff --git a/src/components/action-menu/action-menu.tsx b/src/components/action-menu/action-menu.tsx
@@ -1,29 +1,29 @@
 import {
   Component,
-  h,
   Element,
   Event,
   EventEmitter,
+  h,
   Listen,
-  Prop,
-  Watch,
   Method,
-  State
+  Prop,
+  State,
+  Watch
 } from "@stencil/core";
-import { CSS, SLOTS, ICONS } from "./resources";
-import { focusElement, isPrimaryPointerButton, toAriaBoolean } from "../../utils/dom";
 import { Fragment, VNode } from "@stencil/core/internal";
 import { getRoundRobinIndex } from "../../utils/array";
+import { focusElement, isPrimaryPointerButton, toAriaBoolean } from "../../utils/dom";
+import { EffectivePlacement, LogicalPlacement, OverlayPositioning } from "../../utils/floating-ui";
 import { guid } from "../../utils/guid";
-import { Scale } from "../interfaces";
-import { LogicalPlacement, EffectivePlacement, OverlayPositioning } from "../../utils/floating-ui";
 import { isActivationKey } from "../../utils/key";
 import {
-  setUpLoadableComponent,
-  setComponentLoaded,
+  componentLoaded,
   LoadableComponent,
-  componentLoaded
+  setComponentLoaded,
+  setUpLoadableComponent
 } from "../../utils/loadable";
+import { Scale } from "../interfaces";
+import { CSS, ICONS, SLOTS } from "./resources";
 
 const SUPPORTED_MENU_NAV_KEYS = ["ArrowUp", "ArrowDown", "End", "Home"];
 

diff --git a/src/components/action-pad/action-pad.tsx b/src/components/action-pad/action-pad.tsx
@@ -3,23 +3,26 @@ import {
   Element,
   Event,
   EventEmitter,
+  h,
   Host,
+  Method,
   Prop,
-  Watch,
-  h,
+  State,
   VNode,
-  Method,
-  State
+  Watch
 } from "@stencil/core";
-import { Layout, Position, Scale } from "../interfaces";
-import { ExpandToggle, toggleChildActionText } from "../functional/ExpandToggle";
-import { getSlotted } from "../../utils/dom";
-import { CSS, SLOTS } from "./resources";
 import {
   ConditionalSlotComponent,
   connectConditionalSlotComponent,
   disconnectConditionalSlotComponent
 } from "../../utils/conditionalSlot";
+import { getSlotted } from "../../utils/dom";
+import {
+  componentLoaded,
+  LoadableComponent,
+  setComponentLoaded,
+  setUpLoadableComponent
+} from "../../utils/loadable";
 import { connectLocalized, disconnectLocalized, LocalizedComponent } from "../../utils/locale";
 import {
   connectMessages,
@@ -28,13 +31,10 @@ import {
   T9nComponent,
   updateMessages
 } from "../../utils/t9n";
+import { ExpandToggle, toggleChildActionText } from "../functional/ExpandToggle";
+import { Layout, Position, Scale } from "../interfaces";
 import { ActionPadMessages } from "./assets/action-pad/t9n";
-import {
-  setUpLoadableComponent,
-  setComponentLoaded,
-  LoadableComponent,
-  componentLoaded
-} from "../../utils/loadable";
+import { CSS, SLOTS } from "./resources";
 
 /**
  * @slot - A slot for adding `calcite-action`s to the component.