patternfly
diff --git a/packages/patternfly-4/react-core/src/components/Form/FormHelperText.d.ts b/packages/patternfly-4/react-core/src/components/Form/FormHelperText.d.ts
@@ -3,10 +3,10 @@ import { FunctionComponent, HTMLProps, ReactNode } from 'react';
 export interface FormHelperTextProps extends HTMLProps<HTMLDivElement> {
   children?: ReactNode;
   isError?: boolean;
-  isActive?: boolean;
+  isHidden?: boolean;
   className?: string;
 }
 
 declare const FormHelperText: FunctionComponent<FormHelperTextProps>;
 
-export default FormHelperText;
+export default FormHelperText;
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/Login.d.ts b/packages/patternfly-4/react-core/src/components/LoginPage/Login.d.ts
diff --git a/...re/src/components/LoginPage/Login.test.js → ...e/src/components/LoginPage/Login.test.tsx b/...re/src/components/LoginPage/Login.test.js → ...e/src/components/LoginPage/Login.test.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import * as React from 'react';
 import { shallow } from 'enzyme';
-import Login from './Login';
-import LoginFooter from './LoginFooter';
-import LoginHeader from './LoginHeader';
+import { Login } from './Login';
+import { LoginFooter } from './LoginFooter';
+import { LoginHeader } from './LoginHeader';
 
 test('Check login layout example against snapshot', () => {
   const Header = <LoginHeader headerBrand="HeaderBrand">Header Text</LoginHeader>;

diff --git a/...ct-core/src/components/LoginPage/Login.js → ...t-core/src/components/LoginPage/Login.tsx b/...ct-core/src/components/LoginPage/Login.js → ...t-core/src/components/LoginPage/Login.tsx
@@ -1,29 +1,25 @@
-import React from 'react';
+import * as React from 'react';
 import styles from '@patternfly/patternfly/components/Login/login.css';
 import { css } from '@patternfly/react-styles';
-import PropTypes from 'prop-types';
 
-const propTypes = {
+export interface LoginProps extends React.HTMLProps<HTMLDivElement> {
   /** Content rendered inside the main section of the login layout */
-  children: PropTypes.node,
+  children?: React.ReactNode;
   /** Additional classes added to the login layout */
-  className: PropTypes.string,
+  className?: string;
   /** Footer component (e.g. <LoginFooter />) */
-  footer: PropTypes.node,
+  footer?: React.ReactNode;
   /** Header component (e.g. <LoginHeader />) */
-  header: PropTypes.node,
-  /** Additional props are spread to the container <div> */
-  '': PropTypes.any
-};
+  header?: React.ReactNode;
+}
 
-const defaultProps = {
-  children: null,
-  className: '',
-  footer: null,
-  header: null
-};
-
-const Login = ({ className, children, footer, header, ...props }) => (
+export const Login: React.FunctionComponent<LoginProps> = ({
+  className = '',
+  children = null,
+  footer = null,
+  header = null,
+  ...props
+}: LoginProps) => (
   <div {...props} className={css(styles.login, className)}>
     <div className={css(styles.loginContainer)}>
       {header}
@@ -32,8 +28,3 @@ const Login = ({ className, children, footer, header, ...props }) => (
     </div>
   </div>
 );
-
-Login.propTypes = propTypes;
-Login.defaultProps = defaultProps;
-
-export default Login;
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooter.d.ts b/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooter.d.ts
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooter.js b/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooter.js
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooter.tsx b/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooter.tsx
@@ -0,0 +1,20 @@
+import * as React from 'react';
+import styles from '@patternfly/patternfly/components/Login/login.css';
+import { css } from '@patternfly/react-styles';
+
+export interface LoginFooterProps extends React.HTMLProps<HTMLElement> {
+  /** Content rendered inside the footer of the login layout */
+  children?: React.ReactNode;
+  /** Additional props are spread to the container <footer> */
+  className?: string;
+}
+
+export const LoginFooter: React.FunctionComponent<LoginFooterProps> = ({
+  className = '',
+  children = null,
+  ...props
+}: LoginFooterProps) => (
+  <footer className={css(styles.loginFooter, className)} {...props}>
+    {children}
+  </footer>
+);
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooterItem.d.ts b/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooterItem.d.ts
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooterItem.js b/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooterItem.js
diff --git a/...ponents/LoginPage/LoginFooterItem.test.js → ...onents/LoginPage/LoginFooterItem.test.tsx b/...ponents/LoginPage/LoginFooterItem.test.js → ...onents/LoginPage/LoginFooterItem.test.tsx
@@ -1,7 +1,8 @@
-import React from 'react';
-import LoginFooterItem from './LoginFooterItem';
+import * as React from 'react';
 import { shallow } from 'enzyme';
 
+import { LoginFooterItem } from './LoginFooterItem';
+
 test('renders with PatternFly Core styles', () => {
   const view = shallow(<LoginFooterItem target="_self" href="#" />);
   expect(view).toMatchSnapshot();

diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooterItem.tsx b/packages/patternfly-4/react-core/src/components/LoginPage/LoginFooterItem.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+
+export interface LoginFooterItemProps extends React.HTMLProps<HTMLAnchorElement> {
+  /** Content rendered inside the footer Link Item */
+  children?: React.ReactNode;
+  /** Additional classes added to the Footer Link Item  */
+  className?: string;
+  /** The URL of the Footer Link Item */
+  href?: string;
+  /** Specifies where to open the linked document */
+  target?: string;
+}
+
+export const LoginFooterItem: React.FunctionComponent<LoginFooterItemProps> = ({
+  className = '',
+  children = null,
+  href = '#',
+  target = '_blank',
+  ...props
+}: LoginFooterItemProps) => {
+  const reactElement: boolean = React.isValidElement(children);
+  return reactElement ? (
+    React.cloneElement(children as React.ReactElement<any>)
+  ) : (
+    <a target={target} href={href} {...props}>
+      {children}
+    </a>
+  );
+};
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.d.ts b/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.d.ts
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.js b/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.js
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.tsx b/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.tsx
@@ -0,0 +1,48 @@
+import * as React from 'react';
+import { shallow } from 'enzyme';
+
+import { LoginForm } from './LoginForm';
+
+test('should render Login form', () => {
+  const view = shallow(<LoginForm />);
+  expect(view).toMatchSnapshot();
+});
+
+test('should call onChangeUsername callback', () => {
+  const mockFn = jest.fn();
+  const view = shallow(
+    <LoginForm onChangeUsername={mockFn} rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />
+  );
+  view.find('#pf-login-username-id').simulate('change');
+  expect(mockFn).toHaveBeenCalled();
+});
+
+test('should call onChangePassword callback', () => {
+  const mockFn = jest.fn();
+  const view = shallow(
+    <LoginForm onChangePassword={mockFn} rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />
+  );
+  view.find('#pf-login-password-id').simulate('change');
+  expect(mockFn).toHaveBeenCalled();
+});
+
+test('should call onChangeRememberMe callback', () => {
+  const mockFn = jest.fn();
+  const view = shallow(
+    <LoginForm onChangeRememberMe={mockFn} rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />
+  );
+  view.find('#pf-login-remember-me-id').simulate('change');
+  expect(mockFn).toHaveBeenCalled();
+});
+
+test('LoginForm with rememberMeLabel and no rememberMeAriaLabel uses the rememberMeLabel', () => {
+  const view = shallow(<LoginForm rememberMeLabel="remember me" />);
+  expect(view).toMatchSnapshot();
+});
+
+test('LoginForm with rememberMeLabel and rememberMeAriaLabel uses the rememberMeAriaLabel', () => {
+  const view = shallow(
+    <LoginForm rememberMeAriaLabel="ARIA remember me" rememberMeLabel="remember me" />
+  );
+  expect(view).toMatchSnapshot();
+});