Merge branch 'main' into exportTypes_DatePicker

carbon-design-system · Jun 7, 2024 · f91a31e · f91a31e
2 parents 1a73b34 + 16f0daf
commit f91a31e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 15 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -24,9 +24,9 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         with:
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
diff --git a/.yarn/cache/ejs-npm-3.1.10-4e8cf4bdc1-a9cb7d7cd1.zip b/.yarn/cache/ejs-npm-3.1.10-4e8cf4bdc1-a9cb7d7cd1.zip
diff --git a/.yarn/cache/ejs-npm-3.1.9-e201b2088c-71f56d3754.zip b/.yarn/cache/ejs-npm-3.1.9-e201b2088c-71f56d3754.zip
diff --git a/...components/CheckboxGroup/CheckboxGroup.js → ...omponents/CheckboxGroup/CheckboxGroup.tsx b/...components/CheckboxGroup/CheckboxGroup.js → ...omponents/CheckboxGroup/CheckboxGroup.tsx
@@ -6,15 +6,35 @@
  */
 
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { ReactNode } from 'react';
 import cx from 'classnames';
 import { usePrefix } from '../../internal/usePrefix';
 import { WarningFilled, WarningAltFilled } from '@carbon/icons-react';
 import setupGetInstanceId from '../../tools/setupGetInstanceId';
 
 const getInstanceId = setupGetInstanceId();
 
-function CheckboxGroup({
+export interface CheckboxGroupProps {
+  children?: ReactNode;
+  className?: string;
+  helperText?: ReactNode;
+  invalid?: boolean;
+  invalidText?: ReactNode;
+  legendId?: ReactNode;
+  orientation?: 'horizontal' | 'vertical';
+  legendText: ReactNode;
+  readOnly?: boolean;
+  slug?: ReactNode;
+  warn?: boolean;
+  warnText?: ReactNode;
+}
+
+export interface CustomType {
+  size: string;
+  kind: string;
+}
+
+const CheckboxGroup: React.FC<CheckboxGroupProps> = ({
   children,
   className,
   helperText,
@@ -28,7 +48,7 @@ function CheckboxGroup({
   slug,
   orientation = 'vertical',
   ...rest
-}) {
+}) => {
   const prefix = usePrefix();
 
   const showWarning = !readOnly && !invalid && warn;
@@ -56,20 +76,21 @@ function CheckboxGroup({
 
   // Slug is always size `mini`
   let normalizedSlug;
-  if (slug && slug['type']?.displayName === 'Slug') {
+  if (
+    React.isValidElement(slug) &&
+    (slug['type'] as any)?.displayName === 'Slug'
+  ) {
     normalizedSlug = React.cloneElement(slug, {
       size: 'mini',
       kind: 'default',
-    });
+    } as CustomType);
   }
-
   return (
     <fieldset
       className={fieldsetClasses}
       data-invalid={invalid ? true : undefined}
       aria-labelledby={rest['aria-labelledby'] || legendId}
       aria-readonly={readOnly}
-      orientation="vertical"
       aria-describedby={!invalid && !warn && helper ? helperId : undefined}
       {...rest}>
       <legend
@@ -98,7 +119,7 @@ function CheckboxGroup({
       {showHelper && helper}
     </fieldset>
   );
-}
+};
 
 CheckboxGroup.propTypes = {
   /**
@@ -141,7 +162,6 @@ CheckboxGroup.propTypes = {
    * Provide the orientation for how the checkbox should be displayed
    */
   orientation: PropTypes.oneOf(['horizontal', 'vertical']),
-
   /**
    * Whether the CheckboxGroup should be read-only
    */

diff --git a/packages/react/src/components/ComboBox/ComboBox.tsx b/packages/react/src/components/ComboBox/ComboBox.tsx
@@ -639,9 +639,9 @@ const ComboBox = forwardRef(
               type="text"
               tabIndex={0}
               aria-haspopup="listbox"
-              aria-owns={getMenuProps().id}
               title={textInput?.current?.value}
               {...getInputProps({
+                'aria-controls': isOpen ? undefined : getMenuProps().id,
                 placeholder,
                 ref: { ...mergeRefs(textInput, ref) },
                 onKeyDown: (

diff --git a/yarn.lock b/yarn.lock
@@ -12453,13 +12453,13 @@ __metadata:
   linkType: hard
 
 "ejs@npm:^3.1.7, ejs@npm:^3.1.8":
-  version: 3.1.9
-  resolution: "ejs@npm:3.1.9"
+  version: 3.1.10
+  resolution: "ejs@npm:3.1.10"
   dependencies:
     jake: "npm:^10.8.5"
   bin:
     ejs: bin/cli.js
-  checksum: 10/71f56d37540d2c2d71701f0116710c676f75314a3e997ef8b83515d5d4d2b111c5a72725377caeecb928671bacb84a0d38135f345904812e989847057d59f21a
+  checksum: 10/a9cb7d7cd13b7b1cd0be5c4788e44dd10d92f7285d2f65b942f33e127230c054f99a42db4d99f766d8dbc6c57e94799593ee66a14efd7c8dd70c4812bf6aa384
   languageName: node
   linkType: hard