chore: merge conflicts

.whitesource

@@ -0,0 +1,4 @@
+{
+  "settingsInheritedFrom": "ibm-mend-config/mend-config@main",
+  "minSeverityLevel": "NONE"
+}

package.json

@@ -29,13 +29,13 @@
     "postinstall": "husky"
   },
   "resolutions": {
-    "@types/react": "~18.2.33",
+    "@types/react": "~18.3.0",
     "@types/prop-types": "15.7.12",
     "ast-types": "^0.14.0",
     "node-sass": "^9.0.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "react-is": "~18.2.0"
+    "react": "~18.3.0",
+    "react-dom": "~18.3.0",
+    "react-is": "~18.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.2",
@@ -53,7 +53,7 @@
     "@percy/playwright": "^1.0.4",
     "@playwright/test": "^1.36.2",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^15.0.0",
+    "@testing-library/react": "^15.0.6",
     "@testing-library/user-event": "^14.4.3",
     "@types/react-is": "~18.2.0",
     "accessibility-checker": "^3.1.48",

packages/react/src/components/ComboBox/ComboBox-test.js

@@ -16,7 +16,8 @@ import {
   generateGenericItem,
 } from '../ListBox/test-helpers';
 import ComboBox from '../ComboBox';
-import { act } from 'react-dom/test-utils';
+import { act } from 'react';
+
 import { Slug } from '../Slug';
 
 const findInputNode = () => screen.getByRole('combobox');

packages/react/src/components/DatePicker/DatePicker.tsx

@@ -201,7 +201,7 @@ export type CalRef = {
   plugins: [];
   clickOpens: any;
 };
-interface DatePickerProps {
+export interface DatePickerProps {
   /**
    * Flatpickr prop passthrough enables direct date input, and when set to false,
    * we must clear dates manually by resetting the value prop to empty string making it a controlled input.

packages/react/src/components/DatePicker/index.tsx

@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import DatePicker from './DatePicker';
+import DatePicker, { type DatePickerProps } from './DatePicker';
 
 export {
   default as DatePickerSkeleton,
   type DatePickerSkeletonProps,
 } from './DatePicker.Skeleton';
 export default DatePicker;
-export { DatePicker };
+export { DatePicker, type DatePickerProps };

packages/react/src/components/DatePickerInput/DatePickerInput.tsx

@@ -28,7 +28,7 @@ export type ReactNodeLike =
 
 export type func = (...args: any[]) => any;
 
-interface DatePickerInputProps
+export interface DatePickerInputProps
   extends Omit<ReactAttr<HTMLInputElement>, ExcludedAttributes> {
   /**
    * The type of the date picker:

packages/react/src/components/DatePickerInput/index.ts

@@ -5,6 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import DatePickerInput from './DatePickerInput';
+import DatePickerInput, { type DatePickerInputProps } from './DatePickerInput';
 export default DatePickerInput;
-export { DatePickerInput };
+export { DatePickerInput, type DatePickerInputProps };

packages/react/src/components/Dropdown/Dropdown.stories.js

@@ -49,28 +49,22 @@ export default {
 
 const items = [
   {
-    id: 'option-0',
     text: 'Lorem, ipsum dolor sit amet consectetur adipisicing elit.',
   },
   {
-    id: 'option-1',
     text: 'Option 1',
   },
   {
-    id: 'option-2',
     text: 'Option 2',
   },
   {
-    id: 'option-3',
     text: 'Option 3 - a disabled item',
     disabled: true,
   },
   {
-    id: 'option-4',
     text: 'Option 4',
   },
   {
-    id: 'option-5',
     text: 'Option 5',
   },
 ];

packages/react/src/components/Tabs/Tabs-test.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Tabs, Tab, TabPanel, TabPanels, TabList } from './Tabs';
-import { act } from 'react-dom/test-utils';
+import { act } from 'react';
+
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as hooks from '../../internal/useMatchMedia';

packages/react/src/components/UIShell/HeaderMenuItem.tsx

@@ -75,7 +75,7 @@ const HeaderMenuItem: HeaderMenuItemComponent = forwardRef(
       </li>
     );
   }
-);
+) as HeaderMenuItemComponent;
 
 HeaderMenuItem.displayName = 'HeaderMenuItem';
 HeaderMenuItem.propTypes = {

packages/react/src/components/UIShell/SideNavLink.tsx

@@ -123,7 +123,7 @@ const SideNavLink: SideNavLinkComponent = forwardRef(function SideNavLink<
       </Link>
     </SideNavItem>
   );
-});
+}) as SideNavLinkComponent;
 
 SideNavLink.displayName = 'SideNavLink';
 SideNavLink.propTypes = {

packages/react/src/components/UIShell/__tests__/HeaderContainer-test.js

@@ -7,7 +7,8 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { act } from 'react-dom/test-utils';
+import { act } from 'react';
+
 import { HeaderContainer } from '../';
 
 describe('HeaderContainer', () => {

packages/react/src/internal/__tests__/useMatchMedia-test.js

@@ -7,7 +7,8 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { act } from 'react-dom/test-utils';
+import { act } from 'react';
+
 import { useMatchMedia } from '../useMatchMedia';
 
 describe('useMatchMedia', () => {

packages/styles/package.json

@@ -55,7 +55,7 @@
     "autoprefixer": "^10.4.7",
     "browserslist-config-carbon": "^11.2.0",
     "css": "^3.0.0",
-    "cssnano": "^6.0.0",
+    "cssnano": "^7.0.0",
     "lodash.isequal": "^4.5.0",
     "postcss": "^8.4.14",
     "postcss-flexbugs-fixes": "^5.0.2",