fix: input: ensure id passed from props does not append uuid

src/components/Inputs/TextArea/TextArea.test.tsx

@@ -3,6 +3,7 @@ import Enzyme, { mount } from 'enzyme';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import MatchMediaMock from 'jest-matchmedia-mock';
 import { TextArea } from './TextArea';
+import { render } from '@testing-library/react';
 
 Enzyme.configure({ adapter: new Adapter() });
 
@@ -15,11 +16,16 @@ describe('TextArea', () => {
   afterEach(() => {
     matchMedia.clear();
   });
-  /*
-   * Functionality Tests
-   */
-  test('text input renders', () => {
+
+  test('text area renders', () => {
     const wrapper = mount(<TextArea />);
     expect(wrapper.containsMatchingElement(<TextArea />)).toEqual(true);
   });
+
+  test('text area id does not append uuid when from props', () => {
+    const { container } = render(<TextArea id="textAreaTest" />);
+    expect(
+      container.getElementsByTagName('textarea')[0].getAttribute('id')
+    ).toBe('textAreaTest');
+  });
 });

src/components/Inputs/TextArea/TextArea.tsx

@@ -71,7 +71,7 @@ export const TextArea: FC<TextAreaProps> = React.forwardRef(
 
     const htmlDir: string = useCanvasDirection();
 
-    const textAreaId: string = uniqueId(id || 'textarea-');
+    const textAreaId: string = !!id ? id : uniqueId('textarea-');
     const [inputValue, setInputValue] = useState(value);
 
     const {

src/components/Inputs/TextInput/TextInput.test.tsx

@@ -3,6 +3,7 @@ import Enzyme, { mount } from 'enzyme';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import MatchMediaMock from 'jest-matchmedia-mock';
 import { TextInput } from './TextInput';
+import { render } from '@testing-library/react';
 
 Enzyme.configure({ adapter: new Adapter() });
 
@@ -15,11 +16,16 @@ describe('TextInput', () => {
   afterEach(() => {
     matchMedia.clear();
   });
-  /*
-   * Functionality Tests
-   */
+
   test('text input renders', () => {
     const wrapper = mount(<TextInput />);
     expect(wrapper.containsMatchingElement(<TextInput />)).toEqual(true);
   });
+
+  test('text input id does not append uuid when from props', () => {
+    const { container } = render(<TextInput id="textInputTest" />);
+    expect(container.getElementsByTagName('input')[0].getAttribute('id')).toBe(
+      'textInputTest'
+    );
+  });
 });

src/components/Inputs/TextInput/TextInput.tsx

@@ -90,7 +90,7 @@ export const TextInput: FC<TextInputProps> = React.forwardRef(
     const [inputValue, setInputValue] = useState(value);
 
     const [clearButtonShown, _setClearButtonShown] = useState<boolean>(false);
-    const inputId: string = uniqueId(id || 'input-');
+    const inputId: string = !!id ? id : uniqueId('input-');
 
     const clearButtonRef: React.MutableRefObject<HTMLButtonElement> =
       useRef<HTMLButtonElement>(null);