Merge branch 'main' into renovate/date-fns-3.x

Author: jzempel

.github/renovate.json

@@ -1,7 +1,7 @@
 {
   "extends": ["config:base"],
   "rebaseStalePrs": true,
-  "ignorePaths": ["**/node_modules/**"],
+  "ignorePaths": ["**/node_modules/**", "packages/dropdowns"],
   "schedule": ["on Monday every 9 weeks of the year starting on the 5th week"],
   "labels": ["PR: Internal :seedling:"],
   "postUpdateOptions": ["npmDedupe"],

package-lock.json

@@ -22,7 +22,7 @@
   "types": "dist/typings/index.d.ts",
   "dependencies": {
     "@zendeskgarden/container-accordion": "^3.0.0",
-    "@zendeskgarden/container-utilities": "^1.0.0",
+    "@zendeskgarden/container-utilities": "^2.0.0",
     "polished": "^4.0.0",
     "prop-types": "^15.5.7"
   },

packages/accordions/package.json

@@ -22,10 +22,10 @@
   "types": "dist/typings/index.d.ts",
   "dependencies": {
     "@zendeskgarden/container-selection": "^3.0.0",
-    "@zendeskgarden/container-utilities": "^1.0.6",
+    "@zendeskgarden/container-utilities": "^2.0.0",
     "polished": "^4.0.0",
     "prop-types": "^15.5.7",
-    "react-merge-refs": "^1.1.0"
+    "react-merge-refs": "^2.0.0"
   },
   "peerDependencies": {
     "@zendeskgarden/react-theming": "^8.67.0",

packages/buttons/package.json

@@ -7,7 +7,7 @@
 
 import React, { forwardRef, MutableRefObject, SVGAttributes } from 'react';
 import PropTypes from 'prop-types';
-import mergeRefs from 'react-merge-refs';
+import { mergeRefs } from 'react-merge-refs';
 import { IButtonProps, SIZE } from '../types';
 import { StyledButton } from '../styled';
 import { useButtonGroupContext } from '../utils/useButtonGroupContext';

packages/buttons/src/elements/Button.tsx

@@ -22,11 +22,11 @@
   "types": "dist/typings/index.d.ts",
   "dependencies": {
     "@zendeskgarden/container-accordion": "^2.0.0",
-    "@zendeskgarden/container-utilities": "^1.0.0",
+    "@zendeskgarden/container-utilities": "^2.0.0",
     "dom-helpers": "^5.2.1",
     "polished": "^4.0.0",
     "prop-types": "^15.5.7",
-    "react-merge-refs": "^1.1.0"
+    "react-merge-refs": "^2.0.0"
   },
   "peerDependencies": {
     "@zendeskgarden/react-theming": "^8.67.0",

packages/chrome/package.json

@@ -8,7 +8,7 @@
 import React, { useRef, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useUIDSeed } from 'react-uid';
-import mergeRefs from 'react-merge-refs';
+import { mergeRefs } from 'react-merge-refs';
 
 import { ISheetProps, PLACEMENT } from '../../types';
 import { StyledSheet, StyledSheetWrapper } from '../../styled';

packages/chrome/src/elements/sheet/Sheet.tsx

@@ -22,7 +22,7 @@
   "types": "dist/typings/index.d.ts",
   "dependencies": {
     "@zendeskgarden/container-grid": "^0.1.1",
-    "@zendeskgarden/container-utilities": "^1.0.0",
+    "@zendeskgarden/container-utilities": "^2.0.0",
     "@zendeskgarden/react-buttons": "^8.74.0",
     "@zendeskgarden/react-forms": "^8.74.0",
     "@zendeskgarden/react-modals": "^8.74.0",

packages/colorpickers/package.json

@@ -21,7 +21,7 @@
   "sideEffects": false,
   "types": "dist/typings/index.d.ts",
   "dependencies": {
-    "@zendeskgarden/container-utilities": "^1.0.0",
+    "@zendeskgarden/container-utilities": "^2.0.0",
     "date-fns": "^3.0.0",
     "prop-types": "^15.5.7",
     "react-popper": "^1.3.4"

packages/datepickers/package.json

@@ -11,7 +11,7 @@ import { render, renderRtl, fireEvent, act } from 'garden-test-utils';
 import { addDays } from 'date-fns/addDays';
 import { subDays } from 'date-fns/subDays';
 import mockDate from 'mockdate';
-import { KEY_CODES } from '@zendeskgarden/container-utilities';
+import { KEYS } from '@zendeskgarden/container-utilities';
 import { Datepicker } from './Datepicker';
 import { IDatepickerProps } from '../../types';
 
@@ -305,11 +305,11 @@ describe('Datepicker', () => {
       );
       const input = getByTestId('input');
 
-      fireEvent.keyDown(input, { keyCode: KEY_CODES.UP });
+      fireEvent.keyDown(input, { key: KEYS.UP });
       expect(queryByTestId('datepicker-menu')).toHaveAttribute('data-test-open', 'true');
       await user.tab();
 
-      fireEvent.keyDown(input, { keyCode: KEY_CODES.DOWN });
+      fireEvent.keyDown(input, { key: KEYS.DOWN });
       expect(queryByTestId('datepicker-menu')).toHaveAttribute('data-test-open', 'true');
       await user.tab();
 
@@ -325,12 +325,12 @@ describe('Datepicker', () => {
       const input = getByTestId('input');
 
       await user.click(input);
-      fireEvent.keyDown(input, { keyCode: KEY_CODES.ESCAPE });
+      fireEvent.keyDown(input, { key: KEYS.ESCAPE });
 
       expect(queryByTestId('datepicker-menu')).toHaveAttribute('data-test-open', 'false');
 
       await user.click(input);
-      fireEvent.keyDown(input, { keyCode: KEY_CODES.ENTER });
+      fireEvent.keyDown(input, { key: KEYS.ENTER });
 
       expect(queryByTestId('datepicker-menu')).toHaveAttribute('data-test-open', 'false');
     });