Merge remote-tracking branch 'origin/main' into benelan/pr-bot-token

* origin/main: chore: release next chore: add `directory` to package.json `repository` property (#7510) fix(action-bar): restore "bottom-actions" slot functionality. (#7535) refactor(action-bar, action-pad, action-group): Remove usage of getSlotted utility (#7464) build(deps): update dependency lerna to v7.1.5 (#7502) build(deps): update dependency @esri/calcite-ui-icons to v3.23.7 (#7522) refactor(shell-panel): Remove usage of getSlotted utility. #6059 (#7465) build(deps): update dependency eslint-plugin-unicorn to v46.0.1 (#7501) build(deps): replace dependency rollup-plugin-node-resolve with @rollup/plugin-node-resolve 6.0.0 (#7481) test: skip unstable tests (#7524) build(deps): update dependency lint-staged to v13.2.3 (#7523) build(deps): update dependency @types/estree to v1.0.1 (#7483) build(deps): update dependency eslint-plugin-react to v7.33.1 (#7500) build(deps): update dependency eslint-plugin-jsdoc to v46.4.6 (#7499) build(deps): update dependency @types/node to v20.4.10 (#7484) chore: release next chore: release main (#7485)
Esri · Aug 17, 2023 · 389ed0e · 389ed0e
2 parents 87bd19a + 7e40a34
commit 389ed0e
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 16 deletions.
diff --git a/packages/calcite-components-react/CHANGELOG.md b/packages/calcite-components-react/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@1.6.1-next.0...@esri/calcite-components-react@1.6.1-next.1) (2023-08-16)
+
+**Note:** Version bump only for package @esri/calcite-components-react
+
 ## [1.6.1-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@1.6.0...@esri/calcite-components-react@1.6.1-next.0) (2023-08-15)
 
 **Note:** Version bump only for package @esri/calcite-components-react

diff --git a/packages/calcite-components-react/package.json b/packages/calcite-components-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@esri/calcite-components-react",
   "sideEffects": false,
