diff --git a/packages/react/src/components/TextInput/PasswordInput.js b/packages/react/src/components/TextInput/PasswordInput.tsx
similarity index 68%
rename from packages/react/src/components/TextInput/PasswordInput.js
rename to packages/react/src/components/TextInput/PasswordInput.tsx
index 7ce3d1f11249..d046f6fb99ea 100644
--- a/packages/react/src/components/TextInput/PasswordInput.js
+++ b/packages/react/src/components/TextInput/PasswordInput.tsx
@@ -1,14 +1,170 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React, {
+ InputHTMLAttributes,
+ useContext,
+ useEffect,
+ useState,
+} from 'react';
import classNames from 'classnames';
-import PropTypes from 'prop-types';
+import PropTypes, { ReactNodeLike } from 'prop-types';
import { View, ViewOff } from '@carbon/icons-react';
import { useNormalizedInputProps } from '../../internal/useNormalizedInputProps';
import { textInputProps } from './util';
import { FormContext } from '../FluidForm';
-import * as FeatureFlags from '@carbon/feature-flags';
import deprecate from '../../prop-types/deprecate';
import { usePrefix } from '../../internal/usePrefix';
+type ExcludedAttributes = 'size';
+
+export interface PasswordInputProps
+ extends Omit, ExcludedAttributes> {
+ /**
+ * Provide a custom className that is applied directly to the underlyling `` node
+ */
+ className?: string;
+
+ /**
+ * Optionally provide the default value of the ``
+ */
+ defaultValue?: string | number;
+
+ /**
+ * Specify whether the control is disabled
+ */
+ disabled?: boolean;
+
+ /**
+ * Specify whether to display the character counter
+ */
+ enableCounter?: boolean;
+
+ /**
+ * Provide text that is used alongside the control label for additional help
+ */
+ helperText?: ReactNodeLike;
+
+ /**
+ * Specify whether or not the underlying label is visually hidden
+ */
+ hideLabel?: boolean;
+
+ /**
+ * "Hide password" tooltip text on password visibility toggle
+ */
+ hidePasswordLabel?: string;
+
+ /**
+ * Provide a unique identifier for the input field
+ */
+ id: string;
+
+ /**
+ * `true` to use the inline version
+ */
+ inline?: boolean;
+
+ /**
+ * Specify whether the control is currently invalid
+ */
+ invalid?: boolean;
+
+ /**
+ * Provide the text that is displayed when the control is in an invalid state
+ */
+ invalidText?: ReactNodeLike;
+
+ /**
+ * Provide the text that will be read by a screen reader when visiting this control
+ */
+ labelText: ReactNodeLike;
+
+ /**
+ * @deprecated The `light` prop for `PasswordInput` has been deprecated in favor of the new `Layer` component. It will be removed in the next major release.
+ * `true` to use the light version. For use on $ui-01 backgrounds only.
+ * Don't use this to make tile background color same as container background color.
+ */
+ light?: boolean;
+
+ /**
+ * Max character count allowed for the input. This is needed in order for enableCounter to display
+ */
+ maxCount?: number;
+
+ /**
+ * Optionally provide an `onChange` handler that is called whenever `` is updated
+ * @param evt Change event triggered by ``
+ * @returns {void}
+ */
+ onChange?: (evt: React.ChangeEvent) => void;
+
+ /**
+ * Optionally provide an `onClick` handler that is called whenever the `` is returned
+ * @param evt Mouse event triggered by ``
+ * @returns {void}
+ */
+ onClick?: (evt: React.MouseEvent) => void;
+
+ /**
+ * Callback function that is called whenever the toggle password visibility button is clicked
+ * @param evt Mouse event triggered by the password visibility `
