chore: selectId

gravity-ui · May 22, 2024 · 186ac34 · 186ac34
1 parent d8a2340
commit 186ac34
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/components/Select/Select.tsx b/src/components/Select/Select.tsx
@@ -283,8 +283,7 @@ export const Select = React.forwardRef<HTMLButtonElement, SelectProps>(function
     };
 
     const uniqId = useUniqId();
-    const controlId = id ?? uniqId;
-    const selectId = `select-${controlId}`;
+    const selectId = id ?? uniqId;
     const popupId = `select-popup-${selectId}`;
 
     const _renderList = () => {
@@ -343,7 +342,6 @@ export const Select = React.forwardRef<HTMLButtonElement, SelectProps>(function
                 renderControl={renderControl}
                 value={value}
                 popupId={popupId}
-                id={controlId}
                 selectId={selectId}
                 activeIndex={activeIndex}
                 hasCounter={multiple && hasCounter}

diff --git a/src/components/Select/components/SelectControl/SelectControl.tsx b/src/components/Select/components/SelectControl/SelectControl.tsx
@@ -71,7 +71,6 @@ export const SelectControl = React.forwardRef<HTMLButtonElement, ControlProps>((
         renderCounter,
         hasCounter,
         title,
-        id,
     } = props;
     const showOptionsText = Boolean(selectedOptionsContent);
     const showPlaceholder = Boolean(placeholder && !showOptionsText);
@@ -165,7 +164,6 @@ export const SelectControl = React.forwardRef<HTMLButtonElement, ControlProps>((
                 popupId,
                 selectId,
                 activeIndex,
-                id,
             },
             {value},
         );
@@ -175,7 +173,7 @@ export const SelectControl = React.forwardRef<HTMLButtonElement, ControlProps>((
         <React.Fragment>
             <div className={selectControlBlock(controlMods)} role="group">
                 <button
-                    id={id}
+                    id={selectId}
                     ref={ref}
                     role="combobox"
                     aria-controls={popupId}

diff --git a/src/components/Select/types.ts b/src/components/Select/types.ts
@@ -21,7 +21,6 @@ export type SelectRenderControlProps = {
     open: boolean;
     popupId: string;
     selectId: string;
-    id?: string;
     activeIndex?: number;
 };
 export type SelectRenderControlOptions = {

diff --git a/src/components/TreeSelect/TreeSelect.tsx b/src/components/TreeSelect/TreeSelect.tsx
@@ -64,8 +64,6 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
     ref: React.Ref<HTMLButtonElement>,
 ) {
     const mobile = useMobile();
-    const uniqId = useUniqId();
-    const treeSelectId = id ?? uniqId;
 
     const controlWrapRef = React.useRef<HTMLDivElement>(null);
     const controlRef = React.useRef<HTMLElement>(null);
@@ -175,6 +173,10 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
 
     const handleClose = React.useCallback(() => toggleOpen(false), [toggleOpen]);
 
+    const uniqId = useUniqId();
+    const treeSelectId = id ?? uniqId;
+    const popupId = `tree-select-popup-${treeSelectId}`;
+
     const controlProps: TreeSelectRenderControlProps = {
         open,
         toggleOpen,
@@ -197,8 +199,8 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
             ).join(', ')}
             view="normal"
             pin="round-round"
-            popupId={`tree-select-popup-${treeSelectId}`}
-            selectId={`tree-select-${treeSelectId}`}
+            popupId={popupId}
+            selectId={treeSelectId}
         />
     );
 
@@ -231,7 +233,7 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
                 handleClose={handleClose}
                 disablePortal={popupDisablePortal}
                 mobile={mobile}
-                id={`tree-select-popup-${treeSelectId}`}
+                id={popupId}
             >
                 {slotBeforeListBody}