-  "version": "1.6.1-next.0",
+  "version": "1.6.1-next.1",
   "description": "A set of React components that wrap calcite components",
   "license": "SEE LICENSE.md",
   "scripts": {
@@ -19,7 +19,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@esri/calcite-components": "^1.6.1-next.0"
+    "@esri/calcite-components": "^1.6.1-next.1"
   },
   "peerDependencies": {
     "react": ">=16.7",

diff --git a/packages/calcite-components/CHANGELOG.md b/packages/calcite-components/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1-next.1](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@1.6.1-next.0...@esri/calcite-components@1.6.1-next.1) (2023-08-16)
+
+### Bug Fixes
+
+- **action-bar:** restore "bottom-actions" slot functionality. ([#7535](https://github.com/Esri/calcite-design-system/issues/7535)) ([3aa9afa](https://github.com/Esri/calcite-design-system/commit/3aa9afaef487bbf016cca40d977be2a274eb9fe3)), closes [#7534](https://github.com/Esri/calcite-design-system/issues/7534)
+
 ## [1.6.1-next.0](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@1.6.0...@esri/calcite-components@1.6.1-next.0) (2023-08-15)
 
 **Note:** Version bump only for package @esri/calcite-components

diff --git a/packages/calcite-components/package.json b/packages/calcite-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@esri/calcite-components",
-  "version": "1.6.1-next.0",
+  "version": "1.6.1-next.1",
   "description": "Web Components for Esri's Calcite Design System.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
@@ -58,7 +58,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Esri/calcite-design-system.git"
+    "url": "git+https://github.com/Esri/calcite-design-system.git",
+    "directory": "packages/calcite-components"
   },
   "dependencies": {
     "@floating-ui/dom": "1.5.1",
@@ -75,7 +76,7 @@
   "devDependencies": {
     "@esri/calcite-design-tokens": "1.0.0",
     "@esri/calcite-ui-icons": "3.23.7",
-    "@esri/eslint-plugin-calcite-components": "^0.2.3-next.3",
+    "@esri/eslint-plugin-calcite-components": "^0.2.3-next.4",
     "@stencil-community/eslint-plugin": "0.5.0",
     "@stencil/postcss": "2.1.0",
     "@stencil/react-output-target": "0.5.3",

diff --git a/packages/calcite-components/src/components/action-bar/action-bar.e2e.ts b/packages/calcite-components/src/components/action-bar/action-bar.e2e.ts
@@ -340,9 +340,7 @@ describe("calcite-action-bar", () => {
               <calcite-action text="Save" icon="save" disabled></calcite-action>
               <calcite-action icon="layers" text="Layers"></calcite-action>
             </calcite-action-group>
-            <calcite-action-group slot="actions-end">
-              <calcite-action text="Tips" icon="lightbulb"></calcite-action>
-            </calcite-action-group>
+            <calcite-action slot="actions-end" text="Tips" icon="lightbulb"></calcite-action>
           </calcite-action-bar>
         </div>`,
       });
@@ -388,9 +386,7 @@ describe("calcite-action-bar", () => {
               <calcite-action text="Save" icon="save" disabled></calcite-action>
               <calcite-action icon="layers" text="Layers"></calcite-action>
             </calcite-action-group>
-            <calcite-action-group slot="actions-end">
-              <calcite-action text="Tips" icon="lightbulb"></calcite-action>
-            </calcite-action-group>
+            <calcite-action slot="actions-end" text="Tips" icon="lightbulb"></calcite-action>
           </calcite-action-bar>
         </div>`,
       });

diff --git a/packages/calcite-components/src/components/action-bar/action-bar.stories.ts b/packages/calcite-components/src/components/action-bar/action-bar.stories.ts
@@ -82,6 +82,8 @@ export const horizontal = (): string => html`
         <calcite-action text="Layers" icon="layers"> </calcite-action>
       </calcite-action-group>
       <calcite-action slot="actions-end" text="hello world" icon="layers"> </calcite-action>
+      <!-- The "bottom-actions" slot is deprecated -->
+      <calcite-action slot="bottom-actions" text="hello world 2" icon="information"> </calcite-action>
     </calcite-action-bar>
   </div>
 `;
@@ -100,6 +102,8 @@ export const horizontalSmall = (): string => html`
         <calcite-action text="Layers" icon="layers"> </calcite-action>
       </calcite-action-group>
       <calcite-action slot="actions-end" text="hello world" icon="layers"> </calcite-action>
+      <!-- The "bottom-actions" slot is deprecated -->
+      <calcite-action slot="bottom-actions" text="hello world 2" icon="information"> </calcite-action>
     </calcite-action-bar>
   </div>
 `;

diff --git a/packages/calcite-components/src/components/action-bar/action-bar.tsx b/packages/calcite-components/src/components/action-bar/action-bar.tsx
@@ -182,6 +182,8 @@ export class ActionBar
 
   @State() hasActionsEnd = false;
 
+  @State() hasBottomActions = false;
+
   @State() expandTooltip: HTMLCalciteTooltipElement;
 
   @Watch("effectiveLocale")
@@ -305,7 +307,9 @@ export class ActionBar
     this.setGroupLayout(actionGroups);
 
     const groupCount =
-      this.hasActionsEnd || !expandDisabled ? actionGroups.length + 1 : actionGroups.length;
+      this.hasActionsEnd || this.hasBottomActions || !expandDisabled
+        ? actionGroups.length + 1
+        : actionGroups.length;
 
     const { actionHeight, actionWidth } = geActionDimensions(actions);
 
@@ -355,6 +359,10 @@ export class ActionBar
     this.hasActionsEnd = slotChangeHasAssignedElement(event);
   };
 
+  handleBottomActionsSlotChange = (event: Event): void => {
+    this.hasBottomActions = slotChangeHasAssignedElement(event);
+  };
+
   handleTooltipSlotChange = (event: Event): void => {
     const tooltips = slotChangeGetAssignedElements(event).filter((el) =>
       el?.matches("calcite-tooltip")
@@ -390,12 +398,12 @@ export class ActionBar
     return (
       <calcite-action-group
         class={CSS.actionGroupEnd}
-        hidden={this.expandDisabled && !this.hasActionsEnd}
+        hidden={this.expandDisabled && !(this.hasActionsEnd || this.hasBottomActions)}
         layout={layout}
         scale={scale}
       >
         <slot name={SLOTS.actionsEnd} onSlotchange={this.handleActionsEndSlotChange} />
-        <slot name={SLOTS.bottomActions} onSlotchange={this.handleActionsEndSlotChange} />
+        <slot name={SLOTS.bottomActions} onSlotchange={this.handleBottomActionsSlotChange} />
         <slot name={SLOTS.expandTooltip} onSlotchange={this.handleTooltipSlotChange} />
         {expandToggleNode}
       </calcite-action-group>

diff --git a/packages/calcite-components/src/components/action-bar/resources.ts b/packages/calcite-components/src/components/action-bar/resources.ts
@@ -4,6 +4,6 @@ export const CSS = {
 
 export const SLOTS = {
   actionsEnd: "actions-end",
-  bottomActions: "actions-end",
+  bottomActions: "bottom-actions",
   expandTooltip: "expand-tooltip",
 };
diff --git a/packages/eslint-plugin-calcite-components/package.json b/packages/eslint-plugin-calcite-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@esri/eslint-plugin-calcite-components",
-  "version": "0.2.3-next.3",
+  "version": "0.2.3-next.4",
   "description": "ESLint rules for @esri/calcite-components",
   "main": "dist/index.js",
   "files": [