diff --git a/packages/react/src/components/PrimaryButton/PrimaryButton.js b/packages/react/src/components/PrimaryButton/PrimaryButton.tsx
similarity index 58%
rename from packages/react/src/components/PrimaryButton/PrimaryButton.js
rename to packages/react/src/components/PrimaryButton/PrimaryButton.tsx
index b610751f7415..447e44b694bb 100644
--- a/packages/react/src/components/PrimaryButton/PrimaryButton.js
+++ b/packages/react/src/components/PrimaryButton/PrimaryButton.tsx
@@ -6,8 +6,10 @@
  */
 
 import React from 'react';
-import Button from '../Button';
+import { Button, ButtonProps } from '../Button';
 
-const PrimaryButton = (props) => <Button kind="primary" {...props} />;
+const PrimaryButton = <T extends React.ElementType>(props: ButtonProps<T>) => (
+  <Button kind="primary" {...props} />
+);
 
 export default PrimaryButton;
diff --git a/packages/react/src/components/PrimaryButton/index.js b/packages/react/src/components/PrimaryButton/index.ts
similarity index 100%
rename from packages/react/src/components/PrimaryButton/index.js
rename to packages/react/src/components/PrimaryButton/index.ts
diff --git a/packages/react/src/components/SecondaryButton/SecondaryButton.js b/packages/react/src/components/SecondaryButton/SecondaryButton.tsx
similarity index 58%
rename from packages/react/src/components/SecondaryButton/SecondaryButton.js
rename to packages/react/src/components/SecondaryButton/SecondaryButton.tsx
index 51581b2bbb10..750ac1d79f60 100644
--- a/packages/react/src/components/SecondaryButton/SecondaryButton.js
+++ b/packages/react/src/components/SecondaryButton/SecondaryButton.tsx
@@ -6,8 +6,10 @@
  */
 
 import React from 'react';
-import Button from '../Button';
+import { Button, ButtonProps } from '../Button';
 
-const SecondaryButton = (props) => <Button kind="secondary" {...props} />;
+const SecondaryButton = <T extends React.ElementType>(
+  props: ButtonProps<T>
+) => <Button kind="secondary" {...props} />;
 
 export default SecondaryButton;
diff --git a/packages/react/src/components/SecondaryButton/index.js b/packages/react/src/components/SecondaryButton/index.ts
similarity index 100%
rename from packages/react/src/components/SecondaryButton/index.js
rename to packages/react/src/components/SecondaryButton/index.ts